X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/df2fe4fa15d80bf6b15e648aa962d15a2a40a2c7..6d2f9a6f0b14d7fe1f51dfe3b576a9bf2397ddb5:/src/mc/mc_global.c diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c index ccc32efccb..461e0b53a9 100644 --- a/src/mc/mc_global.c +++ b/src/mc/mc_global.c @@ -8,12 +8,14 @@ #include #include +#include "simgrid/sg_config.h" #include "../surf/surf_private.h" #include "../simix/smx_private.h" #include "../xbt/mmalloc/mmprivate.h" #include "xbt/fifo.h" #include "mc_private.h" #include "xbt/automaton.h" +#include "xbt/dict.h" XBT_LOG_NEW_CATEGORY(mc, "All MC categories"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, @@ -22,12 +24,19 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, /* Configuration support */ e_mc_reduce_t mc_reduce_kind=e_mc_reduce_unset; -extern int _surf_init_status; +int _sg_do_model_check = 0; +int _sg_mc_checkpoint=0; +char* _sg_mc_property_file=NULL; +int _sg_mc_timeout=0; +int _sg_mc_max_depth=1000; +int _sg_mc_visited=0; + +extern int _sg_init_status; void _mc_cfg_cb_reduce(const char *name, int pos) { - if (_surf_init_status && !_surf_do_model_check) { + if (_sg_init_status && !_sg_do_model_check) { xbt_die("You are specifying a reduction strategy after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); } - char *val= xbt_cfg_get_string(_surf_cfg_set, name); + char *val= xbt_cfg_get_string(_sg_cfg_set, name); if (!strcasecmp(val,"none")) { mc_reduce_kind = e_mc_reduce_none; } else if (!strcasecmp(val,"dpor")) { @@ -35,22 +44,40 @@ void _mc_cfg_cb_reduce(const char *name, int pos) { } else { xbt_die("configuration option %s can only take 'none' or 'dpor' as a value",name); } - xbt_cfg_set_int(_surf_cfg_set,"model-check",1); } void _mc_cfg_cb_checkpoint(const char *name, int pos) { - if (_surf_init_status && !_surf_do_model_check) { + if (_sg_init_status && !_sg_do_model_check) { xbt_die("You are specifying a checkpointing value after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); } - _surf_mc_checkpoint = xbt_cfg_get_int(_surf_cfg_set, name); - xbt_cfg_set_int(_surf_cfg_set,"model-check",1); + _sg_mc_checkpoint = xbt_cfg_get_int(_sg_cfg_set, name); } void _mc_cfg_cb_property(const char *name, int pos) { - if (_surf_init_status && !_surf_do_model_check) { + if (_sg_init_status && !_sg_do_model_check) { xbt_die("You are specifying a property after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); } - _surf_mc_property_file= xbt_cfg_get_string(_surf_cfg_set, name); - xbt_cfg_set_int(_surf_cfg_set,"model-check",1); + _sg_mc_property_file= xbt_cfg_get_string(_sg_cfg_set, name); +} + +void _mc_cfg_cb_timeout(const char *name, int pos) { + if (_sg_init_status && !_sg_do_model_check) { + xbt_die("You are specifying a value to enable/disable timeout for wait requests after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); + } + _sg_mc_timeout= xbt_cfg_get_int(_sg_cfg_set, name); +} + +void _mc_cfg_cb_max_depth(const char *name, int pos) { + if (_sg_init_status && !_sg_do_model_check) { + xbt_die("You are specifying a max depth value after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); + } + _sg_mc_max_depth= xbt_cfg_get_int(_sg_cfg_set, name); +} + +void _mc_cfg_cb_visited(const char *name, int pos) { + if (_sg_init_status && !_sg_do_model_check) { + xbt_die("You are specifying a number of stored visited states after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); + } + _sg_mc_visited= xbt_cfg_get_int(_sg_cfg_set, name); } @@ -59,58 +86,145 @@ void _mc_cfg_cb_property(const char *name, int pos) { mc_state_t mc_current_state = NULL; char mc_replay_mode = FALSE; double *mc_time = NULL; -mc_snapshot_t initial_snapshot = NULL; -int raw_mem_set; +mc_comparison_times_t mc_comp_times = NULL; +double mc_snapshot_comparison_time; /* Safety */ xbt_fifo_t mc_stack_safety = NULL; mc_stats_t mc_stats = NULL; +mc_global_t initial_state_safety = NULL; /* Liveness */ mc_stats_pair_t mc_stats_pair = NULL; xbt_fifo_t mc_stack_liveness = NULL; -mc_snapshot_t initial_snapshot_liveness = NULL; +mc_global_t initial_state_liveness = NULL; int compare; -xbt_dynar_t mc_binary_local_variables = NULL; -extern xbt_dynar_t mmalloc_ignore; +/* Local */ +xbt_dict_t mc_local_variables = NULL; +/* Global */ +xbt_dynar_t mc_global_variables = NULL; + +/* Ignore mechanism */ +xbt_dynar_t mc_stack_comparison_ignore; +xbt_dynar_t mc_data_bss_comparison_ignore; +extern xbt_dynar_t mc_heap_comparison_ignore; extern xbt_dynar_t stacks_areas; xbt_automaton_t _mc_property_automaton = NULL; +/* Static functions */ + static void MC_assert_pair(int prop); +static dw_location_t get_location(xbt_dict_t location_list, char *expr); +static dw_frame_t get_frame_by_offset(xbt_dict_t all_variables, unsigned long int offset); +static size_t data_bss_ignore_size(void *address); +static void MC_get_global_variables(char *elf_file); +static void heap_ignore_region_free(mc_heap_ignore_region_t r); +static void heap_ignore_region_free_voidp(void *r); void MC_do_the_modelcheck_for_real() { - if (!_surf_mc_property_file || _surf_mc_property_file[0]=='\0') { + + MC_SET_RAW_MEM; + mc_comp_times = xbt_new0(s_mc_comparison_times_t, 1); + MC_UNSET_RAW_MEM; + + if (!_sg_mc_property_file || _sg_mc_property_file[0]=='\0') { if (mc_reduce_kind==e_mc_reduce_unset) mc_reduce_kind=e_mc_reduce_dpor; XBT_INFO("Check a safety property"); - MC_modelcheck(); + MC_modelcheck_safety(); } else { if (mc_reduce_kind==e_mc_reduce_unset) mc_reduce_kind=e_mc_reduce_none; - XBT_INFO("Check the liveness property %s",_surf_mc_property_file); - MC_automaton_load(_surf_mc_property_file); + XBT_INFO("Check the liveness property %s",_sg_mc_property_file); + MC_automaton_load(_sg_mc_property_file); MC_modelcheck_liveness(); } } -/** - * \brief Initialize the model-checker data structures - */ -void MC_init_safety(void) -{ - raw_mem_set = (mmalloc_get_current_heap() == raw_heap); +void MC_compare(void){ + compare = 1; +} + +void MC_init(){ + + int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + + mc_time = xbt_new0(double, simix_process_maxpid); + + /* mc_time refers to clock for each process -> ignore it for heap comparison */ + int i; + for(i = 0; i 0){ + MC_init(); + }else{ + MC_SET_RAW_MEM; + MC_init_memory_map_info(); + get_libsimgrid_plt_section(); + get_binary_plt_section(); + MC_UNSET_RAW_MEM; + } + MC_dpor_init(); MC_SET_RAW_MEM; /* Save the initial state */ - initial_snapshot = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot(initial_snapshot); + initial_state_safety = xbt_new0(s_mc_global_t, 1); + initial_state_safety->snapshot = MC_take_snapshot(); MC_UNSET_RAW_MEM; + MC_dpor(); if(raw_mem_set) MC_SET_RAW_MEM; - else - MC_UNSET_RAW_MEM; - -} - -void MC_compare(void){ - compare = 1; -} - -void MC_modelcheck(void) -{ - MC_init_safety(); - MC_dpor(); MC_exit(); } void MC_modelcheck_liveness(){ - raw_mem_set = (mmalloc_get_current_heap() == raw_heap); - - /* init stuff */ - XBT_DEBUG("Start init mc"); - - mc_time = xbt_new0(double, simix_process_maxpid); - - /* mc_time refers to clock for each process -> ignore it for heap comparison */ - int i; - for(i = 0; isnapshot); /* At the moment of taking the snapshot the raw heap was set, so restoring * it will set it back again, we have to unset it to continue */ MC_UNSET_RAW_MEM; @@ -317,7 +413,7 @@ void MC_replay(xbt_fifo_t stack, int start) } XBT_DEBUG("**** End Replay ****"); - if(raw_mem_set) + if(raw_mem) MC_SET_RAW_MEM; else MC_UNSET_RAW_MEM; @@ -328,7 +424,7 @@ void MC_replay(xbt_fifo_t stack, int start) void MC_replay_liveness(xbt_fifo_t stack, int all_stack) { - raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + initial_state_liveness->raw_mem_set = (mmalloc_get_current_heap() == raw_heap); int value; char *req_str; @@ -341,10 +437,12 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack) XBT_DEBUG("**** Begin Replay ****"); /* Restore the initial state */ - MC_restore_snapshot(initial_snapshot_liveness); + MC_restore_snapshot(initial_state_liveness->snapshot); + /* At the moment of taking the snapshot the raw heap was set, so restoring * it will set it back again, we have to unset it to continue */ - MC_UNSET_RAW_MEM; + if(!initial_state_liveness->raw_mem_set) + MC_UNSET_RAW_MEM; if(all_stack){ @@ -430,7 +528,7 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack) XBT_DEBUG("**** End Replay ****"); - if(raw_mem_set) + if(initial_state_liveness->raw_mem_set) MC_SET_RAW_MEM; else MC_UNSET_RAW_MEM; @@ -445,11 +543,11 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack) void MC_dump_stack_safety(xbt_fifo_t stack) { - raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); MC_show_stack_safety(stack); - if(!_surf_mc_checkpoint){ + if(!_sg_mc_checkpoint){ mc_state_t state; @@ -528,19 +626,17 @@ void MC_show_stack_liveness(xbt_fifo_t stack){ void MC_dump_stack_liveness(xbt_fifo_t stack){ - raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); mc_pair_stateless_t pair; MC_SET_RAW_MEM; while ((pair = (mc_pair_stateless_t) xbt_fifo_pop(stack)) != NULL) - MC_pair_stateless_delete(pair); + pair_stateless_free(pair); MC_UNSET_RAW_MEM; if(raw_mem_set) MC_SET_RAW_MEM; - else - MC_UNSET_RAW_MEM; } @@ -564,13 +660,14 @@ void MC_print_statistics_pairs(mc_stats_pair_t stats) //XBT_INFO("Executed transitions = %lu", stats->executed_transitions); XBT_INFO("Expanded / Visited = %lf", (double) stats->visited_pairs / stats->expanded_pairs); - /*XBT_INFO("Exploration coverage = %lf", - (double)stats->expanded_states / stats->state_size); */ + + if(mmalloc_get_current_heap() == raw_heap) + MC_UNSET_RAW_MEM; } void MC_assert(int prop) { - if (MC_IS_ENABLED && !prop){ + if (MC_is_active() && !prop){ XBT_INFO("**************************"); XBT_INFO("*** PROPERTY NOT VALID ***"); XBT_INFO("**************************"); @@ -582,7 +679,7 @@ void MC_assert(int prop) } static void MC_assert_pair(int prop){ - if (MC_IS_ENABLED && !prop) { + if (MC_is_active() && !prop) { XBT_INFO("**************************"); XBT_INFO("*** PROPERTY NOT VALID ***"); XBT_INFO("**************************"); @@ -601,15 +698,19 @@ void MC_process_clock_add(smx_process_t process, double amount) double MC_process_clock_get(smx_process_t process) { - if(mc_time) - return mc_time[process->pid]; - else + if(mc_time){ + if(process != NULL) + return mc_time[process->pid]; + else + return -1; + }else{ return 0; + } } void MC_automaton_load(const char *file){ - raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); MC_SET_RAW_MEM; @@ -622,14 +723,12 @@ void MC_automaton_load(const char *file){ if(raw_mem_set) MC_SET_RAW_MEM; - else - MC_UNSET_RAW_MEM; } void MC_automaton_new_propositional_symbol(const char* id, void* fct) { - raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); MC_SET_RAW_MEM; @@ -642,289 +741,726 @@ void MC_automaton_new_propositional_symbol(const char* id, void* fct) { if(raw_mem_set) MC_SET_RAW_MEM; - else - MC_UNSET_RAW_MEM; } /************ MC_ignore ***********/ -void MC_ignore_init(){ - MC_SET_RAW_MEM; - mmalloc_ignore = xbt_dynar_new(sizeof(mc_ignore_region_t), NULL); - stacks_areas = xbt_dynar_new(sizeof(stack_region_t), NULL); - MC_UNSET_RAW_MEM; +static void heap_ignore_region_free(mc_heap_ignore_region_t r){ + if(r) + xbt_free(r); +} + +static void heap_ignore_region_free_voidp(void *r){ + heap_ignore_region_free((mc_heap_ignore_region_t) * (void **) r); } -void MC_ignore(void *address, size_t size){ +void MC_ignore_heap(void *address, size_t size){ + + int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); MC_SET_RAW_MEM; + + if(mc_heap_comparison_ignore == NULL) + mc_heap_comparison_ignore = xbt_dynar_new(sizeof(mc_heap_ignore_region_t), heap_ignore_region_free_voidp); - mc_ignore_region_t region = NULL; - region = xbt_new0(s_mc_ignore_region_t, 1); + mc_heap_ignore_region_t region = NULL; + region = xbt_new0(s_mc_heap_ignore_region_t, 1); region->address = address; region->size = size; - region->block = ((char*)address - (char*)((xbt_mheap_t)std_heap)->heapbase) / BLOCKSIZE + 1; + region->block = ((char*)address - (char*)((xbt_mheap_t)std_heap)->heapbase) / BLOCKSIZE + 1; + if(((xbt_mheap_t)std_heap)->heapinfo[region->block].type == 0){ region->fragment = -1; + ((xbt_mheap_t)std_heap)->heapinfo[region->block].busy_block.ignore = 1; }else{ region->fragment = ((uintptr_t) (ADDR2UINT (address) % (BLOCKSIZE))) >> ((xbt_mheap_t)std_heap)->heapinfo[region->block].type; + ((xbt_mheap_t)std_heap)->heapinfo[region->block].busy_frag.ignore[region->fragment] = 1; } unsigned int cursor = 0; - mc_ignore_region_t current_region; - xbt_dynar_foreach(mmalloc_ignore, cursor, current_region){ + mc_heap_ignore_region_t current_region; + xbt_dynar_foreach(mc_heap_comparison_ignore, cursor, current_region){ if(current_region->address > address) break; } - xbt_dynar_insert_at(mmalloc_ignore, cursor, ®ion); + xbt_dynar_insert_at(mc_heap_comparison_ignore, cursor, ®ion); MC_UNSET_RAW_MEM; -} -void MC_new_stack_area(void *stack, char *name){ - MC_SET_RAW_MEM; - stack_region_t region = NULL; - region = xbt_new0(s_stack_region_t, 1); - region->address = stack; - region->process_name = strdup(name); - xbt_dynar_push(stacks_areas, ®ion); - MC_UNSET_RAW_MEM; + if(raw_mem_set) + MC_SET_RAW_MEM; } -/************ DWARF ***********/ +void MC_remove_ignore_heap(void *address, size_t size){ -static e_dw_location_type get_location(char *expr, dw_location_t entry); + int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); -void MC_get_binary_local_variables(){ + MC_SET_RAW_MEM; + + unsigned int cursor = 0; + int start = 0; + int end = xbt_dynar_length(mc_heap_comparison_ignore) - 1; + mc_heap_ignore_region_t region; + int ignore_found = 0; + + while(start <= end){ + cursor = (start + end) / 2; + region = (mc_heap_ignore_region_t)xbt_dynar_get_as(mc_heap_comparison_ignore, cursor, mc_heap_ignore_region_t); + if(region->address == address){ + ignore_found = 1; + break; + } + if(region->address < address) + start = cursor + 1; + if(region->address > address){ + if((char * )region->address <= ((char *)address + size)){ + ignore_found = 1; + break; + }else + end = cursor - 1; + } + } + + if(ignore_found == 1){ + xbt_dynar_remove_at(mc_heap_comparison_ignore, cursor, NULL); + MC_remove_ignore_heap(address, size); + } - char *command = bprintf("dwarfdump -i %s", xbt_binary_name); + MC_UNSET_RAW_MEM; - FILE* fp = popen(command, "r"); + if(raw_mem_set) + MC_SET_RAW_MEM; - if(fp == NULL) - perror("popen failed"); +} - char *line = NULL, *tmp_line = NULL, *tmp_location = NULL, *frame_name = NULL; - ssize_t read; - size_t n = 0; - int valid_variable = 1, valid_frame = 1; - char *node_type = NULL, *location_type = NULL, *variable_name = NULL, *lowpc = NULL, *highpc = NULL; - xbt_dynar_t split = NULL; +void MC_ignore_data_bss(void *address, size_t size){ - read = getline(&line, &n, fp); + int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); - while (read != -1) { + MC_SET_RAW_MEM; + + if(mc_data_bss_comparison_ignore == NULL) + mc_data_bss_comparison_ignore = xbt_dynar_new(sizeof(mc_data_bss_ignore_variable_t), NULL); - if(n == 0) - continue; + if(xbt_dynar_is_empty(mc_data_bss_comparison_ignore)){ - /* Wipeout the new line character */ - line[read - 1] = '\0'; - - if(line[0] == '<'){ + mc_data_bss_ignore_variable_t var = NULL; + var = xbt_new0(s_mc_data_bss_ignore_variable_t, 1); + var->address = address; + var->size = size; - /* Get node type */ - strtok(line, " "); - strtok(NULL, " "); - node_type = strtok(NULL, " "); + xbt_dynar_insert_at(mc_data_bss_comparison_ignore, 0, &var); - if(strcmp(node_type, "DW_TAG_subprogram") == 0){ /* New frame */ + }else{ + + unsigned int cursor = 0; + int start = 0; + int end = xbt_dynar_length(mc_data_bss_comparison_ignore) - 1; + mc_data_bss_ignore_variable_t current_var = NULL; + + while(start <= end){ + cursor = (start + end) / 2; + current_var = (mc_data_bss_ignore_variable_t)xbt_dynar_get_as(mc_data_bss_comparison_ignore, cursor, mc_data_bss_ignore_variable_t); + if(current_var->address == address){ + MC_UNSET_RAW_MEM; + if(raw_mem_set) + MC_SET_RAW_MEM; + return; + } + if(current_var->address < address) + start = cursor + 1; + if(current_var->address > address) + end = cursor - 1; + } + + mc_data_bss_ignore_variable_t var = NULL; + var = xbt_new0(s_mc_data_bss_ignore_variable_t, 1); + var->address = address; + var->size = size; - read = getline(&line, &n, fp); + if(current_var->address < address) + xbt_dynar_insert_at(mc_data_bss_comparison_ignore, cursor + 1, &var); + else + xbt_dynar_insert_at(mc_data_bss_comparison_ignore, cursor, &var); - while(read != -1 && line[0] != '<'){ + } - if(n == 0) - continue; + MC_UNSET_RAW_MEM; - node_type = strtok(line, " "); + if(raw_mem_set) + MC_SET_RAW_MEM; +} - if(node_type != NULL && strcmp(node_type, "DW_AT_name") == 0){ +static size_t data_bss_ignore_size(void *address){ + unsigned int cursor = 0; + int start = 0; + int end = xbt_dynar_length(mc_data_bss_comparison_ignore) - 1; + mc_data_bss_ignore_variable_t var; + + while(start <= end){ + cursor = (start + end) / 2; + var = (mc_data_bss_ignore_variable_t)xbt_dynar_get_as(mc_data_bss_comparison_ignore, cursor, mc_data_bss_ignore_variable_t); + if(var->address == address) + return var->size; + if(var->address < address){ + if((void *)((char *)var->address + var->size) > address) + return (char *)var->address + var->size - (char*)address; + else + start = cursor + 1; + } + if(var->address > address) + end = cursor - 1; + } - frame_name = strdup(strtok(NULL, " ")); - read = getline(&line, &n, fp); + return 0; +} - }else if(node_type != NULL && strcmp(node_type, "DW_AT_frame_base") == 0){ - if(valid_frame == 1){ - dw_frame_t frame = xbt_new0(s_dw_frame_t, 1); - frame->name = strdup(frame_name); - frame->variables = xbt_dynar_new(sizeof(dw_local_variable_t), NULL); - frame->location = xbt_new0(s_dw_location_t, 1); - - location_type = strtok(NULL, " "); +void MC_ignore_stack(const char *var_name, const char *frame){ + + int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); - if(strcmp(location_type, "location->type = e_dw_loclist; - frame->location->location.loclist = xbt_dynar_new(sizeof(dw_location_entry_t), NULL); - - read = getline(&line, &n, fp); - xbt_str_ltrim(line, NULL); - - while(read != -1 && line[0] == '['){ + if(mc_stack_comparison_ignore == NULL) + mc_stack_comparison_ignore = xbt_dynar_new(sizeof(mc_stack_ignore_variable_t), NULL); - strtok(line, "<"); - lowpc = strdup(strtok(NULL, "<")); - highpc = strdup(strtok(NULL, ">")); - tmp_location = strdup(strtok(NULL, ">")); - lowpc[strlen(lowpc) - 1] = '\0'; /* Remove last character '>' */ - - dw_location_entry_t new_entry = xbt_new0(s_dw_location_entry_t, 1); - - strtok(lowpc, "="); - new_entry->lowpc = (void *) strtoul(strtok(NULL, "="), NULL, 16); - strtok(highpc, "="); - new_entry->highpc = (void *) strtoul(strtok(NULL, "="), NULL, 16); + if(xbt_dynar_is_empty(mc_stack_comparison_ignore)){ - new_entry->location = xbt_new0(s_dw_location_t, 1); - - get_location(tmp_location, new_entry->location); - - xbt_dynar_push(frame->location->location.loclist, &new_entry); + mc_stack_ignore_variable_t var = NULL; + var = xbt_new0(s_mc_stack_ignore_variable_t, 1); + var->var_name = strdup(var_name); + var->frame = strdup(frame); - read = getline(&line, &n, fp); - xbt_str_ltrim(line, NULL); - } + xbt_dynar_insert_at(mc_stack_comparison_ignore, 0, &var); - }else{ - read = getline(&line, &n, fp); - frame->location->type = get_location(location_type, frame->location); + }else{ + + unsigned int cursor = 0; + int start = 0; + int end = xbt_dynar_length(mc_stack_comparison_ignore) - 1; + mc_stack_ignore_variable_t current_var = NULL; + + while(start <= end){ + cursor = (start + end) / 2; + current_var = (mc_stack_ignore_variable_t)xbt_dynar_get_as(mc_stack_comparison_ignore, cursor, mc_stack_ignore_variable_t); + if(strcmp(current_var->frame, frame) == 0){ + if(strcmp(current_var->var_name, var_name) == 0){ + MC_UNSET_RAW_MEM; + if(raw_mem_set) + MC_SET_RAW_MEM; + return; + } + if(strcmp(current_var->var_name, var_name) < 0) + start = cursor + 1; + if(strcmp(current_var->var_name, var_name) > 0) + end = cursor - 1; + } + if(strcmp(current_var->frame, frame) < 0) + start = cursor + 1; + if(strcmp(current_var->frame, frame) > 0) + end = cursor - 1; + } - } + mc_stack_ignore_variable_t var = NULL; + var = xbt_new0(s_mc_stack_ignore_variable_t, 1); + var->var_name = strdup(var_name); + var->frame = strdup(frame); - xbt_dynar_push(mc_binary_local_variables, &frame); + if(strcmp(current_var->frame, frame) < 0) + xbt_dynar_insert_at(mc_stack_comparison_ignore, cursor + 1, &var); + else + xbt_dynar_insert_at(mc_stack_comparison_ignore, cursor, &var); - }else{ + } - read = getline(&line, &n, fp); + MC_UNSET_RAW_MEM; + + if(raw_mem_set) + MC_SET_RAW_MEM; - } - - }else if(node_type != NULL && (strcmp(node_type, "DW_AT_declaration") == 0 || strcmp(node_type, "DW_AT_abstract_origin") == 0 || strcmp(node_type, "DW_AT_artificial") == 0)){ +} - read = getline(&line, &n, fp); - valid_frame = 0; - - }else{ +void MC_new_stack_area(void *stack, char *name, void* context, size_t size){ - read = getline(&line, &n, fp); + int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); - } + MC_SET_RAW_MEM; + if(stacks_areas == NULL) + stacks_areas = xbt_dynar_new(sizeof(stack_region_t), NULL); + + stack_region_t region = NULL; + region = xbt_new0(s_stack_region_t, 1); + region->address = stack; + region->process_name = strdup(name); + region->context = context; + region->size = size; + xbt_dynar_push(stacks_areas, ®ion); + + MC_UNSET_RAW_MEM; - } - - valid_frame = 1; + if(raw_mem_set) + MC_SET_RAW_MEM; +} - }else if(strcmp(node_type, "DW_TAG_variable") == 0){ /* New variable */ - - variable_name = NULL; - location_type = NULL; - - read = getline(&line, &n, fp); +/************ DWARF ***********/ - while(read != -1 && line[0] != '<'){ +xbt_dict_t MC_get_location_list(const char *elf_file){ - if(n == 0) - continue; + char *command = bprintf("objdump -Wo %s", elf_file); - tmp_line = strdup(line); - - node_type = strtok(line, " "); + FILE *fp = popen(command, "r"); - if(node_type != NULL && strcmp(node_type, "DW_AT_name") == 0){ + if(fp == NULL){ + perror("popen for objdump failed"); + xbt_abort(); + } - variable_name = strdup(strtok(NULL, " ")); - read = getline(&line, &n, fp); - - }else if(node_type != NULL && strcmp(node_type, "DW_AT_location") == 0){ + int debug = 0; /*Detect if the program has been compiled with -g */ - if(valid_variable == 1){ + xbt_dict_t location_list = xbt_dict_new_homogeneous(NULL); + char *line = NULL, *loc_expr = NULL; + ssize_t read; + size_t n = 0; + int cursor_remove; + xbt_dynar_t split = NULL; - location_type = strdup(strtok(NULL, " ")); + while ((read = getline(&line, &n, fp)) != -1) { - dw_local_variable_t variable = xbt_new0(s_dw_local_variable_t, 1); - variable->name = strdup(variable_name); - variable->location = xbt_new0(s_dw_location_t, 1); - - if(strcmp(location_type, "location->type = e_dw_loclist; - variable->location->location.loclist = xbt_dynar_new(sizeof(dw_location_entry_t), NULL); + xbt_str_trim(line, NULL); + + if(n == 0) + continue; - read = getline(&line, &n, fp); - xbt_str_ltrim(line, NULL); - - while(read != -1 && line[0] == '['){ + if(strlen(line) == 0) + continue; - strtok(line, "<"); - lowpc = strdup(strtok(NULL, "<")); - highpc = strdup(strtok(NULL, ">")); - tmp_location = strdup(strtok(NULL, ">")); - lowpc[strlen(lowpc) - 1] = '\0'; /* Remove last character '>' */ + if(debug == 0){ - dw_location_entry_t new_entry = xbt_new0(s_dw_location_entry_t, 1); + if(strncmp(line, elf_file, strlen(elf_file)) == 0) + continue; + + if(strncmp(line, "Contents", 8) == 0) + continue; - strtok(lowpc, "="); - new_entry->lowpc = (void *) strtoul(strtok(NULL, "="), NULL, 16); - strtok(highpc, "="); - new_entry->highpc = (void *) strtoul(strtok(NULL, "="), NULL, 16); + if(strncmp(line, "Offset", 6) == 0){ + debug = 1; + continue; + } + } - new_entry->location = xbt_new0(s_dw_location_t, 1); - - get_location(tmp_location, new_entry->location); - - xbt_dynar_push(variable->location->location.loclist, &new_entry); - - read = getline(&line, &n, fp); - xbt_str_ltrim(line, NULL); - } - - }else{ - - xbt_str_strip_spaces(tmp_line); - split = xbt_str_split(tmp_line, " "); - xbt_dynar_remove_at(split, 0, NULL); - location_type = xbt_str_join(split, " "); - - variable->location->type = get_location(location_type, variable->location); - read = getline(&line, &n, fp); + if(debug == 0){ + XBT_INFO("Your program must be compiled with -g"); + xbt_abort(); + } - } + xbt_dynar_t loclist = xbt_dynar_new(sizeof(dw_location_entry_t), NULL); - xbt_dynar_push(((dw_frame_t)xbt_dynar_get_as(mc_binary_local_variables, xbt_dynar_length(mc_binary_local_variables) - 1, dw_frame_t))->variables, &variable); + xbt_str_strip_spaces(line); + split = xbt_str_split(line, " "); - }else{ + while(read != -1 && strcmp("lowpc = strtoul((char *)xbt_dynar_get_as(split, 1, char *), NULL, 16); + new_entry->highpc = strtoul((char *)xbt_dynar_get_as(split, 2, char *), NULL, 16); + + cursor_remove =0; + while(cursor_remove < 3){ + xbt_dynar_remove_at(split, 0, NULL); + cursor_remove++; + } - read = getline(&line, &n, fp); + loc_expr = xbt_str_join(split, " "); + xbt_str_ltrim(loc_expr, "("); + xbt_str_rtrim(loc_expr, ")"); + new_entry->location = get_location(NULL, loc_expr); - } - - }else if(node_type != NULL && (strcmp(node_type, "DW_AT_artificial") == 0 || strcmp(node_type, "DW_AT_external") == 0)){ + xbt_dynar_push(loclist, &new_entry); - valid_variable = 0; - read = getline(&line, &n, fp); + xbt_dynar_free(&split); + free(loc_expr); - }else{ + read = getline(&line, &n, fp); + if(read != -1){ + line[read - 1] = '\0'; + xbt_str_strip_spaces(line); + split = xbt_str_split(line, " "); + } - read = getline(&line, &n, fp); + } + + + char *key = bprintf("%d", (int)strtoul((char *)xbt_dynar_get_as(split, 0, char *), NULL, 16)); + xbt_dict_set(location_list, key, loclist, NULL); + xbt_free(key); + + xbt_dynar_free(&split); + + } + + xbt_free(line); + xbt_free(command); + pclose(fp); + + return location_list; +} + +static dw_frame_t get_frame_by_offset(xbt_dict_t all_variables, unsigned long int offset){ + + xbt_dict_cursor_t cursor = NULL; + char *name; + dw_frame_t res; + + xbt_dict_foreach(all_variables, cursor, name, res) { + if(offset >= res->start && offset < res->end){ + xbt_dict_cursor_free(&cursor); + return res; + } + } + + xbt_dict_cursor_free(&cursor); + return NULL; + +} + +void MC_get_local_variables(const char *elf_file, xbt_dict_t location_list, xbt_dict_t *all_variables){ + + char *command = bprintf("objdump -Wi %s", elf_file); + + FILE *fp = popen(command, "r"); + + if(fp == NULL) + perror("popen for objdump failed"); + + char *line = NULL, *origin, *abstract_origin, *current_frame = NULL; + ssize_t read =0; + size_t n = 0; + int valid_variable = 1; + char *node_type = NULL, *location_type = NULL, *variable_name = NULL, *loc_expr = NULL; + xbt_dynar_t split = NULL, split2 = NULL; + + xbt_dict_t variables_origin = xbt_dict_new_homogeneous(NULL); + xbt_dict_t subprograms_origin = xbt_dict_new_homogeneous(NULL); + char *subprogram_name = NULL, *subprogram_start = NULL, *subprogram_end = NULL; + int new_frame = 0, new_variable = 0; + dw_frame_t variable_frame, subroutine_frame = NULL; + + read = getline(&line, &n, fp); + + while (read != -1) { + + if(n == 0){ + read = getline(&line, &n, fp); + continue; + } + + /* Wipeout the new line character */ + line[read - 1] = '\0'; + + if(strlen(line) == 0){ + read = getline(&line, &n, fp); + continue; + } + + xbt_str_ltrim(line, NULL); + xbt_str_strip_spaces(line); + + if(line[0] != '<'){ + read = getline(&line, &n, fp); + continue; + } + + xbt_dynar_free(&split); + split = xbt_str_split(line, " "); + + /* Get node type */ + node_type = xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char *); + + if(strcmp(node_type, "(DW_TAG_subprogram)") == 0){ /* New frame */ + + dw_frame_t frame = NULL; + + strtok(xbt_dynar_get_as(split, 0, char *), "<"); + subprogram_start = strdup(strtok(NULL, "<")); + xbt_str_rtrim(subprogram_start, ">:"); + + read = getline(&line, &n, fp); + + while(read != -1){ + + if(n == 0){ + read = getline(&line, &n, fp); + continue; + } + + /* Wipeout the new line character */ + line[read - 1] = '\0'; + + if(strlen(line) == 0){ + read = getline(&line, &n, fp); + continue; + } + + xbt_dynar_free(&split); + xbt_str_rtrim(line, NULL); + xbt_str_strip_spaces(line); + split = xbt_str_split(line, " "); + + node_type = xbt_dynar_get_as(split, 1, char *); + + if(strncmp(node_type, "DW_AT_", 6) != 0) + break; + + if(strcmp(node_type, "DW_AT_sibling") == 0){ + + subprogram_end = strdup(xbt_dynar_get_as(split, 3, char*)); + xbt_str_ltrim(subprogram_end, "<0x"); + xbt_str_rtrim(subprogram_end, ">"); + + }else if(strcmp(node_type, "DW_AT_abstract_origin:") == 0){ /* Frame already in dict */ + + new_frame = 0; + abstract_origin = strdup(xbt_dynar_get_as(split, 2, char*)); + xbt_str_ltrim(abstract_origin, "<0x"); + xbt_str_rtrim(abstract_origin, ">"); + subprogram_name = (char *)xbt_dict_get_or_null(subprograms_origin, abstract_origin); + frame = xbt_dict_get_or_null(*all_variables, subprogram_name); + xbt_free(abstract_origin); + + }else if(strcmp(node_type, "DW_AT_name") == 0){ + + new_frame = 1; + xbt_free(current_frame); + frame = xbt_new0(s_dw_frame_t, 1); + frame->name = strdup(xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char *)); + frame->variables = xbt_dict_new_homogeneous(NULL); + frame->frame_base = xbt_new0(s_dw_location_t, 1); + current_frame = strdup(frame->name); + + xbt_dict_set(subprograms_origin, subprogram_start, frame->name, NULL); + + }else if(strcmp(node_type, "DW_AT_frame_base") == 0){ + + location_type = xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char *); + + if(strcmp(location_type, "list)") == 0){ /* Search location in location list */ + + frame->frame_base = get_location(location_list, xbt_dynar_get_as(split, 3, char *)); + + }else{ + + xbt_str_strip_spaces(line); + split2 = xbt_str_split(line, "("); + xbt_dynar_remove_at(split2, 0, NULL); + loc_expr = xbt_str_join(split2, " "); + xbt_str_rtrim(loc_expr, ")"); + frame->frame_base = get_location(NULL, loc_expr); + xbt_dynar_free(&split2); + xbt_free(loc_expr); } + + }else if(strcmp(node_type, "DW_AT_low_pc") == 0){ + + if(frame != NULL) + frame->low_pc = (void *)strtoul(xbt_dynar_get_as(split, 3, char *), NULL, 16); + + }else if(strcmp(node_type, "DW_AT_high_pc") == 0){ + + if(frame != NULL) + frame->high_pc = (void *)strtoul(xbt_dynar_get_as(split, 3, char *), NULL, 16); + + }else if(strcmp(node_type, "DW_AT_MIPS_linkage_name:") == 0){ + + xbt_free(frame->name); + xbt_free(current_frame); + frame->name = strdup(xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char *)); + current_frame = strdup(frame->name); + xbt_dict_set(subprograms_origin, subprogram_start, frame->name, NULL); + + } + + read = getline(&line, &n, fp); + + } + + if(new_frame == 1){ + frame->start = strtoul(subprogram_start, NULL, 16); + if(subprogram_end != NULL) + frame->end = strtoul(subprogram_end, NULL, 16); + xbt_dict_set(*all_variables, frame->name, frame, NULL); + } + + xbt_free(subprogram_start); + if(subprogram_end != NULL){ + xbt_free(subprogram_end); + subprogram_end = NULL; + } + + + }else if(strcmp(node_type, "(DW_TAG_variable)") == 0){ /* New variable */ + + dw_local_variable_t var = NULL; + + strtok(xbt_dynar_get_as(split, 0, char *), "<"); + origin = strdup(strtok(NULL, "<")); + xbt_str_rtrim(origin, ">:"); + read = getline(&line, &n, fp); + + while(read != -1){ + + if(n == 0){ + read = getline(&line, &n, fp); + continue; } - valid_variable = 1; + /* Wipeout the new line character */ + line[read - 1] = '\0'; - }else{ + if(strlen(line) == 0){ + read = getline(&line, &n, fp); + continue; + } + + xbt_dynar_free(&split); + xbt_str_rtrim(line, NULL); + xbt_str_strip_spaces(line); + split = xbt_str_split(line, " "); + + node_type = xbt_dynar_get_as(split, 1, char *); + + if(strncmp(node_type, "DW_AT_", 6) != 0) + break; + + if(strcmp(node_type, "DW_AT_name") == 0){ + + new_variable = 1; + var = xbt_new0(s_dw_local_variable_t, 1); + var->name = strdup(xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char *)); + + xbt_dict_set(variables_origin, origin, var->name, NULL); + + }else if(strcmp(node_type, "DW_AT_abstract_origin:") == 0){ + + new_variable = 0; + abstract_origin = xbt_dynar_get_as(split, 2, char *); + xbt_str_ltrim(abstract_origin, "<0x"); + xbt_str_rtrim(abstract_origin, ">"); + + variable_name = (char *)xbt_dict_get_or_null(variables_origin, abstract_origin); + variable_frame = get_frame_by_offset(*all_variables, strtoul(abstract_origin, NULL, 16)); + var = xbt_dict_get_or_null(variable_frame->variables, variable_name); + + }else if(strcmp(node_type, "DW_AT_location") == 0){ + + if(valid_variable == 1 && var != NULL){ + + var->location = xbt_new0(s_dw_location_t, 1); + + location_type = xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char *); + + if(strcmp(location_type, "list)") == 0){ /* Search location in location list */ + + var->location = get_location(location_list, xbt_dynar_get_as(split, 3, char *)); + + }else{ + + xbt_str_strip_spaces(line); + split2 = xbt_str_split(line, "("); + xbt_dynar_remove_at(split2, 0, NULL); + loc_expr = xbt_str_join(split2, " "); + xbt_str_rtrim(loc_expr, ")"); + var->location = get_location(NULL, loc_expr); + xbt_dynar_free(&split2); + xbt_free(loc_expr); + + } + + } + + }else if(strcmp(node_type, "DW_AT_external") == 0){ + + valid_variable = 0; + + } read = getline(&line, &n, fp); + + } + if(new_variable == 1 && valid_variable == 1){ + + variable_frame = xbt_dict_get_or_null(*all_variables, current_frame); + xbt_dict_set(variable_frame->variables, var->name, var, NULL); } - + + valid_variable = 1; + new_variable = 0; + + }else if(strcmp(node_type, "(DW_TAG_inlined_subroutine)") == 0){ + + strtok(xbt_dynar_get_as(split, 0, char *), "<"); + origin = strdup(strtok(NULL, "<")); + xbt_str_rtrim(origin, ">:"); + + read = getline(&line, &n, fp); + + while(read != -1){ + + /* Wipeout the new line character */ + line[read - 1] = '\0'; + + if(n == 0){ + read = getline(&line, &n, fp); + continue; + } + + if(strlen(line) == 0){ + read = getline(&line, &n, fp); + continue; + } + + xbt_dynar_free(&split); + xbt_str_rtrim(line, NULL); + xbt_str_strip_spaces(line); + split = xbt_str_split(line, " "); + + if(strncmp(xbt_dynar_get_as(split, 1, char *), "DW_AT_", 6) != 0) + break; + + node_type = xbt_dynar_get_as(split, 1, char *); + + if(strcmp(node_type, "DW_AT_abstract_origin:") == 0){ + + origin = xbt_dynar_get_as(split, 2, char *); + xbt_str_ltrim(origin, "<0x"); + xbt_str_rtrim(origin, ">"); + + subprogram_name = (char *)xbt_dict_get_or_null(subprograms_origin, origin); + subroutine_frame = xbt_dict_get_or_null(*all_variables, subprogram_name); + + }else if(strcmp(node_type, "DW_AT_low_pc") == 0){ + + subroutine_frame->low_pc = (void *)strtoul(xbt_dynar_get_as(split, 3, char *), NULL, 16); + + }else if(strcmp(node_type, "DW_AT_high_pc") == 0){ + + subroutine_frame->high_pc = (void *)strtoul(xbt_dynar_get_as(split, 3, char *), NULL, 16); + } + + read = getline(&line, &n, fp); + + } + }else{ read = getline(&line, &n, fp); @@ -932,35 +1468,190 @@ void MC_get_binary_local_variables(){ } } + + xbt_dynar_free(&split); + xbt_free(line); + xbt_free(command); + pclose(fp); + +} - if(XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)) - print_local_variables(mc_binary_local_variables); +static dw_location_t get_location(xbt_dict_t location_list, char *expr){ + + dw_location_t loc = xbt_new0(s_dw_location_t, 1); + + if(location_list != NULL){ + + char *key = bprintf("%d", (int)strtoul(expr, NULL, 16)); + loc->type = e_dw_loclist; + loc->location.loclist = (xbt_dynar_t)xbt_dict_get_or_null(location_list, key); + if(loc->location.loclist == NULL) + XBT_INFO("Key not found in loclist"); + xbt_free(key); + return loc; + + }else{ + + int cursor = 0; + char *tok = NULL, *tok2 = NULL; + + xbt_dynar_t tokens1 = xbt_str_split(expr, ";"); + xbt_dynar_t tokens2; + + loc->type = e_dw_compose; + loc->location.compose = xbt_dynar_new(sizeof(dw_location_t), NULL); + + while(cursor < xbt_dynar_length(tokens1)){ + + tok = xbt_dynar_get_as(tokens1, cursor, char*); + tokens2 = xbt_str_split(tok, " "); + tok2 = xbt_dynar_get_as(tokens2, 0, char*); + + if(strncmp(tok2, "DW_OP_reg", 9) == 0){ + dw_location_t new_element = xbt_new0(s_dw_location_t, 1); + new_element->type = e_dw_register; + new_element->location.reg = atoi(strtok(tok2, "DW_OP_reg")); + xbt_dynar_push(loc->location.compose, &new_element); + }else if(strcmp(tok2, "DW_OP_fbreg:") == 0){ + dw_location_t new_element = xbt_new0(s_dw_location_t, 1); + new_element->type = e_dw_fbregister_op; + new_element->location.fbreg_op = atoi(xbt_dynar_get_as(tokens2, 1, char*)); + xbt_dynar_push(loc->location.compose, &new_element); + }else if(strncmp(tok2, "DW_OP_breg", 10) == 0){ + dw_location_t new_element = xbt_new0(s_dw_location_t, 1); + new_element->type = e_dw_bregister_op; + new_element->location.breg_op.reg = atoi(strtok(tok2, "DW_OP_breg")); + new_element->location.breg_op.offset = atoi(xbt_dynar_get_as(tokens2, 1, char*)); + xbt_dynar_push(loc->location.compose, &new_element); + }else if(strncmp(tok2, "DW_OP_lit", 9) == 0){ + dw_location_t new_element = xbt_new0(s_dw_location_t, 1); + new_element->type = e_dw_lit; + new_element->location.lit = atoi(strtok(tok2, "DW_OP_lit")); + xbt_dynar_push(loc->location.compose, &new_element); + }else if(strcmp(tok2, "DW_OP_piece:") == 0){ + dw_location_t new_element = xbt_new0(s_dw_location_t, 1); + new_element->type = e_dw_piece; + new_element->location.piece = atoi(xbt_dynar_get_as(tokens2, 1, char*)); + /*if(strlen(xbt_dynar_get_as(tokens2, 1, char*)) > 1) + new_element->location.piece = atoi(xbt_dynar_get_as(tokens2, 1, char*)); + else + new_element->location.piece = xbt_dynar_get_as(tokens2, 1, char*)[0] - '0';*/ + xbt_dynar_push(loc->location.compose, &new_element); + }else if(strcmp(tok2, "DW_OP_plus_uconst:") == 0){ + dw_location_t new_element = xbt_new0(s_dw_location_t, 1); + new_element->type = e_dw_plus_uconst; + new_element->location.plus_uconst = atoi(xbt_dynar_get_as(tokens2, 1, char *)); + xbt_dynar_push(loc->location.compose, &new_element); + }else if(strcmp(tok, "DW_OP_abs") == 0 || + strcmp(tok, "DW_OP_and") == 0 || + strcmp(tok, "DW_OP_div") == 0 || + strcmp(tok, "DW_OP_minus") == 0 || + strcmp(tok, "DW_OP_mod") == 0 || + strcmp(tok, "DW_OP_mul") == 0 || + strcmp(tok, "DW_OP_neg") == 0 || + strcmp(tok, "DW_OP_not") == 0 || + strcmp(tok, "DW_OP_or") == 0 || + strcmp(tok, "DW_OP_plus") == 0){ + dw_location_t new_element = xbt_new0(s_dw_location_t, 1); + new_element->type = e_dw_arithmetic; + new_element->location.arithmetic = strdup(strtok(tok2, "DW_OP_")); + xbt_dynar_push(loc->location.compose, &new_element); + }else if(strcmp(tok, "DW_OP_stack_value") == 0){ + }else if(strcmp(tok2, "DW_OP_deref_size:") == 0){ + dw_location_t new_element = xbt_new0(s_dw_location_t, 1); + new_element->type = e_dw_deref; + new_element->location.deref_size = (unsigned int short) atoi(xbt_dynar_get_as(tokens2, 1, char*)); + /*if(strlen(xbt_dynar_get_as(tokens, ++cursor, char*)) > 1) + new_element->location.deref_size = atoi(xbt_dynar_get_as(tokens, cursor, char*)); + else + new_element->location.deref_size = xbt_dynar_get_as(tokens, cursor, char*)[0] - '0';*/ + xbt_dynar_push(loc->location.compose, &new_element); + }else if(strcmp(tok, "DW_OP_deref") == 0){ + dw_location_t new_element = xbt_new0(s_dw_location_t, 1); + new_element->type = e_dw_deref; + new_element->location.deref_size = sizeof(void *); + xbt_dynar_push(loc->location.compose, &new_element); + }else if(strcmp(tok2, "DW_OP_constu:") == 0){ + dw_location_t new_element = xbt_new0(s_dw_location_t, 1); + new_element->type = e_dw_uconstant; + new_element->location.uconstant.bytes = 1; + new_element->location.uconstant.value = (unsigned long int)(atoi(xbt_dynar_get_as(tokens2, 1, char*))); + /*if(strlen(xbt_dynar_get_as(tokens, ++cursor, char*)) > 1) + new_element->location.uconstant.value = (unsigned long int)(atoi(xbt_dynar_get_as(tokens, cursor, char*))); + else + new_element->location.uconstant.value = (unsigned long int)(xbt_dynar_get_as(tokens, cursor, char*)[0] - '0');*/ + xbt_dynar_push(loc->location.compose, &new_element); + }else if(strcmp(tok2, "DW_OP_consts:") == 0){ + dw_location_t new_element = xbt_new0(s_dw_location_t, 1); + new_element->type = e_dw_sconstant; + new_element->location.sconstant.bytes = 1; + new_element->location.sconstant.value = (long int)(atoi(xbt_dynar_get_as(tokens2, 1, char*))); + xbt_dynar_push(loc->location.compose, &new_element); + }else if(strcmp(tok2, "DW_OP_const1u:") == 0 || + strcmp(tok2, "DW_OP_const2u:") == 0 || + strcmp(tok2, "DW_OP_const4u:") == 0 || + strcmp(tok2, "DW_OP_const8u:") == 0){ + dw_location_t new_element = xbt_new0(s_dw_location_t, 1); + new_element->type = e_dw_uconstant; + new_element->location.uconstant.bytes = tok2[11] - '0'; + new_element->location.uconstant.value = (unsigned long int)(atoi(xbt_dynar_get_as(tokens2, 1, char*))); + /*if(strlen(xbt_dynar_get_as(tokens, ++cursor, char*)) > 1) + new_element->location.constant.value = atoi(xbt_dynar_get_as(tokens, cursor, char*)); + else + new_element->location.constant.value = xbt_dynar_get_as(tokens, cursor, char*)[0] - '0';*/ + xbt_dynar_push(loc->location.compose, &new_element); + }else if(strcmp(tok, "DW_OP_const1s") == 0 || + strcmp(tok, "DW_OP_const2s") == 0 || + strcmp(tok, "DW_OP_const4s") == 0 || + strcmp(tok, "DW_OP_const8s") == 0){ + dw_location_t new_element = xbt_new0(s_dw_location_t, 1); + new_element->type = e_dw_sconstant; + new_element->location.sconstant.bytes = tok2[11] - '0'; + new_element->location.sconstant.value = (long int)(atoi(xbt_dynar_get_as(tokens2, 1, char*))); + xbt_dynar_push(loc->location.compose, &new_element); + }else{ + dw_location_t new_element = xbt_new0(s_dw_location_t, 1); + new_element->type = e_dw_unsupported; + xbt_dynar_push(loc->location.compose, &new_element); + } + + cursor++; + xbt_dynar_free(&tokens2); + + } + + xbt_dynar_free(&tokens1); + + return loc; + + } - free(line); free(tmp_line); free(tmp_location); free(frame_name); - free(node_type); free(location_type); free(variable_name); free(lowpc); free(highpc); - free(command); - pclose(fp); } -void print_local_variables(xbt_dynar_t list){ + +void print_local_variables(xbt_dict_t list){ - dw_frame_t frame; - dw_local_variable_t variable; dw_location_entry_t entry; dw_location_t location_entry; - unsigned int cursor = 0, cursor2 = 0, cursor3 = 0, cursor4 = 0; - - xbt_dynar_foreach(list, cursor, frame){ - fprintf(stderr, "Frame name : %s", frame->name); - fprintf(stderr, "Location type : %d\n", frame->location->type); - fprintf(stderr, "Variables : (%lu)\n", xbt_dynar_length(frame->variables)); - xbt_dynar_foreach(frame->variables, cursor2, variable){ - fprintf(stderr, "Name : %s", variable->name); - fprintf(stderr, "Location type : %d\n", variable->location->type); - switch(variable->location->type){ + unsigned int cursor3 = 0, cursor4 = 0; + xbt_dict_cursor_t cursor = 0, cursor2 = 0; + + char *frame_name, *variable_name; + dw_frame_t current_frame; + dw_local_variable_t current_variable; + + xbt_dict_foreach(list, cursor, frame_name, current_frame){ + fprintf(stderr, "Frame name : %s\n", current_frame->name); + fprintf(stderr, "Location type : %d\n", current_frame->frame_base->type); + xbt_dict_foreach((xbt_dict_t)current_frame->variables, cursor2, variable_name, current_variable){ + fprintf(stderr, "Name : %s\n", current_variable->name); + if(current_variable->location == NULL) + continue; + fprintf(stderr, "Location type : %d\n", current_variable->location->type); + switch(current_variable->location->type){ case e_dw_loclist : - xbt_dynar_foreach(variable->location->location.loclist, cursor3, entry){ - fprintf(stderr, "Lowpc : %p, Highpc : %p,", entry->lowpc, entry->highpc); + xbt_dynar_foreach(current_variable->location->location.loclist, cursor3, entry){ + fprintf(stderr, "Lowpc : %lx, Highpc : %lx,", entry->lowpc, entry->highpc); switch(entry->location->type){ case e_dw_register : fprintf(stderr, " Location : in register %d\n", entry->location->location.reg); @@ -991,18 +1682,21 @@ void print_local_variables(xbt_dynar_t list){ fprintf(stderr, " %d) %d bytes from logical frame pointer\n", cursor4 + 1, location_entry->location.fbreg_op); break; case e_dw_deref: - fprintf(stderr, " %d) Pop the stack entry and treats it as an address (size of data %d)\n", cursor4 + 1, location_entry->location.deref_size); + fprintf(stderr, " %d) Pop the stack entry and treats it as an address (size of data %d)\n", cursor4 + 1, location_entry->location.deref_size); break; - case e_dw_arithmetic : + case e_dw_arithmetic : fprintf(stderr, "%d) arithmetic operation : %s\n", cursor4 + 1, location_entry->location.arithmetic); break; case e_dw_piece: fprintf(stderr, "%d) The %d byte(s) previous value\n", cursor4 + 1, location_entry->location.piece); break; - case e_dw_constant : - fprintf(stderr, "%d) Constant %d\n", cursor4 + 1, location_entry->location.constant.value); + case e_dw_uconstant : + fprintf(stderr, "%d) Unsigned constant %lu\n", cursor4 + 1, location_entry->location.uconstant.value); break; - default : + case e_dw_sconstant : + fprintf(stderr, "%d) Signed constant %lu\n", cursor4 + 1, location_entry->location.sconstant.value); + break; + default : fprintf(stderr, "%d) Location type not supported\n", cursor4 + 1); break; } @@ -1017,10 +1711,10 @@ void print_local_variables(xbt_dynar_t list){ case e_dw_compose: cursor4 = 0; fprintf(stderr, "Location :\n"); - xbt_dynar_foreach(variable->location->location.compose, cursor4, location_entry){ + xbt_dynar_foreach(current_variable->location->location.compose, cursor4, location_entry){ switch(location_entry->type){ case e_dw_register : - fprintf(stderr, " %d) in register %d\n", cursor4 + 1, location_entry->location.reg); + fprintf(stderr, " %d) in register %d\n", cursor4 + 1, location_entry->location.reg); break; case e_dw_bregister_op: fprintf(stderr, " %d) add %d to the value in register %d\n", cursor4 + 1, location_entry->location.breg_op.offset, location_entry->location.breg_op.reg); @@ -1032,18 +1726,21 @@ void print_local_variables(xbt_dynar_t list){ fprintf(stderr, " %d) %d bytes from logical frame pointer\n", cursor4 + 1, location_entry->location.fbreg_op); break; case e_dw_deref: - fprintf(stderr, " %d) Pop the stack entry and treats it as an address (size of data %d)\n", cursor4 + 1, location_entry->location.deref_size); + fprintf(stderr, " %d) Pop the stack entry and treats it as an address (size of data %d)\n", cursor4 + 1, location_entry->location.deref_size); break; - case e_dw_arithmetic : + case e_dw_arithmetic : fprintf(stderr, "%d) arithmetic operation : %s\n", cursor4 + 1, location_entry->location.arithmetic); break; case e_dw_piece: fprintf(stderr, "%d) The %d byte(s) previous value\n", cursor4 + 1, location_entry->location.piece); break; - case e_dw_constant : - fprintf(stderr, "%d) Constant %d\n", cursor4 + 1, location_entry->location.constant.value); + case e_dw_uconstant : + fprintf(stderr, "%d) Unsigned constant %lu\n", cursor4 + 1, location_entry->location.uconstant.value); + break; + case e_dw_sconstant : + fprintf(stderr, "%d) Signed constant %lu\n", cursor4 + 1, location_entry->location.sconstant.value); break; - default : + default : fprintf(stderr, "%d) Location type not supported\n", cursor4 + 1); break; } @@ -1058,173 +1755,88 @@ void print_local_variables(xbt_dynar_t list){ } -static e_dw_location_type get_location(char *expr, dw_location_t entry){ +static void MC_get_global_variables(char *elf_file){ + + FILE *fp; + + char *command = bprintf("objdump -t -j .data -j .bss %s", elf_file); - int cursor = 0; - char *tok = NULL, *tmp_tok = NULL; + fp = popen(command, "r"); - xbt_dynar_t tokens = xbt_str_split(expr, NULL); - xbt_dynar_remove_at(tokens, xbt_dynar_length(tokens) - 1, NULL); + if(fp == NULL){ + perror("popen failed"); + xbt_abort(); + } - if(xbt_dynar_length(tokens) > 1){ + if(mc_global_variables == NULL) + mc_global_variables = xbt_dynar_new(sizeof(global_variable_t), global_variable_free_voidp); - entry->type = e_dw_compose; - entry->location.compose = xbt_dynar_new(sizeof(dw_location_t), NULL); + char *line = NULL; + ssize_t read; + size_t n = 0; - while(cursor < xbt_dynar_length(tokens)){ + xbt_dynar_t line_tokens = NULL; + unsigned long offset; - tok = xbt_dynar_get_as(tokens, cursor, char*); - - if(strncmp(tok, "DW_OP_reg", 9) == 0){ - dw_location_t new_element = xbt_new0(s_dw_location_t, 1); - new_element->type = e_dw_register; - if(tok[9] == 'x'){ - new_element->location.reg = atoi(xbt_dynar_get_as(tokens, ++cursor, char*)); - }else{ - new_element->location.reg = atoi(strtok(tok, "DW_OP_reg")); - } - xbt_dynar_push(entry->location.compose, &new_element); - }else if(strcmp(tok, "DW_OP_fbreg") == 0){ - dw_location_t new_element = xbt_new0(s_dw_location_t, 1); - new_element->type = e_dw_fbregister_op; - new_element->location.fbreg_op = atoi(xbt_dynar_get_as(tokens, ++cursor, char*)); - xbt_dynar_push(entry->location.compose, &new_element); - }else if(strncmp(tok, "DW_OP_breg", 10) == 0){ - dw_location_t new_element = xbt_new0(s_dw_location_t, 1); - new_element->type = e_dw_bregister_op; - if(tok[10] == 'x'){ - new_element->location.breg_op.reg = atoi(xbt_dynar_get_as(tokens, ++cursor, char*)); - new_element->location.breg_op.offset = atoi(xbt_dynar_get_as(tokens, ++cursor, char*)); - }else{ - if(strchr(tok,'+') != NULL){ - tmp_tok = strtok(tok,"DW_OP_breg"); - new_element->location.breg_op.reg = atoi(strtok(tmp_tok,"+")); - new_element->location.breg_op.offset = atoi(strtok(NULL,"+")); - }else{ - new_element->location.breg_op.reg = atoi(strtok(tok, "DW_OP_breg")); - new_element->location.breg_op.offset = atoi(xbt_dynar_get_as(tokens, ++cursor, char*)); - } - } - xbt_dynar_push(entry->location.compose, &new_element); - }else if(strncmp(tok, "DW_OP_lit", 9) == 0){ - dw_location_t new_element = xbt_new0(s_dw_location_t, 1); - new_element->type = e_dw_lit; - new_element->location.lit = atoi(strtok(tok, "DW_OP_lit")); - xbt_dynar_push(entry->location.compose, &new_element); - }else if(strcmp(tok, "DW_OP_piece") == 0){ - dw_location_t new_element = xbt_new0(s_dw_location_t, 1); - new_element->type = e_dw_piece; - if(strlen(xbt_dynar_get_as(tokens, ++cursor, char*)) > 1) - new_element->location.piece = atoi(xbt_dynar_get_as(tokens, cursor, char*)); - else - new_element->location.piece = xbt_dynar_get_as(tokens, cursor, char*)[0] - '0'; - xbt_dynar_push(entry->location.compose, &new_element); + int type = strcmp(elf_file, xbt_binary_name); /* 0 = binary, other = libsimgrid */ - }else if(strcmp(tok, "DW_OP_abs") == 0 || - strcmp(tok, "DW_OP_and") == 0 || - strcmp(tok, "DW_OP_div") == 0 || - strcmp(tok, "DW_OP_minus") == 0 || - strcmp(tok, "DW_OP_mod") == 0 || - strcmp(tok, "DW_OP_mul") == 0 || - strcmp(tok, "DW_OP_neg") == 0 || - strcmp(tok, "DW_OP_not") == 0 || - strcmp(tok, "DW_OP_or") == 0 || - strcmp(tok, "DW_OP_plus") == 0 || - strcmp(tok, "DW_OP_plus_uconst") == 0){ - dw_location_t new_element = xbt_new0(s_dw_location_t, 1); - new_element->type = e_dw_arithmetic; - new_element->location.arithmetic = strdup(strtok(tok, "DW_OP_")); - xbt_dynar_push(entry->location.compose, &new_element); - }else if(strcmp(tok, "DW_OP_stack_value") == 0){ - cursor++; - }else if(strcmp(tok, "DW_OP_deref_size") == 0){ - dw_location_t new_element = xbt_new0(s_dw_location_t, 1); - new_element->type = e_dw_deref; - if(strlen(xbt_dynar_get_as(tokens, ++cursor, char*)) > 1) - new_element->location.deref_size = atoi(xbt_dynar_get_as(tokens, cursor, char*)); - else - new_element->location.deref_size = xbt_dynar_get_as(tokens, cursor, char*)[0] - '0'; - xbt_dynar_push(entry->location.compose, &new_element); - }else if(strcmp(tok, "DW_OP_deref") == 0){ - dw_location_t new_element = xbt_new0(s_dw_location_t, 1); - new_element->type = e_dw_deref; - new_element->location.deref_size = sizeof(void *); - xbt_dynar_push(entry->location.compose, &new_element); - }else if(strcmp(tok, "DW_OP_constu") == 0){ - dw_location_t new_element = xbt_new0(s_dw_location_t, 1); - new_element->type = e_dw_constant; - new_element->location.constant.is_signed = 0; - new_element->location.constant.bytes = 1; - if(strlen(xbt_dynar_get_as(tokens, ++cursor, char*)) > 1) - new_element->location.constant.value = atoi(xbt_dynar_get_as(tokens, cursor, char*)); - else - new_element->location.constant.value = xbt_dynar_get_as(tokens, cursor, char*)[0] - '0'; - xbt_dynar_push(entry->location.compose, &new_element); - }else if(strcmp(tok, "DW_OP_consts") == 0){ - dw_location_t new_element = xbt_new0(s_dw_location_t, 1); - new_element->type = e_dw_constant; - new_element->location.constant.is_signed = 1; - new_element->location.constant.bytes = 1; - new_element->location.constant.value = atoi(xbt_dynar_get_as(tokens, ++cursor, char*)); - xbt_dynar_push(entry->location.compose, &new_element); - }else if(strcmp(tok, "DW_OP_const1u") == 0 || - strcmp(tok, "DW_OP_const2u") == 0 || - strcmp(tok, "DW_OP_const4u") == 0 || - strcmp(tok, "DW_OP_const8u") == 0){ - dw_location_t new_element = xbt_new0(s_dw_location_t, 1); - new_element->type = e_dw_constant; - new_element->location.constant.is_signed = 0; - new_element->location.constant.bytes = tok[11] - '0'; - if(strlen(xbt_dynar_get_as(tokens, ++cursor, char*)) > 1) - new_element->location.constant.value = atoi(xbt_dynar_get_as(tokens, cursor, char*)); - else - new_element->location.constant.value = xbt_dynar_get_as(tokens, cursor, char*)[0] - '0'; - xbt_dynar_push(entry->location.compose, &new_element); - }else if(strcmp(tok, "DW_OP_const1s") == 0 || - strcmp(tok, "DW_OP_const2s") == 0 || - strcmp(tok, "DW_OP_const4s") == 0 || - strcmp(tok, "DW_OP_const8s") == 0){ - dw_location_t new_element = xbt_new0(s_dw_location_t, 1); - new_element->type = e_dw_constant; - new_element->location.constant.is_signed = 1; - new_element->location.constant.bytes = tok[11] - '0'; - new_element->location.constant.value = atoi(xbt_dynar_get_as(tokens, ++cursor, char*)); - xbt_dynar_push(entry->location.compose, &new_element); - }else{ - dw_location_t new_element = xbt_new0(s_dw_location_t, 1); - new_element->type = e_dw_unsupported; - xbt_dynar_push(entry->location.compose, &new_element); - } + while ((read = getline(&line, &n, fp)) != -1){ - cursor++; - - } + if(n == 0) + continue; - free(tok); - free(tmp_tok); - /*xbt_dynar_free(&tokens);*/ + /* Wipeout the new line character */ + line[read - 1] = '\0'; - return e_dw_compose; + xbt_str_strip_spaces(line); + xbt_str_ltrim(line, NULL); - }else{ + line_tokens = xbt_str_split(line, NULL); - if(strncmp(expr, "DW_OP_reg", 9) == 0){ - entry->type = e_dw_register; - entry->location.reg = atoi(strtok(expr,"DW_OP_reg")); - }else if(strncmp(expr, "DW_OP_breg", 10) == 0){ - entry->type = e_dw_bregister_op; - tok = strtok(expr, "+"); - entry->location.breg_op.offset = atoi(strtok(NULL, "+")); - entry->location.breg_op.reg = atoi(strtok(tok, "DW_OP_breg")); + if(xbt_dynar_length(line_tokens) <= 4 || strcmp(xbt_dynar_get_as(line_tokens, 0, char *), "SYMBOL") == 0) + continue; + + if((strncmp(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 1, char*), "__gcov", 6) == 0) + || (strncmp(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 1, char*), "gcov", 4) == 0) + || (strcmp(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 1, char*), ".data") == 0) + || (strcmp(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 1, char*), ".bss") == 0) + || (strncmp(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 1, char*), "stderr", 6) == 0) + || (strncmp(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 1, char*), "counter", 7) == 0) + || ((size_t)strtoul(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 2, char*), NULL, 16) == 0)) + continue; + + global_variable_t var = xbt_new0(s_global_variable_t, 1); + + if(type == 0){ + var->address = (void *)strtoul(xbt_dynar_get_as(line_tokens, 0, char*), NULL, 16); }else{ - entry->type = e_dw_unsupported; + offset = strtoul(xbt_dynar_get_as(line_tokens, 0, char*), NULL, 16); + var->address = (char *)start_text_libsimgrid+offset; } - free(tok); - free(tmp_tok); + var->size = (size_t)strtoul(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 2, char*), NULL, 16); + var->name = strdup(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 1, char*)); + + if(data_bss_ignore_size(var->address) > 0) + global_variable_free(var); + else + xbt_dynar_push(mc_global_variables, &var); - return entry->type; + xbt_dynar_free(&line_tokens); } + xbt_free(command); + xbt_free(line); + pclose(fp); + +} + +void global_variable_free(global_variable_t v){ + xbt_free(v->name); + xbt_free(v); +} + +void global_variable_free_voidp(void *v){ + global_variable_free((global_variable_t) * (void **) v); }