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

[qfcc] Make max_params a code option

Browse source 
Rather than relying on progsversion (I think this also fixes a bug with
max params when targeting ruamoko).
This commit is contained in:
Bill Currie 2024-10-11 10:01:45 +09:00
parent f3181d64d0
commit 6db1942bb1
4 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tools/qfcc/include/options.h
View file

@ -43,6 +43,7 @@ typedef struct {
bool vector_calls; // use floats instead of vectors for constant function args
bool local_merging; // merge function locals into one block
unsigned progsversion; // Progs version to generate code for
int max_params; // maximum param count (-1 = unlimited)
bool spirv; // Target spir-v instead of Quake
bool vector_components; // add *_[xyz] symbols for vectors
bool ifstring; // expand if (str) to if (str != "")

9
tools/qfcc/source/expr.c
View file

@ -2010,12 +2010,13 @@ build_function_call (const expr_t *fexpr, const type_t *ftype, const expr_t *par
}
}
if (options.code.progsversion < PROG_VERSION
&& arg_count > PR_MAX_PARAMS) {
return error (fexpr, "more than %d parameters", PR_MAX_PARAMS);
}
if (ftype->func.num_params < -1) {
if (options.code.max_params >= 0
&& arg_count > options.code.max_params) {
return error (fexpr, "more than %d parameters",
options.code.max_params);
}
if (-arg_count > ftype->func.num_params + 1) {
if (!options.traditional)
return error (fexpr, "too few arguments");

3
tools/qfcc/source/function.c
View file

@ -1137,7 +1137,8 @@ static void
build_function (symbol_t *fsym)
{
const type_t *func_type = fsym->metafunc->func->type;
if (func_type->func.num_params > PR_MAX_PARAMS) {
if (options.code.max_params >= 0
&& func_type->func.num_params > options.code.max_params) {
error (0, "too many params");
}
}

4
tools/qfcc/source/target.c
View file

@ -44,15 +44,19 @@ target_set_backend (const char *tgt)
if (!strcasecmp (tgt, "v6")) {
current_target = v6_target;
options.code.progsversion = PROG_ID_VERSION;
options.code.max_params = PR_MAX_PARAMS;
} else if (!strcasecmp (tgt, "v6p")) {
current_target = v6p_target;
options.code.progsversion = PROG_V6P_VERSION;
options.code.max_params = PR_MAX_PARAMS;
} else if (!strcasecmp (tgt, "ruamoko")) {
current_target = ruamoko_target;
options.code.progsversion = PROG_VERSION;
options.code.max_params = -1;
} else if (!strcasecmp (tgt, "spir-v")) {
current_target = spirv_target;
options.code.progsversion = PROG_VERSION;
options.code.max_params = -1;
options.code.spirv = true;
options.code.no_vararg = true;
} else {