wine-commits September 2021

wine-commits@winehq.org

2 participants
1030 discussions

Connor McAdams : user32/tests: Fix occasional failure in ShowWindow() message sequences.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: 5488159209fb1486e529a7d2a1f788d5dd816226 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5488159209fb1486e529a7d2… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Sep 15 03:00:12 2021 -0400 user32/tests: Fix occasional failure in ShowWindow() message sequences. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index d61c813b492..8e523edd5ba 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13405,9 +13405,10 @@ static const struct message WmRestore_3[] = { { HCBT_ACTIVATE, hook|optional }, /* win2003 doesn't send it */ { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* win2003 doesn't send it */ + { WM_WINDOWPOSCHANGED, sent|optional }, /* Win8+ sometimes sends this. */ { HCBT_SETFOCUS, hook|optional }, /* win2003 doesn't send it */ { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_WINDOWPOSCHANGED, sent|optional }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|wparam|defwinproc, SIZE_MAXIMIZED }, { HCBT_SETFOCUS, hook|optional }, /* win2003 sends it */

1 0

Nikolay Sivov : mfplat/tests: Remove unnecessary check (Coverity).
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: f8b8c3ed410bb0a4c4842e0f15fb8f78c43b976d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8b8c3ed410bb0a4c4842e0f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 15 20:20:22 2021 +0300 mfplat/tests: Remove unnecessary check (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 54af1ee151d..541459c715b 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -877,8 +877,6 @@ todo_wine for (i = 0; i < sample_count; ++i) { hr = IMFMediaStream_RequestSample(video_stream, NULL); - if (i == sample_count) - break; ok(hr == S_OK, "Failed to request sample %u, hr %#x.\n", i + 1, hr); if (hr != S_OK) break;

1 0

Eric Pouech : winedbg: Show dwarf version(s) used for a module.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: 0646e156655b1d21e672f09b4854221091c4fb91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0646e156655b1d21e672f09b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 15 10:38:40 2021 +0200 winedbg: Show dwarf version(s) used for a module. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 10 +++++++++- programs/winedbg/info.c | 13 ++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index a9ff9ff2354..90addb9a6b7 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -182,6 +182,7 @@ typedef struct dwarf2_parse_module_context_s const struct elf_thunk_area*thunks; struct symt* symt_cache[sc_num]; /* void, unknown */ struct vector unit_contexts; + DWORD cu_versions; } dwarf2_parse_module_context_t; enum unit_status @@ -2517,6 +2518,8 @@ static BOOL dwarf2_parse_compilation_unit_head(dwarf2_parse_context_t* ctx, TRACE("- word_size: %u\n", ctx->head.word_size); TRACE("- offset_size: %u\n", ctx->head.offset_size); + if (ctx->head.version >= 2) + ctx->module_ctx->cu_versions |= 1 << (ctx->head.version - 2); if (max_supported_dwarf_version == 0) { char* env = getenv("DBGHELP_DWARF_VERSION"); @@ -3732,6 +3735,7 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, module_ctx.symt_cache[sc_void] = &symt_new_basic(module_ctx.module, btVoid, "void", 0)->symt; module_ctx.symt_cache[sc_unknown] = &symt_new_basic(module_ctx.module, btNoType, "# unknown", 0)->symt; vector_init(&module_ctx.unit_contexts, sizeof(dwarf2_parse_context_t), 16); + module_ctx.cu_versions = 0; /* phase I: parse all CU heads */ mod_ctx.data = section[section_debug].address; @@ -3749,7 +3753,11 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, dwarf2_parse_compilation_unit((dwarf2_parse_context_t*)vector_at(&module_ctx.unit_contexts, i)); dwarf2_modfmt->module->module.SymType = SymDia; - dwarf2_modfmt->module->module.CVSig = 'D' | ('W' << 8) | ('A' << 16) | ('R' << 24); + /* hide dwarf versions in CVSig + * bits 24-31 will be set according to found dwarf version + * different CU can have different dwarf version, so use a bit per version (version 2 => b24) + */ + dwarf2_modfmt->module->module.CVSig = 'D' | ('W' << 8) | ('F' << 16) | ((module_ctx.cu_versions & 0xFF) << 24); /* FIXME: we could have a finer grain here */ dwarf2_modfmt->module->module.GlobalSymbols = TRUE; dwarf2_modfmt->module->module.TypeInfo = TRUE; diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index a6335092d84..36da71c4713 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -137,10 +137,21 @@ static const char* get_symtype_str(const IMAGEHLP_MODULE64* mi) case 'S' | ('T' << 8) | ('A' << 16) | ('B' << 24): return "Stabs"; case 'D' | ('W' << 8) | ('A' << 16) | ('R' << 24): + /* previous versions of dbghelp used to report this... */ return "Dwarf"; default: + if ((mi->CVSig & 0x00FFFFFF) == ('D' | ('W' << 8) | ('F' << 16))) + { + static char tmp[64]; + DWORD versbit = mi->CVSig >> 24; + strcpy(tmp, "Dwarf"); + if (versbit & 1) strcat(tmp, "-2"); + if (versbit & 2) strcat(tmp, "-3"); + if (versbit & 4) strcat(tmp, "-4"); + if (versbit & 8) strcat(tmp, "-5"); + return tmp; + } return "DIA"; - } } }

1 0

Eric Pouech : dbghelp/dwarf: Add reference for a DIE to its CU.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: f7377e5e65d0bb18ababa3afb65507b4df54002e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7377e5e65d0bb18ababa3af… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 15 10:38:29 2021 +0200 dbghelp/dwarf: Add reference for a DIE to its CU. Dwarf4 (and GNU extensions) support following debug info in a) different CU b) different ELF/PE files So add a field from debug_info into the parent context unit Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 90 ++++++++++++++++++++++++++-------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f7377e5e65d0bb18abab…

1 0

Eric Pouech : dbghelp/dwarf: Detect out of section sibling DIE information.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: f0c93974596ac45944c9aef9010f2937fc337148 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0c93974596ac45944c9aef9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 15 10:38:23 2021 +0200 dbghelp/dwarf: Detect out of section sibling DIE information. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index eb0cfaf2f50..e1702964efa 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1244,6 +1244,12 @@ static BOOL dwarf2_read_one_debug_info(dwarf2_parse_context_t* ctx, if (dwarf2_find_attribute(ctx, di, DW_AT_sibling, &sibling) && traverse->data != ctx->module_ctx->sections[ctx->section].address + sibling.u.uvalue) { + if (sibling.u.uvalue >= ctx->module_ctx->sections[ctx->section].size) + { + FIXME("cursor sibling after section end %s: 0x%lx 0x%x\n", + dwarf2_debug_ctx(ctx), sibling.u.uvalue, ctx->module_ctx->sections[ctx->section].size); + return FALSE; + } WARN("setting cursor for %s to next sibling <0x%lx>\n", dwarf2_debug_traverse_ctx(traverse), sibling.u.uvalue); traverse->data = ctx->module_ctx->sections[ctx->section].address + sibling.u.uvalue;

1 0

Eric Pouech : dbghelp/dwarf: Support DW_FORM_ref_addr in type DIE lookup using the new cross-CU DIE mechanisms.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: 34b06f873ab8730e07464387555ce892ba5db250 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34b06f873ab8730e07464387… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 15 10:38:17 2021 +0200 dbghelp/dwarf: Support DW_FORM_ref_addr in type DIE lookup using the new cross-CU DIE mechanisms. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index a2ee234f79f..eb0cfaf2f50 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1044,8 +1044,21 @@ static struct symt* dwarf2_lookup_type(dwarf2_parse_context_t* ctx, return ctx->module_ctx->symt_cache[sc_void]; if (!(type = sparse_array_find(&ctx->debug_info_table, attr.u.uvalue))) { - FIXME("Unable to find back reference to type %lx\n", attr.u.uvalue); - return ctx->module_ctx->symt_cache[sc_unknown]; + if (attr.form == DW_FORM_ref_addr) + { + dwarf2_parse_context_t* ref_ctx = dwarf2_locate_cu(ctx->module_ctx, attr.u.uvalue); + /* ensure CU is fully loaded */ + if (ref_ctx && dwarf2_parse_compilation_unit(ref_ctx)) + { + type = sparse_array_find(&ref_ctx->debug_info_table, attr.u.uvalue); + if (type) TRACE("Found type ref %lx in another CU %s\n", attr.u.uvalue, dwarf2_debug_ctx(ref_ctx)); + } + } + if (!type) + { + FIXME("Unable to find back reference to type 0x%lx (form=0x%lx)\n", attr.u.uvalue, attr.form); + return ctx->module_ctx->symt_cache[sc_unknown]; + } } if (type == di) { @@ -2454,7 +2467,7 @@ unsigned dwarf2_cache_cuhead(struct dwarf2_module_info_s* module, struct symt_co return TRUE; } -static inline dwarf2_parse_context_t* dwarf2_locate_cu(dwarf2_parse_module_context_t* module_ctx, ULONG_PTR ref) +static dwarf2_parse_context_t* dwarf2_locate_cu(dwarf2_parse_module_context_t* module_ctx, ULONG_PTR ref) { unsigned i; dwarf2_parse_context_t* ctx;

1 0

Eric Pouech : dbghelp/dwarf: Add ability to get to a DIE in a different CU.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: 8c22d665a87f17b3880fb9ba8614d4c76334fb24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c22d665a87f17b3880fb9ba… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 15 10:38:10 2021 +0200 dbghelp/dwarf: Add ability to get to a DIE in a different CU. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 855168a6085..a2ee234f79f 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -188,6 +188,8 @@ enum unit_status UNIT_ERROR, UNIT_NOTLOADED, UNIT_LOADED, + UNIT_LOADED_FAIL, + UNIT_BEINGLOADED, }; /* this is the context used for parsing a compilation unit @@ -224,6 +226,8 @@ struct dwarf2_module_info_s /* forward declarations */ static struct symt* dwarf2_parse_enumeration_type(dwarf2_parse_context_t* ctx, dwarf2_debug_info_t* entry); +static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_context_t* ctx); +static dwarf2_parse_context_t* dwarf2_locate_cu(dwarf2_parse_module_context_t* module_ctx, ULONG_PTR ref); static unsigned char dwarf2_get_byte(const unsigned char* ptr) { @@ -2450,6 +2454,22 @@ unsigned dwarf2_cache_cuhead(struct dwarf2_module_info_s* module, struct symt_co return TRUE; } +static inline dwarf2_parse_context_t* dwarf2_locate_cu(dwarf2_parse_module_context_t* module_ctx, ULONG_PTR ref) +{ + unsigned i; + dwarf2_parse_context_t* ctx; + const BYTE* where; + for (i = 0; i < module_ctx->unit_contexts.num_elts; ++i) + { + ctx = vector_at(&module_ctx->unit_contexts, i); + where = module_ctx->sections[ctx->section].address + ref; + if (where >= ctx->traverse_DIE.data && where < ctx->traverse_DIE.end_data) + return ctx; + } + FIXME("Couldn't find ref 0x%lx inside sect\n", ref); + return NULL; +} + static BOOL dwarf2_parse_compilation_unit_head(dwarf2_parse_context_t* ctx, dwarf2_traverse_context_t* mod_ctx) { @@ -2516,8 +2536,19 @@ static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_context_t* ctx) dwarf2_traverse_context_t cu_ctx = ctx->traverse_DIE; BOOL ret = FALSE; - if (ctx->status == UNIT_ERROR) return FALSE; + switch (ctx->status) + { + case UNIT_ERROR: return FALSE; + case UNIT_BEINGLOADED: + FIXME("Circular deps on CU\n"); + /* fall through */ + case UNIT_LOADED: + case UNIT_LOADED_FAIL: + return TRUE; + case UNIT_NOTLOADED: break; + } + ctx->status = UNIT_BEINGLOADED; if (dwarf2_read_one_debug_info(ctx, &cu_ctx, NULL, &di)) { if (di->abbrev->tag == DW_TAG_compile_unit) @@ -2558,6 +2589,7 @@ static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_context_t* ctx) } else FIXME("Should have a compilation unit here\n"); } + if (ctx->status == UNIT_BEINGLOADED) ctx->status = UNIT_LOADED_FAIL; return ret; }

1 0

Eric Pouech : dbghelp: Split the parsing of a dwarf compilation unit in two phases.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: 5e74e2b919729854196bdcbb4c20af30e49c9561 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e74e2b919729854196bdcbb… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 15 10:38:04 2021 +0200 dbghelp: Split the parsing of a dwarf compilation unit in two phases. - first phase just parse the header and do elementary checks - second phase, actually load all DIEs in CU Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 41 +++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index e64fcbb822e..855168a6085 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -205,6 +205,7 @@ typedef struct dwarf2_parse_context_s char* cpp_name; dwarf2_cuhead_t head; enum unit_status status; + dwarf2_traverse_context_t traverse_DIE; } dwarf2_parse_context_t; /* stored in the dbghelp's module internal structure for later reuse */ @@ -2449,27 +2450,24 @@ unsigned dwarf2_cache_cuhead(struct dwarf2_module_info_s* module, struct symt_co return TRUE; } -static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_context_t* ctx, - dwarf2_traverse_context_t* mod_ctx) +static BOOL dwarf2_parse_compilation_unit_head(dwarf2_parse_context_t* ctx, + dwarf2_traverse_context_t* mod_ctx) { dwarf2_traverse_context_t abbrev_ctx; - dwarf2_debug_info_t* di; - dwarf2_traverse_context_t cu_ctx; const unsigned char* comp_unit_start = mod_ctx->data; ULONG_PTR cu_length; ULONG_PTR cu_abbrev_offset; - BOOL ret = FALSE; /* FIXME this is a temporary configuration while adding support for dwarf3&4 bits */ static LONG max_supported_dwarf_version = 0; cu_length = dwarf2_parse_3264(mod_ctx, &ctx->head.offset_size); - cu_ctx.data = mod_ctx->data; - cu_ctx.end_data = mod_ctx->data + cu_length; + ctx->traverse_DIE.data = mod_ctx->data; + ctx->traverse_DIE.end_data = mod_ctx->data + cu_length; mod_ctx->data += cu_length; - ctx->head.version = dwarf2_parse_u2(&cu_ctx); - cu_abbrev_offset = dwarf2_parse_offset(&cu_ctx, ctx->head.offset_size); - ctx->head.word_size = dwarf2_parse_byte(&cu_ctx); + ctx->head.version = dwarf2_parse_u2(&ctx->traverse_DIE); + cu_abbrev_offset = dwarf2_parse_offset(&ctx->traverse_DIE, ctx->head.offset_size); + ctx->head.word_size = dwarf2_parse_byte(&ctx->traverse_DIE); ctx->status = UNIT_ERROR; TRACE("Compilation Unit Header found at 0x%x:\n", @@ -2509,6 +2507,16 @@ static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_context_t* ctx, dwarf2_parse_abbrev_set(&abbrev_ctx, &ctx->abbrev_table, &ctx->pool); sparse_array_init(&ctx->debug_info_table, sizeof(dwarf2_debug_info_t), 128); + return TRUE; +} + +static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_context_t* ctx) +{ + dwarf2_debug_info_t* di; + dwarf2_traverse_context_t cu_ctx = ctx->traverse_DIE; + BOOL ret = FALSE; + + if (ctx->status == UNIT_ERROR) return FALSE; if (dwarf2_read_one_debug_info(ctx, &cu_ctx, NULL, &di)) { @@ -3642,9 +3650,6 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, TRACE("Loading Dwarf2 information for %s\n", debugstr_w(module->modulename)); - mod_ctx.data = section[section_debug].address; - mod_ctx.end_data = mod_ctx.data + section[section_debug].size; - dwarf2_modfmt = HeapAlloc(GetProcessHeap(), 0, sizeof(*dwarf2_modfmt) + sizeof(*dwarf2_modfmt->u.dwarf2_info)); if (!dwarf2_modfmt) @@ -3677,13 +3682,21 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, module_ctx.symt_cache[sc_unknown] = &symt_new_basic(module_ctx.module, btNoType, "# unknown", 0)->symt; vector_init(&module_ctx.unit_contexts, sizeof(dwarf2_parse_context_t), 16); + /* phase I: parse all CU heads */ + mod_ctx.data = section[section_debug].address; + mod_ctx.end_data = mod_ctx.data + section[section_debug].size; while (mod_ctx.data < mod_ctx.end_data) { dwarf2_parse_context_t* unit_ctx = vector_add(&module_ctx.unit_contexts, &module_ctx.module->pool); unit_ctx->module_ctx = &module_ctx; - dwarf2_parse_compilation_unit(unit_ctx, &mod_ctx); + dwarf2_parse_compilation_unit_head(unit_ctx, &mod_ctx); } + + /* phase2: load content of all CU */ + for (i = 0; i < module_ctx.unit_contexts.num_elts; ++i) + dwarf2_parse_compilation_unit((dwarf2_parse_context_t*)vector_at(&module_ctx.unit_contexts, i)); + dwarf2_modfmt->module->module.SymType = SymDia; dwarf2_modfmt->module->module.CVSig = 'D' | ('W' << 8) | ('A' << 16) | ('R' << 24); /* FIXME: we could have a finer grain here */

1 0

Eric Pouech : dbghelp/dwarf: Keep open and keep track of parse_context_t inside a module_context_t.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: f7244dc1a8de235ffb3dad02a94e1fd3ce3f22e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7244dc1a8de235ffb3dad02… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 15 10:37:58 2021 +0200 dbghelp/dwarf: Keep open and keep track of parse_context_t inside a module_context_t. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 97 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 58 insertions(+), 39 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 4bb5bb23ac6..e64fcbb822e 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -180,8 +180,16 @@ typedef struct dwarf2_parse_module_context_s struct module* module; const struct elf_thunk_area*thunks; struct symt* symt_cache[sc_num]; /* void, unknown */ + struct vector unit_contexts; } dwarf2_parse_module_context_t; +enum unit_status +{ + UNIT_ERROR, + UNIT_NOTLOADED, + UNIT_LOADED, +}; + /* this is the context used for parsing a compilation unit * inside an ELF/PE section (likely .debug_info) */ @@ -196,6 +204,7 @@ typedef struct dwarf2_parse_context_s ULONG_PTR ref_offset; char* cpp_name; dwarf2_cuhead_t head; + enum unit_status status; } dwarf2_parse_context_t; /* stored in the dbghelp's module internal structure for later reuse */ @@ -2440,10 +2449,9 @@ unsigned dwarf2_cache_cuhead(struct dwarf2_module_info_s* module, struct symt_co return TRUE; } -static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_module_context_t* module_ctx, +static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_context_t* ctx, dwarf2_traverse_context_t* mod_ctx) { - dwarf2_parse_context_t ctx; dwarf2_traverse_context_t abbrev_ctx; dwarf2_debug_info_t* di; dwarf2_traverse_context_t cu_ctx; @@ -2454,22 +2462,23 @@ static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_module_context_t* module_ /* FIXME this is a temporary configuration while adding support for dwarf3&4 bits */ static LONG max_supported_dwarf_version = 0; - cu_length = dwarf2_parse_3264(mod_ctx, &ctx.head.offset_size); + cu_length = dwarf2_parse_3264(mod_ctx, &ctx->head.offset_size); cu_ctx.data = mod_ctx->data; cu_ctx.end_data = mod_ctx->data + cu_length; mod_ctx->data += cu_length; - ctx.head.version = dwarf2_parse_u2(&cu_ctx); - cu_abbrev_offset = dwarf2_parse_offset(&cu_ctx, ctx.head.offset_size); - ctx.head.word_size = dwarf2_parse_byte(&cu_ctx); + ctx->head.version = dwarf2_parse_u2(&cu_ctx); + cu_abbrev_offset = dwarf2_parse_offset(&cu_ctx, ctx->head.offset_size); + ctx->head.word_size = dwarf2_parse_byte(&cu_ctx); + ctx->status = UNIT_ERROR; TRACE("Compilation Unit Header found at 0x%x:\n", - (int)(comp_unit_start - module_ctx->sections[section_debug].address)); + (int)(comp_unit_start - ctx->module_ctx->sections[section_debug].address)); TRACE("- length: %lu\n", cu_length); - TRACE("- version: %u\n", ctx.head.version); + TRACE("- version: %u\n", ctx->head.version); TRACE("- abbrev_offset: %lu\n", cu_abbrev_offset); - TRACE("- word_size: %u\n", ctx.head.word_size); - TRACE("- offset_size: %u\n", ctx.head.offset_size); + TRACE("- word_size: %u\n", ctx->head.word_size); + TRACE("- offset_size: %u\n", ctx->head.offset_size); if (max_supported_dwarf_version == 0) { @@ -2478,30 +2487,30 @@ static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_module_context_t* module_ max_supported_dwarf_version = (v >= 2 && v <= 4) ? v : 2; } - if (ctx.head.version < 2 || ctx.head.version > max_supported_dwarf_version) + if (ctx->head.version < 2 || ctx->head.version > max_supported_dwarf_version) { if (max_supported_dwarf_version > 2) WARN("%u DWARF version unsupported. Wine dbghelp only support DWARF 2 up to %u.\n", - ctx.head.version, max_supported_dwarf_version); + ctx->head.version, max_supported_dwarf_version); else WARN("%u DWARF version unsupported. Wine dbghelp only support DWARF 2.\n", - ctx.head.version); + ctx->head.version); return FALSE; } - pool_init(&ctx.pool, 65536); - ctx.section = section_debug; - ctx.ref_offset = comp_unit_start - module_ctx->sections[section_debug].address; - ctx.cpp_name = NULL; - ctx.module_ctx = module_ctx; + pool_init(&ctx->pool, 65536); + ctx->section = section_debug; + ctx->ref_offset = comp_unit_start - ctx->module_ctx->sections[section_debug].address; + ctx->cpp_name = NULL; + ctx->status = UNIT_NOTLOADED; - abbrev_ctx.data = module_ctx->sections[section_abbrev].address + cu_abbrev_offset; - abbrev_ctx.end_data = module_ctx->sections[section_abbrev].address + module_ctx->sections[section_abbrev].size; - dwarf2_parse_abbrev_set(&abbrev_ctx, &ctx.abbrev_table, &ctx.pool); + abbrev_ctx.data = ctx->module_ctx->sections[section_abbrev].address + cu_abbrev_offset; + abbrev_ctx.end_data = ctx->module_ctx->sections[section_abbrev].address + ctx->module_ctx->sections[section_abbrev].size; + dwarf2_parse_abbrev_set(&abbrev_ctx, &ctx->abbrev_table, &ctx->pool); - sparse_array_init(&ctx.debug_info_table, sizeof(dwarf2_debug_info_t), 128); + sparse_array_init(&ctx->debug_info_table, sizeof(dwarf2_debug_info_t), 128); - if (dwarf2_read_one_debug_info(&ctx, &cu_ctx, NULL, &di)) + if (dwarf2_read_one_debug_info(ctx, &cu_ctx, NULL, &di)) { if (di->abbrev->tag == DW_TAG_compile_unit) { @@ -2512,37 +2521,35 @@ static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_module_context_t* module_ struct attribute stmt_list, low_pc; struct attribute comp_dir; - if (!dwarf2_find_attribute(&ctx, di, DW_AT_name, &name)) + if (!dwarf2_find_attribute(ctx, di, DW_AT_name, &name)) name.u.string = NULL; /* get working directory of current compilation unit */ - if (!dwarf2_find_attribute(&ctx, di, DW_AT_comp_dir, &comp_dir)) + if (!dwarf2_find_attribute(ctx, di, DW_AT_comp_dir, &comp_dir)) comp_dir.u.string = NULL; - if (!dwarf2_find_attribute(&ctx, di, DW_AT_low_pc, &low_pc)) + if (!dwarf2_find_attribute(ctx, di, DW_AT_low_pc, &low_pc)) low_pc.u.uvalue = 0; - - ctx.compiland = symt_new_compiland(module_ctx->module, module_ctx->load_offset + low_pc.u.uvalue, - source_new(module_ctx->module, comp_dir.u.string, name.u.string)); - dwarf2_cache_cuhead(module_ctx->module->format_info[DFI_DWARF]->u.dwarf2_info, ctx.compiland, &ctx.head); - - di->symt = &ctx.compiland->symt; - children = dwarf2_get_di_children(&ctx, di); + ctx->compiland = symt_new_compiland(ctx->module_ctx->module, ctx->module_ctx->load_offset + low_pc.u.uvalue, + source_new(ctx->module_ctx->module, comp_dir.u.string, name.u.string)); + dwarf2_cache_cuhead(ctx->module_ctx->module->format_info[DFI_DWARF]->u.dwarf2_info, ctx->compiland, &ctx->head); + di->symt = &ctx->compiland->symt; + children = dwarf2_get_di_children(ctx, di); if (children) for (i = 0; i < vector_length(children); i++) { child = *(dwarf2_debug_info_t**)vector_at(children, i); - dwarf2_load_one_entry(&ctx, child); + dwarf2_load_one_entry(ctx, child); } - if (dwarf2_find_attribute(&ctx, di, DW_AT_stmt_list, &stmt_list)) + if (dwarf2_find_attribute(ctx, di, DW_AT_stmt_list, &stmt_list)) { - if (dwarf2_parse_line_numbers(&ctx, comp_dir.u.string, stmt_list.u.uvalue)) - module_ctx->module->module.LineNumbers = TRUE; + if (dwarf2_parse_line_numbers(ctx, comp_dir.u.string, stmt_list.u.uvalue)) + ctx->module_ctx->module->module.LineNumbers = TRUE; } + ctx->status = UNIT_LOADED; ret = TRUE; } else FIXME("Should have a compilation unit here\n"); } - pool_destroy(&ctx.pool); return ret; } @@ -3605,6 +3612,7 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, BOOL ret = TRUE; struct module_format* dwarf2_modfmt; dwarf2_parse_module_context_t module_ctx; + unsigned i; if (!dwarf2_init_section(&eh_frame, fmap, ".eh_frame", NULL, &eh_frame_sect)) /* lld produces .eh_fram to avoid generating a long name */ @@ -3667,10 +3675,14 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, memset(module_ctx.symt_cache, 0, sizeof(module_ctx.symt_cache)); module_ctx.symt_cache[sc_void] = &symt_new_basic(module_ctx.module, btVoid, "void", 0)->symt; module_ctx.symt_cache[sc_unknown] = &symt_new_basic(module_ctx.module, btNoType, "# unknown", 0)->symt; + vector_init(&module_ctx.unit_contexts, sizeof(dwarf2_parse_context_t), 16); while (mod_ctx.data < mod_ctx.end_data) { - dwarf2_parse_compilation_unit(&module_ctx, &mod_ctx); + dwarf2_parse_context_t* unit_ctx = vector_add(&module_ctx.unit_contexts, &module_ctx.module->pool); + + unit_ctx->module_ctx = &module_ctx; + dwarf2_parse_compilation_unit(unit_ctx, &mod_ctx); } dwarf2_modfmt->module->module.SymType = SymDia; dwarf2_modfmt->module->module.CVSig = 'D' | ('W' << 8) | ('A' << 16) | ('R' << 24); @@ -3680,6 +3692,13 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, dwarf2_modfmt->module->module.SourceIndexed = TRUE; dwarf2_modfmt->module->module.Publics = TRUE; + for (i = 0; i < module_ctx.unit_contexts.num_elts; ++i) + { + dwarf2_parse_context_t* unit = vector_at(&module_ctx.unit_contexts, i); + if (unit->status != UNIT_ERROR) + pool_destroy(&unit->pool); + } + leave: dwarf2_fini_section(&section[section_debug]); dwarf2_fini_section(&section[section_abbrev]);

1 0

Eric Pouech : dbghelp/dwarf: Move the symt_cache from the unit context into the module context.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: b4d0dbd70b899105a501045351a3be8633d3f087 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4d0dbd70b899105a5010453… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 15 10:37:52 2021 +0200 dbghelp/dwarf: Move the symt_cache from the unit context into the module context. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index e9d62404eba..4bb5bb23ac6 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -179,6 +179,7 @@ typedef struct dwarf2_parse_module_context_s const dwarf2_section_t* sections; struct module* module; const struct elf_thunk_area*thunks; + struct symt* symt_cache[sc_num]; /* void, unknown */ } dwarf2_parse_module_context_t; /* this is the context used for parsing a compilation unit @@ -193,7 +194,6 @@ typedef struct dwarf2_parse_context_s struct sparse_array abbrev_table; struct sparse_array debug_info_table; ULONG_PTR ref_offset; - struct symt* symt_cache[sc_num]; /* void, unknown */ char* cpp_name; dwarf2_cuhead_t head; } dwarf2_parse_context_t; @@ -1027,16 +1027,16 @@ static struct symt* dwarf2_lookup_type(dwarf2_parse_context_t* ctx, if (!dwarf2_find_attribute(ctx, di, DW_AT_type, &attr)) /* this is only valid if current language of CU is C or C++ */ - return ctx->symt_cache[sc_void]; + return ctx->module_ctx->symt_cache[sc_void]; if (!(type = sparse_array_find(&ctx->debug_info_table, attr.u.uvalue))) { FIXME("Unable to find back reference to type %lx\n", attr.u.uvalue); - return ctx->symt_cache[sc_unknown]; + return ctx->module_ctx->symt_cache[sc_unknown]; } if (type == di) { FIXME("Reference to itself\n"); - return ctx->symt_cache[sc_unknown]; + return ctx->module_ctx->symt_cache[sc_unknown]; } if (!type->symt) { @@ -1045,7 +1045,7 @@ static struct symt* dwarf2_lookup_type(dwarf2_parse_context_t* ctx, if (!type->symt) { FIXME("Unable to load forward reference for tag %lx\n", type->abbrev->tag); - return ctx->symt_cache[sc_unknown]; + return ctx->module_ctx->symt_cache[sc_unknown]; } } return type->symt; @@ -1339,6 +1339,7 @@ static struct symt* dwarf2_parse_array_type(dwarf2_parse_context_t* ctx, else for (i = 0; i < vector_length(children); i++) { child = *(dwarf2_debug_info_t**)vector_at(children, i); + if (child->symt == ctx->module_ctx->symt_cache[sc_unknown]) continue; switch (child->abbrev->tag) { case DW_TAG_subrange_type: @@ -2121,7 +2122,7 @@ static void dwarf2_parse_namespace(dwarf2_parse_context_t* ctx, TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); - di->symt = ctx->symt_cache[sc_void]; + di->symt = ctx->module_ctx->symt_cache[sc_void]; children = dwarf2_get_di_children(ctx, di); if (children) for (i = 0; i < vector_length(children); i++) @@ -2491,9 +2492,6 @@ static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_module_context_t* module_ pool_init(&ctx.pool, 65536); ctx.section = section_debug; ctx.ref_offset = comp_unit_start - module_ctx->sections[section_debug].address; - memset(ctx.symt_cache, 0, sizeof(ctx.symt_cache)); - ctx.symt_cache[sc_void] = &symt_new_basic(module_ctx->module, btVoid, "void", 0)->symt; - ctx.symt_cache[sc_unknown] = &symt_new_basic(module_ctx->module, btNoType, "# unknown", 0)->symt; ctx.cpp_name = NULL; ctx.module_ctx = module_ctx; @@ -3666,6 +3664,9 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, module_ctx.module = dwarf2_modfmt->module; module_ctx.thunks = thunks; module_ctx.load_offset = load_offset; + memset(module_ctx.symt_cache, 0, sizeof(module_ctx.symt_cache)); + module_ctx.symt_cache[sc_void] = &symt_new_basic(module_ctx.module, btVoid, "void", 0)->symt; + module_ctx.symt_cache[sc_unknown] = &symt_new_basic(module_ctx.module, btNoType, "# unknown", 0)->symt; while (mod_ctx.data < mod_ctx.end_data) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2021