]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - pr_exec.c
gave names to nearly all structs and enums which should make for better C++ error...
[xonotic/darkplaces.git] / pr_exec.c
index 6650aa96c645d22e33ebf99a436289e6bc78c786..e44d9545184eb796e886e4515da2c581ffa96db6 100644 (file)
--- a/pr_exec.c
+++ b/pr_exec.c
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -21,27 +21,25 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "quakedef.h"
 
 
-/*
-
-*/
-
-typedef struct
+typedef struct prstack_s
 {
        int                             s;
-       dfunction_t             *f;
+       mfunction_t             *f;
 } prstack_t;
 
-#define        MAX_STACK_DEPTH         32
-prstack_t      pr_stack[MAX_STACK_DEPTH];
-int                    pr_depth;
+#define        MAX_STACK_DEPTH         256
+// stacktrace writes into pr_stack[MAX_STACK_DEPTH]
+// thus increase the array, so depth wont be overwritten
+prstack_t      pr_stack[MAX_STACK_DEPTH+1];
+int                    pr_depth = 0;
 
 #define        LOCALSTACK_SIZE         2048
 int                    localstack[LOCALSTACK_SIZE];
 int                    localstack_used;
 
 
-qboolean       pr_trace;
-dfunction_t    *pr_xfunction;
+int                    pr_trace;
+mfunction_t    *pr_xfunction;
 int                    pr_xstatement;
 
 
@@ -52,43 +50,43 @@ char *pr_opnames[] =
 "DONE",
 
 "MUL_F",
-"MUL_V", 
+"MUL_V",
 "MUL_FV",
 "MUL_VF",
+
 "DIV",
 
 "ADD_F",
-"ADD_V", 
-  
+"ADD_V",
+
 "SUB_F",
 "SUB_V",
 
 "EQ_F",
 "EQ_V",
-"EQ_S", 
+"EQ_S",
 "EQ_E",
 "EQ_FNC",
+
 "NE_F",
-"NE_V", 
+"NE_V",
 "NE_S",
-"NE_E", 
+"NE_E",
 "NE_FNC",
+
 "LE",
 "GE",
 "LT",
-"GT", 
+"GT",
 
 "INDIRECT",
 "INDIRECT",
-"INDIRECT", 
-"INDIRECT", 
 "INDIRECT",
-"INDIRECT", 
+"INDIRECT",
+"INDIRECT",
+"INDIRECT",
 
-"ADDRESS", 
+"ADDRESS",
 
 "STORE_F",
 "STORE_V",
@@ -105,16 +103,16 @@ char *pr_opnames[] =
 "STOREP_FNC",
 
 "RETURN",
-  
+
 "NOT_F",
 "NOT_V",
-"NOT_S", 
-"NOT_ENT", 
-"NOT_FNC", 
-  
+"NOT_S",
+"NOT_ENT",
+"NOT_FNC",
+
 "IF",
 "IFNOT",
-  
+
 "CALL0",
 "CALL1",
 "CALL2",
@@ -124,13 +122,13 @@ char *pr_opnames[] =
 "CALL6",
 "CALL7",
 "CALL8",
-  
+
 "STATE",
-  
-"GOTO", 
-  
+
+"GOTO",
+
 "AND",
-"OR", 
+"OR",
 
 "BITAND",
 "BITOR"
@@ -150,36 +148,36 @@ PR_PrintStatement
 void PR_PrintStatement (dstatement_t *s)
 {
        int             i;
-       
+
        if ( (unsigned)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]);
                for ( ; i<10 ; i++)
-                       Con_Print(" ");
+                       Con_Print(" ");
        }
-               
+
        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),s->b);
        else if (s->op == OP_GOTO)
        {
-               Con_Printf ("branch %i",s->a);
+               Con_Printf("branch %i",s->a);
        }
        else if ( (unsigned)(s->op - OP_STORE_F) < 6)
        {
-               Con_Printf ("%s",PR_GlobalString((unsigned short) s->a));
-               Con_Printf ("%s", PR_GlobalStringNoContents((unsigned short) s->b));
+               Con_Print(PR_GlobalString((unsigned short) s->a));
+               Con_Print(PR_GlobalStringNoContents((unsigned short) s->b));
        }
        else
        {
                if (s->a)
-                       Con_Printf ("%s",PR_GlobalString((unsigned short) s->a));
+                       Con_Print(PR_GlobalString((unsigned short) s->a));
                if (s->b)
-                       Con_Printf ("%s",PR_GlobalString((unsigned short) s->b));
+                       Con_Print(PR_GlobalString((unsigned short) s->b));
                if (s->c)
-                       Con_Printf ("%s", PR_GlobalStringNoContents((unsigned short) s->c));
+                       Con_Print(PR_GlobalStringNoContents((unsigned short) s->c));
        }
-       Con_Print("\n");
+       Con_Print("\n");
 }
 
 /*
@@ -189,26 +187,19 @@ PR_StackTrace
 */
 void PR_StackTrace (void)
 {
-       dfunction_t     *f;
+       mfunction_t     *f;
        int                     i;
-       
-       if (pr_depth == 0)
-       {
-               Con_Printf ("<NO STACK>\n");
-               return;
-       }
-       
+
+       pr_stack[pr_depth].s = pr_xstatement;
        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;
-               
+
                if (!f)
-               {
-                       Con_Printf ("<NO FUNCTION>\n");
-               }
+                       Con_Print("<NULL FUNCTION>\n");
                else
-                       Con_Printf ("%12s : %s\n", pr_strings + f->s_file, pr_strings + f->s_name);             
+                       Con_Printf("%12s : %s : statement %i\n", PRVM_GetString(f->s_file), PRVM_GetString(f->s_name), pr_stack[i].s - f->first_statement);
        }
 }
 
@@ -221,19 +212,28 @@ PR_Profile_f
 */
 void PR_Profile_f (void)
 {
-       dfunction_t     *f, *best;
-       int                     max;
-       int                     num;
-       int                     i;
-       
-       num = 0;        
+       mfunction_t *f, *best;
+       int i, num, max/*, howmany*/;
+
+       if (!sv.active)
+       {
+               Con_Printf("no server running, can't profile\n");
+               return;
+       }
+
+       Con_Print( "Server Profile:\n[Profile] [BuiltinProfile] [CallCount]\n" );
+
+       //howmany = 10;
+       //if (Cmd_Argc() == 2)
+       //      howmany = atoi(Cmd_Argv(1));
+       num = 0;
        do
        {
                max = 0;
                best = NULL;
                for (i=0 ; i<progs->numfunctions ; i++)
                {
-                       f = &pr_functions[i];
+                       f = &prog->functions[i];
                        if (f->profile > max)
                        {
                                max = f->profile;
@@ -242,43 +242,45 @@ void PR_Profile_f (void)
                }
                if (best)
                {
-                       if (num < 10)
-                               Con_Printf ("%7i %s\n", best->profile, pr_strings+best->s_name);
+                       //if (num < howmany)
+                               Con_Printf("%7i %7i %7i %s\n", best->profile, best->builtinsprofile, best->callcount, PRVM_GetString(best->s_name));
                        num++;
                        best->profile = 0;
+                       best->builtinsprofile = 0;
                }
        } while (best);
 }
 
-
-/*
-============
-PR_RunError
-
-Aborts the currently executing function
-============
-*/
-void PR_RunError (char *error, ...)
+void PR_PrintState(void)
 {
-       va_list         argptr;
-       char            string[1024];
-
-       va_start (argptr,error);
-       vsprintf (string,error,argptr);
-       va_end (argptr);
-
-       PR_PrintStatement (pr_statements + pr_xstatement);
+       int i;
+       if (pr_xfunction)
+       {
+               for (i = -7;i <= 0;i++)
+                       if (pr_xstatement + i >= pr_xfunction->first_statement)
+                               PR_PrintStatement (pr_statements + pr_xstatement + i);
+       }
+       else
+               Con_Print("null function executing??\n");
        PR_StackTrace ();
-       Con_Printf ("%s\n", string);
-       
-       pr_depth = 0;           // dump the stack so host_error can shutdown functions
+}
+
+void PR_Crash(void)
+{
+       if (pr_depth > 0)
+       {
+               Con_Print("QuakeC crash report:\n");
+               PR_PrintState();
+       }
 
-       Host_Error ("Program error");
+       // dump the stack so host_error can shutdown functions
+       pr_depth = 0;
+       localstack_used = 0;
 }
 
 /*
 ============================================================================
-PR_ExecuteProgram
+PRVM_ExecuteProgram
 
 The interpretation main loop
 ============================================================================
@@ -291,20 +293,23 @@ PR_EnterFunction
 Returns the new program statement counter
 ====================
 */
-int PR_EnterFunction (dfunction_t *f)
+int PR_EnterFunction (mfunction_t *f)
 {
        int             i, j, c, o;
 
+       if (!f)
+               Host_Error ("PR_EnterFunction: NULL function\n");
+
        pr_stack[pr_depth].s = pr_xstatement;
-       pr_stack[pr_depth].f = pr_xfunction;    
+       pr_stack[pr_depth].f = pr_xfunction;
        pr_depth++;
        if (pr_depth >= MAX_STACK_DEPTH)
-               PR_RunError ("stack overflow");
+               Host_Error ("stack overflow");
 
 // save off any locals that the new function steps on
        c = f->locals;
        if (localstack_used + c > LOCALSTACK_SIZE)
-               PR_RunError ("PR_ExecuteProgram: locals stack overflow\n");
+               Host_Error ("PRVM_ExecuteProgram: locals stack overflow\n");
 
        for (i=0 ; i < c ; i++)
                localstack[localstack_used+i] = ((int *)pr_globals)[f->parm_start + i];
@@ -337,11 +342,13 @@ int PR_LeaveFunction (void)
        if (pr_depth <= 0)
                Host_Error ("prog stack underflow");
 
+       if (!pr_xfunction)
+               Host_Error ("PR_LeaveFunction: NULL function\n");
 // restore locals from the stack
        c = pr_xfunction->locals;
        localstack_used -= c;
        if (localstack_used < 0)
-               PR_RunError ("PR_ExecuteProgram: locals stack underflow\n");
+               Host_Error ("PRVM_ExecuteProgram: locals stack underflow\n");
 
        for (i=0 ; i < c ; i++)
                ((int *)pr_globals)[pr_xfunction->parm_start + i] = localstack[localstack_used+i];
@@ -352,1221 +359,85 @@ int PR_LeaveFunction (void)
        return pr_stack[pr_depth].s;
 }
 
+void PR_ReInitStrings (void);
+void PR_Execute_ProgsLoaded(void)
+{
+       // dump the stack
+       pr_depth = 0;
+       localstack_used = 0;
+       // reset the string table
+       PR_ReInitStrings();
+}
 
 /*
 ====================
-PR_ExecuteProgram
+PRVM_ExecuteProgram
 ====================
 */
-/*
-void PR_ExecuteProgram (func_t fnum)
-{
-       eval_t  *a, *b, *c;
-       int                     s;
-       dstatement_t    *st;
-       dfunction_t     *f, *newf;
-       int             runaway;
-       int             i;
-       edict_t *ed;
-       int             exitdepth;
-       eval_t  *ptr;
-
-       if (!fnum || fnum >= progs->numfunctions)
-       {
-               if (pr_global_struct->self)
-                       ED_Print (PROG_TO_EDICT(pr_global_struct->self));
-               Host_Error ("PR_ExecuteProgram: NULL function");
-       }
-       
-       f = &pr_functions[fnum];
-
-       runaway = 100000;
-       pr_trace = false;
-
-// make a stack frame
-       exitdepth = pr_depth;
-
-       s = PR_EnterFunction (f);
-       
-while (1)
-{
-       s++;    // next statement
-
-       st = &pr_statements[s];
-       // LordHavoc: fix for 32768 QC def limit (just added unsigned short typecast)
-       a = (eval_t *)&pr_globals[(unsigned short) st->a];
-       b = (eval_t *)&pr_globals[(unsigned short) st->b];
-       c = (eval_t *)&pr_globals[(unsigned short) st->c];
-       
-       if (!--runaway)
-               PR_RunError ("runaway loop error");
-               
-       pr_xfunction->profile++;
-       pr_xstatement = s;
-       
-       if (pr_trace)
-               PR_PrintStatement (st);
-               
-       switch (st->op)
-       {
-       case OP_ADD_F:
-               c->_float = a->_float + b->_float;
-               break;
-       case OP_ADD_V:
-               c->vector[0] = a->vector[0] + b->vector[0];
-               c->vector[1] = a->vector[1] + b->vector[1];
-               c->vector[2] = a->vector[2] + b->vector[2];
-               break;
-               
-       case OP_SUB_F:
-               c->_float = a->_float - b->_float;
-               break;
-       case OP_SUB_V:
-               c->vector[0] = a->vector[0] - b->vector[0];
-               c->vector[1] = a->vector[1] - b->vector[1];
-               c->vector[2] = a->vector[2] - b->vector[2];
-               break;
-
-       case OP_MUL_F:
-               c->_float = a->_float * b->_float;
-               break;
-       case OP_MUL_V:
-               c->_float = a->vector[0]*b->vector[0]
-                               + a->vector[1]*b->vector[1]
-                               + a->vector[2]*b->vector[2];
-               break;
-       case OP_MUL_FV:
-               c->vector[0] = a->_float * b->vector[0];
-               c->vector[1] = a->_float * b->vector[1];
-               c->vector[2] = a->_float * b->vector[2];
-               break;
-       case OP_MUL_VF:
-               c->vector[0] = b->_float * a->vector[0];
-               c->vector[1] = b->_float * a->vector[1];
-               c->vector[2] = b->_float * a->vector[2];
-               break;
-
-       case OP_DIV_F:
-               c->_float = a->_float / b->_float;
-               break;
-       
-       case OP_BITAND:
-               c->_float = (int)a->_float & (int)b->_float;
-               break;
-       
-       case OP_BITOR:
-               c->_float = (int)a->_float | (int)b->_float;
-               break;
-       
-               
-       case OP_GE:
-               c->_float = a->_float >= b->_float;
-               break;
-       case OP_LE:
-               c->_float = a->_float <= b->_float;
-               break;
-       case OP_GT:
-               c->_float = a->_float > b->_float;
-               break;
-       case OP_LT:
-               c->_float = a->_float < b->_float;
-               break;
-       case OP_AND:
-               c->_float = a->_float && b->_float;
-               break;
-       case OP_OR:
-               c->_float = a->_float || b->_float;
-               break;
-               
-       case OP_NOT_F:
-               c->_float = !a->_float;
-               break;
-       case OP_NOT_V:
-               c->_float = !a->vector[0] && !a->vector[1] && !a->vector[2];
-               break;
-       case OP_NOT_S:
-               c->_float = !a->string || !pr_strings[a->string];
-               break;
-       case OP_NOT_FNC:
-               c->_float = !a->function;
-               break;
-       case OP_NOT_ENT:
-               c->_float = (PROG_TO_EDICT(a->edict) == sv.edicts);
-               break;
-
-       case OP_EQ_F:
-               c->_float = a->_float == b->_float;
-               break;
-       case OP_EQ_V:
-               c->_float = (a->vector[0] == b->vector[0]) &&
-                                       (a->vector[1] == b->vector[1]) &&
-                                       (a->vector[2] == b->vector[2]);
-               break;
-       case OP_EQ_S:
-               c->_float = !strcmp(pr_strings+a->string,pr_strings+b->string);
-               break;
-       case OP_EQ_E:
-               c->_float = a->_int == b->_int;
-               break;
-       case OP_EQ_FNC:
-               c->_float = a->function == b->function;
-               break;
-
-
-       case OP_NE_F:
-               c->_float = a->_float != b->_float;
-               break;
-       case OP_NE_V:
-               c->_float = (a->vector[0] != b->vector[0]) ||
-                                       (a->vector[1] != b->vector[1]) ||
-                                       (a->vector[2] != b->vector[2]);
-               break;
-       case OP_NE_S:
-               c->_float = strcmp(pr_strings+a->string,pr_strings+b->string);
-               break;
-       case OP_NE_E:
-               c->_float = a->_int != b->_int;
-               break;
-       case OP_NE_FNC:
-               c->_float = a->function != b->function;
-               break;
-
-//==================
-       case OP_STORE_F:
-       case OP_STORE_ENT:
-       case OP_STORE_FLD:              // integers
-       case OP_STORE_S:
-       case OP_STORE_FNC:              // pointers
-               b->_int = a->_int;
-               break;
-       case OP_STORE_V:
-               b->vector[0] = a->vector[0];
-               b->vector[1] = a->vector[1];
-               b->vector[2] = a->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
-               ptr = (eval_t *)((byte *)sv.edicts + b->_int);
-               ptr->_int = a->_int;
-               break;
-       case OP_STOREP_V:
-               ptr = (eval_t *)((byte *)sv.edicts + b->_int);
-               ptr->vector[0] = a->vector[0];
-               ptr->vector[1] = a->vector[1];
-               ptr->vector[2] = a->vector[2];
-               break;
-               
-       case OP_ADDRESS:
-               ed = PROG_TO_EDICT(a->edict);
-#ifdef PARANOID
-               NUM_FOR_EDICT(ed);              // make sure it's in range
-#endif
-               if (ed == (edict_t *)sv.edicts && sv.state == ss_active)
-                       PR_RunError ("assignment to world entity");
-               c->_int = (byte *)((int *)&ed->v + b->_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:
-               ed = PROG_TO_EDICT(a->edict);
-#ifdef PARANOID
-               NUM_FOR_EDICT(ed);              // make sure it's in range
-#endif
-               a = (eval_t *)((int *)&ed->v + b->_int);
-               c->_int = a->_int;
-               break;
-
-       case OP_LOAD_V:
-               ed = PROG_TO_EDICT(a->edict);
-#ifdef PARANOID
-               NUM_FOR_EDICT(ed);              // make sure it's in range
-#endif
-               a = (eval_t *)((int *)&ed->v + b->_int);
-               c->vector[0] = a->vector[0];
-               c->vector[1] = a->vector[1];
-               c->vector[2] = a->vector[2];
-               break;
-               
-//==================
-
-       case OP_IFNOT:
-               if (!a->_int)
-                       s += st->b - 1; // offset the s++
-               break;
-               
-       case OP_IF:
-               if (a->_int)
-                       s += st->b - 1; // offset the s++
-               break;
-               
-       case OP_GOTO:
-               s += 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_argc = st->op - OP_CALL0;
-               if (!a->function)
-                       PR_RunError ("NULL function");
-
-               newf = &pr_functions[a->function];
-
-               if (newf->first_statement < 0)
-               {       // negative statements are built in functions
-                       i = -newf->first_statement;
-                       if (i >= pr_numbuiltins)
-                               PR_RunError ("Bad builtin call number");
-                       pr_builtins[i] ();
-                       break;
-               }
-
-               s = PR_EnterFunction (newf);
-               break;
-
-       case OP_DONE:
-       case OP_RETURN:
-               pr_globals[OFS_RETURN] = pr_globals[st->a];
-               pr_globals[OFS_RETURN+1] = pr_globals[st->a+1];
-               pr_globals[OFS_RETURN+2] = pr_globals[st->a+2];
-       
-               s = PR_LeaveFunction ();
-               if (pr_depth == exitdepth)
-                       return;         // all done
-               break;
-               
-       case OP_STATE:
-               ed = PROG_TO_EDICT(pr_global_struct->self);
-#ifdef FPS_20
-               ed->v.nextthink = pr_global_struct->time + 0.05;
-#else
-               ed->v.nextthink = pr_global_struct->time + 0.1;
-#endif
-               //if (a->_float != ed->v.frame) // LordHavoc: this was silly
-               //{
-                       ed->v.frame = a->_float;
-               //}
-               ed->v.think = b->function;
-               break;
-               
-       default:
-               PR_RunError ("Bad opcode %i", st->op);
-       }
-}
-
-}
-*/
-
 // LordHavoc: optimized
-#define OPA ((eval_t *)&pr_globals[(unsigned short) st->a])
-#define OPB ((eval_t *)&pr_globals[(unsigned short) st->b])
-#define OPC ((eval_t *)&pr_globals[(unsigned short) st->c])
+#define OPA ((prvm_eval_t *)&pr_globals[(unsigned short) st->a])
+#define OPB ((prvm_eval_t *)&pr_globals[(unsigned short) st->b])
+#define OPC ((prvm_eval_t *)&pr_globals[(unsigned short) st->c])
 extern cvar_t pr_boundscheck;
-void PR_ExecuteProgram (func_t fnum)
+extern cvar_t pr_traceqc;
+void PRVM_ExecuteProgram (func_t fnum, const char *errormessage)
 {
        dstatement_t    *st;
-       dfunction_t     *f, *newf;
-       edict_t *ed;
-       int             exitdepth;
-       eval_t  *ptr;
-       int             profile, startprofile;
+       mfunction_t     *f, *newf;
+       prvm_edict_t    *ed;
+       prvm_eval_t     *ptr;
+       int             profile, startprofile, cachedpr_trace, exitdepth;
 
-       if (!fnum || fnum >= progs->numfunctions)
+       if (!fnum || fnum >= (unsigned) progs->numfunctions)
        {
-               if (pr_global_struct->self)
-                       ED_Print (PROG_TO_EDICT(pr_global_struct->self));
-               Host_Error ("PR_ExecuteProgram: NULL function");
+               if (prog->globals.server->self)
+                       ED_Print(PRVM_PROG_TO_EDICT(prog->globals.server->self));
+               Host_Error ("PRVM_ExecuteProgram: %s", errormessage);
        }
-       
-       f = &pr_functions[fnum];
 
-       pr_trace = false;
+       f = &prog->functions[fnum];
 
-// make a stack frame
+       pr_trace = pr_traceqc.integer;
+
+       // we know we're done when pr_depth drops to this
        exitdepth = pr_depth;
 
+// make a stack frame
        st = &pr_statements[PR_EnterFunction (f)];
        startprofile = profile = 0;
 
-       if (pr_boundscheck.value)
+chooseexecprogram:
+       cachedpr_trace = pr_trace;
+       if (pr_boundscheck.integer)
        {
-               while (1)
+#define PRBOUNDSCHECK 1
+               if (pr_trace)
                {
-                       st++;
-                       if (++profile > 1000000) // LordHavoc: increased runaway loop limited 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_strings[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_strings+OPA->string,pr_strings+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_strings+OPA->string,pr_strings+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);
-               #ifdef FPS_20
-                               ed->v.nextthink = pr_global_struct->time + 0.05;
-               #else
-                               ed->v.nextthink = pr_global_struct->time + 0.1;
-               #endif
-                               ed->v.frame = OPA->_float;
-                               ed->v.think = OPB->function;
-                               break;
-                               
-                       default:
-                               pr_xstatement = st - pr_statements;
-                               PR_RunError ("Bad opcode %i", st->op);
-                       }
+#define PRTRACE 1
+#include "pr_execprogram.h"
+               }
+               else
+               {
+#undef PRTRACE
+#include "pr_execprogram.h"
                }
        }
        else
        {
-               while (1)
+#undef PRBOUNDSCHECK
+               if (pr_trace)
                {
-                       st++;
-                       if (++profile > 1000000) // LordHavoc: increased runaway loop limited 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_strings[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_strings+OPA->string,pr_strings+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_strings+OPA->string,pr_strings+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);
-               #ifdef FPS_20
-                               ed->v.nextthink = pr_global_struct->time + 0.05;
-               #else
-                               ed->v.nextthink = pr_global_struct->time + 0.1;
-               #endif
-                               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
-/*
-                       case OP_ADD_I:
-                               OPC->_int = OPA->_int + OPB->_int;
-                               break;
-                       case OP_ADD_IF:
-                               OPC->_int = OPA->_int + (int) OPB->_float;
-                               break;
-                       case OP_ADD_FI:
-                               OPC->_float = OPA->_float + (float) OPB->_int;
-                               break;
-                       case OP_SUB_I:
-                               OPC->_int = OPA->_int - OPB->_int;
-                               break;
-                       case OP_SUB_IF:
-                               OPC->_int = OPA->_int - (int) OPB->_float;
-                               break;
-                       case OP_SUB_FI:
-                               OPC->_float = OPA->_float - (float) OPB->_int;
-                               break;
-                       case OP_MUL_I:
-                               OPC->_int = OPA->_int * OPB->_int;
-                               break;
-                       case OP_MUL_IF:
-                               OPC->_int = OPA->_int * (int) OPB->_float;
-                               break;
-                       case OP_MUL_FI:
-                               OPC->_float = OPA->_float * (float) OPB->_int;
-                               break;
-                       case OP_MUL_VI:
-                               OPC->vector[0] = (float) OPB->_int * OPA->vector[0];
-                               OPC->vector[1] = (float) OPB->_int * OPA->vector[1];
-                               OPC->vector[2] = (float) OPB->_int * OPA->vector[2];
-                               break;
-                       case OP_DIV_VF:
-                               {
-                                       float temp = 1.0f / OPB->_float;
-                                       OPC->vector[0] = temp * OPA->vector[0];
-                                       OPC->vector[1] = temp * OPA->vector[1];
-                                       OPC->vector[2] = temp * OPA->vector[2];
-                               }
-                               break;
-                       case OP_DIV_I:
-                               OPC->_int = OPA->_int / OPB->_int;
-                               break;
-                       case OP_DIV_IF:
-                               OPC->_int = OPA->_int / (int) OPB->_float;
-                               break;
-                       case OP_DIV_FI:
-                               OPC->_float = OPA->_float / (float) OPB->_int;
-                               break;
-                       case OP_BITAND_I:
-                               OPC->_int = OPA->_int & OPB->_int;
-                               break;
-                       case OP_BITOR_I:
-                               OPC->_int = OPA->_int | OPB->_int;
-                               break;
-                       case OP_BITAND_IF:
-                               OPC->_int = OPA->_int & (int)OPB->_float;
-                               break;
-                       case OP_BITOR_IF:
-                               OPC->_int = OPA->_int | (int)OPB->_float;
-                               break;
-                       case OP_BITAND_FI:
-                               OPC->_float = (int)OPA->_float & OPB->_int;
-                               break;
-                       case OP_BITOR_FI:
-                               OPC->_float = (int)OPA->_float | OPB->_int;
-                               break;
-                       case OP_GE_I:
-                               OPC->_float = OPA->_int >= OPB->_int;
-                               break;
-                       case OP_LE_I:
-                               OPC->_float = OPA->_int <= OPB->_int;
-                               break;
-                       case OP_GT_I:
-                               OPC->_float = OPA->_int > OPB->_int;
-                               break;
-                       case OP_LT_I:
-                               OPC->_float = OPA->_int < OPB->_int;
-                               break;
-                       case OP_AND_I:
-                               OPC->_float = OPA->_int && OPB->_int;
-                               break;
-                       case OP_OR_I:
-                               OPC->_float = OPA->_int || OPB->_int;
-                               break;
-                       case OP_GE_IF:
-                               OPC->_float = (float)OPA->_int >= OPB->_float;
-                               break;
-                       case OP_LE_IF:
-                               OPC->_float = (float)OPA->_int <= OPB->_float;
-                               break;
-                       case OP_GT_IF:
-                               OPC->_float = (float)OPA->_int > OPB->_float;
-                               break;
-                       case OP_LT_IF:
-                               OPC->_float = (float)OPA->_int < OPB->_float;
-                               break;
-                       case OP_AND_IF:
-                               OPC->_float = (float)OPA->_int && OPB->_float;
-                               break;
-                       case OP_OR_IF:
-                               OPC->_float = (float)OPA->_int || OPB->_float;
-                               break;
-                       case OP_GE_FI:
-                               OPC->_float = OPA->_float >= (float)OPB->_int;
-                               break;
-                       case OP_LE_FI:
-                               OPC->_float = OPA->_float <= (float)OPB->_int;
-                               break;
-                       case OP_GT_FI:
-                               OPC->_float = OPA->_float > (float)OPB->_int;
-                               break;
-                       case OP_LT_FI:
-                               OPC->_float = OPA->_float < (float)OPB->_int;
-                               break;
-                       case OP_AND_FI:
-                               OPC->_float = OPA->_float && (float)OPB->_int;
-                               break;
-                       case OP_OR_FI:
-                               OPC->_float = OPA->_float || (float)OPB->_int;
-                               break;
-                       case OP_NOT_I:
-                               OPC->_float = !OPA->_int;
-                               break;
-                       case OP_EQ_I:
-                               OPC->_float = OPA->_int == OPB->_int;
-                               break;
-                       case OP_EQ_IF:
-                               OPC->_float = (float)OPA->_int == OPB->_float;
-                               break;
-                       case OP_EQ_FI:
-                               OPC->_float = OPA->_float == (float)OPB->_int;
-                               break;
-                       case OP_NE_I:
-                               OPC->_float = OPA->_int != OPB->_int;
-                               break;
-                       case OP_NE_IF:
-                               OPC->_float = (float)OPA->_int != OPB->_float;
-                               break;
-                       case OP_NE_FI:
-                               OPC->_float = OPA->_float != (float)OPB->_int;
-                               break;
-                       case OP_STORE_I:
-                               OPB->_int = OPA->_int;
-                               break;
-                       case OP_STOREP_I:
-                               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_LOAD_I:
-                               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_GSTOREP_I:
-                       case OP_GSTOREP_F:
-                       case OP_GSTOREP_ENT:
-                       case OP_GSTOREP_FLD:            // integers
-                       case OP_GSTOREP_S:
-                       case OP_GSTOREP_FNC:            // pointers
-                               if (OPB->_int < 0 || OPB->_int >= pr_globaldefs)
-                               {
-                                       pr_xstatement = st - pr_statements;
-                                       PR_RunError("Progs attempted to write to an invalid indexed global\n");
-                                       return;
-                               }
-                               pr_globals[OPB->_int] = OPA->_float;
-                               break;
-                       case OP_GSTOREP_V:
-                               if (OPB->_int < 0 || OPB->_int + 2 >= pr_globaldefs)
-                               {
-                                       pr_xstatement = st - pr_statements;
-                                       PR_RunError("Progs attempted to write to an invalid indexed global\n");
-                                       return;
-                               }
-                               pr_globals[OPB->_int  ] = OPA->vector[0];
-                               pr_globals[OPB->_int+1] = OPA->vector[1];
-                               pr_globals[OPB->_int+2] = OPA->vector[2];
-                               break;
-                               
-                       case OP_GADDRESS:
-                               i = OPA->_int + (int) OPB->_float;
-                               if (i < 0 || i >= pr_globaldefs)
-                               {
-                                       pr_xstatement = st - pr_statements;
-                                       PR_RunError("Progs attempted to address an out of bounds global\n");
-                                       return;
-                               }
-                               OPC->_float = pr_globals[i];
-                               break;
-                               
-                       case OP_GLOAD_I:
-                       case OP_GLOAD_F:
-                       case OP_GLOAD_FLD:
-                       case OP_GLOAD_ENT:
-                       case OP_GLOAD_S:
-                       case OP_GLOAD_FNC:
-                               if (OPA->_int < 0 || OPA->_int >= pr_globaldefs)
-                               {
-                                       pr_xstatement = st - pr_statements;
-                                       PR_RunError("Progs attempted to read an invalid indexed global\n");
-                                       return;
-                               }
-                               OPC->_float = pr_globals[OPA->_int];
-                               break;
-
-                       case OP_GLOAD_V:
-                               if (OPA->_int < 0 || OPA->_int + 2 >= pr_globaldefs)
-                               {
-                                       pr_xstatement = st - pr_statements;
-                                       PR_RunError("Progs attempted to read an invalid indexed global\n");
-                                       return;
-                               }
-                               OPC->vector[0] = pr_globals[OPA->_int  ];
-                               OPC->vector[1] = pr_globals[OPA->_int+1];
-                               OPC->vector[2] = pr_globals[OPA->_int+2];
-                               break;
-
-                       case OP_BOUNDCHECK:
-                               if (OPA->_int < 0 || OPA->_int >= st->b)
-                               {
-                                       pr_xstatement = st - pr_statements;
-                                       PR_RunError("Progs boundcheck failed at line number %d, value is < 0 or >= %d\n", st->b, st->c);
-                                       return;
-                               }
-                               break;
-
-*/
-               //==================
-
-                       default:
-                               pr_xstatement = st - pr_statements;
-                               PR_RunError ("Bad opcode %i", st->op);
-                       }
+#define PRTRACE 1
+#include "pr_execprogram.h"
+               }
+               else
+               {
+#undef PRTRACE
+#include "pr_execprogram.h"
                }
        }
 }
+
+void PR_ReInitStrings (void)
+{
+}