/************************************* 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;
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;
/* 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(¤t_variable->locations,
+ &(stack_frame->unw_cursor), (void*)stack_frame->frame_base);
}
xbt_dynar_push(variables, &new_var);
if(frame) {
stack_frame->frame_name = xbt_strdup(frame->name);
- stack_frame->frame_base = (unw_word_t)mc_find_frame_base((void*)ip, frame, &c);
+ stack_frame->frame_base = (unw_word_t)mc_find_frame_base(frame, &c);
} else {
stack_frame->frame_base = 0;
}