[mc] Cleanup mc_object_info_t code

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

diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c
index e2999d6..7521448 100644 (file)
--- a/src/mc/mc_global.c
+++ b/src/mc/mc_global.c
@@ -180,6 +180,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);
@@ -521,7 +526,7 @@ 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){
+void MC_dwarf_get_variables(mc_object_info_t info) {
   mc_object_info_t result = info;
   const char *elf_file = info->file_name;
 
@@ -1737,10 +1742,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 +1768,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 +1907,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();
     MC_UNSET_RAW_MEM;
   }