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

[gamecode] Save return pointer when saving params

Browse source 
And point the return pointer at the return buffer. And, of course,
restore it. This fixes a really subtle (ie, difficult to find) bug
caused by the recent optimization improvements in qfcc: the optimizer
had decided to set the return value of a message call to the parameter
for the next call, but because the message was to the receiver class for
the first time, the class's +initialize was called. The +initialize
method returned self, which of course when into the parameter for the
*next* call, but the first call hadn't been made, so its parameter got
corrupted.
This commit is contained in:
Bill Currie 2024-03-07 22:12:24 +09:00
parent 5191fc26a3
commit 2471147488
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/QF/progs.h
View file

@ -117,6 +117,7 @@ void PR_RunError (progs_t *pr, const char *error, ...) __attribute__((format(PRI
///@{ ///@{
typedef struct pr_stashed_params_s { typedef struct pr_stashed_params_s {
pr_type_t *param_ptrs[2]; pr_type_t *param_ptrs[2];
pr_type_t *return_ptr;
int argc; int argc;
pr_type_t params[1]; pr_type_t params[1];
} pr_stashed_params_t; } pr_stashed_params_t;

3
libs/gamecode/pr_exec.c
View file

@ -104,8 +104,10 @@ _PR_SaveParams (progs_t *pr, pr_stashed_params_t *params)
params->param_ptrs[0] = pr->pr_params[0]; params->param_ptrs[0] = pr->pr_params[0];
params->param_ptrs[1] = pr->pr_params[1]; params->param_ptrs[1] = pr->pr_params[1];
params->return_ptr = pr->pr_return;
pr->pr_params[0] = pr->pr_real_params[0]; pr->pr_params[0] = pr->pr_real_params[0];
pr->pr_params[1] = pr->pr_real_params[1]; pr->pr_params[1] = pr->pr_real_params[1];
pr->pr_return = pr->pr_return_buffer;
for (i = 0; i < pr->pr_argc; i++) { for (i = 0; i < pr->pr_argc; i++) {
memcpy (params->params + i * pr->pr_param_size, memcpy (params->params + i * pr->pr_param_size,
pr->pr_real_params[i], size); pr->pr_real_params[i], size);
@ -122,6 +124,7 @@ PR_RestoreParams (progs_t *pr, pr_stashed_params_t *params)
pr->pr_params[0] = params->param_ptrs[0]; pr->pr_params[0] = params->param_ptrs[0];
pr->pr_params[1] = params->param_ptrs[1]; pr->pr_params[1] = params->param_ptrs[1];
pr->pr_return = params->return_ptr;
pr->pr_argc = params->argc; pr->pr_argc = params->argc;
for (i = 0; i < pr->pr_argc; i++) { for (i = 0; i < pr->pr_argc; i++) {
memcpy (pr->pr_real_params[i], memcpy (pr->pr_real_params[i],