qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-02-08 15:22:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove the duplicated progs engine. That would have been a maintainence

Browse source 
nightmare.
This commit is contained in:
Bill Currie 2000-12-06 18:41:21 +00:00
parent bb2928830c
commit 56656df96a
1 changed files with 753 additions and 1037 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

628
source/pr_exec.c
View file

@ -46,8 +46,7 @@
void SV_Error (char *error, ...); void SV_Error (char *error, ...);
typedef struct typedef struct {
{
int s; int s;
dfunction_t *f; dfunction_t *f;
} prstack_t; } prstack_t;
@ -68,8 +67,7 @@ int pr_xstatement;
int pr_argc; int pr_argc;
char *pr_opnames[] = char *pr_opnames[] = {
{
"DONE", "DONE",
"MUL_F", "MUL_F",
@ -168,12 +166,12 @@ char *PR_GlobalStringNoContents (int ofs);
PR_PrintStatement PR_PrintStatement
================= =================
*/ */
void PR_PrintStatement (dstatement_t *s) void
PR_PrintStatement (dstatement_t *s)
{ {
int i; int i;
if ( (unsigned int)s->op < sizeof(pr_opnames)/sizeof(pr_opnames[0])) if ((unsigned int) s->op < sizeof (pr_opnames) / sizeof (pr_opnames[0])) {
{
Con_Printf ("%s ", pr_opnames[s->op]); Con_Printf ("%s ", pr_opnames[s->op]);
i = strlen (pr_opnames[s->op]); i = strlen (pr_opnames[s->op]);
for (; i < 10; i++) for (; i < 10; i++)
@ -181,24 +179,21 @@ void PR_PrintStatement (dstatement_t *s)
} }
if (s->op == OP_IF || s->op == OP_IFNOT) if (s->op == OP_IF || s->op == OP_IFNOT)
Con_Printf ("%sbranch %i",PR_GlobalString((unsigned short) s->a),s->b); Con_Printf ("%sbranch %i", PR_GlobalString ((unsigned short) s->a),
else if (s->op == OP_GOTO) s->b);
{ else if (s->op == OP_GOTO) {
Con_Printf ("branch %i", s->a); Con_Printf ("branch %i", s->a);
} } else if ((unsigned int) (s->op - OP_STORE_F) < 6) {
else if ( (unsigned int)(s->op - OP_STORE_F) < 6)
{
Con_Printf ("%s", PR_GlobalString ((unsigned short) s->a)); Con_Printf ("%s", PR_GlobalString ((unsigned short) s->a));
Con_Printf ("%s", PR_GlobalStringNoContents ((unsigned short) s->b)); Con_Printf ("%s", PR_GlobalStringNoContents ((unsigned short) s->b));
} } else {
else
{
if (s->a) if (s->a)
Con_Printf ("%s", PR_GlobalString ((unsigned short) s->a)); Con_Printf ("%s", PR_GlobalString ((unsigned short) s->a));
if (s->b) if (s->b)
Con_Printf ("%s", PR_GlobalString ((unsigned short) s->b)); Con_Printf ("%s", PR_GlobalString ((unsigned short) s->b));
if (s->c) if (s->c)
Con_Printf ("%s", PR_GlobalStringNoContents((unsigned short) s->c)); Con_Printf ("%s",
PR_GlobalStringNoContents ((unsigned short) s->c));
} }
Con_Printf ("\n"); Con_Printf ("\n");
} }
@ -208,28 +203,26 @@ void PR_PrintStatement (dstatement_t *s)
PR_StackTrace PR_StackTrace
============ ============
*/ */
void PR_StackTrace (void) void
PR_StackTrace (void)
{ {
dfunction_t *f; dfunction_t *f;
int i; int i;
if (pr_depth == 0) if (pr_depth == 0) {
{
Con_Printf ("<NO STACK>\n"); Con_Printf ("<NO STACK>\n");
return; return;
} }
pr_stack[pr_depth].f = pr_xfunction; pr_stack[pr_depth].f = pr_xfunction;
for (i=pr_depth ; i>=0 ; i--) for (i = pr_depth; i >= 0; i--) {
{
f = pr_stack[i].f; f = pr_stack[i].f;
if (!f) if (!f) {
{
Con_Printf ("<NO FUNCTION>\n"); Con_Printf ("<NO FUNCTION>\n");
} } else
else Con_Printf ("%12s : %s\n", PR_GetString (f->s_file),
Con_Printf ("%12s : %s\n", PR_GetString(f->s_file), PR_GetString(f->s_name)); PR_GetString (f->s_name));
} }
} }
@ -240,7 +233,8 @@ PR_Profile_f
============ ============
*/ */
void PR_Profile_f (void) void
PR_Profile_f (void)
{ {
dfunction_t *f, *best; dfunction_t *f, *best;
int max; int max;
@ -248,23 +242,20 @@ void PR_Profile_f (void)
int i; int i;
num = 0; num = 0;
do do {
{
max = 0; max = 0;
best = NULL; best = NULL;
for (i=0 ; i<progs->numfunctions ; i++) for (i = 0; i < progs->numfunctions; i++) {
{
f = &pr_functions[i]; f = &pr_functions[i];
if (f->profile > max) if (f->profile > max) {
{
max = f->profile; max = f->profile;
best = f; best = f;
} }
} }
if (best) if (best) {
{
if (num < 10) if (num < 10)
Con_Printf ("%7i %s\n", best->profile, PR_GetString(best->s_name)); Con_Printf ("%7i %s\n", best->profile,
PR_GetString (best->s_name));
num++; num++;
best->profile = 0; best->profile = 0;
} }
@ -279,7 +270,8 @@ PR_RunError
Aborts the currently executing function Aborts the currently executing function
============ ============
*/ */
void PR_RunError (char *error, ...) void
PR_RunError (char *error, ...)
{ {
va_list argptr; va_list argptr;
char string[1024]; char string[1024];
@ -292,7 +284,8 @@ void PR_RunError (char *error, ...)
PR_StackTrace (); PR_StackTrace ();
Con_Printf ("%s\n", string); Con_Printf ("%s\n", string);
pr_depth = 0; // dump the stack so SV_Error can shutdown functions pr_depth = 0; // dump the stack so SV_Error can
// shutdown functions
SV_Error ("Program error"); SV_Error ("Program error");
} }
@ -312,7 +305,8 @@ PR_EnterFunction
Returns the new program statement counter Returns the new program statement counter
==================== ====================
*/ */
int PR_EnterFunction (dfunction_t *f) int
PR_EnterFunction (dfunction_t *f)
{ {
int i, j, c, o; int i, j, c, o;
@ -328,15 +322,14 @@ int PR_EnterFunction (dfunction_t *f)
PR_RunError ("PR_ExecuteProgram: locals stack overflow\n"); PR_RunError ("PR_ExecuteProgram: locals stack overflow\n");
for (i = 0; i < c; i++) for (i = 0; i < c; i++)
localstack[localstack_used+i] = ((int *)pr_globals)[f->parm_start + i]; localstack[localstack_used + i] =
((int *) pr_globals)[f->parm_start + i];
localstack_used += c; localstack_used += c;
// copy parameters // copy parameters
o = f->parm_start; o = f->parm_start;
for (i=0 ; i<f->numparms ; i++) for (i = 0; i < f->numparms; i++) {
{ for (j = 0; j < f->parm_size[i]; j++) {
for (j=0 ; j<f->parm_size[i] ; j++)
{
((int *) pr_globals)[o] = ((int *) pr_globals)[OFS_PARM0 + i * 3 + j]; ((int *) pr_globals)[o] = ((int *) pr_globals)[OFS_PARM0 + i * 3 + j];
o++; o++;
} }
@ -351,7 +344,8 @@ int PR_EnterFunction (dfunction_t *f)
PR_LeaveFunction PR_LeaveFunction
==================== ====================
*/ */
int PR_LeaveFunction (void) int
PR_LeaveFunction (void)
{ {
int i, c; int i, c;
@ -365,7 +359,9 @@ int PR_LeaveFunction (void)
PR_RunError ("PR_ExecuteProgram: locals stack underflow\n"); PR_RunError ("PR_ExecuteProgram: locals stack underflow\n");
for (i = 0; i < c; i++) for (i = 0; i < c; i++)
((int *)pr_globals)[pr_xfunction->parm_start + i] = localstack[localstack_used+i];
((int *) pr_globals)[pr_xfunction->parm_start + i] =
localstack[localstack_used + i];
// up stack // up stack
pr_depth--; pr_depth--;
@ -384,7 +380,8 @@ PR_ExecuteProgram
#define OPB ((eval_t *)&pr_globals[(unsigned short) st->b]) #define OPB ((eval_t *)&pr_globals[(unsigned short) st->b])
#define OPC ((eval_t *)&pr_globals[(unsigned short) st->c]) #define OPC ((eval_t *)&pr_globals[(unsigned short) st->c])
extern cvar_t *pr_boundscheck; extern cvar_t *pr_boundscheck;
void PR_ExecuteProgram (func_t fnum) void
PR_ExecuteProgram (func_t fnum)
{ {
dstatement_t *st; dstatement_t *st;
dfunction_t *f, *newf; dfunction_t *f, *newf;
@ -393,8 +390,7 @@ void PR_ExecuteProgram (func_t fnum)
eval_t *ptr; eval_t *ptr;
int profile, startprofile; int profile, startprofile;
if (!fnum || fnum >= progs->numfunctions) if (!fnum || fnum >= progs->numfunctions) {
{
if (pr_global_struct->self) if (pr_global_struct->self)
ED_Print (PROG_TO_EDICT (pr_global_struct->self)); ED_Print (PROG_TO_EDICT (pr_global_struct->self));
SV_Error ("PR_ExecuteProgram: NULL function"); SV_Error ("PR_ExecuteProgram: NULL function");
@ -410,12 +406,11 @@ void PR_ExecuteProgram (func_t fnum)
st = &pr_statements[PR_EnterFunction (f)]; st = &pr_statements[PR_EnterFunction (f)];
startprofile = profile = 0; startprofile = profile = 0;
if (pr_boundscheck->int_val) if (pr_boundscheck->int_val) {
{ while (1) {
while (1)
{
st++; st++;
if (++profile > 1000000) // LordHavoc: increased runaway loop limit 10x if (++profile > 1000000) // LordHavoc: increased runaway loop
// limit 10x
{ {
pr_xstatement = st - pr_statements; pr_xstatement = st - pr_statements;
PR_RunError ("runaway loop error"); PR_RunError ("runaway loop error");
@ -424,8 +419,7 @@ void PR_ExecuteProgram (func_t fnum)
if (pr_trace) if (pr_trace)
PR_PrintStatement (st); PR_PrintStatement (st);
switch (st->op) switch (st->op) {
{
case OP_ADD_F: case OP_ADD_F:
OPC->_float = OPA->_float + OPB->_float; OPC->_float = OPA->_float + OPB->_float;
break; break;
@ -446,7 +440,10 @@ void PR_ExecuteProgram (func_t fnum)
OPC->_float = OPA->_float * OPB->_float; OPC->_float = OPA->_float * OPB->_float;
break; break;
case OP_MUL_V: case OP_MUL_V:
OPC->_float = OPA->vector[0]*OPB->vector[0] + OPA->vector[1]*OPB->vector[1] + OPA->vector[2]*OPB->vector[2]; OPC->_float =
OPA->vector[0] * OPB->vector[0] +
OPA->vector[1] * OPB->vector[1] +
OPA->vector[2] * OPB->vector[2];
break; break;
case OP_MUL_FV: case OP_MUL_FV:
OPC->vector[0] = OPA->_float * OPB->vector[0]; OPC->vector[0] = OPA->_float * OPB->vector[0];
@ -489,7 +486,8 @@ void PR_ExecuteProgram (func_t fnum)
OPC->_float = !OPA->_float; OPC->_float = !OPA->_float;
break; break;
case OP_NOT_V: case OP_NOT_V:
OPC->_float = !OPA->vector[0] && !OPA->vector[1] && !OPA->vector[2]; OPC->_float = !OPA->vector[0] && !OPA->vector[1]
&& !OPA->vector[2];
break; break;
case OP_NOT_S: case OP_NOT_S:
OPC->_float = !OPA->string || !*PR_GetString (OPA->string); OPC->_float = !OPA->string || !*PR_GetString (OPA->string);
@ -504,10 +502,14 @@ void PR_ExecuteProgram (func_t fnum)
OPC->_float = OPA->_float == OPB->_float; OPC->_float = OPA->_float == OPB->_float;
break; break;
case OP_EQ_V: case OP_EQ_V:
OPC->_float = (OPA->vector[0] == OPB->vector[0]) && (OPA->vector[1] == OPB->vector[1]) && (OPA->vector[2] == OPB->vector[2]); OPC->_float = (OPA->vector[0] == OPB->vector[0])
&& (OPA->vector[1] == OPB->vector[1])
&& (OPA->vector[2] == OPB->vector[2]);
break; break;
case OP_EQ_S: case OP_EQ_S:
OPC->_float = !strcmp(PR_GetString(OPA->string), PR_GetString(OPB->string)); OPC->_float =
!strcmp (PR_GetString (OPA->string),
PR_GetString (OPB->string));
break; break;
case OP_EQ_E: case OP_EQ_E:
OPC->_float = OPA->_int == OPB->_int; OPC->_float = OPA->_int == OPB->_int;
@ -519,10 +521,14 @@ void PR_ExecuteProgram (func_t fnum)
OPC->_float = OPA->_float != OPB->_float; OPC->_float = OPA->_float != OPB->_float;
break; break;
case OP_NE_V: case OP_NE_V:
OPC->_float = (OPA->vector[0] != OPB->vector[0]) || (OPA->vector[1] != OPB->vector[1]) || (OPA->vector[2] != OPB->vector[2]); OPC->_float = (OPA->vector[0] != OPB->vector[0])
|| (OPA->vector[1] != OPB->vector[1])
|| (OPA->vector[2] != OPB->vector[2]);
break; break;
case OP_NE_S: case OP_NE_S:
OPC->_float = strcmp(PR_GetString(OPA->string), PR_GetString(OPB->string)); OPC->_float =
strcmp (PR_GetString (OPA->string),
PR_GetString (OPB->string));
break; break;
case OP_NE_E: case OP_NE_E:
OPC->_float = OPA->_int != OPB->_int; OPC->_float = OPA->_int != OPB->_int;
@ -550,26 +556,30 @@ void PR_ExecuteProgram (func_t fnum)
case OP_STOREP_FLD: // integers case OP_STOREP_FLD: // integers
case OP_STOREP_S: case OP_STOREP_S:
case OP_STOREP_FNC: // pointers case OP_STOREP_FNC: // pointers
if (OPB->_int < 0 || OPB->_int + 4 > pr_edictareasize) if (pr_boundscheck->int_val
{ && (OPB->_int < 0 || OPB->_int + 4 > pr_edictareasize)) {
pr_xstatement = st - pr_statements; pr_xstatement = st - pr_statements;
PR_RunError("Progs attempted to write to an out of bounds edict\n"); PR_RunError
("Progs attempted to write to an out of bounds edict\n");
return; return;
} }
if (OPB->_int % pr_edict_size < ((byte *)&sv.edicts->v - (byte *)sv.edicts)) if (pr_boundscheck->int_val && (OPB->_int % pr_edict_size <
{ ((byte *) & sv.edicts->v -
(byte *) sv.edicts))) {
pr_xstatement = st - pr_statements; pr_xstatement = st - pr_statements;
PR_RunError("Progs attempted to write to an engine edict field\n"); PR_RunError
("Progs attempted to write to an engine edict field\n");
return; return;
} }
ptr = (eval_t *) ((byte *) sv.edicts + OPB->_int); ptr = (eval_t *) ((byte *) sv.edicts + OPB->_int);
ptr->_int = OPA->_int; ptr->_int = OPA->_int;
break; break;
case OP_STOREP_V: case OP_STOREP_V:
if (OPB->_int < 0 || OPB->_int + 12 > pr_edictareasize) if (pr_boundscheck->int_val
{ && (OPB->_int < 0 || OPB->_int + 12 > pr_edictareasize)) {
pr_xstatement = st - pr_statements; pr_xstatement = st - pr_statements;
PR_RunError("Progs attempted to write to an out of bounds edict\n"); PR_RunError
("Progs attempted to write to an out of bounds edict\n");
return; return;
} }
ptr = (eval_t *) ((byte *) sv.edicts + OPB->_int); ptr = (eval_t *) ((byte *) sv.edicts + OPB->_int);
@ -577,86 +587,88 @@ void PR_ExecuteProgram (func_t fnum)
ptr->vector[1] = OPA->vector[1]; ptr->vector[1] = OPA->vector[1];
ptr->vector[2] = OPA->vector[2]; ptr->vector[2] = OPA->vector[2];
break; break;
case OP_ADDRESS: case OP_ADDRESS:
if (OPA->edict < 0 || OPA->edict >= pr_edictareasize) if (pr_boundscheck->int_val
{ && (OPA->edict < 0 || OPA->edict >= pr_edictareasize)) {
pr_xstatement = st - pr_statements; pr_xstatement = st - pr_statements;
PR_RunError("Progs attempted to address an out of bounds edict\n"); PR_RunError
("Progs attempted to address an out of bounds edict\n");
return; return;
} }
if (OPA->edict == 0 && sv.state == ss_active) if (pr_boundscheck->int_val
{ && (OPA->edict == 0 && sv.state == ss_active)) {
pr_xstatement = st - pr_statements; pr_xstatement = st - pr_statements;
PR_RunError ("assignment to world entity"); PR_RunError ("assignment to world entity");
return; return;
} }
if (OPB->_int < 0 || OPB->_int >= progs->entityfields) if (pr_boundscheck->int_val
{ && (OPB->_int < 0 || OPB->_int >= progs->entityfields)) {
pr_xstatement = st - pr_statements; pr_xstatement = st - pr_statements;
PR_RunError("Progs attempted to address an invalid field in an edict\n"); PR_RunError
("Progs attempted to address an invalid field in an edict\n");
return; return;
} }
ed = PROG_TO_EDICT (OPA->edict); ed = PROG_TO_EDICT (OPA->edict);
OPC->_int = (byte *)((int *)&ed->v + OPB->_int) - (byte *)sv.edicts; OPC->_int =
break; (byte *) ((int *) &ed->v + OPB->_int) -
(byte *) sv.edicts; break; case OP_LOAD_F:
case OP_LOAD_F:
case OP_LOAD_FLD: case OP_LOAD_FLD:
case OP_LOAD_ENT: case OP_LOAD_ENT:
case OP_LOAD_S: case OP_LOAD_S:
case OP_LOAD_FNC: case OP_LOAD_FNC:
if (OPA->edict < 0 || OPA->edict >= pr_edictareasize) if (pr_boundscheck->int_val
{ && (OPA->edict < 0 || OPA->edict >= pr_edictareasize)) {
pr_xstatement = st - pr_statements; pr_xstatement = st - pr_statements;
PR_RunError("Progs attempted to read an out of bounds edict number\n"); PR_RunError
("Progs attempted to read an out of bounds edict number\n");
return; return;
} }
if (OPB->_int < 0 || OPB->_int >= progs->entityfields) if (pr_boundscheck->int_val
{ && (OPB->_int < 0 || OPB->_int >= progs->entityfields)) {
pr_xstatement = st - pr_statements; pr_xstatement = st - pr_statements;
PR_RunError("Progs attempted to read an invalid field in an edict\n"); PR_RunError
("Progs attempted to read an invalid field in an edict\n");
return; return;
} }
ed = PROG_TO_EDICT (OPA->edict); ed = PROG_TO_EDICT (OPA->edict);
OPC->_int = ((eval_t *) ((int *) &ed->v + OPB->_int))->_int; OPC->_int = ((eval_t *) ((int *) &ed->v + OPB->_int))->_int;
break; break;
case OP_LOAD_V: case OP_LOAD_V:
if (OPA->edict < 0 || OPA->edict >= pr_edictareasize) if (pr_boundscheck->int_val
{ && (OPA->edict < 0 || OPA->edict >= pr_edictareasize)) {
pr_xstatement = st - pr_statements; pr_xstatement = st - pr_statements;
PR_RunError("Progs attempted to read an out of bounds edict number\n"); PR_RunError
("Progs attempted to read an out of bounds edict number\n");
return; return;
} }
if (OPB->_int < 0 || OPB->_int + 2 >= progs->entityfields) if (pr_boundscheck->int_val
{ && (OPB->_int < 0
|| OPB->_int + 2 >= progs->entityfields)) {
pr_xstatement = st - pr_statements; pr_xstatement = st - pr_statements;
PR_RunError("Progs attempted to read an invalid field in an edict\n"); PR_RunError
("Progs attempted to read an invalid field in an edict\n");
return; return;
} }
ed = PROG_TO_EDICT (OPA->edict); ed = PROG_TO_EDICT (OPA->edict);
OPC->vector[0] = ((eval_t *)((int *)&ed->v + OPB->_int))->vector[0]; OPC->vector[0] =
OPC->vector[1] = ((eval_t *)((int *)&ed->v + OPB->_int))->vector[1]; ((eval_t *) ((int *) &ed->v + OPB->_int))->vector[0];
OPC->vector[2] = ((eval_t *)((int *)&ed->v + OPB->_int))->vector[2]; OPC->vector[1] =
((eval_t *) ((int *) &ed->v + OPB->_int))->vector[1];
OPC->vector[2] =
((eval_t *) ((int *) &ed->v + OPB->_int))->vector[2];
break; break;
// ================== // ==================
case OP_IFNOT: case OP_IFNOT:
if (!OPA->_int) if (!OPA->_int)
st += st->b - 1; // offset the s++ st += st->b - 1; // offset the s++
break; break;
case OP_IF: case OP_IF:
if (OPA->_int) if (OPA->_int)
st += st->b - 1; // offset the s++ st += st->b - 1; // offset the s++
break; break;
case OP_GOTO: case OP_GOTO:
st += st->a - 1; // offset the s++ st += st->a - 1; // offset the s++
break; break;
case OP_CALL0: case OP_CALL0:
case OP_CALL1: case OP_CALL1:
case OP_CALL2: case OP_CALL2:
@ -672,12 +684,12 @@ void PR_ExecuteProgram (func_t fnum)
pr_argc = st->op - OP_CALL0; pr_argc = st->op - OP_CALL0;
if (!OPA->function) if (!OPA->function)
PR_RunError ("NULL function"); PR_RunError ("NULL function");
newf = &pr_functions[OPA->function]; newf = &pr_functions[OPA->function];
if (newf->first_statement < 0) { // negative
if (newf->first_statement < 0) // statements are
{ // negative statements are built in functions // built in functions
int i = -newf->first_statement; int i = -newf->first_statement;
if (i >= pr_numbuiltins) if (i >= pr_numbuiltins)
PR_RunError ("Bad builtin call number"); PR_RunError ("Bad builtin call number");
pr_builtins[i] (); pr_builtins[i] ();
@ -686,328 +698,23 @@ void PR_ExecuteProgram (func_t fnum)
st = &pr_statements[PR_EnterFunction (newf)]; st = &pr_statements[PR_EnterFunction (newf)];
break; break;
case OP_DONE: case OP_DONE:
case OP_RETURN: case OP_RETURN:
pr_globals[OFS_RETURN] = pr_globals[(unsigned short) st->a]; pr_globals[OFS_RETURN] = pr_globals[(unsigned short) st->a];
pr_globals[OFS_RETURN+1] = pr_globals[(unsigned short) st->a+1]; pr_globals[OFS_RETURN + 1] =
pr_globals[OFS_RETURN+2] = pr_globals[(unsigned short) st->a+2]; pr_globals[(unsigned short) st->a + 1];
pr_globals[OFS_RETURN + 2] =
pr_globals[(unsigned short) st->a + 2];
st = &pr_statements[PR_LeaveFunction ()]; st = &pr_statements[PR_LeaveFunction ()];
if (pr_depth == exitdepth) if (pr_depth == exitdepth)
return; // all done return; // all done
break; break;
case OP_STATE: case OP_STATE:
ed = PROG_TO_EDICT (pr_global_struct->self); ed = PROG_TO_EDICT (pr_global_struct->self);
ed->v.nextthink = pr_global_struct->time + 0.1; ed->v.nextthink = pr_global_struct->time + 0.1;
ed->v.frame = OPA->_float; ed->v.frame = OPA->_float;
ed->v.think = OPB->function; ed->v.think = OPB->function;
break; break;
default:
pr_xstatement = st - pr_statements;
PR_RunError ("Bad opcode %i", st->op);
}
}
}
else
{
while (1)
{
st++;
if (++profile > 1000000) // LordHavoc: increased runaway loop limit 10x
{
pr_xstatement = st - pr_statements;
PR_RunError ("runaway loop error");
}
if (pr_trace)
PR_PrintStatement (st);
switch (st->op)
{
case OP_ADD_F:
OPC->_float = OPA->_float + OPB->_float;
break;
case OP_ADD_V:
OPC->vector[0] = OPA->vector[0] + OPB->vector[0];
OPC->vector[1] = OPA->vector[1] + OPB->vector[1];
OPC->vector[2] = OPA->vector[2] + OPB->vector[2];
break;
case OP_SUB_F:
OPC->_float = OPA->_float - OPB->_float;
break;
case OP_SUB_V:
OPC->vector[0] = OPA->vector[0] - OPB->vector[0];
OPC->vector[1] = OPA->vector[1] - OPB->vector[1];
OPC->vector[2] = OPA->vector[2] - OPB->vector[2];
break;
case OP_MUL_F:
OPC->_float = OPA->_float * OPB->_float;
break;
case OP_MUL_V:
OPC->_float = OPA->vector[0]*OPB->vector[0] + OPA->vector[1]*OPB->vector[1] + OPA->vector[2]*OPB->vector[2];
break;
case OP_MUL_FV:
OPC->vector[0] = OPA->_float * OPB->vector[0];
OPC->vector[1] = OPA->_float * OPB->vector[1];
OPC->vector[2] = OPA->_float * OPB->vector[2];
break;
case OP_MUL_VF:
OPC->vector[0] = OPB->_float * OPA->vector[0];
OPC->vector[1] = OPB->_float * OPA->vector[1];
OPC->vector[2] = OPB->_float * OPA->vector[2];
break;
case OP_DIV_F:
OPC->_float = OPA->_float / OPB->_float;
break;
case OP_BITAND:
OPC->_float = (int)OPA->_float & (int)OPB->_float;
break;
case OP_BITOR:
OPC->_float = (int)OPA->_float | (int)OPB->_float;
break;
case OP_GE:
OPC->_float = OPA->_float >= OPB->_float;
break;
case OP_LE:
OPC->_float = OPA->_float <= OPB->_float;
break;
case OP_GT:
OPC->_float = OPA->_float > OPB->_float;
break;
case OP_LT:
OPC->_float = OPA->_float < OPB->_float;
break;
case OP_AND:
OPC->_float = OPA->_float && OPB->_float;
break;
case OP_OR:
OPC->_float = OPA->_float || OPB->_float;
break;
case OP_NOT_F:
OPC->_float = !OPA->_float;
break;
case OP_NOT_V:
OPC->_float = !OPA->vector[0] && !OPA->vector[1] && !OPA->vector[2];
break;
case OP_NOT_S:
OPC->_float = !OPA->string || !*PR_GetString(OPA->string);
break;
case OP_NOT_FNC:
OPC->_float = !OPA->function;
break;
case OP_NOT_ENT:
OPC->_float = (PROG_TO_EDICT(OPA->edict) == sv.edicts);
break;
case OP_EQ_F:
OPC->_float = OPA->_float == OPB->_float;
break;
case OP_EQ_V:
OPC->_float = (OPA->vector[0] == OPB->vector[0]) && (OPA->vector[1] == OPB->vector[1]) && (OPA->vector[2] == OPB->vector[2]);
break;
case OP_EQ_S:
OPC->_float = !strcmp(PR_GetString(OPA->string), PR_GetString(OPB->string));
break;
case OP_EQ_E:
OPC->_float = OPA->_int == OPB->_int;
break;
case OP_EQ_FNC:
OPC->_float = OPA->function == OPB->function;
break;
case OP_NE_F:
OPC->_float = OPA->_float != OPB->_float;
break;
case OP_NE_V:
OPC->_float = (OPA->vector[0] != OPB->vector[0]) || (OPA->vector[1] != OPB->vector[1]) || (OPA->vector[2] != OPB->vector[2]);
break;
case OP_NE_S:
OPC->_float = strcmp(PR_GetString(OPA->string), PR_GetString(OPB->string));
break;
case OP_NE_E:
OPC->_float = OPA->_int != OPB->_int;
break;
case OP_NE_FNC:
OPC->_float = OPA->function != OPB->function;
break;
//==================
case OP_STORE_F:
case OP_STORE_ENT:
case OP_STORE_FLD: // integers
case OP_STORE_S:
case OP_STORE_FNC: // pointers
OPB->_int = OPA->_int;
break;
case OP_STORE_V:
OPB->vector[0] = OPA->vector[0];
OPB->vector[1] = OPA->vector[1];
OPB->vector[2] = OPA->vector[2];
break;
case OP_STOREP_F:
case OP_STOREP_ENT:
case OP_STOREP_FLD: // integers
case OP_STOREP_S:
case OP_STOREP_FNC: // pointers
if (OPB->_int < 0 || OPB->_int + 4 > pr_edictareasize)
{
pr_xstatement = st - pr_statements;
PR_RunError("Progs attempted to write to an out of bounds edict\n");
return;
}
if (OPB->_int % pr_edict_size < ((byte *)&sv.edicts->v - (byte *)sv.edicts))
{
pr_xstatement = st - pr_statements;
PR_RunError("Progs attempted to write to an engine edict field\n");
return;
}
ptr = (eval_t *)((byte *)sv.edicts + OPB->_int);
ptr->_int = OPA->_int;
break;
case OP_STOREP_V:
if (OPB->_int < 0 || OPB->_int + 12 > pr_edictareasize)
{
pr_xstatement = st - pr_statements;
PR_RunError("Progs attempted to write to an out of bounds edict\n");
return;
}
ptr = (eval_t *)((byte *)sv.edicts + OPB->_int);
ptr->vector[0] = OPA->vector[0];
ptr->vector[1] = OPA->vector[1];
ptr->vector[2] = OPA->vector[2];
break;
case OP_ADDRESS:
if (OPA->edict < 0 || OPA->edict >= pr_edictareasize)
{
pr_xstatement = st - pr_statements;
PR_RunError("Progs attempted to address an out of bounds edict\n");
return;
}
if (OPA->edict == 0 && sv.state == ss_active)
{
pr_xstatement = st - pr_statements;
PR_RunError ("assignment to world entity");
return;
}
if (OPB->_int < 0 || OPB->_int >= progs->entityfields)
{
pr_xstatement = st - pr_statements;
PR_RunError("Progs attempted to address an invalid field in an edict\n");
return;
}
ed = PROG_TO_EDICT(OPA->edict);
OPC->_int = (byte *)((int *)&ed->v + OPB->_int) - (byte *)sv.edicts;
break;
case OP_LOAD_F:
case OP_LOAD_FLD:
case OP_LOAD_ENT:
case OP_LOAD_S:
case OP_LOAD_FNC:
if (OPA->edict < 0 || OPA->edict >= pr_edictareasize)
{
pr_xstatement = st - pr_statements;
PR_RunError("Progs attempted to read an out of bounds edict number\n");
return;
}
if (OPB->_int < 0 || OPB->_int >= progs->entityfields)
{
pr_xstatement = st - pr_statements;
PR_RunError("Progs attempted to read an invalid field in an edict\n");
return;
}
ed = PROG_TO_EDICT(OPA->edict);
OPC->_int = ((eval_t *)((int *)&ed->v + OPB->_int))->_int;
break;
case OP_LOAD_V:
if (OPA->edict < 0 || OPA->edict >= pr_edictareasize)
{
pr_xstatement = st - pr_statements;
PR_RunError("Progs attempted to read an out of bounds edict number\n");
return;
}
if (OPB->_int < 0 || OPB->_int + 2 >= progs->entityfields)
{
pr_xstatement = st - pr_statements;
PR_RunError("Progs attempted to read an invalid field in an edict\n");
return;
}
ed = PROG_TO_EDICT(OPA->edict);
OPC->vector[0] = ((eval_t *)((int *)&ed->v + OPB->_int))->vector[0];
OPC->vector[1] = ((eval_t *)((int *)&ed->v + OPB->_int))->vector[1];
OPC->vector[2] = ((eval_t *)((int *)&ed->v + OPB->_int))->vector[2];
break;
//==================
case OP_IFNOT:
if (!OPA->_int)
st += st->b - 1; // offset the s++
break;
case OP_IF:
if (OPA->_int)
st += st->b - 1; // offset the s++
break;
case OP_GOTO:
st += st->a - 1; // offset the s++
break;
case OP_CALL0:
case OP_CALL1:
case OP_CALL2:
case OP_CALL3:
case OP_CALL4:
case OP_CALL5:
case OP_CALL6:
case OP_CALL7:
case OP_CALL8:
pr_xfunction->profile += profile - startprofile;
startprofile = profile;
pr_xstatement = st - pr_statements;
pr_argc = st->op - OP_CALL0;
if (!OPA->function)
PR_RunError ("NULL function");
newf = &pr_functions[OPA->function];
if (newf->first_statement < 0)
{ // negative statements are built in functions
int i = -newf->first_statement;
if (i >= pr_numbuiltins)
PR_RunError ("Bad builtin call number");
pr_builtins[i] ();
break;
}
st = &pr_statements[PR_EnterFunction (newf)];
break;
case OP_DONE:
case OP_RETURN:
pr_globals[OFS_RETURN] = pr_globals[(unsigned short) st->a];
pr_globals[OFS_RETURN+1] = pr_globals[(unsigned short) st->a+1];
pr_globals[OFS_RETURN+2] = pr_globals[(unsigned short) st->a+2];
st = &pr_statements[PR_LeaveFunction ()];
if (pr_depth == exitdepth)
return; // all done
break;
case OP_STATE:
ed = PROG_TO_EDICT(pr_global_struct->self);
ed->v.nextthink = pr_global_struct->time + 0.1;
ed->v.frame = OPA->_float;
ed->v.think = OPB->function;
break;
//==================
// LordHavoc: to be enabled when Progs version 7 (or whatever it will be numbered) is finalized // LordHavoc: to be enabled when Progs version 7 (or whatever it will be numbered) is finalized
/* /*
case OP_ADD_I: case OP_ADD_I:
@ -1045,6 +752,7 @@ void PR_ExecuteProgram (func_t fnum)
case OP_DIV_VF: case OP_DIV_VF:
{ {
float temp = 1.0f / OPB->_float; float temp = 1.0f / OPB->_float;
OPC->vector[0] = temp * OPA->vector[0]; OPC->vector[0] = temp * OPA->vector[0];
OPC->vector[1] = temp * OPA->vector[1]; OPC->vector[1] = temp * OPA->vector[1];
OPC->vector[2] = temp * OPA->vector[2]; OPC->vector[2] = temp * OPA->vector[2];
@ -1162,32 +870,37 @@ void PR_ExecuteProgram (func_t fnum)
OPB->_int = OPA->_int; OPB->_int = OPA->_int;
break; break;
case OP_STOREP_I: case OP_STOREP_I:
if (OPB->_int < 0 || OPB->_int + 4 > pr_edictareasize) if (pr_boundscheck->int_val
{ && (OPB->_int < 0 || OPB->_int + 4 > pr_edictareasize)) {
pr_xstatement = st - pr_statements; pr_xstatement = st - pr_statements;
PR_RunError("Progs attempted to write to an out of bounds edict\n"); PR_RunError
("Progs attempted to write to an out of bounds edict\n");
return; return;
} }
if (OPB->_int % pr_edict_size < ((byte *)&sv.edicts->v - (byte *)sv.edicts)) if (pr_boundscheck->int_val
{ && (OPB->_int % pr_edict_size <
((byte *) & sv.edicts->v - (byte *) sv.edicts))) {
pr_xstatement = st - pr_statements; pr_xstatement = st - pr_statements;
PR_RunError("Progs attempted to write to an engine edict field\n"); PR_RunError
("Progs attempted to write to an engine edict field\n");
return; return;
} }
ptr = (eval_t *) ((byte *) sv.edicts + OPB->_int); ptr = (eval_t *) ((byte *) sv.edicts + OPB->_int);
ptr->_int = OPA->_int; ptr->_int = OPA->_int;
break; break;
case OP_LOAD_I: case OP_LOAD_I:
if (OPA->edict < 0 || OPA->edict >= pr_edictareasize) if (pr_boundscheck->int_val
{ && (OPA->edict < 0 || OPA->edict >= pr_edictareasize)) {
pr_xstatement = st - pr_statements; pr_xstatement = st - pr_statements;
PR_RunError("Progs attempted to read an out of bounds edict number\n"); PR_RunError
("Progs attempted to read an out of bounds edict number\n");
return; return;
} }
if (OPB->_int < 0 || OPB->_int >= progs->entityfields) if (pr_boundscheck->int_val
{ && (OPB->_int < 0 || OPB->_int >= progs->entityfields)) {
pr_xstatement = st - pr_statements; pr_xstatement = st - pr_statements;
PR_RunError("Progs attempted to read an invalid field in an edict\n"); PR_RunError
("Progs attempted to read an invalid field in an edict\n");
return; return;
} }
ed = PROG_TO_EDICT (OPA->edict); ed = PROG_TO_EDICT (OPA->edict);
@ -1200,19 +913,21 @@ void PR_ExecuteProgram (func_t fnum)
case OP_GSTOREP_FLD: // integers case OP_GSTOREP_FLD: // integers
case OP_GSTOREP_S: case OP_GSTOREP_S:
case OP_GSTOREP_FNC: // pointers case OP_GSTOREP_FNC: // pointers
if (OPB->_int < 0 || OPB->_int >= pr_globaldefs) if (pr_boundscheck->int_val
{ && (OPB->_int < 0 || OPB->_int >= pr_globaldefs)) {
pr_xstatement = st - pr_statements; pr_xstatement = st - pr_statements;
PR_RunError("Progs attempted to write to an invalid indexed global\n"); PR_RunError
("Progs attempted to write to an invalid indexed global\n");
return; return;
} }
pr_globals[OPB->_int] = OPA->_float; pr_globals[OPB->_int] = OPA->_float;
break; break;
case OP_GSTOREP_V: case OP_GSTOREP_V:
if (OPB->_int < 0 || OPB->_int + 2 >= pr_globaldefs) if (pr_boundscheck->int_val
{ && (OPB->_int < 0 || OPB->_int + 2 >= pr_globaldefs)) {
pr_xstatement = st - pr_statements; pr_xstatement = st - pr_statements;
PR_RunError("Progs attempted to write to an invalid indexed global\n"); PR_RunError
("Progs attempted to write to an invalid indexed global\n");
return; return;
} }
pr_globals[OPB->_int] = OPA->vector[0]; pr_globals[OPB->_int] = OPA->vector[0];
@ -1222,10 +937,11 @@ void PR_ExecuteProgram (func_t fnum)
case OP_GADDRESS: case OP_GADDRESS:
i = OPA->_int + (int) OPB->_float; i = OPA->_int + (int) OPB->_float;
if (i < 0 || i >= pr_globaldefs) if (pr_boundscheck->int_val
{ && (i < 0 || i >= pr_globaldefs)) {
pr_xstatement = st - pr_statements; pr_xstatement = st - pr_statements;
PR_RunError("Progs attempted to address an out of bounds global\n"); PR_RunError
("Progs attempted to address an out of bounds global\n");
return; return;
} }
OPC->_float = pr_globals[i]; OPC->_float = pr_globals[i];
@ -1237,20 +953,22 @@ void PR_ExecuteProgram (func_t fnum)
case OP_GLOAD_ENT: case OP_GLOAD_ENT:
case OP_GLOAD_S: case OP_GLOAD_S:
case OP_GLOAD_FNC: case OP_GLOAD_FNC:
if (OPA->_int < 0 || OPA->_int >= pr_globaldefs) if (pr_boundscheck->int_val
{ && (OPA->_int < 0 || OPA->_int >= pr_globaldefs)) {
pr_xstatement = st - pr_statements; pr_xstatement = st - pr_statements;
PR_RunError("Progs attempted to read an invalid indexed global\n"); PR_RunError
("Progs attempted to read an invalid indexed global\n");
return; return;
} }
OPC->_float = pr_globals[OPA->_int]; OPC->_float = pr_globals[OPA->_int];
break; break;
case OP_GLOAD_V: case OP_GLOAD_V:
if (OPA->_int < 0 || OPA->_int + 2 >= pr_globaldefs) if (pr_boundscheck->int_val
{ && (OPA->_int < 0 || OPA->_int + 2 >= pr_globaldefs)) {
pr_xstatement = st - pr_statements; pr_xstatement = st - pr_statements;
PR_RunError("Progs attempted to read an invalid indexed global\n"); PR_RunError
("Progs attempted to read an invalid indexed global\n");
return; return;
} }
OPC->vector[0] = pr_globals[OPA->_int]; OPC->vector[0] = pr_globals[OPA->_int];
@ -1259,17 +977,16 @@ void PR_ExecuteProgram (func_t fnum)
break; break;
case OP_BOUNDCHECK: case OP_BOUNDCHECK:
if (OPA->_int < 0 || OPA->_int >= st->b) if (OPA->_int < 0 || OPA->_int >= st->b) {
{
pr_xstatement = st - pr_statements; pr_xstatement = st - pr_statements;
PR_RunError("Progs boundcheck failed at line number %d, value is < 0 or >= %d\n", st->b, st->c); PR_RunError
("Progs boundcheck failed at line number %d, value is < 0 or >= %d\n",
st->b, st->c);
return; return;
} }
break; break;
*/ */
//==================
default: default:
pr_xstatement = st - pr_statements; pr_xstatement = st - pr_statements;
PR_RunError ("Bad opcode %i", st->op); PR_RunError ("Bad opcode %i", st->op);
@ -1280,8 +997,8 @@ void PR_ExecuteProgram (func_t fnum)
char *pr_strtbl[MAX_PRSTR]; char *pr_strtbl[MAX_PRSTR];
int num_prstr; int num_prstr;
char *
char *PR_GetString(int num) PR_GetString (int num)
{ {
if (num < 0) { if (num < 0) {
//Con_DPrintf("GET:%d == %s\n", num, pr_strtbl[-num]); //Con_DPrintf("GET:%d == %s\n", num, pr_strtbl[-num]);
@ -1290,7 +1007,8 @@ char *PR_GetString(int num)
return pr_strings + num; return pr_strings + num;
} }
int PR_SetString(char *s) int
PR_SetString (char *s)
{ {
int i; int i;
@ -1309,5 +1027,3 @@ int PR_SetString(char *s)
} }
return (int) (s - pr_strings); return (int) (s - pr_strings);
} }