OpenE2K
/
dwarves
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dwarf_loader: Add containing_type to dwarf_tag 

Sharing the same space with abstract_origin, so that we can remove the last
Dwarf_Off in dwarf_fprintf.c.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2009-04-19 14:04:59 -03:00
parent f84bf73d54
commit 29e67fce58
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dwarf_loader.c
View File

@ -39,7 +39,10 @@ struct dwarf_tag {
struct hlist_node hash_node;
Dwarf_Off type;
Dwarf_Off id;
Dwarf_Off abstract_origin;
union {
Dwarf_Off abstract_origin;
Dwarf_Off containing_type;
};
struct tag *tag;
strings_t decl_file;
uint16_t decl_line;
@ -321,7 +324,8 @@ static struct ptr_to_member_type *ptr_to_member_type__new(Dwarf_Die *die)
if (self != NULL) {
tag__init(&self->tag, die);
self->containing_type = attr_type(die, DW_AT_containing_type);
struct dwarf_tag *dself = self->tag.priv;
dself->containing_type = attr_type(die, DW_AT_containing_type);
}
return self;
@ -1640,7 +1644,7 @@ static int tag__recode_dwarf_type(struct tag *self, struct cu *cu)
case DW_TAG_ptr_to_member_type: {
struct ptr_to_member_type *pt = tag__ptr_to_member_type(self);
dtype = dwarf_cu__find_type_by_id(cu->priv, pt->containing_type);
dtype = dwarf_cu__find_type_by_id(cu->priv, dtag->containing_type);
if (dtype != NULL)
pt->containing_type = dtype->small_id;
else {
@ -1649,7 +1653,7 @@ static int tag__recode_dwarf_type(struct tag *self, struct cu *cu)
"containing_type %#llx, containing_type=%#llx\n",
__func__,
(unsigned long long)dtag->id,
(unsigned long long)pt->containing_type);
(unsigned long long)dtag->containing_type);
}
}
break;

2
dwarves.h
View File

@ -426,7 +426,7 @@ size_t __tag__id_not_found_fprintf(FILE *fp, uint16_t id, const char *fn);
struct ptr_to_member_type {
struct tag tag;
Dwarf_Off containing_type;
uint16_t containing_type;
};
static inline struct ptr_to_member_type *

2
dwarves_fprintf.c
View File

@ -380,7 +380,7 @@ const char *tag__name(const struct tag *self, const struct cu *cu,
return tag__ptr_name(self, cu, bf, len, "&");
case DW_TAG_ptr_to_member_type: {
char suffix[512];
Dwarf_Off id = tag__ptr_to_member_type(self)->containing_type;
uint16_t id = tag__ptr_to_member_type(self)->containing_type;
type = cu__type(cu, id);
if (type != NULL)