qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-03-21 09:51:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

[gamecode] Make return support 32 words

Browse source 
This took interpreting the lower 5 bits of operand c as size - 1, and
0xffff as void (0 words).
This commit is contained in:
Bill Currie 2022-01-17 16:54:27 +09:00
parent 94ef9931a5
commit 89e120ba34
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libs/gamecode/pr_exec.c
View file

@ -3131,9 +3131,9 @@ pr_exec_ruamoko (progs_t *pr, int exitdepth)
break;
OP_cmp_T (LT, U, long, lvec2, lvec4, <, ulong, ulvec2, ulvec4);
case OP_RETURN:
int ret_size = st->c & 0x1f; // up to 32 words
if (ret_size) {
mm = pr_return_mode (pr, st, (st->c >> 5) & 7);
int ret_size = (st->c & 0x1f) + 1; // up to 32 words
if (st->c != 0xffff) {
mm = pr_return_mode (pr, st, st->c >> 5);
memcpy (&R_INT (pr), mm, ret_size * sizeof (*op_a));
}
pr->pr_xfunction->profile += profile - startprofile;

8
libs/gamecode/test/test-callret.c
View file

@ -85,7 +85,7 @@ static dstatement_t callret_statements[] = {
{ OP(2, 2, 2, OP_ADD_F_4), fa, fi, fa }, // f += inc
{ OP(2, 0, 2, OP_LEA_C), c, -1, c }, // dec count
{ OP(0, 0, 2, OP_IFA), -7, 0, c }, // count > 0
{ OP(2, 0, 0, OP_RETURN), ac, 0, 4 },
{ OP(2, 0, 0, OP_RETURN), ac, 0, 3 }, // size is (c&31)+1
#undef x
#undef xn
#undef x2
@ -132,7 +132,7 @@ static dstatement_t call32_statements[] = {
{ OP(2, 0, 2, OP_LEA_C), 32, -1, 32 },
{ OP(2, 2, 2, OP_STORE_D_1), 33, 32, 32 }, // array[index] = index
{ OP(0, 0, 0, OP_JUMP_A), -3, 0, 0 },
{ OP(2, 0, 0, OP_RETURN), 0, 0, 32 },
{ OP(2, 0, 0, OP_RETURN), 0, 0, 0x1f }, // only bits 0-5 are size
};
static pr_ivec4_t callchain_init[32] = {
@ -152,12 +152,12 @@ static dstatement_t callchain_statements[] = {
{ OP_LEA_C, STK, -4, STK }, // reserve 4 words on the stack
{ OP_WITH, 2, 0, 2 }, // put locals into reg 2
{ OP(0, 0, 2, OP_CALL_B), 2, 0, 0 },
{ OP(2, 0, 0, OP_RETURN), 0, 0, 1 },
{ OP(2, 0, 0, OP_RETURN), 0, 0, 0 },
[64]=
{ OP_LEA_C, STK, -4, STK }, // reserve 4 words on the stack
{ OP_WITH, 2, 0, 2 }, // put locals into reg 2
{ OP(0, 0, 2, OP_LEA_A), 42, 0, 0 }, // init value
{ OP(2, 0, 0, OP_RETURN), 0, 0, 1 }, // return value
{ OP(2, 0, 0, OP_RETURN), 0, 0, 0 }, // return value
};
static bfunction_t callret_functions[] = {