qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-25 13:11:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[qfcc] Ensure only one type def for functions

Browse source 
Only aggregate types are allowed to have duplicate type definitions. It
seems I forgot to do the id check for function types.
This commit is contained in:
Bill Currie 2024-10-02 02:12:07 +09:00
parent 56f8e19f63
commit 8853d56af3
1 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
tools/qfcc/source/spirv.c
View file

@ -58,6 +58,28 @@ typedef struct spirvctx_s {
unsigned id;
} spirvctx_t;
static unsigned
spirv_type_id (const type_t *type, spirvctx_t *ctx)
{
if (type->id < ctx->type_ids.size && ctx->type_ids.a[type->id]) {
return ctx->type_ids.a[type->id];
}
return 0;
}
static void
spirv_add_type_id (const type_t *type, unsigned id, spirvctx_t *ctx)
{
if (type->id >= ctx->type_ids.size) {
size_t base = ctx->type_ids.size;
DARRAY_RESIZE (&ctx->type_ids, type->id + 1);
while (base < type->id + 1) {
ctx->type_ids.a[base++] = 0;
}
}
ctx->type_ids.a[type->id] = id;
}
static def_t *
spirv_new_insn (int op, int size, defspace_t *space)
{
@ -271,6 +293,10 @@ spirv_TypeFunction (symbol_t *fsym, spirvctx_t *ctx)
for (auto p = fsym->params; p; p = p->next) {
num_params++;
}
auto type = fsym->type;
if (spirv_type_id (type, ctx)) {
return spirv_type_id (type, ctx);
}
unsigned ret_type = type_id (fsym->type->func.ret_type, ctx);
unsigned param_types[num_params];
@ -290,21 +316,15 @@ spirv_TypeFunction (symbol_t *fsym, spirvctx_t *ctx)
for (int i = 0; i < num_params; i++) {
D_var_o(int, def, 3 + i) = param_types[i];
}
spirv_add_type_id (type, ft_id, ctx);
return ft_id;
}
static unsigned
type_id (const type_t *type, spirvctx_t *ctx)
{
if (type->id < ctx->type_ids.size && ctx->type_ids.a[type->id]) {
return ctx->type_ids.a[type->id];
}
if (type->id >= ctx->type_ids.size) {
size_t base = ctx->type_ids.size;
DARRAY_RESIZE (&ctx->type_ids, type->id + 1);
while (base < type->id + 1) {
ctx->type_ids.a[base++] = 0;
}
if (spirv_type_id (type, ctx)) {
return spirv_type_id (type, ctx);
}
unsigned id = 0;
if (is_void (type)) {
@ -349,8 +369,7 @@ type_id (const type_t *type, spirvctx_t *ctx)
print_type_str (str, type);
internal_error (0, "can't emit type %s", str->str);
}
ctx->type_ids.a[type->id] = id;
spirv_add_type_id (type, id, ctx);
return id;
}