Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
model-checker : verification of current_heap
[simgrid.git] / src / mc / mc_global.c
index ccc32ef..e7a8de6 100644 (file)
@@ -14,6 +14,7 @@
 #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,6 +23,7 @@ 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;
 void _mc_cfg_cb_reduce(const char *name, int pos) {
   if (_surf_init_status && !_surf_do_model_check) {
@@ -71,16 +73,24 @@ mc_stats_t mc_stats = NULL;
 
 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;
+
+/* Ignore mechanism */
+xbt_dynar_t mc_stack_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);
 
 void MC_do_the_modelcheck_for_real() {
   if (!_surf_mc_property_file || _surf_mc_property_file[0]=='\0') {
@@ -137,11 +147,8 @@ void MC_init_safety(void)
   MC_take_snapshot(initial_snapshot);
   MC_UNSET_RAW_MEM;
 
-
   if(raw_mem_set)
     MC_SET_RAW_MEM;
-  else
-    MC_UNSET_RAW_MEM;
   
 }
 
@@ -157,19 +164,16 @@ void MC_modelcheck(void)
   MC_exit();
 }
 
-void MC_modelcheck_liveness(){
+void MC_init_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; i<simix_process_maxpid; i++)
-    MC_ignore(&(mc_time[i]), sizeof(double));
+    MC_ignore_heap(&(mc_time[i]), sizeof(double));
   
   compare = 0;
 
@@ -178,8 +182,39 @@ void MC_modelcheck_liveness(){
 
   MC_SET_RAW_MEM;
 
-  mc_binary_local_variables = xbt_dynar_new(sizeof(dw_frame_t), NULL);
+  char *ls_path = get_libsimgrid_path(); 
+  
+  mc_local_variables = xbt_dict_new_homogeneous(NULL);
+
+  /* Get local variables in binary for state equality detection */
+  xbt_dict_t binary_location_list = MC_get_location_list(xbt_binary_name);
+  MC_get_local_variables(xbt_binary_name, binary_location_list, &mc_local_variables);
+
+  /* Get local variables in libsimgrid for state equality detection */
+  xbt_dict_t libsimgrid_location_list = MC_get_location_list(ls_path);
+  MC_get_local_variables(ls_path, libsimgrid_location_list, &mc_local_variables);
+
+  MC_UNSET_RAW_MEM;
 
+  MC_init_memory_map_info();
+
+  /* Get .plt section (start and end addresses) for data libsimgrid and data program comparison */
+  get_libsimgrid_plt_section();
+  get_binary_plt_section();
+
+  if(raw_mem_set)
+    MC_SET_RAW_MEM;
+
+}
+
+void MC_modelcheck_liveness(){
+
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
+  MC_init_liveness();
+  MC_SET_RAW_MEM;
+  
   /* Initialize statistics */
   mc_stats_pair = xbt_new0(s_mc_stats_pair_t, 1);
 
@@ -190,16 +225,12 @@ void MC_modelcheck_liveness(){
 
   MC_UNSET_RAW_MEM;
 
-  /* Get local variables in binary for state equality detection */
-  MC_get_binary_local_variables();
-
   MC_ddfs_init();
 
   /* We're done */
   MC_print_statistics_pairs(mc_stats_pair);
   xbt_free(mc_time);
-  MC_memory_exit();
-  exit(0);
+
 }
 
 
@@ -261,7 +292,7 @@ int MC_deadlock_check()
  */
 void MC_replay(xbt_fifo_t stack, int start)
 {
-  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+  int raw_mem = (mmalloc_get_current_heap() == raw_heap);
 
   int value, i = 1;
   char *req_str;
@@ -317,7 +348,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 +359,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);
+  int raw_mem = (mmalloc_get_current_heap() == raw_heap);
 
   int value;
   char *req_str;
@@ -341,9 +372,10 @@ 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->initial_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(all_stack){
@@ -430,7 +462,7 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack)
 
   XBT_DEBUG("**** End Replay ****");
 
-  if(raw_mem_set)
+  if(raw_mem)
     MC_SET_RAW_MEM;
   else
     MC_UNSET_RAW_MEM;
@@ -534,13 +566,11 @@ void MC_dump_stack_liveness(xbt_fifo_t stack){
 
   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;
 
 }
 
@@ -570,7 +600,7 @@ void MC_print_statistics_pairs(mc_stats_pair_t stats)
 
 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 +612,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,10 +631,14 @@ 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){
@@ -622,8 +656,6 @@ void MC_automaton_load(const char *file){
 
   if(raw_mem_set)
     MC_SET_RAW_MEM;
-  else
-    MC_UNSET_RAW_MEM;
 
 }
 
@@ -642,289 +674,627 @@ 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;
-}
+void MC_ignore_heap(void *address, size_t size){
 
-void MC_ignore(void *address, size_t size){
+  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), NULL);
 
-  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;
 
-  if(((xbt_mheap_t)std_heap)->heapinfo[region->block].type == 0){
-    region->fragment = -1;
-  }else{
-    region->fragment = ((uintptr_t) (ADDR2UINT (address) % (BLOCKSIZE))) >> ((xbt_mheap_t)std_heap)->heapinfo[region->block].type;
+  if((address >= std_heap) && (address <= (void*)((char *)std_heap + STD_HEAP_SIZE))){
+
+    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;
+    }else{
+      region->fragment = ((uintptr_t) (ADDR2UINT (address) % (BLOCKSIZE))) >> ((xbt_mheap_t)std_heap)->heapinfo[region->block].type;
+    }
+    
   }
 
   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, &region);
+  xbt_dynar_insert_at(mc_heap_comparison_ignore, cursor, &region);
 
   MC_UNSET_RAW_MEM;
+
+  if(raw_mem_set)
+    MC_SET_RAW_MEM;
 }
 
-void MC_new_stack_area(void *stack, char *name){
+void MC_ignore_stack(const char *var_name, const char *frame){
+  
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
   MC_SET_RAW_MEM;
+
+  if(mc_stack_comparison_ignore == NULL)
+    mc_stack_comparison_ignore = xbt_dynar_new(sizeof(mc_stack_ignore_variable_t), NULL);
+
+  if(xbt_dynar_is_empty(mc_stack_comparison_ignore)){
+
+    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_insert_at(mc_stack_comparison_ignore, 0, &var);
+
+  }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);
+
+    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);
+
+  }
+
+  MC_UNSET_RAW_MEM;
+  
+  if(raw_mem_set)
+    MC_SET_RAW_MEM;
+
+}
+
+void MC_new_stack_area(void *stack, char *name, void* context){
+
+  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;
   xbt_dynar_push(stacks_areas, &region);
+  
   MC_UNSET_RAW_MEM;
+
+  if(raw_mem_set)
+    MC_SET_RAW_MEM;
 }
 
 /************ DWARF ***********/
 
-static e_dw_location_type get_location(char *expr, dw_location_t entry);
+xbt_dict_t MC_get_location_list(const char *elf_file){
 
-void MC_get_binary_local_variables(){
+  char *command = bprintf("objdump -Wo %s", elf_file);
 
-  char *command = bprintf("dwarfdump -i %s", xbt_binary_name); 
-  
-  FILE* fp = popen(command, "r");
+  FILE *fp = popen(command, "r");
 
   if(fp == NULL)
-    perror("popen failed");
+    perror("popen for objdump failed");
+
+  int debug = 0; /*Detect if the program has been compiled with -g */
 
-  char *line = NULL, *tmp_line = NULL, *tmp_location = NULL, *frame_name = NULL;
+  xbt_dict_t location_list = xbt_dict_new_homogeneous(NULL);
+  char *line = NULL, *loc_expr = 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;
+  int cursor_remove;
   xbt_dynar_t split = NULL;
 
-  read = getline(&line, &n, fp);
+  while ((read = getline(&line, &n, fp)) != -1) {
 
-  while (read != -1) {
+    /* Wipeout the new line character */
+    line[read - 1] = '\0';
 
+    xbt_str_trim(line, NULL);
+    
+    if(n == 0)
+      continue;
+
+    if(strlen(line) == 0)
+      continue;
+
+    if(debug == 0){
+
+      if(strncmp(line, elf_file, strlen(elf_file)) == 0)
+        continue;
+      
+      if(strncmp(line, "Contents", 8) == 0)
+        continue;
+
+      if(strncmp(line, "Offset", 6) == 0){
+        debug = 1;
+        continue;
+      }
+    }
+
+    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_str_strip_spaces(line);
+    split = xbt_str_split(line, " ");
+
+    while(read != -1 && strcmp("<End", (char *)xbt_dynar_get_as(split, 1, char *)) != 0){
+      
+      dw_location_entry_t new_entry = xbt_new0(s_dw_location_entry_t, 1);
+      new_entry->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++;
+      }
+
+      loc_expr = xbt_str_join(split, " ");
+      xbt_str_ltrim(loc_expr, "(");
+      xbt_str_rtrim(loc_expr, ")");
+      new_entry->location = get_location(NULL, loc_expr);
+
+      xbt_dynar_push(loclist, &new_entry);
+
+      xbt_dynar_free(&split);
+      free(loc_expr);
+
+      read = getline(&line, &n, fp);
+      if(read != -1){
+        line[read - 1] = '\0';
+        xbt_str_strip_spaces(line);
+        split = xbt_str_split(line, " ");
+      }
+
+    }
+
+
+    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_dynar_free(&split);
+
+  }
+
+  free(line);
+  free(command);
+  pclose(fp);
+
+  return location_list;
+}
+
+char *get_libsimgrid_path(){
+
+  char *command = bprintf("ldd %s", xbt_binary_name);
+  
+  FILE *fp = popen(command, "r");
+  if(fp == NULL)
+    perror("popen for ldd failed");
+
+  char *line;
+  ssize_t read;
+  size_t n = 0;
+  xbt_dynar_t split;
+  
+  while((read = getline(&line, &n, fp)) != -1){
+  
     if(n == 0)
       continue;
 
     /* Wipeout the new line character */
     line[read - 1] = '\0';
+
+    xbt_str_strip_spaces(line);
+    xbt_str_ltrim(line, NULL);
+    split = xbt_str_split(line, " ");
+
+    if(strncmp((char *)xbt_dynar_get_as(split, 0, char *), "libsimgrid.so", 13) == 0){
+      free(line);
+      free(command);
+      pclose(fp);
+      return ((char *)xbt_dynar_get_as(split, 2, char *));
+    }
+
+    xbt_dynar_free(&split);
     
-    if(line[0] == '<'){
+  }
 
-      /* Get node type */
-      strtok(line, " ");
-      strtok(NULL, " ");
-      node_type = strtok(NULL, " ");
+  free(line);
+  free(command);
+  pclose(fp);
 
-      if(strcmp(node_type, "DW_TAG_subprogram") == 0){ /* New frame */
+  return NULL;
+  
+}
 
-        read = getline(&line, &n, fp);
+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;
 
-        while(read != -1 && line[0] != '<'){
+  xbt_dict_foreach(all_variables, cursor, name, res) {
+    if(offset >= res->start && offset < res->end)
+      return res;
+  }
+
+  return NULL;
+  
+}
 
-          if(n == 0)
-            continue;
+void MC_get_local_variables(const char *elf_file, xbt_dict_t location_list, xbt_dict_t *all_variables){
 
-          node_type = strtok(line, " ");
+  char *command = bprintf("objdump -Wi %s", elf_file);
+  
+  FILE *fp = popen(command, "r");
 
-          if(node_type != NULL && strcmp(node_type, "DW_AT_name") == 0){
+  if(fp == NULL)
+    perror("popen for objdump failed");
 
-            frame_name = strdup(strtok(NULL, " "));
-            read = getline(&line, &n, fp);
+  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;
 
-          }else if(node_type != NULL && strcmp(node_type, "DW_AT_frame_base") == 0){
+  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;
 
-            if(valid_frame == 1){
+  read = getline(&line, &n, fp);
 
-              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, " ");
+  while (read != -1) {
 
-              if(strcmp(location_type, "<loclist") == 0){
+    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;
+    }
 
-                frame->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] == '['){
+    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, " ");
 
-                  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);
+    /* Get node type */
+    node_type = xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char *);
 
-                  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);
+    if(strcmp(node_type, "(DW_TAG_subprogram)") == 0){ /* New frame */
 
-                  read = getline(&line, &n, fp);
-                  xbt_str_ltrim(line, NULL);
-                }
+      dw_frame_t frame = NULL;
 
-              }else{
-                read = getline(&line, &n, fp);
-                frame->location->type = get_location(location_type, frame->location);
+      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){
 
-              xbt_dynar_push(mc_binary_local_variables, &frame);
+        if(n == 0){
+          read = getline(&line, &n, fp);
+          continue;
+        }
 
-            }else{
+        /* 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 *);
 
-               read = getline(&line, &n, fp);
+        if(strncmp(node_type, "DW_AT_", 6) != 0)
+          break;
 
-            }
-          }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)){
+        if(strcmp(node_type, "DW_AT_sibling") == 0){
 
-            read = getline(&line, &n, fp);
-            valid_frame = 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); 
+
+        }else if(strcmp(node_type, "DW_AT_name") == 0){
+
+          new_frame = 1;
+          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);
 
-            read = getline(&line, &n, fp);
+          }
+        }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){
+
+          free(frame->name);
+          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);
 
         }
-        
-        valid_frame = 1;
 
-      }else if(strcmp(node_type, "DW_TAG_variable") == 0){ /* New variable */
-        
-        variable_name = NULL;
-        location_type = NULL;
-        
         read = getline(&line, &n, fp);
 
-        while(read != -1 && line[0] != '<'){
+      }
+      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);
+      }
 
-          if(n == 0)
-            continue;
+      free(subprogram_start);
+      if(subprogram_end != NULL){
+        free(subprogram_end);
+        subprogram_end = NULL;
+      }
+        
 
-          tmp_line = strdup(line);
-          
-          node_type = strtok(line, " ");
+    }else if(strcmp(node_type, "(DW_TAG_variable)") == 0){ /* New variable */
 
-          if(node_type != NULL && strcmp(node_type, "DW_AT_name") == 0){
+      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){
 
-            variable_name = strdup(strtok(NULL, " "));
-            read = getline(&line, &n, fp);
-            
-          }else if(node_type != NULL && strcmp(node_type, "DW_AT_location") == 0){
+        if(n == 0){
+          read = getline(&line, &n, fp);
+          continue;
+        }
 
-            if(valid_variable == 1){
+        /* Wipeout the new line character */
+        line[read - 1] = '\0'; 
 
-              location_type = strdup(strtok(NULL, " "));
+        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 *);
 
-              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, "<loclist") == 0){
+        if(strncmp(node_type, "DW_AT_", 6) != 0)
+          break;
 
-                variable->location->type = e_dw_loclist;
-                variable->location->location.loclist = xbt_dynar_new(sizeof(dw_location_entry_t), NULL);
+        if(strcmp(node_type, "DW_AT_name") == 0){
 
-                read = getline(&line, &n, fp);
-                xbt_str_ltrim(line, NULL);
-                
-                while(read != -1 && line[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 *));
 
-                  strtok(line, "<");
-                  lowpc = strdup(strtok(NULL, "<"));
-                  highpc = strdup(strtok(NULL, ">"));
-                  tmp_location = strdup(strtok(NULL, ">"));
-                  lowpc[strlen(lowpc) - 1] = '\0'; /* Remove last character '>' */
+          xbt_dict_set(variables_origin, origin, var->name, NULL);
+         
+        }else if(strcmp(node_type, "DW_AT_abstract_origin:") == 0){
 
-                  dw_location_entry_t new_entry = xbt_new0(s_dw_location_entry_t, 1);
+          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);   
 
-                  strtok(lowpc, "=");
-                  new_entry->lowpc = (void *) strtoul(strtok(NULL, "="), NULL, 16);
-                  strtok(highpc, "=");
-                  new_entry->highpc = (void *) strtoul(strtok(NULL, "="), NULL, 16);
+        }else if(strcmp(node_type, "DW_AT_location") == 0){
 
-                  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(valid_variable == 1 && var != NULL){
 
-              }
+            var->location = xbt_new0(s_dw_location_t, 1);
 
-              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);
+            location_type = xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char *);
 
-            }else{
+            if(strcmp(location_type, "list)") == 0){ /* Search location in location list */
 
-              read = getline(&line, &n, fp);
+              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);
 
             }
+
+          }
            
-          }else if(node_type != NULL && (strcmp(node_type, "DW_AT_artificial") == 0 || strcmp(node_type, "DW_AT_external") == 0)){
+        }else if(strcmp(node_type, "DW_AT_external") == 0){
 
-            valid_variable = 0;
-            read = getline(&line, &n, fp);
+          valid_variable = 0;
+        
+        }
 
-          }else{
+        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);
+      }
 
-            read = getline(&line, &n, fp);
+      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;
         }
 
-        valid_variable = 1;
+        if(strlen(line) == 0){
+          read = getline(&line, &n, fp);
+          continue;
+        }
 
-      }else{
+        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 *);
 
-        read = getline(&line, &n, fp);
+        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 +1302,189 @@ void MC_get_binary_local_variables(){
     }
 
   }
-
-  if(XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug))
-    print_local_variables(mc_binary_local_variables);
-
-  free(line); free(tmp_line); free(tmp_location); free(frame_name);
-  free(node_type); free(location_type); free(variable_name); free(lowpc); free(highpc);
+  
+  xbt_dynar_free(&split);
+  free(line);
   free(command);
   pclose(fp);
+  
 }
 
-void print_local_variables(xbt_dynar_t list){
+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 == NULL)
+      XBT_INFO("Key not found in loclist");
+    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;
+    
+  }
+
+}
+
+
+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 +1515,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 +1544,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 +1559,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;
           }
@@ -1057,174 +1587,3 @@ void print_local_variables(xbt_dynar_t list){
   }
 
 }
-
-static e_dw_location_type get_location(char *expr, dw_location_t entry){
-
-  int cursor = 0;
-  char *tok = NULL, *tmp_tok = NULL; 
-
-  xbt_dynar_t tokens = xbt_str_split(expr, NULL);
-  xbt_dynar_remove_at(tokens, xbt_dynar_length(tokens) - 1, NULL);
-
-  if(xbt_dynar_length(tokens) > 1){
-
-    entry->type = e_dw_compose;
-    entry->location.compose = xbt_dynar_new(sizeof(dw_location_t), NULL);
-
-    while(cursor < xbt_dynar_length(tokens)){
-
-      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);
-
-      }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);
-      }
-
-      cursor++;
-      
-    }
-
-    free(tok);
-    free(tmp_tok);
-    /*xbt_dynar_free(&tokens);*/
-
-    return e_dw_compose;
-
-  }else{
-
-    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"));
-    }else{
-      entry->type = e_dw_unsupported;
-    }
-
-    free(tok);
-    free(tmp_tok);
-
-    return entry->type;
-
-  }
-
-}