xbt_assert(!type->members);
type->members = xbt_dynar_new(sizeof(dw_type_t), (void(*)(void*))dw_type_free);
for (res=dwarf_child(die, &child); res==0; res=dwarf_siblingof(&child,&child)) {
- if (dwarf_tag(&child)==DW_TAG_member) {
+ int tag = dwarf_tag(&child);
+ if (tag==DW_TAG_member || tag==DW_TAG_inheritance) {
// Skip declarations:
if (MC_dwarf_attr_flag(&child, DW_AT_declaration, false))
// TODO, we should use another type (because is is not a type but a member)
dw_type_t member = xbt_new0(s_dw_type_t, 1);
- member->type = -1;
- member->id = NULL;
+ member->type = tag;
+
+ // Global Offset:
+ member->id = (void *) dwarf_dieoffset(&child);
const char* name = MC_dwarf_attr_string(&child, DW_AT_name);
if(name)
// Global Offset
type->id = (void *) dwarf_dieoffset(die);
- char* prefix = "";
+ const char* prefix = "";
switch (type->type) {
case DW_TAG_structure_type:
prefix = "struct ";
Dwarf_Attribute attr_frame_base;
if (!dwarf_attr_integrate(die, DW_AT_frame_base, &attr_frame_base))
- xbt_die("Coult not find DW_AT_frame_base for subprogram %s %p", frame->name, frame->start);
+ xbt_die("Coult not find DW_AT_frame_base for subprogram %s 0x%lx", frame->name, frame->start);
mc_dwarf_location_list_init(&frame->frame_base, info, die, &attr_frame_base);
frame->end = -1; // This one is now useless: