wine-commits February 2024

wine-commits@winehq.org

1 participants
716 discussions

Nikolay Sivov : vkd3d-shader/fx: Add initial support for writing object variables.
by Alexandre Julliard 22 Feb '24

22 Feb '24

Module: vkd3d Branch: master Commit: a6057a13659e6d71f10dc08717c58aee64736fc8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a6057a13659e6d71f10dc08717c58… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 9 22:42:23 2024 +0100 vkd3d-shader/fx: Add initial support for writing object variables. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 94 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 84 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 11dee4ba..7830ba6e 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -83,6 +83,7 @@ struct fx_write_context uint32_t group_count; uint32_t buffer_count; uint32_t numeric_variable_count; + uint32_t object_variable_count; int status; const struct fx_write_context_ops *ops; @@ -392,9 +393,21 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co } else if (type->class == HLSL_CLASS_OBJECT) { - FIXME("Object types are not supported.\n"); - set_status(fx, VKD3D_ERROR_NOT_IMPLEMENTED); - return 0; + static const uint32_t object_type[] = + { + [HLSL_TYPE_RENDERTARGETVIEW] = 19, + }; + + switch (type->base_type) + { + case HLSL_TYPE_RENDERTARGETVIEW: + put_u32_unaligned(buffer, object_type[type->base_type]); + break; + default: + FIXME("Object type %u is not supported.\n", type->base_type); + set_status(fx, VKD3D_ERROR_NOT_IMPLEMENTED); + return 0; + } } else /* Numeric type */ { @@ -588,12 +601,12 @@ static const struct fx_write_context_ops fx_4_ops = .write_pass = write_fx_4_pass, }; -static void write_fx_4_variable(struct hlsl_ir_var *var, struct fx_write_context *fx) +static void write_fx_4_numeric_variable(struct hlsl_ir_var *var, struct fx_write_context *fx) { struct vkd3d_bytecode_buffer *buffer = &fx->structured; uint32_t semantic_offset, flags = 0; uint32_t name_offset, type_offset; - enum fx_4_variable_flags + enum fx_4_numeric_variable_flags { HAS_EXPLICIT_BIND_POINT = 0x4, }; @@ -618,6 +631,29 @@ static void write_fx_4_variable(struct hlsl_ir_var *var, struct fx_write_context /* FIXME: write annotations */ } +static void write_fx_4_object_variable(struct hlsl_ir_var *var, struct fx_write_context *fx) +{ + struct vkd3d_bytecode_buffer *buffer = &fx->structured; + uint32_t semantic_offset, bind_point = ~0u; + uint32_t name_offset, type_offset; + + if (var->reg_reservation.reg_type) + bind_point = var->reg_reservation.reg_index; + + type_offset = write_type(var->data_type, fx); + name_offset = write_string(var->name, fx); + semantic_offset = write_string(var->semantic.name, fx); + + put_u32(buffer, name_offset); + put_u32(buffer, type_offset); + + semantic_offset = put_u32(buffer, semantic_offset); /* Semantic */ + put_u32(buffer, bind_point); /* Explicit bind point */ + + put_u32(buffer, 0); /* Annotations count */ + /* FIXME: write annotations */ +} + static void write_fx_4_buffer(struct hlsl_buffer *b, struct fx_write_context *fx) { enum fx_4_buffer_flags @@ -656,7 +692,7 @@ static void write_fx_4_buffer(struct hlsl_buffer *b, struct fx_write_context *fx if (var->buffer != b) continue; - write_fx_4_variable(var, fx); + write_fx_4_numeric_variable(var, fx); size += get_fx_4_type_size(var->data_type); ++count; } @@ -687,6 +723,44 @@ static void write_buffers(struct fx_write_context *fx) } } +static bool is_object_variable(const struct hlsl_ir_var *var) +{ + const struct hlsl_type *type = hlsl_get_multiarray_element_type(var->data_type); + + if (type->class != HLSL_CLASS_OBJECT) + return false; + + switch (type->base_type) + { + case HLSL_TYPE_SAMPLER: + case HLSL_TYPE_TEXTURE: + case HLSL_TYPE_UAV: + case HLSL_TYPE_PIXELSHADER: + case HLSL_TYPE_VERTEXSHADER: + case HLSL_TYPE_RENDERTARGETVIEW: + return true; + default: + return false; + } +} + +static void write_objects(struct fx_write_context *fx) +{ + struct hlsl_ir_var *var; + uint32_t count = 0; + + LIST_FOR_EACH_ENTRY(var, &fx->ctx->extern_vars, struct hlsl_ir_var, extern_entry) + { + if (!is_object_variable(var)) + continue; + + write_fx_4_object_variable(var, fx); + ++count; + } + + fx->object_variable_count += count; +} + static int hlsl_fx_4_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) { struct vkd3d_bytecode_buffer buffer = { 0 }; @@ -698,7 +772,7 @@ static int hlsl_fx_4_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) put_u32(&fx.unstructured, 0); /* Empty string placeholder. */ write_buffers(&fx); - /* TODO: objects */ + write_objects(&fx); /* TODO: shared buffers */ /* TODO: shared objects */ @@ -707,7 +781,7 @@ static int hlsl_fx_4_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) put_u32(&buffer, ctx->profile->minor_version == 0 ? 0xfeff1001 : 0xfeff1011); /* Version. */ put_u32(&buffer, fx.buffer_count); /* Buffer count. */ put_u32(&buffer, fx.numeric_variable_count); /* Numeric variable count. */ - put_u32(&buffer, 0); /* Object variable count. */ + put_u32(&buffer, fx.object_variable_count); /* Object variable count. */ put_u32(&buffer, 0); /* Pool buffer count. */ put_u32(&buffer, 0); /* Pool variable count. */ put_u32(&buffer, 0); /* Pool object count. */ @@ -757,7 +831,7 @@ static int hlsl_fx_5_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) put_u32(&fx.unstructured, 0); /* Empty string placeholder. */ write_buffers(&fx); - /* TODO: objects */ + write_objects(&fx); /* TODO: interface variables */ write_groups(&fx); @@ -765,7 +839,7 @@ static int hlsl_fx_5_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) put_u32(&buffer, 0xfeff2001); /* Version. */ put_u32(&buffer, fx.buffer_count); /* Buffer count. */ put_u32(&buffer, fx.numeric_variable_count); /* Numeric variable count. */ - put_u32(&buffer, 0); /* Object variable count. */ + put_u32(&buffer, fx.object_variable_count); /* Object variable count. */ put_u32(&buffer, 0); /* Pool buffer count. */ put_u32(&buffer, 0); /* Pool variable count. */ put_u32(&buffer, 0); /* Pool object count. */

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Add RenderTargetView object type.
by Alexandre Julliard 22 Feb '24

22 Feb '24

Module: vkd3d Branch: master Commit: c2b1714c5ca4c6c750067b0e7ce253b807e59e0f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c2b1714c5ca4c6c750067b0e7ce25… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 8 17:00:30 2024 +0100 vkd3d-shader/hlsl: Add RenderTargetView object type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 3 +++ libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 353e34d2..fffac6bc 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -3521,6 +3521,9 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) type->e.version = technique_types[i].version; hlsl_scope_add_type(ctx->globals, type); } + + type = hlsl_new_type(ctx, "RenderTargetView", HLSL_CLASS_OBJECT, HLSL_TYPE_RENDERTARGETVIEW, 1, 1); + hlsl_scope_add_type(ctx->globals, type); } static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const struct vkd3d_shader_compile_info *compile_info, diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 5b73857b..425ccfe7 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -96,6 +96,7 @@ enum hlsl_base_type HLSL_TYPE_PIXELSHADER, HLSL_TYPE_VERTEXSHADER, HLSL_TYPE_PASS, + HLSL_TYPE_RENDERTARGETVIEW, HLSL_TYPE_TECHNIQUE, HLSL_TYPE_EFFECT_GROUP, HLSL_TYPE_STRING, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index b59dbf32..88904832 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -6446,6 +6446,10 @@ type_no_void: hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_REDEFINED, "\"%s\" redefined as a structure.", $2); vkd3d_free($2); } + | KW_RENDERTARGETVIEW + { + $$ = hlsl_get_type(ctx->cur_scope, "RenderTargetView", true, true); + } type: type_no_void

1 0

Giovanni Mascellani : vkd3d-shader/ir: Dump the domination relationship.
by Alexandre Julliard 22 Feb '24

22 Feb '24

Module: vkd3d Branch: master Commit: 9c678532a7452ae44057235a1543719d3bb5134c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9c678532a7452ae44057235a15437… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Jan 30 15:07:50 2024 +0100 vkd3d-shader/ir: Dump the domination relationship. --- libs/vkd3d-shader/ir.c | 26 +++++++++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 536b19e1..f0bd8533 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -3285,7 +3285,11 @@ static void vsir_cfg_compute_dominators_recurse(struct vsir_block *current, stru static void vsir_cfg_compute_dominators(struct vsir_cfg *cfg) { - size_t i; + struct vkd3d_string_buffer buf; + size_t i, j; + + if (TRACE_ON()) + vkd3d_string_buffer_init(&buf); for (i = 0; i < cfg->block_count; ++i) { @@ -3295,7 +3299,27 @@ static void vsir_cfg_compute_dominators(struct vsir_cfg *cfg) continue; vsir_cfg_compute_dominators_recurse(cfg->entry, block); + + if (TRACE_ON()) + { + vkd3d_string_buffer_printf(&buf, "Block %u dominates:", block->label); + for (j = 0; j < cfg->block_count; j++) + { + struct vsir_block *block2 = &cfg->blocks[j]; + + if (block2->label == 0) + continue; + + if (bitmap_is_set(block->dominates, j)) + vkd3d_string_buffer_printf(&buf, " %u", block2->label); + } + TRACE("%s\n", buf.buffer); + vkd3d_string_buffer_clear(&buf); + } } + + if (TRACE_ON()) + vkd3d_string_buffer_cleanup(&buf); } enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser, diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 20c4c2e2..462a5c25 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -71,7 +71,7 @@ void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) vkd3d_free(buffer->buffer); } -static void vkd3d_string_buffer_clear(struct vkd3d_string_buffer *buffer) +void vkd3d_string_buffer_clear(struct vkd3d_string_buffer *buffer) { buffer->buffer[0] = '\0'; buffer->content_size = 0; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 7239beaf..4b322b95 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1399,6 +1399,7 @@ struct vkd3d_string_buffer *vkd3d_string_buffer_get(struct vkd3d_string_buffer_c void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer); void vkd3d_string_buffer_cache_cleanup(struct vkd3d_string_buffer_cache *list); void vkd3d_string_buffer_cache_init(struct vkd3d_string_buffer_cache *list); +void vkd3d_string_buffer_clear(struct vkd3d_string_buffer *buffer); int vkd3d_string_buffer_print_f32(struct vkd3d_string_buffer *buffer, float f); int vkd3d_string_buffer_print_f64(struct vkd3d_string_buffer *buffer, double d); int vkd3d_string_buffer_printf(struct vkd3d_string_buffer *buffer, const char *format, ...) VKD3D_PRINTF_FUNC(2, 3);

1 0

Giovanni Mascellani : vkd3d-shader/ir: Compute the domination relationship.
by Alexandre Julliard 22 Feb '24

22 Feb '24

Module: vkd3d Branch: master Commit: 04c2852c1ade1b58f3a0834f7ee5a29a477060ab URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/04c2852c1ade1b58f3a0834f7ee5a… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Jan 30 12:51:04 2024 +0100 vkd3d-shader/ir: Compute the domination relationship. --- libs/vkd3d-shader/ir.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 646a71a2..536b19e1 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -3053,21 +3053,40 @@ struct vsir_block * that the block is empty. */ struct vkd3d_shader_instruction *begin, *end; struct vsir_block_list predecessors, successors; + uint32_t *dominates; }; -static void vsir_block_init(struct vsir_block *block, unsigned int label) +static enum vkd3d_result vsir_block_init(struct vsir_block *block, unsigned int label, size_t block_count) { + size_t byte_count; + + if (block_count > SIZE_MAX - (sizeof(*block->dominates) * CHAR_BIT - 1)) + return VKD3D_ERROR_OUT_OF_MEMORY; + + block_count = align(block_count, sizeof(*block->dominates) * CHAR_BIT); + byte_count = block_count / CHAR_BIT; + assert(label); memset(block, 0, sizeof(*block)); block->label = label; vsir_block_list_init(&block->predecessors); vsir_block_list_init(&block->successors); + + if (!(block->dominates = vkd3d_malloc(byte_count))) + return VKD3D_ERROR_OUT_OF_MEMORY; + + memset(block->dominates, 0xff, byte_count); + + return VKD3D_OK; } static void vsir_block_cleanup(struct vsir_block *block) { + if (block->label == 0) + return; vsir_block_list_cleanup(&block->predecessors); vsir_block_list_cleanup(&block->successors); + vkd3d_free(block->dominates); } struct vsir_cfg @@ -3174,7 +3193,9 @@ static enum vkd3d_result vsir_cfg_init(struct vsir_cfg *cfg, struct vsir_program assert(label > 0); assert(label <= cfg->block_count); current_block = &cfg->blocks[label - 1]; - vsir_block_init(current_block, label); + assert(current_block->label == 0); + if ((ret = vsir_block_init(current_block, label, program->block_count)) < 0) + goto fail; current_block->begin = &program->instructions.elements[i + 1]; if (!cfg->entry) cfg->entry = current_block; @@ -3237,6 +3258,46 @@ fail: return ret; } +/* Block A dominates block B if every path from the entry point to B + * must pass through A. Naively compute the set of blocks that are + * dominated by `reference' by running a graph visit starting from the + * entry point (which must be the initial value of `current') and + * avoiding `reference'. Running this for all the blocks takes + * quadratic time: if in the future something better is sought after, + * the standard tool seems to be the Lengauer-Tarjan algorithm. */ +static void vsir_cfg_compute_dominators_recurse(struct vsir_block *current, struct vsir_block *reference) +{ + size_t i; + + assert(current->label != 0); + + if (current == reference) + return; + + if (!bitmap_is_set(reference->dominates, current->label - 1)) + return; + + bitmap_clear(reference->dominates, current->label - 1); + + for (i = 0; i < current->successors.count; ++i) + vsir_cfg_compute_dominators_recurse(current->successors.blocks[i], reference); +} + +static void vsir_cfg_compute_dominators(struct vsir_cfg *cfg) +{ + size_t i; + + for (i = 0; i < cfg->block_count; ++i) + { + struct vsir_block *block = &cfg->blocks[i]; + + if (block->label == 0) + continue; + + vsir_cfg_compute_dominators_recurse(cfg->entry, block); + } +} + enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser, const struct vkd3d_shader_compile_info *compile_info) { @@ -3261,6 +3322,8 @@ enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser, if ((result = vsir_cfg_init(&cfg, &parser->program)) < 0) return result; + vsir_cfg_compute_dominators(&cfg); + if ((result = simple_structurizer_run(parser)) < 0) { vsir_cfg_cleanup(&cfg);

1 0

Giovanni Mascellani : vkd3d-shader/ir: Dump the control flow graph in the GraphViz format.
by Alexandre Julliard 22 Feb '24

22 Feb '24

Module: vkd3d Branch: master Commit: 2573d86ccf2027e946372040e1b57d867e5ab848 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2573d86ccf2027e946372040e1b57… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Jan 30 14:59:52 2024 +0100 vkd3d-shader/ir: Dump the control flow graph in the GraphViz format. --- libs/vkd3d-shader/ir.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 4da8c0cb..646a71a2 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -3106,6 +3106,43 @@ static enum vkd3d_result vsir_cfg_add_edge(struct vsir_cfg *cfg, struct vsir_blo return VKD3D_OK; } +static void vsir_cfg_dump_dot(struct vsir_cfg *cfg) +{ + size_t i, j; + + TRACE("digraph cfg {\n"); + + for (i = 0; i < cfg->block_count; ++i) + { + struct vsir_block *block = &cfg->blocks[i]; + const char *shape; + + if (block->label == 0) + continue; + + switch (block->end->handler_idx) + { + case VKD3DSIH_RET: + shape = "trapezium"; + break; + + case VKD3DSIH_BRANCH: + shape = vsir_register_is_label(&block->end->src[0].reg) ? "ellipse" : "box"; + break; + + default: + vkd3d_unreachable(); + } + + TRACE(" n%u [label=\"%u\", shape=\"%s\"];\n", block->label, block->label, shape); + + for (j = 0; j < block->successors.count; ++j) + TRACE(" n%u -> n%u;\n", block->label, block->successors.blocks[j]->label); + } + + TRACE("}\n"); +} + static enum vkd3d_result vsir_cfg_init(struct vsir_cfg *cfg, struct vsir_program *program) { struct vsir_block *current_block = NULL; @@ -3189,6 +3226,9 @@ static enum vkd3d_result vsir_cfg_init(struct vsir_cfg *cfg, struct vsir_program } } + if (TRACE_ON()) + vsir_cfg_dump_dot(cfg); + return VKD3D_OK; fail:

1 0

Giovanni Mascellani : vkd3d-shader/ir: Build a representation of the control flow graph.
by Alexandre Julliard 22 Feb '24

22 Feb '24

Module: vkd3d Branch: master Commit: da037b61ba498270cdcece03baf4e5bec9c73ee5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/da037b61ba498270cdcece03baf4e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Jan 29 16:41:31 2024 +0100 vkd3d-shader/ir: Build a representation of the control flow graph. --- libs/vkd3d-shader/ir.c | 198 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 198 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 88634487..4da8c0cb 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -3009,6 +3009,194 @@ fail: return VKD3D_ERROR_OUT_OF_MEMORY; } +struct vsir_block_list +{ + struct vsir_block **blocks; + size_t count, capacity; +}; + +static void vsir_block_list_init(struct vsir_block_list *list) +{ + memset(list, 0, sizeof(*list)); +} + +static void vsir_block_list_cleanup(struct vsir_block_list *list) +{ + vkd3d_free(list->blocks); +} + +static enum vkd3d_result vsir_block_list_add(struct vsir_block_list *list, struct vsir_block *block) +{ + size_t i; + + for (i = 0; i < list->count; ++i) + if (block == list->blocks[i]) + return VKD3D_OK; + + if (!vkd3d_array_reserve((void **)&list->blocks, &list->capacity, list->count + 1, sizeof(*list->blocks))) + { + ERR("Cannot extend block list.\n"); + return VKD3D_ERROR_OUT_OF_MEMORY; + } + + list->blocks[list->count++] = block; + + return VKD3D_OK; +} + +struct vsir_block +{ + unsigned int label; + /* `begin' points to the instruction immediately following the + * LABEL that introduces the block. `end' points to the terminator + * instruction (either BRANCH or RET). They can coincide, meaning + * that the block is empty. */ + struct vkd3d_shader_instruction *begin, *end; + struct vsir_block_list predecessors, successors; +}; + +static void vsir_block_init(struct vsir_block *block, unsigned int label) +{ + assert(label); + memset(block, 0, sizeof(*block)); + block->label = label; + vsir_block_list_init(&block->predecessors); + vsir_block_list_init(&block->successors); +} + +static void vsir_block_cleanup(struct vsir_block *block) +{ + vsir_block_list_cleanup(&block->predecessors); + vsir_block_list_cleanup(&block->successors); +} + +struct vsir_cfg +{ + struct vsir_program *program; + struct vsir_block *blocks; + struct vsir_block *entry; + size_t block_count; +}; + +static void vsir_cfg_cleanup(struct vsir_cfg *cfg) +{ + size_t i; + + for (i = 0; i < cfg->block_count; ++i) + vsir_block_cleanup(&cfg->blocks[i]); + + vkd3d_free(cfg->blocks); +} + +static enum vkd3d_result vsir_cfg_add_edge(struct vsir_cfg *cfg, struct vsir_block *block, + struct vkd3d_shader_src_param *successor_param) +{ + unsigned int target = label_from_src_param(successor_param); + struct vsir_block *successor = &cfg->blocks[target - 1]; + enum vkd3d_result ret; + + assert(successor->label != 0); + + if ((ret = vsir_block_list_add(&block->successors, successor)) < 0) + return ret; + + if ((ret = vsir_block_list_add(&successor->predecessors, block)) < 0) + return ret; + + return VKD3D_OK; +} + +static enum vkd3d_result vsir_cfg_init(struct vsir_cfg *cfg, struct vsir_program *program) +{ + struct vsir_block *current_block = NULL; + enum vkd3d_result ret; + size_t i; + + memset(cfg, 0, sizeof(*cfg)); + cfg->program = program; + cfg->block_count = program->block_count; + + if (!(cfg->blocks = vkd3d_calloc(cfg->block_count, sizeof(*cfg->blocks)))) + return VKD3D_ERROR_OUT_OF_MEMORY; + + for (i = 0; i < program->instructions.count; ++i) + { + struct vkd3d_shader_instruction *instruction = &program->instructions.elements[i]; + + switch (instruction->handler_idx) + { + case VKD3DSIH_PHI: + case VKD3DSIH_SWITCH_MONOLITHIC: + vkd3d_unreachable(); + + case VKD3DSIH_LABEL: + { + unsigned int label = label_from_src_param(&instruction->src[0]); + + assert(!current_block); + assert(label > 0); + assert(label <= cfg->block_count); + current_block = &cfg->blocks[label - 1]; + vsir_block_init(current_block, label); + current_block->begin = &program->instructions.elements[i + 1]; + if (!cfg->entry) + cfg->entry = current_block; + break; + } + + case VKD3DSIH_BRANCH: + case VKD3DSIH_RET: + assert(current_block); + current_block->end = instruction; + current_block = NULL; + break; + + default: + break; + } + } + + for (i = 0; i < cfg->block_count; ++i) + { + struct vsir_block *block = &cfg->blocks[i]; + + if (block->label == 0) + continue; + + switch (block->end->handler_idx) + { + case VKD3DSIH_RET: + break; + + case VKD3DSIH_BRANCH: + if (vsir_register_is_label(&block->end->src[0].reg)) + { + if ((ret = vsir_cfg_add_edge(cfg, block, &block->end->src[0])) < 0) + goto fail; + } + else + { + if ((ret = vsir_cfg_add_edge(cfg, block, &block->end->src[1])) < 0) + goto fail; + + if ((ret = vsir_cfg_add_edge(cfg, block, &block->end->src[2])) < 0) + goto fail; + } + break; + + default: + vkd3d_unreachable(); + } + } + + return VKD3D_OK; + +fail: + vsir_cfg_cleanup(cfg); + + return ret; +} + enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser, const struct vkd3d_shader_compile_info *compile_info) { @@ -3022,14 +3210,24 @@ enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser, if (parser->shader_desc.is_dxil) { + struct vsir_cfg cfg; + if ((result = lower_switch_to_if_ladder(&parser->program)) < 0) return result; if ((result = materialize_ssas_to_temps(parser)) < 0) return result; + if ((result = vsir_cfg_init(&cfg, &parser->program)) < 0) + return result; + if ((result = simple_structurizer_run(parser)) < 0) + { + vsir_cfg_cleanup(&cfg); return result; + } + + vsir_cfg_cleanup(&cfg); } else {

1 0

Jinoh Kang : kernel32/tests: Fix console test with odd-sized consoles.
by Alexandre Julliard 22 Feb '24

22 Feb '24

Module: wine Branch: master Commit: 232b18d820e08fe6534249a64d3afdbf35d0b688 URL: https://gitlab.winehq.org/wine/wine/-/commit/232b18d820e08fe6534249a64d3afd… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Feb 20 20:45:44 2024 +0900 kernel32/tests: Fix console test with odd-sized consoles. --- dlls/kernel32/tests/process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 2904a31d014..8fadc624e05 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -545,8 +545,8 @@ static void doChild(const char* file, const char* option) ok( ret, "Setting mode (%ld)\n", GetLastError()); ret = SetConsoleMode(hConOut, modeOut ^ 1); ok( ret, "Setting mode (%ld)\n", GetLastError()); - sbi.dwCursorPosition.X ^= 1; - sbi.dwCursorPosition.Y ^= 1; + sbi.dwCursorPosition.X = !sbi.dwCursorPosition.X; + sbi.dwCursorPosition.Y = !sbi.dwCursorPosition.Y; ret = SetConsoleCursorPosition(hConOut, sbi.dwCursorPosition); ok( ret, "Setting cursor position (%ld)\n", GetLastError()); }

1 0

Louis Lenders : imm32: Update spec file.
by Alexandre Julliard 22 Feb '24

22 Feb '24

Module: wine Branch: master Commit: 7a92a33b27b3e362c12539d6382dfe6444ed77cf URL: https://gitlab.winehq.org/wine/wine/-/commit/7a92a33b27b3e362c12539d6382dfe… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Feb 21 13:51:54 2024 +0100 imm32: Update spec file. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56299 --- dlls/imm32/imm32.spec | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/imm32/imm32.spec b/dlls/imm32/imm32.spec index 47b3916c822..df105743eca 100644 --- a/dlls/imm32/imm32.spec +++ b/dlls/imm32/imm32.spec @@ -1,3 +1,26 @@ +@ stub CtfImmAppCompatEnableIMEonProtectedCode +@ stub CtfImmCoUninitialize +@ stub CtfImmDispatchDefImeMessage +@ stub CtfImmEnterCoInitCountSkipMode +@ stub CtfImmGenerateMessage +@ stub CtfImmGetCompatibleKeyboardLayout +@ stub CtfImmGetGuidAtom +@ stub CtfImmGetIMEFileName +@ stub CtfImmGetTMAEFlags +@ stub CtfImmHideToolbarWnd +@ stub CtfImmIsCiceroEnabled +@ stub CtfImmIsCiceroStartedInThread +@ stub CtfImmIsGuidMapEnable +@ stub CtfImmIsTextFrameServiceDisabled +@ stub CtfImmLastEnabledWndDestroy +@ stub CtfImmLeaveCoInitCountSkipMode +@ stub CtfImmNotify +@ stub CtfImmRestoreToolbarWnd +@ stub CtfImmSetAppCompatFlags +@ stub CtfImmSetCiceroStartInThread +@ stub CtfImmSetDefaultRemoteKeyboardLayout +@ stub CtfImmTIMActivate +@ stub GetKeyboardLayoutCP @ stdcall ImmActivateLayout(long) @ stdcall ImmAssociateContext(long long) @ stdcall ImmAssociateContextEx(long long long)

1 0

Alexandre Julliard : ntdll: Remove support for unwinding ELF dlls on ARM.
by Alexandre Julliard 22 Feb '24

22 Feb '24

Module: wine Branch: master Commit: 2778e4542171c1127450ac88b778c570dd4c4e8f URL: https://gitlab.winehq.org/wine/wine/-/commit/2778e4542171c1127450ac88b778c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 22 17:38:28 2024 +0100 ntdll: Remove support for unwinding ELF dlls on ARM. --- dlls/ntdll/unix/signal_arm.c | 433 +------------------------------------------ 1 file changed, 1 insertion(+), 432 deletions(-)

1 0

Alexandre Julliard : ntdll: Handle leaf functions in RtlVirtualUnwind on x86-64.
by Alexandre Julliard 22 Feb '24

22 Feb '24

Module: wine Branch: master Commit: 654c03d1317f4b22294109fee7ded2dbbe39645e URL: https://gitlab.winehq.org/wine/wine/-/commit/654c03d1317f4b22294109fee7ded2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 22 14:54:02 2024 +0100 ntdll: Handle leaf functions in RtlVirtualUnwind on x86-64. --- dlls/ntdll/signal_x86_64.c | 32 ++++++++++---------------------- dlls/ntdll/tests/unwind.c | 40 ++++++++++++++++++++++++++++++++-------- dlls/ntdll/unwind.c | 12 +++++++++++- 3 files changed, 53 insertions(+), 31 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 1303883ecfa..96a2da29201 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -100,22 +100,12 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX dispatch->ImageBase = 0; dispatch->ScopeIndex = 0; dispatch->ControlPc = context->Rip; + dispatch->FunctionEntry = RtlLookupFunctionEntry( context->Rip, &dispatch->ImageBase, + dispatch->HistoryTable ); - /* first look for PE exception information */ - - if ((dispatch->FunctionEntry = RtlLookupFunctionEntry( context->Rip, &dispatch->ImageBase, - dispatch->HistoryTable ))) - { - dispatch->LanguageHandler = RtlVirtualUnwind( type, dispatch->ImageBase, context->Rip, - dispatch->FunctionEntry, context, - &dispatch->HandlerData, &dispatch->EstablisherFrame, - NULL ); - return STATUS_SUCCESS; - } - - /* then look for host system exception information */ - - if (LdrFindEntryForAddress( (void *)context->Rip, &module ) || (module->Flags & LDR_WINE_INTERNAL)) + /* look for host system exception information */ + if (!dispatch->FunctionEntry && + (LdrFindEntryForAddress( (void *)context->Rip, &module ) || (module->Flags & LDR_WINE_INTERNAL))) { struct unwind_builtin_dll_params params = { type, dispatch, context }; @@ -127,14 +117,12 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX } if (status != STATUS_UNSUCCESSFUL) return status; } + else WARN( "exception data not found for pc %p\n", (void *)context->Rip ); - /* no exception information, treat as a leaf function */ - - WARN( "exception data not found for pc %p\n", (void *)context->Rip ); - dispatch->EstablisherFrame = context->Rsp; - dispatch->LanguageHandler = NULL; - context->Rip = *(ULONG64 *)context->Rsp; - context->Rsp = context->Rsp + sizeof(ULONG64); + dispatch->LanguageHandler = RtlVirtualUnwind( type, dispatch->ImageBase, context->Rip, + dispatch->FunctionEntry, context, + &dispatch->HandlerData, &dispatch->EstablisherFrame, + NULL ); return STATUS_SUCCESS; } diff --git a/dlls/ntdll/tests/unwind.c b/dlls/ntdll/tests/unwind.c index 458c368bcc7..a68bda6c748 100644 --- a/dlls/ntdll/tests/unwind.c +++ b/dlls/ntdll/tests/unwind.c @@ -2632,15 +2632,17 @@ static void call_virtual_unwind_x86( int testnum, const struct unwind_test_x86 * UINT i, j, k, broken_k; ULONG64 fake_stack[256]; ULONG64 frame, orig_rip, orig_rbp, unset_reg; - UINT unwind_size = 4 + 2 * test->unwind_info[2] + 8; void *expected_handler, *broken_handler; memcpy( (char *)code_mem + code_offset, test->function, test->function_size ); - memcpy( (char *)code_mem + unwind_offset, test->unwind_info, unwind_size ); - - runtime_func.BeginAddress = code_offset; - runtime_func.EndAddress = code_offset + test->function_size; - runtime_func.UnwindData = unwind_offset; + if (test->unwind_info) + { + UINT unwind_size = 4 + 2 * test->unwind_info[2] + 8; + memcpy( (char *)code_mem + unwind_offset, test->unwind_info, unwind_size ); + runtime_func.BeginAddress = code_offset; + runtime_func.EndAddress = code_offset + test->function_size; + runtime_func.UnwindData = unwind_offset; + } trace( "code: %p stack: %p\n", code_mem, fake_stack ); @@ -2660,8 +2662,10 @@ static void call_virtual_unwind_x86( int testnum, const struct unwind_test_x86 * (void *)orig_rip, *(BYTE *)orig_rip, (void *)orig_rbp, (void *)context.Rsp ); data = (void *)0xdeadbeef; + if (!test->unwind_info) fake_stack[0] = 0x1234; handler = RtlVirtualUnwind( UNW_FLAG_EHANDLER, (ULONG64)code_mem, orig_rip, - &runtime_func, &context, &data, &frame, &ctx_ptr ); + test->unwind_info ? &runtime_func : NULL, + &context, &data, &frame, &ctx_ptr ); expected_handler = test->results[i].handler ? (char *)code_mem + 0x200 : NULL; broken_handler = test->broken_results && test->broken_results[i].handler ? (char *)code_mem + 0x200 : NULL; @@ -2671,7 +2675,8 @@ static void call_virtual_unwind_x86( int testnum, const struct unwind_test_x86 * if (handler) ok( *(DWORD *)data == 0x08070605, "%u/%u: wrong handler data %lx\n", testnum, i, *(DWORD *)data ); else - ok( data == (void *)0xdeadbeef, "%u/%u: handler data set to %p\n", testnum, i, data ); + ok( data == (test->unwind_info ? (void *)0xdeadbeef : NULL), + "%u/%u: handler data set to %p\n", testnum, i, data ); ok( context.Rip == test->results[i].rip || broken( test->broken_results && context.Rip == test->broken_results[i].rip ), @@ -2960,6 +2965,22 @@ static void test_virtual_unwind_x86(void) { 0x01, 0x50, FALSE, 0x008, 0x000, { {rsp,0x010}, {rbp,0x000}, {-1,-1} }}, }; +#if 0 + static const BYTE function_5[] = + { + 0x90, /* 00: nop */ + 0x90, /* 01: nop */ + 0xc3 /* 02: ret */ + }; + + static const struct results_x86 results_5[] = + { + /* offset rbp handler rip frame registers */ + { 0x01, 0x00, FALSE, 0x1234, 0x000, { {rsp,0x08}, {-1,-1} }}, + { 0x02, 0x00, FALSE, 0x1234, 0x000, { {rsp,0x08}, {-1,-1} }}, + }; +#endif + static const struct unwind_test_x86 tests[] = { { function_0, sizeof(function_0), unwind_info_0, results_0, ARRAY_SIZE(results_0), broken_results_0 }, @@ -2969,6 +2990,9 @@ static void test_virtual_unwind_x86(void) /* Broken before Win10 1809. */ { function_4, sizeof(function_4), unwind_info_4, results_4, ARRAY_SIZE(results_4), broken_results_4 }, +#if 0 /* crashes before Win10 21H2 */ + { function_5, sizeof(function_5), NULL, results_5, ARRAY_SIZE(results_5) }, +#endif }; unsigned int i; diff --git a/dlls/ntdll/unwind.c b/dlls/ntdll/unwind.c index ff68303e553..21a1669f659 100644 --- a/dlls/ntdll/unwind.c +++ b/dlls/ntdll/unwind.c @@ -1838,9 +1838,19 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, #endif TRACE( "type %lx rip %I64x rsp %I64x\n", type, pc, context->Rsp ); - if (TRACE_ON(unwind)) dump_unwind_info( base, function ); frame = *frame_ret = context->Rsp; + + if (!function) /* leaf function */ + { + context->Rip = *(ULONG64 *)context->Rsp; + context->Rsp += sizeof(ULONG64); + *data = NULL; + return NULL; + } + + if (TRACE_ON(unwind)) dump_unwind_info( base, function ); + for (;;) { info = (struct UNWIND_INFO *)((char *)base + function->UnwindData);

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
72
Older →

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 February 2024