This is need to determine if a specified enumeration type is present
in a given debug information.
In this patch set, I'll use this to check if enum pageflags is
present.
The newly introduced interface is a simple extension from the existing
one for enumeration value.
Signed-off-by: HATAYAMA Daisuke <d.hatayama at jp.fujitsu.com>
---
dwarf_info.c | 18 +++++++++++++++++-
dwarf_info.h | 1 +
makedumpfile.h | 13 +++++++++++--
3 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/dwarf_info.c b/dwarf_info.c
index 94b920a..09a8e1e 100644
--- a/dwarf_info.c
+++ b/dwarf_info.c
@@ -607,7 +607,7 @@ search_structure(Dwarf_Die *die, int *found)
static void
search_number(Dwarf_Die *die, int *found)
{
- int tag;
+ int tag, bytesize;
Dwarf_Word const_value;
Dwarf_Attribute attr;
Dwarf_Die child, *walker;
@@ -618,6 +618,22 @@ search_number(Dwarf_Die *die, int *found)
if (tag != DW_TAG_enumeration_type)
continue;
+ if (dwarf_info.cmd == DWARF_INFO_GET_ENUMERATION_TYPE_SIZE) {
+ name = dwarf_diename(die);
+
+ if (!name || strcmp(name, dwarf_info.struct_name))
+ continue;
+
+ if ((bytesize = dwarf_bytesize(die)) <= 0)
+ continue;
+
+ *found = TRUE;
+
+ dwarf_info.struct_size = bytesize;
+
+ return;
+ }
+
if (dwarf_child(die, &child) != 0)
continue;
diff --git a/dwarf_info.h b/dwarf_info.h
index 8d0084d..185cbb6 100644
--- a/dwarf_info.h
+++ b/dwarf_info.h
@@ -46,6 +46,7 @@ enum {
DWARF_INFO_CHECK_SYMBOL_ARRAY_TYPE,
DWARF_INFO_GET_SYMBOL_TYPE,
DWARF_INFO_GET_MEMBER_TYPE,
+ DWARF_INFO_GET_ENUMERATION_TYPE_SIZE,
};
char *get_dwarf_module_name(void);
diff --git a/makedumpfile.h b/makedumpfile.h
index 97aca2a..20f4d99 100644
--- a/makedumpfile.h
+++ b/makedumpfile.h
@@ -256,14 +256,23 @@ do { \
#define ARRAY_LENGTH(X) (array_table.X)
#define SIZE_INIT(X, Y) \
do { \
- if ((SIZE(X) = get_structure_size(Y, 0)) == FAILED_DWARFINFO) \
+ if ((SIZE(X) = get_structure_size(Y, DWARF_INFO_GET_STRUCT_SIZE)) \
+ == FAILED_DWARFINFO) \
return FALSE; \
} while (0)
#define TYPEDEF_SIZE_INIT(X, Y) \
do { \
- if ((SIZE(X) = get_structure_size(Y, 1)) == FAILED_DWARFINFO) \
+ if ((SIZE(X) = get_structure_size(Y, DWARF_INFO_GET_TYPEDEF_SIZE)) \
+ == FAILED_DWARFINFO) \
return FALSE; \
} while (0)
+#define ENUM_TYPE_SIZE_INIT(X, Y) \
+do { \
+ if ((SIZE(X) = get_structure_size(Y, \
+ DWARF_INFO_GET_ENUMERATION_TYPE_SIZE)) \
+ == FAILED_DWARFINFO) \
+ return FALSE; \
+} while (0)
#define OFFSET_INIT(X, Y, Z) \
do { \
if ((OFFSET(X) = get_member_offset(Y, Z, DWARF_INFO_GET_MEMBER_OFFSET)) \
