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

make a common call function and fix pr_trace such that it autoclears only when the execution session it's set in is exited

Browse source 
This is an imperfect revision of history.
This commit is contained in:
Bill Currie 2004-11-07 03:00:00 +00:00 • committed by Jeff Teunissen
parent 201252c1c0
commit 780fb41858
5 changed files with 64 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libs/gamecode/builtins/pr_cmds.c
View file

@ -330,6 +330,7 @@ static void
PF_traceon (progs_t *pr)
{
pr->pr_trace = true;
pr->pr_trace_depth = pr->pr_depth;
}
/*

65
libs/gamecode/engine/pr_exec.c
View file

@ -112,12 +112,15 @@ PR_PopFrame (progs_t *pr)
pr->pr_xtstr = frame->tstr;
}
/*
PR_EnterFunction
Returns the new program statement counter
/** Setup the stackframe prior to calling a progs function. Saves all local
data the called function will trample on and copies the parameters used
by the function into the function's local data space.
\param pr pointer to progs_t VM struct
\param f pointer to the descriptor for the called function
\note Passing a descriptor for a builtin function will result in
undefined behavior.
*/
void
static void
PR_EnterFunction (progs_t *pr, dfunction_t *f)
{
int i, j, c, o;
@ -242,6 +245,24 @@ signal_hook (int sig, void *data)
return 0;
}
int
PR_CallFunction (progs_t *pr, func_t fnum)
{
dfunction_t *f;
if (!fnum)
PR_RunError (pr, "NULL function");
f = pr->pr_functions + fnum;
if (f->first_statement < 0) {
// negative statements are built in functions
((bfunction_t *) f)->func (pr);
return 0;
} else {
PR_EnterFunction (pr, f);
return 1;
}
}
/*
PR_ExecuteProgram
@ -252,31 +273,23 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum)
{
int exitdepth, profile, startprofile;
unsigned int pointer;
dfunction_t *f;
dstatement_t *st;
edict_t *ed;
pr_type_t *ptr;
if (!fnum || fnum >= pr->progs->numfunctions) {
if (*pr->globals.self)
ED_Print (pr, PROG_TO_EDICT (pr, *pr->globals.self));
PR_RunError (pr, "PR_ExecuteProgram: NULL function");
}
f = &pr->pr_functions[fnum];
//Sys_Printf("%s:\n", PR_GetString(pr,f->s_name));
pr->pr_trace = false;
// make a stack frame
exitdepth = pr->pr_depth;
PR_EnterFunction (pr, f);
st = pr->pr_statements + pr->pr_xstatement;
startprofile = profile = 0;
Sys_PushSignalHook (signal_hook, pr);
if (!PR_CallFunction (pr, fnum)) {
// called a builtin instead of progs code
Sys_PopSignalHook ();
return;
}
st = pr->pr_statements + pr->pr_xstatement;
while (1) {
pr_type_t *op_a, *op_b, *op_c;
@ -771,15 +784,7 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum)
pr->pr_xfunction->profile += profile - startprofile;
startprofile = profile;
pr->pr_argc = st->op - OP_CALL0;
if (!OPA.func_var)
PR_RunError (pr, "NULL function");
f = &pr->pr_functions[OPA.func_var];
// negative statements are built in functions
if (f->first_statement < 0) {
((bfunction_t *) f)->func (pr);
} else {
PR_EnterFunction (pr, f);
}
PR_CallFunction (pr, OPA.func_var);
st = pr->pr_statements + pr->pr_xstatement;
break;
case OP_DONE:
@ -795,6 +800,8 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum)
PR_LeaveFunction (pr);
st = pr->pr_statements + pr->pr_xstatement;
if (pr->pr_depth == exitdepth) {
if (pr->pr_trace && pr->pr_depth <= pr->pr_trace_depth)
pr->pr_trace = false;
Sys_PopSignalHook ();
return; // all done
}