-/* 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
static void local_variable_free(local_variable_t v){
xbt_free(v->frame);
xbt_free(v->name);
- xbt_free(v->type);
xbt_free(v);
}
/************************************* 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;
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(¤t_variable->locations,
+ &(stack_frame->unw_cursor), (void*)stack_frame->frame_base, NULL);
}
xbt_dynar_push(variables, &new_var);
unw_cursor_t c;
- dw_frame_t test = MC_find_function_by_ip(&MC_unwind_stack_frames);
- xbt_assert(test);
-
int ret;
for(ret = unw_init_local(&c, (unw_context_t *)stack_context); ret >= 0; ret = unw_step(&c)){
mc_stack_frame_t stack_frame = xbt_new(s_mc_stack_frame_t, 1);
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;
}
}
+void* mc_translate_address(uintptr_t addr, mc_snapshot_t snapshot) {
+
+ // If not in a process state/clone:
+ if(!snapshot) {
+ return (uintptr_t*) addr;
+ }
+
+ // If it is in a snapshot:
+ for(size_t i=0; i!=NB_REGIONS; ++i) {
+ mc_mem_region_t region = snapshot->regions[i];
+ uintptr_t start = (uintptr_t) region->start_addr;
+ uintptr_t end = start + region->size;
+
+ // The address is in this region:
+ if(addr >= start && addr < end) {
+ uintptr_t offset = addr - start;
+ return (void*) ((uintptr_t)region->data + offset);
+ }
+
+ }
+
+ // It is not in a snapshot:
+ return (void*) addr;
+}
+
mc_snapshot_t SIMIX_pre_mc_snapshot(smx_simcall_t simcall){
return MC_take_snapshot(1);
}