September 2021 - Wine-Commits

Eric Pouech : dbghelp/dwarf: Pass dwarf2_cuhead_t to lookuploclist().
by Alexandre Julliard Sept. 10, 2021

Sept. 10, 2021

Module: wine Branch: master Commit: 7bb85884e038113e367fcf67f7e7e2798ab6742e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bb85884e038113e367fcf67… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Sep 10 10:37:40 2021 +0200 dbghelp/dwarf: Pass dwarf2_cuhead_t to lookuploclist(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 22350124de7..435b2a0e3b0 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2471,8 +2471,8 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, return ret; } -static BOOL dwarf2_lookup_loclist(const struct module_format* modfmt, const BYTE* start, - ULONG_PTR ip, dwarf2_traverse_context_t* lctx) +static BOOL dwarf2_lookup_loclist(const struct module_format* modfmt, const dwarf2_cuhead_t* head, + const BYTE* start, ULONG_PTR ip, dwarf2_traverse_context_t* lctx) { DWORD_PTR beg, end; const BYTE* ptr = start; @@ -2480,8 +2480,8 @@ static BOOL dwarf2_lookup_loclist(const struct module_format* modfmt, const BYTE while (ptr < modfmt->u.dwarf2_info->debug_loc.address + modfmt->u.dwarf2_info->debug_loc.size) { - beg = dwarf2_get_addr(ptr, modfmt->u.dwarf2_info->word_size); ptr += modfmt->u.dwarf2_info->word_size; - end = dwarf2_get_addr(ptr, modfmt->u.dwarf2_info->word_size); ptr += modfmt->u.dwarf2_info->word_size; + beg = dwarf2_get_addr(ptr, head->word_size); ptr += head->word_size; + end = dwarf2_get_addr(ptr, head->word_size); ptr += head->word_size; if (!beg && !end) break; len = dwarf2_get_u2(ptr); ptr += 2; @@ -2518,7 +2518,13 @@ static enum location_error loc_compute_frame(struct process* pcs, dwarf2_traverse_context_t lctx; enum location_error err; unsigned int i; + const dwarf2_cuhead_t* head = get_cuhead_from_func(func); + if (!head) + { + FIXME("Shouldn't happen\n"); + return loc_err_internal; + } for (i=0; i<vector_length(&func->vchildren); i++) { psym = vector_at(&func->vchildren, i); @@ -2535,11 +2541,11 @@ static enum location_error loc_compute_frame(struct process* pcs, break; case loc_dwarf2_location_list: WARN("Searching loclist for %s\n", debugstr_a(func->hash_elt.name)); - if (!dwarf2_lookup_loclist(modfmt, + if (!dwarf2_lookup_loclist(modfmt, head, modfmt->u.dwarf2_info->debug_loc.address + pframe->offset, ip, &lctx)) return loc_err_out_of_scope; - if ((err = compute_location(modfmt->module, get_cuhead_from_func(func), + if ((err = compute_location(modfmt->module, head, &lctx, frame, pcs->handle, NULL)) < 0) return err; if (frame->kind >= loc_user) { @@ -3332,10 +3338,12 @@ static void dwarf2_location_compute(struct process* pcs, DWORD_PTR ip; int err; dwarf2_traverse_context_t lctx; + const dwarf2_cuhead_t* head = get_cuhead_from_func(func); - if (!func || !symt_check_tag(func->container, SymTagCompiland)) + if (!head) { - WARN("We'd expect function %s's container to exist and be a compiland\n", debugstr_a(func->hash_elt.name)); + WARN("We'd expect function %s's container to be a valid compiland with dwarf inforamation\n", + debugstr_a(func->hash_elt.name)); err = loc_err_internal; } else @@ -3349,7 +3357,7 @@ static void dwarf2_location_compute(struct process* pcs, { case loc_dwarf2_location_list: /* Then, if the variable has a location list, find it !! */ - if (dwarf2_lookup_loclist(modfmt, + if (dwarf2_lookup_loclist(modfmt, head, modfmt->u.dwarf2_info->debug_loc.address + loc->offset, ip, &lctx)) goto do_compute; @@ -3365,7 +3373,7 @@ static void dwarf2_location_compute(struct process* pcs, } do_compute: /* now get the variable */ - err = compute_location(modfmt->module, get_cuhead_from_func(func), + err = compute_location(modfmt->module, head, &lctx, loc, pcs->handle, &frame); break; case loc_register:

1 0

Eric Pouech : dbghelp/dwarf: Add dwarf2_cuhead_s structure to hold compilation unit parsing info.
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: 1c8869e79abf80e416793032c604917d2de6361c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c8869e79abf80e416793032… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 8 08:33:55 2021 +0200 dbghelp/dwarf: Add dwarf2_cuhead_s structure to hold compilation unit parsing info. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 5ce60b3bf5b..0ba15fd338c 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -167,6 +167,12 @@ typedef struct dwarf2_traverse_context_s #define sc_unknown 1 #define sc_num 2 +typedef struct dwarf2_cuhead_s +{ + unsigned char word_size; /* size of a word on target machine */ + unsigned char version; +} dwarf2_cuhead_t; + typedef struct dwarf2_parse_context_s { const dwarf2_section_t* sections; @@ -181,6 +187,7 @@ typedef struct dwarf2_parse_context_s ULONG_PTR ref_offset; struct symt* symt_cache[sc_num]; /* void, unknown */ char* cpp_name; + dwarf2_cuhead_t head; } dwarf2_parse_context_t; /* stored in the dbghelp's module internal structure for later reuse */ @@ -2340,7 +2347,6 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, dwarf2_traverse_context_t cu_ctx; const unsigned char* comp_unit_start = mod_ctx->data; ULONG_PTR cu_length; - unsigned short cu_version; ULONG_PTR cu_abbrev_offset; BOOL ret = FALSE; /* FIXME this is a temporary configuration while adding support for dwarf3&4 bits */ @@ -2350,16 +2356,16 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, cu_ctx.data = mod_ctx->data; cu_ctx.end_data = mod_ctx->data + cu_length; mod_ctx->data += cu_length; - cu_version = dwarf2_parse_u2(&cu_ctx); + ctx.head.version = dwarf2_parse_u2(&cu_ctx); cu_abbrev_offset = dwarf2_parse_u4(&cu_ctx); - cu_ctx.word_size = dwarf2_parse_byte(&cu_ctx); + ctx.head.word_size = cu_ctx.word_size = dwarf2_parse_byte(&cu_ctx); TRACE("Compilation Unit Header found at 0x%x:\n", (int)(comp_unit_start - sections[section_debug].address)); TRACE("- length: %lu\n", cu_length); - TRACE("- version: %u\n", cu_version); + TRACE("- version: %u\n", ctx.head.version); TRACE("- abbrev_offset: %lu\n", cu_abbrev_offset); - TRACE("- word_size: %u\n", cu_ctx.word_size); + TRACE("- word_size: %u\n", ctx.head.word_size); if (max_supported_dwarf_version == 0) { @@ -2368,14 +2374,14 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, max_supported_dwarf_version = (v >= 2 && v <= 4) ? v : 2; } - if (cu_version < 2 || cu_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", - cu_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", - cu_version); + ctx.head.version); return FALSE; }

1 0

Eric Pouech : dbghelp/dwarf: Add word size parameter to parse_addr() internal function.
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: f4da45d9f5dacc0b4ce1c09ae3685a26f7fc1919 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4da45d9f5dacc0b4ce1c09a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 8 08:34:08 2021 +0200 dbghelp/dwarf: Add word size parameter to parse_addr() internal function. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 19545e2b72b..07f06c4fa82 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -351,13 +351,18 @@ static ULONG_PTR dwarf2_get_addr(const unsigned char* ptr, unsigned word_size) return ret; } -static ULONG_PTR dwarf2_parse_addr(dwarf2_traverse_context_t* ctx) +static inline ULONG_PTR dwarf2_parse_addr(dwarf2_traverse_context_t* ctx, unsigned word_size) { - ULONG_PTR ret = dwarf2_get_addr(ctx->data, ctx->word_size); - ctx->data += ctx->word_size; + ULONG_PTR ret = dwarf2_get_addr(ctx->data, word_size); + ctx->data += word_size; return ret; } +static inline ULONG_PTR dwarf2_parse_addr_head(dwarf2_traverse_context_t* ctx, const dwarf2_cuhead_t* head) +{ + return dwarf2_parse_addr(ctx, head->word_size); +} + static const char* dwarf2_debug_traverse_ctx(const dwarf2_traverse_context_t* ctx) { return wine_dbg_sprintf("ctx(%p)", ctx->data); @@ -714,7 +719,7 @@ compute_location(const struct module *module, dwarf2_traverse_context_t* ctx, st else switch (op) { case DW_OP_nop: break; - case DW_OP_addr: stack[++stk] = dwarf2_parse_addr(ctx); break; + case DW_OP_addr: stack[++stk] = dwarf2_parse_addr(ctx, ctx->word_size); break; case DW_OP_const1u: stack[++stk] = dwarf2_parse_byte(ctx); break; case DW_OP_const1s: stack[++stk] = dwarf2_parse_byte(ctx); break; case DW_OP_const2u: stack[++stk] = dwarf2_parse_u2(ctx); break; @@ -1050,10 +1055,10 @@ static BOOL dwarf2_read_range(dwarf2_parse_context_t* ctx, const dwarf2_debug_in *plow = ULONG_MAX; *phigh = 0; - while (traverse.data + 2 * traverse.word_size < traverse.end_data) + while (traverse.data + 2 * ctx->head.word_size < traverse.end_data) { - low = dwarf2_parse_addr(&traverse); - high = dwarf2_parse_addr(&traverse); + low = dwarf2_parse_addr_head(&traverse, &ctx->head); + high = dwarf2_parse_addr_head(&traverse, &ctx->head); if (low == 0 && high == 0) break; if (low == ULONG_MAX) FIXME("unsupported yet (base address selection)\n"); if (low < *plow) *plow = low; @@ -2303,7 +2308,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, end_sequence = TRUE; break; case DW_LNE_set_address: - address = ctx->load_offset + dwarf2_parse_addr(&traverse); + address = ctx->load_offset + dwarf2_parse_addr_head(&traverse, &ctx->head); break; case DW_LNE_define_file: FIXME("not handled define file %s\n", debugstr_a((char *)traverse.data)); @@ -2608,7 +2613,7 @@ static ULONG_PTR dwarf2_parse_augmentation_ptr(dwarf2_traverse_context_t* ctx, u switch (encoding & 0x0f) { case DW_EH_PE_native: - return base + dwarf2_parse_addr(ctx); + return base + dwarf2_parse_addr(ctx, ctx->word_size); case DW_EH_PE_leb128: return base + dwarf2_leb128_as_unsigned(ctx); case DW_EH_PE_data2: @@ -3107,7 +3112,7 @@ static ULONG_PTR eval_expression(const struct module* module, struct cpu_stack_w else switch (opcode) { case DW_OP_nop: break; - case DW_OP_addr: stack[++sp] = dwarf2_parse_addr(&ctx); break; + case DW_OP_addr: stack[++sp] = dwarf2_parse_addr(&ctx, ctx.word_size); break; case DW_OP_const1u: stack[++sp] = dwarf2_parse_byte(&ctx); break; case DW_OP_const1s: stack[++sp] = (signed char)dwarf2_parse_byte(&ctx); break; case DW_OP_const2u: stack[++sp] = dwarf2_parse_u2(&ctx); break;

1 0

Eric Pouech : dbghelp/dwarf: Pass dwarf2_cuhead_t for addr details to swallow_attribute.
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: d12c7548061b53c2b251f16fd595f48f8cf80b60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d12c7548061b53c2b251f16f… Author: Eric Pouech <eric.pouech(a)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(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)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;

1 0

Eric Pouech : dbghelp/dwarf: Pass a parse_cuhead_t to compute_location().
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: bb5d9cf63d60dc6b477baf2081fffb8408882dd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb5d9cf63d60dc6b477baf20… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 8 08:34:20 2021 +0200 dbghelp/dwarf: Pass a parse_cuhead_t to compute_location(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 78b2c685286..d31ad8c89c2 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -662,7 +662,8 @@ static unsigned dwarf2_map_register(int regno, const struct module* module) } static enum location_error -compute_location(const struct module *module, dwarf2_traverse_context_t* ctx, struct location* loc, +compute_location(const struct module *module, const dwarf2_cuhead_t* head, + dwarf2_traverse_context_t* ctx, struct location* loc, HANDLE hproc, const struct location* frame) { DWORD_PTR tmp, stack[64]; @@ -719,7 +720,7 @@ compute_location(const struct module *module, dwarf2_traverse_context_t* ctx, st else switch (op) { case DW_OP_nop: break; - case DW_OP_addr: stack[++stk] = dwarf2_parse_addr(ctx, ctx->word_size); break; + case DW_OP_addr: stack[++stk] = dwarf2_parse_addr_head(ctx, head); break; case DW_OP_const1u: stack[++stk] = dwarf2_parse_byte(ctx); break; case DW_OP_const1s: stack[++stk] = dwarf2_parse_byte(ctx); break; case DW_OP_const2u: stack[++stk] = dwarf2_parse_u2(ctx); break; @@ -828,7 +829,7 @@ compute_location(const struct module *module, dwarf2_traverse_context_t* ctx, st DWORD_PTR addr = stack[stk--]; DWORD_PTR deref = 0; - if (!ReadProcessMemory(hproc, (void*)addr, &deref, ctx->word_size, NULL)) + if (!ReadProcessMemory(hproc, (void*)addr, &deref, head->word_size, NULL)) { WARN("Couldn't read memory at %lx\n", addr); return loc_err_cant_read; @@ -868,7 +869,7 @@ compute_location(const struct module *module, dwarf2_traverse_context_t* ctx, st case 1: stack[++stk] = *(unsigned char*)&deref; break; case 2: stack[++stk] = *(unsigned short*)&deref; break; case 4: stack[++stk] = *(DWORD*)&deref; break; - case 8: if (ctx->word_size >= derefsize) stack[++stk] = deref; break; + case 8: if (head->word_size >= derefsize) stack[++stk] = deref; break; } } else @@ -935,7 +936,7 @@ static BOOL dwarf2_compute_location_attr(dwarf2_parse_context_t* ctx, lctx.end_data = xloc.u.block.ptr + xloc.u.block.size; lctx.word_size = ctx->module->format_info[DFI_DWARF]->u.dwarf2_info->word_size; - err = compute_location(ctx->module, &lctx, loc, NULL, frame); + err = compute_location(ctx->module, &ctx->head, &lctx, loc, NULL, frame); if (err < 0) { loc->kind = loc_error; @@ -948,7 +949,7 @@ static BOOL dwarf2_compute_location_attr(dwarf2_parse_context_t* ctx, *ptr = xloc.u.block.size; memcpy(ptr + 1, xloc.u.block.ptr, xloc.u.block.size); loc->offset = (ULONG_PTR)ptr; - compute_location(ctx->module, &lctx, loc, NULL, frame); + compute_location(ctx->module, &ctx->head, &lctx, loc, NULL, frame); } } return TRUE; @@ -2503,6 +2504,17 @@ static BOOL dwarf2_lookup_loclist(const struct module_format* modfmt, const BYTE return FALSE; } +static const dwarf2_cuhead_t* get_cuhead_from_func(const struct symt_function* func) +{ + if (func && symt_check_tag(func->container, SymTagCompiland)) + { + struct symt_compiland* c = (struct symt_compiland*)func->container; + return (const dwarf2_cuhead_t*)c->user; + } + FIXME("Should have a compilation unit head\n"); + return NULL; +} + static enum location_error loc_compute_frame(struct process* pcs, const struct module_format* modfmt, const struct symt_function* func, @@ -2534,7 +2546,8 @@ static enum location_error loc_compute_frame(struct process* pcs, modfmt->u.dwarf2_info->debug_loc.address + pframe->offset, ip, &lctx)) return loc_err_out_of_scope; - if ((err = compute_location(modfmt->module, &lctx, frame, pcs->handle, NULL)) < 0) return err; + if ((err = compute_location(modfmt->module, get_cuhead_from_func(func), + &lctx, frame, pcs->handle, NULL)) < 0) return err; if (frame->kind >= loc_user) { WARN("Couldn't compute runtime frame location\n"); @@ -3363,7 +3376,8 @@ static void dwarf2_location_compute(struct process* pcs, } do_compute: /* now get the variable */ - err = compute_location(modfmt->module, &lctx, loc, pcs->handle, &frame); + err = compute_location(modfmt->module, get_cuhead_from_func(func), + &lctx, loc, pcs->handle, &frame); break; case loc_register: case loc_regrel:

1 0

Eric Pouech : dbghelp/dwarf: Pass word_size as a parameter to a couple of frame related functions.
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: ff7ec0d82934c17eef5b920061a0bb6dd81bae92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff7ec0d82934c17eef5b9200… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 8 08:34:26 2021 +0200 dbghelp/dwarf: Pass word_size as a parameter to a couple of frame related functions. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index d31ad8c89c2..f43ad2445cb 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2604,7 +2604,7 @@ struct frame_info struct frame_state state_stack[MAX_SAVED_STATES]; }; -static ULONG_PTR dwarf2_parse_augmentation_ptr(dwarf2_traverse_context_t* ctx, unsigned char encoding) +static ULONG_PTR dwarf2_parse_augmentation_ptr(dwarf2_traverse_context_t* ctx, unsigned char encoding, unsigned char word_size) { ULONG_PTR base; @@ -2626,7 +2626,7 @@ static ULONG_PTR dwarf2_parse_augmentation_ptr(dwarf2_traverse_context_t* ctx, u switch (encoding & 0x0f) { case DW_EH_PE_native: - return base + dwarf2_parse_addr(ctx, ctx->word_size); + return base + dwarf2_parse_addr(ctx, word_size); case DW_EH_PE_leb128: return base + dwarf2_leb128_as_unsigned(ctx); case DW_EH_PE_data2: @@ -2649,7 +2649,7 @@ static ULONG_PTR dwarf2_parse_augmentation_ptr(dwarf2_traverse_context_t* ctx, u } } -static BOOL parse_cie_details(dwarf2_traverse_context_t* ctx, struct frame_info* info) +static BOOL parse_cie_details(dwarf2_traverse_context_t* ctx, struct frame_info* info, unsigned char word_size) { unsigned char version; const char* augmentation; @@ -2706,7 +2706,7 @@ static BOOL parse_cie_details(dwarf2_traverse_context_t* ctx, struct frame_info* unsigned char encoding = dwarf2_parse_byte(ctx); /* throw away the indirect bit, as we don't care for the result */ encoding &= ~DW_EH_PE_indirect; - dwarf2_parse_augmentation_ptr(ctx, encoding); /* handler */ + dwarf2_parse_augmentation_ptr(ctx, encoding, word_size); /* handler */ continue; } case 'R': @@ -2735,6 +2735,7 @@ static BOOL dwarf2_get_cie(ULONG_PTR addr, struct module* module, DWORD_PTR delt ULONG_PTR start, range; unsigned cie_id; const BYTE* start_data = fde_ctx->data; + unsigned char word_size = module->format_info[DFI_DWARF]->u.dwarf2_info->word_size; cie_id = in_eh_frame ? 0 : DW_CIE_ID; /* skip 0-padding at beginning of section (alignment) */ @@ -2757,7 +2758,7 @@ static BOOL dwarf2_get_cie(ULONG_PTR addr, struct module* module, DWORD_PTR delt { last_cie_ptr = fde_ctx->data - 8; /* we need some bits out of the CIE in order to parse all contents */ - if (!parse_cie_details(fde_ctx, info)) return FALSE; + if (!parse_cie_details(fde_ctx, info, word_size)) return FALSE; cie_ctx->data = fde_ctx->data; cie_ctx->end_data = ptr_blk; cie_ctx->word_size = fde_ctx->word_size; @@ -2778,10 +2779,10 @@ static BOOL dwarf2_get_cie(ULONG_PTR addr, struct module* module, DWORD_PTR delt (unsigned)(fde_ctx->data - start_data)); return FALSE; } - if (!parse_cie_details(cie_ctx, info)) return FALSE; + if (!parse_cie_details(cie_ctx, info, word_size)) return FALSE; } - start = delta + dwarf2_parse_augmentation_ptr(fde_ctx, info->fde_encoding); - range = dwarf2_parse_augmentation_ptr(fde_ctx, info->fde_encoding & 0x0F); + start = delta + dwarf2_parse_augmentation_ptr(fde_ctx, info->fde_encoding, word_size); + range = dwarf2_parse_augmentation_ptr(fde_ctx, info->fde_encoding & 0x0F, word_size); if (addr >= start && addr < start + range) { @@ -2850,7 +2851,8 @@ static void execute_cfa_instructions(struct module* module, dwarf2_traverse_cont break; case DW_CFA_set_loc: { - ULONG_PTR loc = dwarf2_parse_augmentation_ptr(ctx, info->fde_encoding); + ULONG_PTR loc = dwarf2_parse_augmentation_ptr(ctx, info->fde_encoding, + module->format_info[DFI_DWARF]->u.dwarf2_info->word_size); TRACE("%lx: DW_CFA_set_loc %lx\n", info->ip, loc); info->ip = loc; break; @@ -3125,7 +3127,7 @@ static ULONG_PTR eval_expression(const struct module* module, struct cpu_stack_w else switch (opcode) { case DW_OP_nop: break; - case DW_OP_addr: stack[++sp] = dwarf2_parse_addr(&ctx, ctx.word_size); break; + case DW_OP_addr: stack[++sp] = dwarf2_parse_addr(&ctx, module->format_info[DFI_DWARF]->u.dwarf2_info->word_size); break; case DW_OP_const1u: stack[++sp] = dwarf2_parse_byte(&ctx); break; case DW_OP_const1s: stack[++sp] = (signed char)dwarf2_parse_byte(&ctx); break; case DW_OP_const2u: stack[++sp] = dwarf2_parse_u2(&ctx); break; @@ -3138,7 +3140,7 @@ static ULONG_PTR eval_expression(const struct module* module, struct cpu_stack_w case DW_OP_consts: stack[++sp] = dwarf2_leb128_as_signed(&ctx); break; case DW_OP_deref: tmp = 0; - if (!sw_read_mem(csw, stack[sp], &tmp, ctx.word_size)) + if (!sw_read_mem(csw, stack[sp], &tmp, module->format_info[DFI_DWARF]->u.dwarf2_info->word_size)) { ERR("Couldn't read memory at %s\n", wine_dbgstr_longlong(stack[sp])); tmp = 0; @@ -3176,7 +3178,7 @@ static ULONG_PTR eval_expression(const struct module* module, struct cpu_stack_w case DW_OP_bra: tmp = (short)dwarf2_parse_u2(&ctx); if (!stack[sp--]) ctx.data += tmp; break; case DW_OP_GNU_encoded_addr: tmp = dwarf2_parse_byte(&ctx); - stack[++sp] = dwarf2_parse_augmentation_ptr(&ctx, tmp); + stack[++sp] = dwarf2_parse_augmentation_ptr(&ctx, tmp, module->format_info[DFI_DWARF]->u.dwarf2_info->word_size); break; case DW_OP_regx: stack[++sp] = get_context_reg(module, csw, context, dwarf2_leb128_as_unsigned(&ctx)); @@ -3320,7 +3322,7 @@ BOOL dwarf2_virtual_unwind(struct cpu_stack_walk *csw, ULONG_PTR ip, end = fde_ctx.data + len; } else end = NULL; - dwarf2_parse_augmentation_ptr(&fde_ctx, info.lsda_encoding); /* handler_data */ + dwarf2_parse_augmentation_ptr(&fde_ctx, info.lsda_encoding, modfmt->u.dwarf2_info->word_size); /* handler_data */ if (end) fde_ctx.data = end; execute_cfa_instructions(pair.effective, &fde_ctx, ip, &info);

1 0

Eric Pouech : dbghelp/dwarf: Use word_size from cuhead_t.
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: 0b7f8373e3593ca8e5261d4486f1d04092a15653 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b7f8373e3593ca8e5261d44… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 8 08:34:32 2021 +0200 dbghelp/dwarf: Use word_size from cuhead_t. Removed word_size from traverse context and make use of cuhead_t's equivalent field instead Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index f43ad2445cb..22350124de7 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -159,7 +159,6 @@ typedef struct dwarf2_traverse_context_s { const unsigned char* data; const unsigned char* end_data; - unsigned char word_size; } dwarf2_traverse_context_t; /* symt_cache indexes */ @@ -934,7 +933,6 @@ static BOOL dwarf2_compute_location_attr(dwarf2_parse_context_t* ctx, lctx.data = xloc.u.block.ptr; lctx.end_data = xloc.u.block.ptr + xloc.u.block.size; - lctx.word_size = ctx->module->format_info[DFI_DWARF]->u.dwarf2_info->word_size; err = compute_location(ctx->module, &ctx->head, &lctx, loc, NULL, frame); if (err < 0) @@ -1052,7 +1050,6 @@ static BOOL dwarf2_read_range(dwarf2_parse_context_t* ctx, const dwarf2_debug_in traverse.data = ctx->sections[section_ranges].address + range.u.uvalue; traverse.end_data = ctx->sections[section_ranges].address + ctx->sections[section_ranges].size; - traverse.word_size = ctx->module->format_info[DFI_DWARF]->u.dwarf2_info->word_size; *plow = ULONG_MAX; *phigh = 0; @@ -2179,7 +2176,6 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, } traverse.data = sections[section_line].address + offset; traverse.end_data = traverse.data + 4; - traverse.word_size = ctx->module->format_info[DFI_DWARF]->u.dwarf2_info->word_size; length = dwarf2_parse_u4(&traverse); traverse.end_data = sections[section_line].address + offset + length; @@ -2386,7 +2382,7 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, mod_ctx->data += cu_length; ctx.head.version = dwarf2_parse_u2(&cu_ctx); cu_abbrev_offset = dwarf2_parse_u4(&cu_ctx); - ctx.head.word_size = cu_ctx.word_size = dwarf2_parse_byte(&cu_ctx); + ctx.head.word_size = dwarf2_parse_byte(&cu_ctx); TRACE("Compilation Unit Header found at 0x%x:\n", (int)(comp_unit_start - sections[section_debug].address)); @@ -2413,8 +2409,7 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, return FALSE; } - module->format_info[DFI_DWARF]->u.dwarf2_info->word_size = cu_ctx.word_size; - mod_ctx->word_size = cu_ctx.word_size; + module->format_info[DFI_DWARF]->u.dwarf2_info->word_size = ctx.head.word_size; pool_init(&ctx.pool, 65536); ctx.sections = sections; @@ -2430,7 +2425,6 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, abbrev_ctx.data = sections[section_abbrev].address + cu_abbrev_offset; abbrev_ctx.end_data = sections[section_abbrev].address + sections[section_abbrev].size; - abbrev_ctx.word_size = cu_ctx.word_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); @@ -2495,7 +2489,6 @@ static BOOL dwarf2_lookup_loclist(const struct module_format* modfmt, const BYTE { lctx->data = ptr; lctx->end_data = ptr + len; - lctx->word_size = modfmt->u.dwarf2_info->word_size; return TRUE; } ptr += len; @@ -2761,7 +2754,6 @@ static BOOL dwarf2_get_cie(ULONG_PTR addr, struct module* module, DWORD_PTR delt if (!parse_cie_details(fde_ctx, info, word_size)) return FALSE; cie_ctx->data = fde_ctx->data; cie_ctx->end_data = ptr_blk; - cie_ctx->word_size = fde_ctx->word_size; continue; } cie_ptr = (in_eh_frame) ? fde_ctx->data - id - 4 : start_data + id; @@ -2769,7 +2761,6 @@ static BOOL dwarf2_get_cie(ULONG_PTR addr, struct module* module, DWORD_PTR delt { last_cie_ptr = cie_ptr; cie_ctx->data = cie_ptr; - cie_ctx->word_size = fde_ctx->word_size; cie_ctx->end_data = cie_ptr + 4; cie_ctx->end_data = cie_ptr + 4 + dwarf2_parse_u4(cie_ctx); if (dwarf2_parse_u4(cie_ctx) != cie_id) @@ -3111,7 +3102,6 @@ static ULONG_PTR eval_expression(const struct module* module, struct cpu_stack_w ctx.end_data = zp + 4; len = dwarf2_leb128_as_unsigned(&ctx); ctx.end_data = ctx.data + len; - ctx.word_size = module->format_info[DFI_DWARF]->u.dwarf2_info->word_size; while (ctx.data < ctx.end_data) { @@ -3288,7 +3278,6 @@ BOOL dwarf2_virtual_unwind(struct cpu_stack_walk *csw, ULONG_PTR ip, memset(&info, 0, sizeof(info)); fde_ctx.data = modfmt->u.dwarf2_info->eh_frame.address; fde_ctx.end_data = fde_ctx.data + modfmt->u.dwarf2_info->eh_frame.size; - fde_ctx.word_size = modfmt->u.dwarf2_info->word_size; /* let offsets relative to the eh_frame sections be correctly computed, as we'll map * in this process the IMAGE section at a different address as the one expected by * the image @@ -3299,7 +3288,6 @@ BOOL dwarf2_virtual_unwind(struct cpu_stack_walk *csw, ULONG_PTR ip, { fde_ctx.data = modfmt->u.dwarf2_info->debug_frame.address; fde_ctx.end_data = fde_ctx.data + modfmt->u.dwarf2_info->debug_frame.size; - fde_ctx.word_size = modfmt->u.dwarf2_info->word_size; delta = pair.effective->reloc_delta; if (!dwarf2_get_cie(ip, pair.effective, delta, &fde_ctx, &cie_ctx, &info, FALSE)) { @@ -3374,7 +3362,6 @@ static void dwarf2_location_compute(struct process* pcs, lctx.data = (const BYTE*)(ptr + 1); lctx.end_data = lctx.data + *ptr; - lctx.word_size = modfmt->u.dwarf2_info->word_size; } do_compute: /* now get the variable */ @@ -3563,7 +3550,6 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, mod_ctx.data = section[section_debug].address; mod_ctx.end_data = mod_ctx.data + section[section_debug].size; - mod_ctx.word_size = 0; /* will be correctly set later on */ dwarf2_modfmt = HeapAlloc(GetProcessHeap(), 0, sizeof(*dwarf2_modfmt) + sizeof(*dwarf2_modfmt->u.dwarf2_info));

1 0

Rémi Bernon : dinput8/tests: Move HID driver tests from ntoskrnl.exe.
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: 6aef301e08b4e1d59215f7a94bebc06a8cfe071b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6aef301e08b4e1d59215f7a9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 9 08:50:08 2021 +0200 dinput8/tests: Move HID driver tests from ntoskrnl.exe. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/Makefile.in | 12 +- dlls/dinput8/tests/dinput.c | 4 +- dlls/{ntoskrnl.exe => dinput8}/tests/driver_hid.c | 507 +++-- dlls/dinput8/tests/driver_hid.h | 451 +++++ .../tests/driver_hid.spec | 0 dlls/dinput8/tests/hid.c | 2121 ++++++++++++++++++++ dlls/dinput8/tests/pop_hid_macros.h | 83 + dlls/dinput8/tests/psh_hid_macros.h | 85 + dlls/ntoskrnl.exe/tests/Makefile.in | 4 - dlls/ntoskrnl.exe/tests/ntoskrnl.c | 1594 --------------- 10 files changed, 3004 insertions(+), 1857 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6aef301e08b4e1d59215…

1 0

Eric Pouech : dbghelp/dwarf: Share compilation unit header information.
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: d648dcd3a6addca18ea25a07aa31764021ea4e9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d648dcd3a6addca18ea25a07… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 8 08:34:02 2021 +0200 dbghelp/dwarf: Share compilation unit header information. Store cu information for dwarf content - in each compiland - and queue the unique one's inside the module. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/dwarf.c | 25 +++++++++++++++++++++++++ dlls/dbghelp/symbol.c | 1 + 3 files changed, 27 insertions(+) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index f9191ae1205..2d4efafd041 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -179,6 +179,7 @@ struct symt_compiland ULONG_PTR address; unsigned source; struct vector vchildren; /* global variables & functions */ + void* user; /* when debug info provider needs to store information */ }; struct symt_data diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 0ba15fd338c..19545e2b72b 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -193,6 +193,8 @@ typedef struct dwarf2_parse_context_s /* stored in the dbghelp's module internal structure for later reuse */ struct dwarf2_module_info_s { + dwarf2_cuhead_t** cuheads; + unsigned num_cuheads; dwarf2_section_t debug_loc; dwarf2_section_t debug_frame; dwarf2_section_t eh_frame; @@ -2335,6 +2337,26 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, return TRUE; } +unsigned dwarf2_cache_cuhead(struct dwarf2_module_info_s* module, struct symt_compiland* c, const dwarf2_cuhead_t* head) +{ + dwarf2_cuhead_t* ah; + unsigned i; + for (i = 0; i < module->num_cuheads; ++i) + { + if (memcmp(module->cuheads[i], head, sizeof(*head)) == 0) + { + c->user = module->cuheads[i]; + return TRUE; + } + } + if (!(ah = pool_alloc(&c->container->module->pool, sizeof(*head)))) return FALSE; + memcpy(ah, head, sizeof(*head)); + module->cuheads = realloc(module->cuheads, ++module->num_cuheads * sizeof(head)); + module->cuheads[module->num_cuheads - 1] = ah; + c->user = ah; + return TRUE; +} + static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, struct module* module, const struct elf_thunk_area* thunks, @@ -3475,6 +3497,7 @@ static void dwarf2_module_remove(struct process* pcs, struct module_format* modf { dwarf2_fini_section(&modfmt->u.dwarf2_info->debug_loc); dwarf2_fini_section(&modfmt->u.dwarf2_info->debug_frame); + free(modfmt->u.dwarf2_info->cuheads); HeapFree(GetProcessHeap(), 0, modfmt); } @@ -3541,6 +3564,8 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, dwarf2_init_section(&dwarf2_modfmt->u.dwarf2_info->debug_loc, fmap, ".debug_loc", ".zdebug_loc", NULL); dwarf2_init_section(&dwarf2_modfmt->u.dwarf2_info->debug_frame, fmap, ".debug_frame", ".zdebug_frame", NULL); dwarf2_modfmt->u.dwarf2_info->eh_frame = eh_frame; + dwarf2_modfmt->u.dwarf2_info->cuheads = NULL; + dwarf2_modfmt->u.dwarf2_info->num_cuheads = 0; while (mod_ctx.data < mod_ctx.end_data) { diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 8f192662b7d..28c906c10a3 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -210,6 +210,7 @@ struct symt_compiland* symt_new_compiland(struct module* module, sym->address = address; sym->source = src_idx; vector_init(&sym->vchildren, sizeof(struct symt*), 32); + sym->user = NULL; } return sym; }

1 0

Eric Pouech : dbghelp/dwarf: Allow tweaking from env variable which DWARF version is to be loaded.
by Alexandre Julliard Sept. 9, 2021

Sept. 9, 2021

Module: wine Branch: master Commit: 31b6640e48f222ef0fe7d56c21825a3e0ee3054f URL: https://source.winehq.org/git/wine.git/?a=commit;h=31b6640e48f222ef0fe7d56c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 8 08:33:49 2021 +0200 dbghelp/dwarf: Allow tweaking from env variable which DWARF version is to be loaded. This is a temporary feature while implementing the required bits for Dwarf3 and Dwarf4 format. 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 c6657c87f18..5ce60b3bf5b 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2343,6 +2343,8 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, unsigned short cu_version; 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_u4(mod_ctx); cu_ctx.data = mod_ctx->data; @@ -2359,10 +2361,21 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, TRACE("- abbrev_offset: %lu\n", cu_abbrev_offset); TRACE("- word_size: %u\n", cu_ctx.word_size); - if (cu_version != 2) + if (max_supported_dwarf_version == 0) { - WARN("%u DWARF version unsupported. Wine dbghelp only support DWARF 2.\n", - cu_version); + char* env = getenv("DBGHELP_DWARF_VERSION"); + LONG v = env ? atol(env) : 2; + max_supported_dwarf_version = (v >= 2 && v <= 4) ? v : 2; + } + + if (cu_version < 2 || cu_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", + cu_version, max_supported_dwarf_version); + else + WARN("%u DWARF version unsupported. Wine dbghelp only support DWARF 2.\n", + cu_version); return FALSE; }

1 0