[mc] Use new expression evaluation code frame_base

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

diff --git a/src/mc/mc_checkpoint.c b/src/mc/mc_checkpoint.c
index 6f6825a..eaf8566 100644 (file)
--- a/src/mc/mc_checkpoint.c
+++ b/src/mc/mc_checkpoint.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2013. The SimGrid Team.
+/* Copyright (c) 2008-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -45,7 +45,6 @@ static void MC_snapshot_stack_free_voidp(void *s){
 static void local_variable_free(local_variable_t v){
   xbt_free(v->frame);
   xbt_free(v->name);
-  xbt_free(v->type);
   xbt_free(v);
 }
 
@@ -237,6 +236,14 @@ void MC_find_object_address(memory_map_t maps, mc_object_info_t result) {
 /************************************* Take Snapshot ************************************/
 /****************************************************************************************/
 
+static bool mc_valid_variable(dw_variable_t var, dw_frame_t frame, const void* ip) {
+  // The variable is not yet valid:
+  if((const void*)((const char*) frame->low_pc + var->start_scope) > ip)
+    return false;
+  else
+    return true;
+}
+
 static xbt_dynar_t MC_get_local_variables_values(xbt_dynar_t stack_frames){
 
   unsigned cursor1 = 0;
@@ -249,6 +256,9 @@ static xbt_dynar_t MC_get_local_variables_values(xbt_dynar_t stack_frames){
     dw_variable_t current_variable;
     xbt_dynar_foreach(stack_frame->frame->variables, cursor2, current_variable){
       
+      if(!mc_valid_variable(current_variable, stack_frame->frame, (void*) stack_frame->ip))
+        continue;
+
       int region_type;
       if((long)stack_frame->ip > (long)mc_libsimgrid_info->start_exec)
         region_type = 1;
@@ -259,15 +269,15 @@ static xbt_dynar_t MC_get_local_variables_values(xbt_dynar_t stack_frames){
       new_var->frame = xbt_strdup(stack_frame->frame_name);
       new_var->ip = stack_frame->ip;
       new_var->name = xbt_strdup(current_variable->name);
-      new_var->type = strdup(current_variable->type_origin);
+      new_var->type = current_variable->type;
       new_var->region= region_type;
       
       /* if(current_variable->address!=NULL) {
         new_var->address = current_variable->address;
       } else */
-      if(current_variable->location != NULL){
-        new_var->address = (void*) MC_dwarf_resolve_location(
-          &(stack_frame->unw_cursor), current_variable->location, (void*)stack_frame->frame_base);
+      if(current_variable->locations.size != 0){
+        new_var->address = (void*) mc_dwarf_resolve_locations(&current_variable->locations,
+          &(stack_frame->unw_cursor), (void*)stack_frame->frame_base);
       }
 
       xbt_dynar_push(variables, &new_var);
@@ -317,21 +327,7 @@ static xbt_dynar_t MC_unwind_stack_frames(void *stack_context) {
 
     if(frame) {
       stack_frame->frame_name = xbt_strdup(frame->name);
-
-      mc_object_info_t info = MC_ip_find_object_info((void*)ip);
-
-      // This is the instruction pointer as present in the DWARF of the object:
-      // Relocated addresses are offset for shared objets and constant for executables objects.
-      // See DWARF4 spec 7.5
-      unw_word_t normalized_ip;
-      if(info->flags & MC_OBJECT_INFO_EXECUTABLE) {
-        normalized_ip = ip;
-      } else {
-        void* base = MC_object_base_address(info);
-        normalized_ip = (unw_word_t) ip - (unw_word_t) base;
-      }
-
-      stack_frame->frame_base = (unw_word_t)mc_find_frame_base(normalized_ip, frame, &c);
+      stack_frame->frame_base = (unw_word_t)mc_find_frame_base(frame, &c);
     } else {
       stack_frame->frame_base = 0;
     }