[mc] Attach correct namespaced name in inlined subroutine (DW_TAG_inlined_subroutine)

[simgrid.git] / src / mc / mc_global.c

diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c
index fb55f18..17b7634 100644 (file)
--- a/src/mc/mc_global.c
+++ b/src/mc/mc_global.c
@@ -277,7 +277,7 @@ static dw_frame_t MC_find_function_by_ip_and_object(void* ip, mc_object_info_t i
     int k = i + ((j-i)/2);
     if(ip < base[k].low_pc) {
       j = k-1;
-    } else if(ip > base[k].high_pc) {
+    } else if(ip >= base[k].high_pc) {
       i = k+1;
     } else {
       return base[k].function;
@@ -304,18 +304,41 @@ static void MC_post_process_variables(mc_object_info_t info) {
   }
 }
 
+static void mc_post_process_scope(mc_object_info_t info, dw_frame_t scope) {
+
+  if(scope->tag == DW_TAG_inlined_subroutine) {
+
+    // Attach correct namespaced name in inlined subroutine:
+    char* key = bprintf("%" PRIx64, (uint64_t) scope->abstract_origin_id);
+    dw_frame_t abstract_origin = xbt_dict_get_or_null(info->subprograms, key);
+    xbt_assert(abstract_origin, "Could not lookup abstract origin %s", key);
+    xbt_free(key);
+    scope->name = xbt_strdup(abstract_origin->name);
+
+  }
+
+  // Direct:
+  unsigned cursor = 0;
+  dw_variable_t variable = NULL;
+  xbt_dynar_foreach(scope->variables, cursor, variable) {
+    if(variable->type_origin) {
+      variable->type = xbt_dict_get_or_null(info->types, variable->type_origin);
+    }
+  }
+
+  // Recursive post-processing of nested-scopes:
+  dw_frame_t nested_scope = NULL;
+  xbt_dynar_foreach(scope->scopes, cursor, nested_scope)
+    mc_post_process_scope(info, nested_scope);
+
+}
+
 static void MC_post_process_functions(mc_object_info_t info) {
   xbt_dict_cursor_t cursor;
   char* key;
-  dw_frame_t function = NULL;
-  xbt_dict_foreach(info->subprograms, cursor, key, function) {
-    unsigned cursor2 = 0;
-    dw_variable_t variable = NULL;
-    xbt_dynar_foreach(function->variables, cursor2, variable) {
-      if(variable->type_origin) {
-        variable->type = xbt_dict_get_or_null(info->types, variable->type_origin);
-      }
-    }
+  dw_frame_t subprogram = NULL;
+  xbt_dict_foreach(info->subprograms, cursor, key, subprogram) {
+    mc_post_process_scope(info, subprogram);
   }
 }
 
@@ -336,19 +359,6 @@ mc_object_info_t MC_find_object_info(memory_map_t maps, char* name, int executab
 
 /*************************************************************************/
 
-static dw_variable_t MC_dwarf_get_variable_by_name(dw_frame_t frame, char *var){
-
-  unsigned int cursor = 0;
-  dw_variable_t current_var;
-
-  xbt_dynar_foreach(frame->variables, cursor, current_var){
-    if(strcmp(var, current_var->name) == 0)
-      return current_var;
-  }
-
-  return NULL;
-}
-
 static int MC_dwarf_get_variable_index(xbt_dynar_t variables, char* var, void *address){
 
   if(xbt_dynar_is_empty(variables))
@@ -586,35 +596,42 @@ void MC_ignore_global_variable(const char *name){
     MC_UNSET_RAW_MEM;
 }
 
+static void mc_ignore_local_variable_in_scope(const char *var_name, dw_frame_t scope) {
+  // Processing of direct variables:
+  int start = 0;
+  int end = xbt_dynar_length(scope->variables) - 1;
+  while(start <= end){
+    int cursor = (start + end) / 2;
+    dw_variable_t current_var = (dw_variable_t)xbt_dynar_get_as(scope->variables, cursor, dw_variable_t);
+
+    int compare = strcmp(current_var->name, var_name);
+    if(compare == 0){
+      xbt_dynar_remove_at(scope->variables, cursor, NULL);
+      start = 0;
+      end = xbt_dynar_length(scope->variables) - 1;
+    }else if(compare < 0){
+      start = cursor + 1;
+    }else{
+      end = cursor - 1;
+    }
+  }
+
+  // And recursive processing in nested scopes:
+  unsigned cursor = 0;
+  dw_frame_t nested_scope = NULL;
+  xbt_dynar_foreach(scope->scopes, cursor, nested_scope) {
+    mc_ignore_local_variable_in_scope(var_name, nested_scope);
+  }
+}
+
 static void MC_ignore_local_variable_in_object(const char *var_name, const char *frame_name, mc_object_info_t info) {
   xbt_dict_cursor_t cursor2;
   dw_frame_t frame;
-  int start, end;
-  int cursor = 0;
-  dw_variable_t current_var;
   char* key;
   xbt_dict_foreach(info->subprograms, cursor2, key, frame) {
-
     if(frame_name && strcmp(frame_name, frame->name))
       continue;
-
-    start = 0;
-    end = xbt_dynar_length(frame->variables) - 1;
-    while(start <= end){
-      cursor = (start + end) / 2;
-      current_var = (dw_variable_t)xbt_dynar_get_as(frame->variables, cursor, dw_variable_t);
-
-      int compare = strcmp(current_var->name, var_name);
-      if(compare == 0){
-        xbt_dynar_remove_at(frame->variables, cursor, NULL);
-        start = 0;
-        end = xbt_dynar_length(frame->variables) - 1;
-      }else if(compare < 0){
-        start = cursor + 1;
-      }else{
-        end = cursor - 1;
-      }
-    }
+    mc_ignore_local_variable_in_scope(var_name, frame);
   }
 }