September 2021 - Wine-Commits

Zebediah Figura : vkd3d-shader/hlsl: Parse the saturate() intrinsic.
by Alexandre Julliard Sept. 17, 2021

Sept. 17, 2021

Module: vkd3d Branch: master Commit: f0955c164a87b7099e556489ebeef90a847e8418 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f0955c164a87b7099e55648… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 16 20:55:56 2021 +0200 vkd3d-shader/hlsl: Parse the saturate() intrinsic. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ libs/vkd3d-shader/hlsl.y | 9 +++++++++ tests/saturate.shader_test | 10 ++++++++++ 3 files changed, 21 insertions(+) diff --git a/Makefile.am b/Makefile.am index 67dcbba..45db1a1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -87,6 +87,7 @@ vkd3d_shader_tests = \ tests/preproc-invalid.shader_test \ tests/preproc-macro.shader_test \ tests/preproc-misc.shader_test \ + tests/saturate.shader_test \ tests/swizzle-0.shader_test \ tests/swizzle-1.shader_test \ tests/swizzle-2.shader_test \ @@ -295,6 +296,7 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ tests/max.shader_test \ + tests/saturate.shader_test \ tests/trigonometry.shader_test \ tests/writemask-assignop-1.shader_test endif diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 8f63472..fe3c328 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1577,6 +1577,14 @@ static bool intrinsic_max(struct hlsl_ctx *ctx, return !!add_expr(ctx, params->instrs, HLSL_OP2_MAX, args, &loc); } +static bool intrinsic_saturate(struct hlsl_ctx *ctx, + const struct parse_initializer *params, struct vkd3d_shader_location loc) +{ + struct hlsl_ir_node *args[3] = {params->args[0]}; + + return !!add_expr(ctx, params->instrs, HLSL_OP1_SAT, args, &loc); +} + static const struct intrinsic_function { const char *name; @@ -1588,6 +1596,7 @@ intrinsic_functions[] = { {"clamp", 3, true, intrinsic_clamp}, {"max", 2, true, intrinsic_max}, + {"saturate", 1, true, intrinsic_saturate}, }; static int intrinsic_function_name_compare(const void *a, const void *b) diff --git a/tests/saturate.shader_test b/tests/saturate.shader_test new file mode 100644 index 0000000..0a954e7 --- /dev/null +++ b/tests/saturate.shader_test @@ -0,0 +1,10 @@ +[pixel shader] +float4 main(uniform float2 u) : sv_target +{ + return float4(saturate(u), saturate(u.x + 0.5), saturate(-1.2)); +} + +[test] +uniform 0 float4 0.7 -0.1 0.0 0.0 +draw quad +probe all rgba (0.7, 0.0, 1.0, 0.0)

1 0

Zebediah Figura : vkd3d-shader: Factor out a vkd3d_shader_trace_text() helper and use it in vkd3d_spirv_dump() (Valgrind).
by Alexandre Julliard Sept. 17, 2021

Sept. 17, 2021

Module: vkd3d Branch: master Commit: 75a1a24d63f8e7ddca244968eb966574ad8d2c22 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=75a1a24d63f8e7ddca24496… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 16 22:36:35 2021 -0500 vkd3d-shader: Factor out a vkd3d_shader_trace_text() helper and use it in vkd3d_spirv_dump() (Valgrind). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 8 +------- libs/vkd3d-shader/vkd3d_shader_main.c | 9 +++++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 3 +++ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 6f948c3..f604b8e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -127,13 +127,7 @@ static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv, if (!vkd3d_spirv_binary_to_text(spirv, environment, options, &text)) { - const char *str, *current = text.code; - while ((str = strchr(current, '\n'))) - { - TRACE("%.*s\n", (int)(str - current), current); - current = str + 1; - } - + vkd3d_shader_trace_text(text.code, text.size); vkd3d_shader_free_shader_code(&text); } } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 5d7cdf0..e38261b 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -98,12 +98,17 @@ int vkd3d_string_buffer_printf(struct vkd3d_string_buffer *buffer, const char *f void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer, const char *function) { - const char *p, *q, *end = buffer->buffer + buffer->content_size; + vkd3d_shader_trace_text_(buffer->buffer, buffer->content_size, function); +} + +void vkd3d_shader_trace_text_(const char *text, size_t size, const char *function) +{ + const char *p, *q, *end = text + size; if (!TRACE_ON()) return; - for (p = buffer->buffer; p < end; p = q) + for (p = text; p < end; p = q) { if (!(q = memchr(p, '\n', end - p))) q = end; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index b9c2cce..b02315a 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -984,6 +984,9 @@ void vkd3d_shader_vwarning(struct vkd3d_shader_message_context *context, const s void vkd3d_shader_dump_shader(enum vkd3d_shader_source_type source_type, enum vkd3d_shader_type shader_type, const struct vkd3d_shader_code *shader); +void vkd3d_shader_trace_text_(const char *text, size_t size, const char *function); +#define vkd3d_shader_trace_text(text, size) \ + vkd3d_shader_trace_text_(text, size, __FUNCTION__) int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, struct vkd3d_shader_message_context *message_context, const char *source_name, struct vkd3d_shader_desc *desc);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 saturate instructions.
by Alexandre Julliard Sept. 17, 2021

Sept. 17, 2021

Module: vkd3d Branch: master Commit: 155812b1249ce3a3a0b21fc281baedae0c802b2f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=155812b1249ce3a3a0b21fc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 15 17:43:32 2021 -0500 vkd3d-shader/hlsl: Write SM4 saturate instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl_sm4.c | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 45db1a1..c9ad388 100644 --- a/Makefile.am +++ b/Makefile.am @@ -296,7 +296,6 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ tests/max.shader_test \ - tests/saturate.shader_test \ tests/trigonometry.shader_test \ tests/writemask-assignop-1.shader_test endif diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 24c586c..8a1d363 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1023,6 +1023,12 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_unary_op(buffer, VKD3D_SM4_OP_MOV, &expr->node, arg1, VKD3D_SM4_REGISTER_MODIFIER_NEGATE); break; + case HLSL_OP1_SAT: + write_sm4_unary_op(buffer, VKD3D_SM4_OP_MOV + | (VKD3D_SM4_INSTRUCTION_FLAG_SATURATE << VKD3D_SM4_INSTRUCTION_FLAGS_SHIFT), + &expr->node, arg1, 0); + break; + case HLSL_OP2_ADD: write_sm4_binary_op(buffer, VKD3D_SM4_OP_ADD, &expr->node, arg1, arg2); break;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM1 max instructions.
by Alexandre Julliard Sept. 17, 2021

Sept. 17, 2021

Module: vkd3d Branch: master Commit: b46900bb82caf4dbac4667073b887891cf54f01c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b46900bb82caf4dbac46670… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 15 17:43:27 2021 -0500 vkd3d-shader/hlsl: Write SM1 max instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm1.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index b9a681a..d56b689 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -632,6 +632,10 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b write_sm1_binary_op(ctx, buffer, D3DSIO_ADD, &instr->reg, &arg1->reg, &arg2->reg); break; + case HLSL_OP2_MAX: + write_sm1_binary_op(ctx, buffer, D3DSIO_MAX, &instr->reg, &arg1->reg, &arg2->reg); + break; + case HLSL_OP2_MUL: write_sm1_binary_op(ctx, buffer, D3DSIO_MUL, &instr->reg, &arg1->reg, &arg2->reg); break;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 max instructions.
by Alexandre Julliard Sept. 17, 2021

Sept. 17, 2021

Module: vkd3d Branch: master Commit: c0a7e3e40ab9583a58ad3cfb5227aa43c68d625f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c0a7e3e40ab9583a58ad3cf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 15 17:43:28 2021 -0500 vkd3d-shader/hlsl: Write SM4 max instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index b344cf8..08828b8 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1031,6 +1031,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_binary_op(buffer, VKD3D_SM4_OP_DIV, &expr->node, arg1, arg2); break; + case HLSL_OP2_MAX: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_MAX, &expr->node, arg1, arg2); + break; + case HLSL_OP2_MUL: write_sm4_binary_op(buffer, VKD3D_SM4_OP_MUL, &expr->node, arg1, arg2); break;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 min instructions.
by Alexandre Julliard Sept. 17, 2021

Sept. 17, 2021

Module: vkd3d Branch: master Commit: 4ecdd280ac75ad02dc85f3aec2723225a83f575c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4ecdd280ac75ad02dc85f3a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 15 17:43:30 2021 -0500 vkd3d-shader/hlsl: Write SM4 min instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl_sm4.c | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index c745dba..67dcbba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -279,7 +279,6 @@ XFAIL_TESTS = \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-bool-cast.shader_test \ - tests/hlsl-clamp.shader_test \ tests/hlsl-comma.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 08828b8..24c586c 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1035,6 +1035,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_binary_op(buffer, VKD3D_SM4_OP_MAX, &expr->node, arg1, arg2); break; + case HLSL_OP2_MIN: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_MIN, &expr->node, arg1, arg2); + break; + case HLSL_OP2_MUL: write_sm4_binary_op(buffer, VKD3D_SM4_OP_MUL, &expr->node, arg1, arg2); break;

1 0

Eric Pouech : dbghelp/dwarf: When loading a DWZ alternate file, don't force loading of all debug_infos.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 8547aac2dcfcae9060d0a630c9f80af7bcaf19b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8547aac2dcfcae9060d0a630… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 16 11:10:53 2021 +0200 dbghelp/dwarf: When loading a DWZ alternate file, don't force loading of all debug_infos. Can have huge performance impact: libgcc_s.so.8 load time decreased from 40 seconds down to less than 1 second. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index fffc7c37c13..f67efc43993 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -3710,7 +3710,7 @@ static void dwarf2_module_remove(struct process* pcs, struct module_format* modf static BOOL dwarf2_load_CU_module(dwarf2_parse_module_context_t* module_ctx, struct module* module, dwarf2_section_t* sections, ULONG_PTR load_offset, - const struct elf_thunk_area* thunks) + const struct elf_thunk_area* thunks, BOOL is_dwz) { dwarf2_traverse_context_t mod_ctx; unsigned i; @@ -3736,9 +3736,14 @@ static BOOL dwarf2_load_CU_module(dwarf2_parse_module_context_t* module_ctx, str 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)); + /* phase2: load content of all CU + * If this is a DWZ alternate module, don't load all debug_info at once + * wait for main module to ask for them (it's likely it won't need them all) + * Doing this can lead to a huge performance improvement. + */ + if (!is_dwz) + 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)); return TRUE; } @@ -3765,7 +3770,7 @@ static dwarf2_dwz_alternate_t* dwarf2_load_dwz(struct image_file_map* fmap, stru dwarf2_init_section(&dwz->sections[section_ranges], fmap_dwz, ".debug_ranges", ".zdebug_ranges", &dwz->sectmap[section_ranges]); dwz->module_ctx.dwz = NULL; - dwarf2_load_CU_module(&dwz->module_ctx, module, dwz->sections, 0/*FIXME*/, NULL); + dwarf2_load_CU_module(&dwz->module_ctx, module, dwz->sections, 0/*FIXME*/, NULL, TRUE); return dwz; } @@ -3864,7 +3869,7 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, dwarf2_modfmt->u.dwarf2_info->num_cuheads = 0; module_ctx.dwz = dwarf2_load_dwz(fmap, module); - dwarf2_load_CU_module(&module_ctx, module, section, load_offset, thunks); + dwarf2_load_CU_module(&module_ctx, module, section, load_offset, thunks, FALSE); dwarf2_modfmt->module->module.SymType = SymDia; /* hide dwarf versions in CVSig

1 0

Eric Pouech : dbghelp/dwarf: Add proper support for DW_FORM_GNU_ref_alt.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: dc0ac71f5a7a41c2976d659cfa37b3db26c20a27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc0ac71f5a7a41c2976d659c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 16 11:10:47 2021 +0200 dbghelp/dwarf: Add proper support for DW_FORM_GNU_ref_alt. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index c0f4afcb606..fffc7c37c13 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -680,9 +680,16 @@ static BOOL dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, break; case DW_FORM_GNU_ref_alt: - FIXME("Unhandled FORM_GNU_ref_alt\n"); - attr->u.uvalue = 0; - return FALSE; + if (!ctx->module_ctx->dwz) + { + ERR("No DWZ file present for GNU_ref_alt in %s\n", debugstr_w(ctx->module_ctx->module->modulename)); + attr->u.uvalue = 0; + return FALSE; + } + attr->u.uvalue = dwarf2_get_addr(data, ctx->head.offset_size); + TRACE("ref_alt<0x%lx>\n", attr->u.uvalue); + break; + case DW_FORM_GNU_strp_alt: if (ctx->module_ctx->dwz) { @@ -767,6 +774,10 @@ static dwarf2_debug_info_t* dwarf2_jump_to_debug_info(struct attribute* attr) case DW_FORM_ref_addr: ref_ctx = dwarf2_locate_cu(attr->debug_info->unit_ctx->module_ctx, attr->u.uvalue); break; + case DW_FORM_GNU_ref_alt: + if (attr->debug_info->unit_ctx->module_ctx->dwz) + ref_ctx = dwarf2_locate_cu(&attr->debug_info->unit_ctx->module_ctx->dwz->module_ctx, attr->u.uvalue); + break; default: with_other = FALSE; ref_ctx = attr->debug_info->unit_ctx;

1 0

Eric Pouech : dbghelp/dwarf: Add a helper to jump into another debug_info.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: d832d51c2c6d0283e271312a6baa69138067e421 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d832d51c2c6d0283e271312a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 16 11:10:41 2021 +0200 dbghelp/dwarf: Add a helper to jump into another debug_info. This helper takes into account that source and destination debug_info can be in different dwarf units, and even different debug files (DWZ). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 77 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 52 insertions(+), 25 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index bf4999ab0bb..c0f4afcb606 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -134,6 +134,7 @@ struct attribute const char* string; struct dwarf2_block block; } u; + const struct dwarf2_debug_info_s* debug_info; }; typedef struct dwarf2_debug_info_s @@ -711,6 +712,8 @@ static BOOL dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, return TRUE; } +static dwarf2_debug_info_t* dwarf2_jump_to_debug_info(struct attribute* attr); + static BOOL dwarf2_find_attribute(const dwarf2_debug_info_t* di, unsigned at, struct attribute* attr) { @@ -722,6 +725,7 @@ static BOOL dwarf2_find_attribute(const dwarf2_debug_info_t* di, while (di) { ref_abbrev_attr = NULL; + attr->debug_info = di; for (i = 0, abbrev_attr = di->abbrev->attrs; abbrev_attr; i++, abbrev_attr = abbrev_attr->next) { if (abbrev_attr->attribute == at) @@ -743,12 +747,49 @@ static BOOL dwarf2_find_attribute(const dwarf2_debug_info_t* di, /* do we have either an abstract origin or a specification debug entry to look into ? */ if (!ref_abbrev_attr || !dwarf2_fill_attr(di->unit_ctx, ref_abbrev_attr, di->data[refidx], attr)) break; - if (!(di = sparse_array_find(&di->unit_ctx->debug_info_table, attr->u.uvalue))) + if (!(di = dwarf2_jump_to_debug_info(attr))) + { FIXME("Should have found the debug info entry\n"); + break; + } } return FALSE; } +static dwarf2_debug_info_t* dwarf2_jump_to_debug_info(struct attribute* attr) +{ + dwarf2_parse_context_t* ref_ctx = NULL; + BOOL with_other = TRUE; + dwarf2_debug_info_t* ret; + + switch (attr->form) + { + case DW_FORM_ref_addr: + ref_ctx = dwarf2_locate_cu(attr->debug_info->unit_ctx->module_ctx, attr->u.uvalue); + break; + default: + with_other = FALSE; + ref_ctx = attr->debug_info->unit_ctx; + break; + } + if (!ref_ctx) return FALSE; + /* There are cases where we end up with a circular reference between two (or more) + * compilation units. Before this happens, try to see if we can refer to an already + * loaded debug_info in the target compilation unit (even if all the debug_info + * haven't been loaded yet). + */ + if (ref_ctx->status == UNIT_BEINGLOADED && + (ret = sparse_array_find(&ref_ctx->debug_info_table, attr->u.uvalue))) + return ret; + if (with_other) + { + /* ensure CU is fully loaded */ + if (ref_ctx != attr->debug_info->unit_ctx && !dwarf2_parse_compilation_unit(ref_ctx)) + return NULL; + } + return sparse_array_find(&ref_ctx->debug_info_table, attr->u.uvalue); +} + static void dwarf2_load_one_entry(dwarf2_debug_info_t*); #define Wine_DW_no_register 0x7FFFFFFF @@ -1069,24 +1110,9 @@ static struct symt* dwarf2_lookup_type(const dwarf2_debug_info_t* di) if (!dwarf2_find_attribute(di, DW_AT_type, &attr)) /* this is only valid if current language of CU is C or C++ */ return di->unit_ctx->module_ctx->symt_cache[sc_void]; - if (!(type = sparse_array_find(&di->unit_ctx->debug_info_table, attr.u.uvalue))) - { - if (attr.form == DW_FORM_ref_addr) - { - dwarf2_parse_context_t* ref_ctx = dwarf2_locate_cu(di->unit_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_unit_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 di->unit_ctx->module_ctx->symt_cache[sc_unknown]; - } - } + if (!(type = dwarf2_jump_to_debug_info(&attr))) + return di->unit_ctx->module_ctx->symt_cache[sc_unknown]; + if (type == di) { FIXME("Reference to itself\n"); @@ -1112,17 +1138,13 @@ static const char* dwarf2_get_cpp_name(dwarf2_debug_info_t* di, const char* name struct attribute spec; if (di->abbrev->tag == DW_TAG_compile_unit) return name; - if (!di->unit_ctx->cpp_name) - di->unit_ctx->cpp_name = pool_alloc(&di->unit_ctx->pool, MAX_SYM_NAME); - last = di->unit_ctx->cpp_name + MAX_SYM_NAME - strlen(name) - 1; - strcpy(last, name); /* if the di is a definition, but has also a (previous) declaration, then scope must * be gotten from declaration not definition */ if (dwarf2_find_attribute(di, DW_AT_specification, &spec) && spec.gotten_from == attr_direct) { - di = sparse_array_find(&di->unit_ctx->debug_info_table, spec.u.uvalue); + di = dwarf2_jump_to_debug_info(&spec); if (!di) { FIXME("Should have found the debug info entry\n"); @@ -1130,6 +1152,11 @@ static const char* dwarf2_get_cpp_name(dwarf2_debug_info_t* di, const char* name } } + if (!di->unit_ctx->cpp_name) + di->unit_ctx->cpp_name = pool_alloc(&di->unit_ctx->pool, MAX_SYM_NAME); + last = di->unit_ctx->cpp_name + MAX_SYM_NAME - strlen(name) - 1; + strcpy(last, name); + for (di = di->parent; di; di = di->parent) { switch (di->abbrev->tag) @@ -1295,7 +1322,7 @@ static struct vector* dwarf2_get_di_children(dwarf2_debug_info_t* di) if (di->abbrev->have_child) return &di->children; if (!dwarf2_find_attribute(di, DW_AT_specification, &spec)) break; - if (!(di = sparse_array_find(&di->unit_ctx->debug_info_table, spec.u.uvalue))) + if (!(di = dwarf2_jump_to_debug_info(&spec))) FIXME("Should have found the debug info entry\n"); } return NULL;

1 0

Eric Pouech : dbghelp/dwarf: No longer pas a unit context when parsing debug_info content.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: def87b2aef5d06dd5dcf6d10f968dbf6ee5beb82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=def87b2aef5d06dd5dcf6d10… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 16 11:10:34 2021 +0200 dbghelp/dwarf: No longer pas a unit context when parsing debug_info content. Use debug_info's unit_context instead. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 174 +++++++++++++++++++++++---------------------------- 1 file changed, 78 insertions(+), 96 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=def87b2aef5d06dd5dcf…

1 0