Eric Pouech : dbghelp/dwarf: Make use of AT_type if present when parsing an enumeration type.
Alexandre Julliard
julliard at winehq.org
Mon Nov 15 16:01:29 CST 2021
Module: wine
Branch: master
Commit: 19f97c5fd8cd04bd18ee61ab41fd394360f74680
URL: https://source.winehq.org/git/wine.git/?a=commit;h=19f97c5fd8cd04bd18ee61ab41fd394360f74680
Author: Eric Pouech <eric.pouech at gmail.com>
Date: Mon Nov 15 18:25:55 2021 +0100
dbghelp/dwarf: Make use of AT_type if present when parsing an enumeration type.
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dbghelp/dwarf.c | 33 +++++++++++++++++++++------------
1 file changed, 21 insertions(+), 12 deletions(-)
diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c
index ef17f7d539f..7b925ee53b8 100644
--- a/dlls/dbghelp/dwarf.c
+++ b/dlls/dbghelp/dwarf.c
@@ -1835,8 +1835,9 @@ static void dwarf2_parse_enumerator(dwarf2_debug_info_t* di,
static struct symt* dwarf2_parse_enumeration_type(dwarf2_debug_info_t* di)
{
struct attribute name;
- struct attribute size;
- struct symt_basic* basetype;
+ struct attribute attrtype;
+ dwarf2_debug_info_t*ditype;
+ struct symt* type;
struct vector* children;
dwarf2_debug_info_t*child;
unsigned int i;
@@ -1846,20 +1847,28 @@ static struct symt* dwarf2_parse_enumeration_type(dwarf2_debug_info_t* di)
TRACE("%s\n", dwarf2_debug_di(di));
if (!dwarf2_find_attribute(di, DW_AT_name, &name)) name.u.string = NULL;
- if (!dwarf2_find_attribute(di, DW_AT_byte_size, &size)) size.u.uvalue = 4;
-
- switch (size.u.uvalue) /* FIXME: that's wrong */
+ if (dwarf2_find_attribute(di, DW_AT_type, &attrtype) && (ditype = dwarf2_jump_to_debug_info(&attrtype)) != NULL)
+ type = ditype->symt;
+ else /* no type found for this enumeration, construct it from size */
{
- case 1: basetype = symt_new_basic(di->unit_ctx->module_ctx->module, btInt, "char", 1); break;
- case 2: basetype = symt_new_basic(di->unit_ctx->module_ctx->module, btInt, "short", 2); break;
- default:
- case 4: basetype = symt_new_basic(di->unit_ctx->module_ctx->module, btInt, "int", 4); break;
- }
+ struct attribute size;
+ struct symt_basic* basetype;
+
+ if (!dwarf2_find_attribute(di, DW_AT_byte_size, &size)) size.u.uvalue = 4;
- di->symt = &symt_new_enum(di->unit_ctx->module_ctx->module, name.u.string, &basetype->symt)->symt;
+ switch (size.u.uvalue) /* FIXME: that's wrong */
+ {
+ case 1: basetype = symt_new_basic(di->unit_ctx->module_ctx->module, btInt, "char", 1); break;
+ case 2: basetype = symt_new_basic(di->unit_ctx->module_ctx->module, btInt, "short", 2); break;
+ default:
+ case 4: basetype = symt_new_basic(di->unit_ctx->module_ctx->module, btInt, "int", 4); break;
+ }
+ type = &basetype->symt;
+ }
+ di->symt = &symt_new_enum(di->unit_ctx->module_ctx->module, name.u.string, type)->symt;
children = dwarf2_get_di_children(di);
- /* FIXME: should we use the sibling stuff ?? */
+
if (children) for (i = 0; i < vector_length(children); i++)
{
child = *(dwarf2_debug_info_t**)vector_at(children, i);
More information about the wine-cvs
mailing list