Eric Pouech : dbghelp/dwarf: Pass dwarf2_cuhead_t for addr details to swallow_attribute.
Alexandre Julliard
julliard at winehq.org
Thu Sep 9 15:42:32 CDT 2021
Module: wine
Branch: master
Commit: d12c7548061b53c2b251f16fd595f48f8cf80b60
URL: https://source.winehq.org/git/wine.git/?a=commit;h=d12c7548061b53c2b251f16fd595f48f8cf80b60
Author: Eric Pouech <eric.pouech at gmail.com>
Date: Wed Sep 8 08:34:14 2021 +0200
dbghelp/dwarf: Pass dwarf2_cuhead_t for addr details to swallow_attribute.
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dbghelp/dwarf.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c
index 07f06c4fa82..78b2c685286 100644
--- a/dlls/dbghelp/dwarf.c
+++ b/dlls/dbghelp/dwarf.c
@@ -451,6 +451,7 @@ static void dwarf2_parse_abbrev_set(dwarf2_traverse_context_t* abbrev_ctx,
}
static void dwarf2_swallow_attribute(dwarf2_traverse_context_t* ctx,
+ const dwarf2_cuhead_t* head,
const dwarf2_abbrev_entry_attr_t* abbrev_attr)
{
unsigned step;
@@ -461,7 +462,7 @@ static void dwarf2_swallow_attribute(dwarf2_traverse_context_t* ctx,
{
case DW_FORM_flag_present: step = 0; break;
case DW_FORM_ref_addr:
- case DW_FORM_addr: step = ctx->word_size; break;
+ case DW_FORM_addr: step = head->word_size; break;
case DW_FORM_flag:
case DW_FORM_data1:
case DW_FORM_ref1: step = 1; break;
@@ -497,8 +498,7 @@ static void dwarf2_fill_attr(const dwarf2_parse_context_t* ctx,
{
case DW_FORM_ref_addr:
case DW_FORM_addr:
- attr->u.uvalue = dwarf2_get_addr(data,
- ctx->module->format_info[DFI_DWARF]->u.dwarf2_info->word_size);
+ attr->u.uvalue = dwarf2_get_addr(data, ctx->head.word_size);
TRACE("addr<0x%lx>\n", attr->u.uvalue);
break;
@@ -1129,7 +1129,7 @@ static BOOL dwarf2_read_one_debug_info(dwarf2_parse_context_t* ctx,
for (i = 0, attr = abbrev->attrs; attr; i++, attr = attr->next)
{
di->data[i] = traverse->data;
- dwarf2_swallow_attribute(traverse, attr);
+ dwarf2_swallow_attribute(traverse, &ctx->head, attr);
}
}
else di->data = NULL;
More information about the wine-cvs
mailing list