X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3dd60a862d49627a1c169b4be980456fe13854f9..5c628c87e93357849fdcfa2433c42a60733f4362:/src/mc/mc_global.c diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c index e2999d6c0d..07c7800b49 100644 --- a/src/mc/mc_global.c +++ b/src/mc/mc_global.c @@ -19,6 +19,8 @@ #include "xbt/automaton.h" #include "xbt/dict.h" +static void MC_post_process_types(mc_object_info_t info); + XBT_LOG_NEW_CATEGORY(mc, "All MC categories"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, "Logging specific to MC (global)"); @@ -180,6 +182,11 @@ mc_object_info_t MC_new_object_info() { res->file_name = NULL; res->start_text = NULL; res->start_data = NULL; + res->start_bss = NULL; + res->start_plt = NULL; + res->end_plt = NULL; + res->start_got_plt = NULL; + res->end_got_plt = NULL; res->local_variables = xbt_dict_new_homogeneous(NULL); res->global_variables = xbt_dynar_new(sizeof(dw_variable_t), dw_variable_free_voidp); res->types = xbt_dict_new_homogeneous(NULL); @@ -447,6 +454,10 @@ static xbt_dict_t MC_dwarf_get_location_list(const char *elf_file){ return location_list; } +/** \brief Finds a frame (DW_TAG_subprogram) from an DWARF offset in the rangd of this subprogram + * + * The offset can be an offset of a child DW_TAG_variable. + */ static dw_frame_t MC_dwarf_get_frame_by_offset(xbt_dict_t all_variables, unsigned long int offset){ xbt_dict_cursor_t cursor = NULL; @@ -521,7 +532,8 @@ static int MC_dwarf_get_variable_index(xbt_dynar_t variables, char* var, void *a } -static void MC_dwarf_get_variables(mc_object_info_t info){ +/** \brief Fill DWARf debug infomations (types, frames, variables ...). */ +void MC_dwarf_get_variables(mc_object_info_t info) { mc_object_info_t result = info; const char *elf_file = info->file_name; @@ -908,7 +920,6 @@ static void MC_dwarf_get_variables(mc_object_info_t info){ }else if(strcmp(node_type, "(DW_TAG_base_type)") == 0 || strcmp(node_type, "(DW_TAG_enumeration_type)") == 0 - || strcmp(node_type, "(DW_TAG_enumerator)") == 0 || strcmp(node_type, "(DW_TAG_typedef)") == 0 || strcmp(node_type, "(DW_TAG_const_type)") == 0 || strcmp(node_type, "(DW_TAG_subroutine_type)") == 0 @@ -921,8 +932,6 @@ static void MC_dwarf_get_variables(mc_object_info_t info){ type_type = e_dw_base_type; else if(strcmp(node_type, "(DW_TAG_enumeration_type)") == 0) type_type = e_dw_enumeration_type; - else if(strcmp(node_type, "(DW_TAG_enumerator)") == 0) - type_type = e_dw_enumerator; else if(strcmp(node_type, "(DW_TAG_typedef)") == 0) type_type = e_dw_typedef; else if(strcmp(node_type, "(DW_TAG_const_type)") == 0) @@ -989,10 +998,11 @@ static void MC_dwarf_get_variables(mc_object_info_t info){ type->id = (void *)strtoul(origin, NULL, 16); if(type_origin) type->dw_type_id = xbt_strdup(type_origin); - if(type_type == e_dw_enumerator) - type->size = enumeration_size; - else - type->size = size; + + type->byte_size = size; + // Not relevant: + type->element_count = -1; + type->members = NULL; xbt_dict_set(*types, origin, type, NULL); @@ -1077,9 +1087,11 @@ static void MC_dwarf_get_variables(mc_object_info_t info){ if(member_end && type){ member_end = 0; + // Why are we not simply referencing, the DW_AT_type? dw_type_t member_type = xbt_new0(s_dw_type_t, 1); member_type->name = xbt_strdup(name); - member_type->size = size; + member_type->byte_size = size; + member_type->element_count = -1; member_type->is_pointer_type = is_pointer; member_type->id = (void *)strtoul(origin, NULL, 16); member_type->offset = offset; @@ -1112,7 +1124,8 @@ static void MC_dwarf_get_variables(mc_object_info_t info){ else type->type = e_dw_union_type; type->name = xbt_strdup(name); - type->size = size; + type->byte_size = size; + type->element_count = -1; type->is_pointer_type = is_pointer; type->id = (void *)strtoul(origin, NULL, 16); if(type_origin) @@ -1153,8 +1166,10 @@ static void MC_dwarf_get_variables(mc_object_info_t info){ dw_type_t type = NULL; + // Read DW_TAG_subrange_type children: while(read != -1){ + // Read attributes of the DW_TAG_subrange_type: while(read != -1){ /* Wipeout the new line character */ @@ -1198,8 +1213,8 @@ static void MC_dwarf_get_variables(mc_object_info_t info){ } if(subrange && type){ - type->size = size; - + type->element_count = size; + xbt_free(name); name = NULL; xbt_free(end); @@ -1224,6 +1239,9 @@ static void MC_dwarf_get_variables(mc_object_info_t info){ if(type_origin) type->dw_type_id = xbt_strdup(type_origin); type->members = NULL; + + // Filled in a post processing step: + type-> byte_size = 0; xbt_dict_set(*types, origin, type, NULL); @@ -1262,8 +1280,23 @@ static void MC_dwarf_get_variables(mc_object_info_t info){ xbt_dict_free(&location_list); pclose(fp); + + MC_post_process_types(info); } +static void MC_post_process_types(mc_object_info_t info) { + xbt_dict_cursor_t cursor; + char *origin; + dw_type_t type; + xbt_dict_foreach(info->types, cursor, origin, type){ + if(type->type==e_dw_array_type) { + xbt_assert(type->dw_type_id, "No base type for array %s %s", type->id, type->name); + dw_type_t subtype = xbt_dict_get_or_null(info->types, type->dw_type_id); + xbt_assert(subtype, "Unkown base type for array %s %s", type->id, type->name); + type->byte_size = type->element_count*subtype->byte_size; + } + } +} /******************************* Ignore mechanism *******************************/ /*********************************************************************************/ @@ -1737,10 +1770,24 @@ static void MC_dump_ignored_global_variables(void){ } +static void MC_init_debug_info(); +static void MC_init_debug_info() { + XBT_INFO("Get debug information ..."); + + memory_map_t maps = MC_get_memory_map(); + + /* Get local variables for state equality detection */ + mc_binary_info = MC_find_object_info(maps, xbt_binary_name); + mc_libsimgrid_info = MC_find_object_info(maps, libsimgrid_path); + + MC_free_memory_map(maps); + XBT_INFO("Get debug information done !"); +} + void MC_init(){ int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); - + compare = 0; /* Initialize the data structures that must be persistent across every @@ -1749,34 +1796,15 @@ void MC_init(){ MC_SET_RAW_MEM; MC_init_memory_map_info(); - - XBT_INFO("Get debug information ..."); - - memory_map_t maps = MC_get_memory_map(); - - /* Get local variables for state equality detection */ - - mc_binary_info = MC_find_object_address(maps, xbt_binary_name); - MC_dwarf_get_variables(mc_binary_info); - - mc_libsimgrid_info = MC_find_object_address(maps, libsimgrid_path); - MC_dwarf_get_variables(mc_libsimgrid_info); - - XBT_INFO("Get debug information done !"); + MC_init_debug_info(); /* Remove variables ignored before getting list of variables */ MC_dump_ignored_local_variables(); MC_dump_ignored_global_variables(); - - /* Get .plt section (start and end addresses) for data libsimgrid and data program comparison */ - MC_get_libsimgrid_plt_section(); - MC_get_binary_plt_section(); /* Init parmap */ parmap = xbt_parmap_mc_new(xbt_os_get_numcores(), XBT_PARMAP_DEFAULT); - MC_free_memory_map(maps); - MC_UNSET_RAW_MEM; /* Ignore some variables from xbt/ex.h used by exception e for stacks comparison */ @@ -1907,8 +1935,7 @@ void MC_modelcheck_safety(void) }else{ MC_SET_RAW_MEM; MC_init_memory_map_info(); - MC_get_libsimgrid_plt_section(); - MC_get_binary_plt_section(); + MC_init_debug_info(); MC_UNSET_RAW_MEM; }