From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Thu, 6 Mar 2014 12:29:59 +0000 (+0100)
Subject: Merge branch 'mc' into mc++
X-Git-Tag: v3_11~199^2~2^2~19
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/49e85177c669d793e84242983a1b1f430e47184e?hp=3c05a7cdb90b7f5d0628daa4d430edf1f79e5132

Merge branch 'mc' into mc++
---

diff --git a/src/mc/mc_dwarf.c b/src/mc/mc_dwarf.c
index c4c00ba078..aa5f9f0f4e 100644
--- a/src/mc/mc_dwarf.c
+++ b/src/mc/mc_dwarf.c
@@ -529,9 +529,6 @@ Dwarf_Off MC_dwarf_resolve_location(unw_cursor_t* c, dw_location_t location, voi
     }
     dw_location_t location_entry = xbt_dynar_get_as(location->location.compose, 0, dw_location_t);
     switch (location_entry->type){
-    case e_dw_register:
-      unw_get_reg(c, location_entry->location.reg, &res);
-      return res;
     case e_dw_bregister_op:
       unw_get_reg(c, location_entry->location.breg_op.reg, &res);
       return (Dwarf_Off) ((long)res + location_entry->location.breg_op.offset);
@@ -569,7 +566,7 @@ static void MC_dwarf_fill_member_location(dw_type_t type, dw_type_t member, Dwar
 
   Dwarf_Attribute attr;
   dwarf_attr_integrate(child, DW_AT_data_member_location, &attr);
-  int form  = dwarf_whatform(&attr);
+  int form = dwarf_whatform(&attr);
   int klass = MC_dwarf_form_get_class(form);
   switch (klass) {
   case MC_DW_CLASS_EXPRLOC:
@@ -932,7 +929,8 @@ static dw_variable_t MC_die_to_variable(mc_object_info_t info, Dwarf_Die* die, D
 
   variable->type_origin = MC_dwarf_at_type(die);
 
-  int klass = MC_dwarf_form_get_class(dwarf_whatform(&attr_location));
+  int form = dwarf_whatform(&attr_location);
+  int klass = form == DW_FORM_sec_offset ? MC_DW_CLASS_CONSTANT : MC_dwarf_form_get_class(form);
   switch (klass) {
   case MC_DW_CLASS_EXPRLOC:
   case MC_DW_CLASS_BLOCK:
@@ -964,8 +962,8 @@ static dw_variable_t MC_die_to_variable(mc_object_info_t info, Dwarf_Die* die, D
     variable->location = MC_dwarf_get_location_list(info, die, &attr_location);
     break;
   default:
-    xbt_die("Unexpected calss 0x%x (%i) list for location in <%p>%s",
-      klass, klass, (void*) variable->dwarf_offset, variable->name);
+    xbt_die("Unexpected form 0x%x (%i), class 0x%x (%i) list for location in <%p>%s",
+      form, form, klass, klass, (void*) variable->dwarf_offset, variable->name);
   }
 
   // Handle start_scope: