qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 23:32:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

[gamecode] Add more modes to WITH

Browse source 
It turned out I had no way of using a pointer or field as the value to
load, so all 4 modes are duplicated with loads from where operand b
points, but the loaded value interpreted the same way. Also, fixed an
error in the calculation of op-b offsets.
This commit is contained in:
Bill Currie 2022-01-04 17:55:20 +09:00
parent f2b258ba76
commit 2f09ece65b
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libs/gamecode/pr_exec.c
View file

@ -1828,21 +1828,35 @@ pr_jump_mode (progs_t *pr, const dstatement_t *st)
static pr_pointer_t __attribute__((pure)) static pr_pointer_t __attribute__((pure))
pr_with (progs_t *pr, const dstatement_t *st) pr_with (progs_t *pr, const dstatement_t *st)
{ {
pr_type_t *op_b = pr->pr_globals + st->b + PR_BASE (pr, st, A);
pointer_t edict_area = pr->pr_edict_area - pr->pr_globals; pointer_t edict_area = pr->pr_edict_area - pr->pr_globals;
pr_type_t *op_b = pr->pr_globals + PR_BASE (pr, st, B) + st->b;
switch (st->a) { switch (st->a) {
// fixed offset
case 0: case 0:
// hard-0 base // hard-0 base
return st->b; return st->b;
case 1: case 1:
// relative to current base // relative to current base
return op_b - pr->pr_globals; return PR_BASE (pr, st, B) + st->b;
case 2: case 2:
// relative to stack (-ve offset) // relative to stack (-ve offset)
return *pr->globals.stack + (pr_short_t) st->b; return *pr->globals.stack + (pr_short_t) st->b;
case 3: case 3:
// relative to edict_area (+ve only) // relative to edict_area (+ve only)
return edict_area + st->b; return edict_area + st->b;
case 4:
// hard-0 base
return pr->pr_globals[st->b].pointer_var;
case 5:
return OPB(pointer);
case 6:
// relative to stack (-ve offset)
return *pr->globals.stack + OPB(int);
case 7:
// relative to edict_area (+ve only)
return edict_area + OPB(uint);
} }
PR_RunError (pr, "Invalid with index: %u", st->a); PR_RunError (pr, "Invalid with index: %u", st->a);
} }
@ -2875,7 +2889,7 @@ pr_exec_ruamoko (progs_t *pr, int exitdepth)
} }
break; break;
case OP_WITH: case OP_WITH:
pr->pr_bases[st->c] = pr_with (pr, st); pr->pr_bases[st->c & 3] = pr_with (pr, st);
break; break;
case OP_STATE_ft: case OP_STATE_ft:
{ {