X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=prvm_exec.c;h=37daaaa252f19ccf84039862a5c2cd5c9d305c40;hp=97130220029d56a6a55f86bebe5a486658edac58;hb=1ff3bc8e953680793a28ea923f2d1e58cdf2c9f0;hpb=e75c24b1e8be6f18dfb33ac2d3b6f860457d64d4

diff --git a/prvm_exec.c b/prvm_exec.c
index 97130220..37daaaa2 100644
--- a/prvm_exec.c
+++ b/prvm_exec.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "quakedef.h"
 #include "progsvm.h"
 
-char *prvm_opnames[] =
+const char *prvm_opnames[] =
 {
 "^5DONE",
 
@@ -110,9 +110,6 @@ char *prvm_opnames[] =
 "BITOR"
 };
 
-char *PRVM_GlobalString (int ofs);
-char *PRVM_GlobalStringNoContents (int ofs);
-extern ddef_t *PRVM_ED_FieldAtOfs(int ofs);
 
 
 //=============================================================================
@@ -122,15 +119,23 @@ extern ddef_t *PRVM_ED_FieldAtOfs(int ofs);
 PRVM_PrintStatement
 =================
 */
+extern cvar_t prvm_coverage;
 extern cvar_t prvm_statementprofiling;
-void PRVM_PrintStatement (dstatement_t *s)
+extern cvar_t prvm_timeprofiling;
+static void PRVM_PrintStatement(prvm_prog_t *prog, mstatement_t *s)
 {
 	size_t i;
 	int opnum = (int)(s - prog->statements);
+	char valuebuf[MAX_INPUTLINE];
 
 	Con_Printf("s%i: ", opnum);
 	if( prog->statement_linenums )
-		Con_Printf( "%s:%i: ", PRVM_GetString( prog->xfunction->s_file ), prog->statement_linenums[ opnum ] );
+	{
+		if ( prog->statement_columnnums )
+			Con_Printf( "%s:%i:%i: ", PRVM_GetString( prog, prog->xfunction->s_file ), prog->statement_linenums[ opnum ], prog->statement_columnnums[ opnum ] );
+		else
+			Con_Printf( "%s:%i: ", PRVM_GetString( prog, prog->xfunction->s_file ), prog->statement_linenums[ opnum ] );
+	}
 
 	if (prvm_statementprofiling.integer)
 		Con_Printf("%7.0f ", prog->statement_profile[s - prog->statements]);
@@ -145,79 +150,47 @@ void PRVM_PrintStatement (dstatement_t *s)
 		for ( ; i<10 ; i++)
 			Con_Print(" ");
 	}
-	if (s->op == OP_IF || s->op == OP_IFNOT)
-		Con_Printf("%s, s%i",PRVM_GlobalString((unsigned short) s->a),(signed short)s->b + opnum);
-	else if (s->op == OP_GOTO)
-		Con_Printf("s%i",(signed short)s->a + opnum);
-	else if ( (unsigned)(s->op - OP_STORE_F) < 6)
-	{
-		Con_Print(PRVM_GlobalString((unsigned short) s->a));
-		Con_Print(", ");
-		Con_Print(PRVM_GlobalStringNoContents((unsigned short) s->b));
-	}
-	else if (s->op == OP_ADDRESS || (unsigned)(s->op - OP_LOAD_F) < 6)
-	{
-		if (s->a)
-			Con_Print(PRVM_GlobalString((unsigned short) s->a));
-		if (s->b)
-		{
-			Con_Print(", ");
-			Con_Print(PRVM_GlobalStringNoContents((unsigned short) s->b));
-		}
-		if (s->c)
-		{
-			Con_Print(", ");
-			Con_Print(PRVM_GlobalStringNoContents((unsigned short) s->c));
-		}
-	}
-	else
-	{
-		if (s->a)
-			Con_Print(PRVM_GlobalString((unsigned short) s->a));
-		if (s->b)
-		{
-			Con_Print(", ");
-			Con_Print(PRVM_GlobalString((unsigned short) s->b));
-		}
-		if (s->c)
-		{
-			Con_Print(", ");
-			Con_Print(PRVM_GlobalStringNoContents((unsigned short) s->c));
-		}
-	}
+	if (s->operand[0] >= 0) Con_Printf(  "%s", PRVM_GlobalString(prog, s->operand[0], valuebuf, sizeof(valuebuf)));
+	if (s->operand[1] >= 0) Con_Printf(", %s", PRVM_GlobalString(prog, s->operand[1], valuebuf, sizeof(valuebuf)));
+	if (s->operand[2] >= 0) Con_Printf(", %s", PRVM_GlobalString(prog, s->operand[2], valuebuf, sizeof(valuebuf)));
+	if (s->jumpabsolute >= 0) Con_Printf(", statement %i", s->jumpabsolute);
 	Con_Print("\n");
 }
 
-void PRVM_PrintFunctionStatements (const char *name)
+void PRVM_PrintFunctionStatements (prvm_prog_t *prog, const char *name)
 {
 	int i, firststatement, endstatement;
 	mfunction_t *func;
-	func = PRVM_ED_FindFunction (name);
+	func = PRVM_ED_FindFunction (prog, name);
 	if (!func)
 	{
-		Con_Printf("%s progs: no function named %s\n", PRVM_NAME, name);
+		Con_Printf("%s progs: no function named %s\n", prog->name, name);
 		return;
 	}
 	firststatement = func->first_statement;
 	if (firststatement < 0)
 	{
-		Con_Printf("%s progs: function %s is builtin #%i\n", PRVM_NAME, name, -firststatement);
+		Con_Printf("%s progs: function %s is builtin #%i\n", prog->name, name, -firststatement);
 		return;
 	}
 
 	// find the end statement
-	endstatement = prog->progs->numstatements;
-	for (i = 0;i < prog->progs->numfunctions;i++)
+	endstatement = prog->numstatements;
+	for (i = 0;i < prog->numfunctions;i++)
 		if (endstatement > prog->functions[i].first_statement && firststatement < prog->functions[i].first_statement)
 			endstatement = prog->functions[i].first_statement;
 
 	// now print the range of statements
-	Con_Printf("%s progs: disassembly of function %s (statements %i-%i, locals %i-%i):\n", PRVM_NAME, name, firststatement, endstatement, func->parm_start, func->parm_start + func->locals - 1);
+	Con_Printf("%s progs: disassembly of function %s (statements %i-%i, locals %i-%i):\n", prog->name, name, firststatement, endstatement, func->parm_start, func->parm_start + func->locals - 1);
+	prog->xfunction = func;
 	for (i = firststatement;i < endstatement;i++)
 	{
-		PRVM_PrintStatement(prog->statements + i);
-		prog->statement_profile[i] = 0;
+		PRVM_PrintStatement(prog, prog->statements + i);
+		if (!(prvm_coverage.integer & 4))
+			prog->statement_profile[i] = 0;
 	}
+	if (prvm_coverage.integer & 4)
+		Con_Printf("Collecting statement coverage, not flushing statement profile.\n");
 }
 
 /*
@@ -228,19 +201,17 @@ PRVM_PrintFunction_f
 */
 void PRVM_PrintFunction_f (void)
 {
+	prvm_prog_t *prog;
 	if (Cmd_Argc() != 3)
 	{
 		Con_Printf("usage: prvm_printfunction <program name> <function name>\n");
 		return;
 	}
 
-	PRVM_Begin;
-	if(!PRVM_SetProgFromString(Cmd_Argv(1)))
+	if (!(prog = PRVM_FriendlyProgFromString(Cmd_Argv(1))))
 		return;
 
-	PRVM_PrintFunctionStatements(Cmd_Argv(2));
-
-	PRVM_End;
+	PRVM_PrintFunctionStatements(prog, Cmd_Argv(2));
 }
 
 /*
@@ -248,7 +219,7 @@ void PRVM_PrintFunction_f (void)
 PRVM_StackTrace
 ============
 */
-void PRVM_StackTrace (void)
+void PRVM_StackTrace (prvm_prog_t *prog)
 {
 	mfunction_t	*f;
 	int			i;
@@ -262,14 +233,25 @@ void PRVM_StackTrace (void)
 		if (!f)
 			Con_Print("<NULL FUNCTION>\n");
 		else
-			Con_Printf("%12s : %s : statement %i\n", PRVM_GetString(f->s_file), PRVM_GetString(f->s_name), prog->stack[i].s - f->first_statement);
+		{
+			if (prog->statement_linenums)
+			{
+				if (prog->statement_columnnums)
+					Con_Printf("%12s:%i:%i : %s : statement %i\n", PRVM_GetString(prog, f->s_file), prog->statement_linenums[prog->stack[i].s], prog->statement_columnnums[prog->stack[i].s], PRVM_GetString(prog, f->s_name), prog->stack[i].s - f->first_statement);
+				else
+					Con_Printf("%12s:%i : %s : statement %i\n", PRVM_GetString(prog, f->s_file), prog->statement_linenums[prog->stack[i].s], PRVM_GetString(prog, f->s_name), prog->stack[i].s - f->first_statement);
+			}
+			else
+				Con_Printf("%12s : %s : statement %i\n", PRVM_GetString(prog, f->s_file), PRVM_GetString(prog, f->s_name), prog->stack[i].s - f->first_statement);
+		}
 	}
 }
 
-void PRVM_ShortStackTrace(char *buf, size_t bufsize)
+void PRVM_ShortStackTrace(prvm_prog_t *prog, char *buf, size_t bufsize)
 {
 	mfunction_t	*f;
 	int			i;
+	char vabuf[1024];
 
 	if(prog)
 	{
@@ -289,7 +271,7 @@ void PRVM_ShortStackTrace(char *buf, size_t bufsize)
 
 		if(strlcat(buf,
 			f
-				? va("%s:%s(%i) ", PRVM_GetString(f->s_file), PRVM_GetString(f->s_name), prog->stack[i].s - f->first_statement)
+				? va(vabuf, sizeof(vabuf), "%s:%s(%i) ", PRVM_GetString(prog, f->s_file), PRVM_GetString(prog, f->s_name), prog->stack[i].s - f->first_statement)
 				: "<NULL> ",
 			bufsize
 		) >= bufsize)
@@ -298,21 +280,22 @@ void PRVM_ShortStackTrace(char *buf, size_t bufsize)
 }
 
 
-void PRVM_CallProfile (void)
+static void PRVM_CallProfile (prvm_prog_t *prog)
 {
 	mfunction_t *f, *best;
 	int i;
 	double max;
 	double sum;
+	double newprofiletime;
 
-	Con_Printf( "%s Call Profile:\n", PRVM_NAME );
+	Con_Printf( "%s Call Profile:\n", prog->name );
 
 	sum = 0;
 	do
 	{
 		max = 0;
 		best = NULL;
-		for (i=0 ; i<prog->progs->numfunctions ; i++)
+		for (i=0 ; i<prog->numfunctions ; i++)
 		{
 			f = &prog->functions[i];
 			if (max < f->totaltime)
@@ -324,65 +307,120 @@ void PRVM_CallProfile (void)
 		if (best)
 		{
 			sum += best->totaltime;
-			Con_Printf("%9.4f %s\n", best->totaltime, PRVM_GetString(best->s_name));
+			Con_Printf("%9.4f %s\n", best->totaltime, PRVM_GetString(prog, best->s_name));
 			best->totaltime = 0;
 		}
 	} while (best);
 
-	Con_Printf("Total time since last profile reset: %9.4f\n", Sys_DoubleTime() - prog->starttime);
+	newprofiletime = Sys_DirtyTime();
+	Con_Printf("Total time since last profile reset: %9.4f\n", newprofiletime - prog->profiletime);
 	Con_Printf("       - used by QC code of this VM: %9.4f\n", sum);
 
-	prog->starttime = Sys_DoubleTime();
+	prog->profiletime = newprofiletime;
 }
 
-void PRVM_Profile (int maxfunctions, int mininstructions, int sortby)
+void PRVM_Profile (prvm_prog_t *prog, int maxfunctions, double mintime, int sortby)
 {
 	mfunction_t *f, *best;
 	int i, num;
 	double max;
 
-	Con_Printf( "%s Profile:\n[CallCount] [Statement] [BuiltinCt] [StmtTotal] [BltnTotal] [self]\n", PRVM_NAME );
-	//                        12345678901 12345678901 12345678901 12345678901 12345678901 123.45%
+	if(!prvm_timeprofiling.integer)
+		mintime *= 10000000; // count each statement as about 0.1µs
+
+	if(prvm_timeprofiling.integer)
+		Con_Printf( "%s Profile:\n[CallCount]      [Time] [BuiltinTm] [Statement] [BuiltinCt] [TimeTotal] [StmtTotal] [BltnTotal] [self]\n", prog->name );
+		//                        12345678901 12345678901 12345678901 12345678901 12345678901 12345678901 12345678901 123.45%
+	else
+		Con_Printf( "%s Profile:\n[CallCount] [Statement] [BuiltinCt] [StmtTotal] [BltnTotal] [self]\n", prog->name );
+		//                        12345678901 12345678901 12345678901 12345678901 12345678901 123.45%
 
 	num = 0;
 	do
 	{
 		max = 0;
 		best = NULL;
-		for (i=0 ; i<prog->progs->numfunctions ; i++)
+		for (i=0 ; i<prog->numfunctions ; i++)
 		{
 			f = &prog->functions[i];
-			if(sortby)
+			if(prvm_timeprofiling.integer)
 			{
-				if (max < f->profile_total + f->builtinsprofile_total + f->callcount)
+				if(sortby)
+				{
+					if(f->first_statement < 0)
+					{
+						if (max < f->tprofile)
+						{
+							max = f->tprofile;
+							best = f;
+						}
+					}
+					else
+					{
+						if (max < f->tprofile_total)
+						{
+							max = f->tprofile_total;
+							best = f;
+						}
+					}
+				}
+				else
 				{
-					max = f->profile_total + f->builtinsprofile_total + f->callcount;
-					best = f;
+					if (max < f->tprofile + f->tbprofile)
+					{
+						max = f->tprofile + f->tbprofile;
+						best = f;
+					}
 				}
 			}
 			else
 			{
-				if (max < f->profile + f->builtinsprofile + f->callcount)
+				if(sortby)
 				{
-					max = f->profile + f->builtinsprofile + f->callcount;
-					best = f;
+					if (max < f->profile_total + f->builtinsprofile_total + f->callcount)
+					{
+						max = f->profile_total + f->builtinsprofile_total + f->callcount;
+						best = f;
+					}
+				}
+				else
+				{
+					if (max < f->profile + f->builtinsprofile + f->callcount)
+					{
+						max = f->profile + f->builtinsprofile + f->callcount;
+						best = f;
+					}
 				}
 			}
 		}
 		if (best)
 		{
-			if (num < maxfunctions && max >= mininstructions)
+			if (num < maxfunctions && max > mintime)
 			{
-				if (best->first_statement < 0)
-					Con_Printf("%11.0f ----------------------- builtin ----------------------- %s\n", best->callcount, PRVM_GetString(best->s_name));
-					//                 12345678901 12345678901 12345678901 12345678901 123.45%
+				if(prvm_timeprofiling.integer)
+				{
+					if (best->first_statement < 0)
+						Con_Printf("%11.0f %11.6f ------------- builtin ------------- %11.6f ----------- builtin ----------- %s\n", best->callcount, best->tprofile, best->tprofile, PRVM_GetString(prog, best->s_name));
+					//                 %11.6f 12345678901 12345678901 12345678901 %11.6f 12345678901 12345678901 123.45%
+					else
+						Con_Printf("%11.0f %11.6f %11.6f %11.0f %11.0f %11.6f %11.0f %11.0f %6.2f%% %s\n", best->callcount, best->tprofile, best->tbprofile, best->profile, best->builtinsprofile, best->tprofile_total, best->profile_total, best->builtinsprofile_total, (best->tprofile_total > 0) ? ((best->tprofile) * 100.0 / (best->tprofile_total)) : -99.99, PRVM_GetString(prog, best->s_name));
+				}
 				else
-					Con_Printf("%11.0f %11.0f %11.0f %11.0f %11.0f %6.2f%% %s\n", best->callcount, best->profile, best->builtinsprofile, best->profile_total, best->builtinsprofile_total, (best->profile + best->builtinsprofile) * 100.0 / (best->profile_total + best->builtinsprofile_total), PRVM_GetString(best->s_name));
+				{
+					if (best->first_statement < 0)
+						Con_Printf("%11.0f ----------------------- builtin ----------------------- %s\n", best->callcount, PRVM_GetString(prog, best->s_name));
+					//                 12345678901 12345678901 12345678901 12345678901 123.45%
+					else
+						Con_Printf("%11.0f %11.0f %11.0f %11.0f %11.0f %6.2f%% %s\n", best->callcount, best->profile, best->builtinsprofile, best->profile_total, best->builtinsprofile_total, (best->profile + best->builtinsprofile) * 100.0 / (best->profile_total + best->builtinsprofile_total), PRVM_GetString(prog, best->s_name));
+				}
 			}
 			num++;
 			best->profile = 0;
+			best->tprofile = 0;
+			best->tbprofile = 0;
 			best->builtinsprofile = 0;
 			best->profile_total = 0;
+			best->tprofile_total = 0;
 			best->builtinsprofile_total = 0;
 			best->callcount = 0;
 		}
@@ -397,19 +435,17 @@ PRVM_CallProfile_f
 */
 void PRVM_CallProfile_f (void)
 {
+	prvm_prog_t *prog;
 	if (Cmd_Argc() != 2)
 	{
 		Con_Print("prvm_callprofile <program name>\n");
 		return;
 	}
 
-	PRVM_Begin;
-	if(!PRVM_SetProgFromString(Cmd_Argv(1)))
+	if (!(prog = PRVM_FriendlyProgFromString(Cmd_Argv(1))))
 		return;
 
-	PRVM_CallProfile();
-
-	PRVM_End;
+	PRVM_CallProfile(prog);
 }
 
 /*
@@ -420,8 +456,15 @@ PRVM_Profile_f
 */
 void PRVM_Profile_f (void)
 {
+	prvm_prog_t *prog;
 	int howmany;
 
+	if (prvm_coverage.integer & 1)
+	{
+		Con_Printf("Collecting function coverage, cannot profile - sorry!\n");
+		return;
+	}
+
 	howmany = 1<<30;
 	if (Cmd_Argc() == 3)
 		howmany = atoi(Cmd_Argv(2));
@@ -431,19 +474,23 @@ void PRVM_Profile_f (void)
 		return;
 	}
 
-	PRVM_Begin;
-	if(!PRVM_SetProgFromString(Cmd_Argv(1)))
+	if (!(prog = PRVM_FriendlyProgFromString(Cmd_Argv(1))))
 		return;
 
-	PRVM_Profile(howmany, 1, 0);
-
-	PRVM_End;
+	PRVM_Profile(prog, howmany, 0, 0);
 }
 
 void PRVM_ChildProfile_f (void)
 {
+	prvm_prog_t *prog;
 	int howmany;
 
+	if (prvm_coverage.integer & 1)
+	{
+		Con_Printf("Collecting function coverage, cannot profile - sorry!\n");
+		return;
+	}
+
 	howmany = 1<<30;
 	if (Cmd_Argc() == 3)
 		howmany = atoi(Cmd_Argv(2));
@@ -453,69 +500,56 @@ void PRVM_ChildProfile_f (void)
 		return;
 	}
 
-	PRVM_Begin;
-	if(!PRVM_SetProgFromString(Cmd_Argv(1)))
+	if (!(prog = PRVM_FriendlyProgFromString(Cmd_Argv(1))))
 		return;
 
-	PRVM_Profile(howmany, 1, 1);
-
-	PRVM_End;
+	PRVM_Profile(prog, howmany, 0, 1);
 }
 
-void PRVM_CrashAll(void)
+void PRVM_PrintState(prvm_prog_t *prog, int stack_index)
 {
 	int i;
-	prvm_prog_t *oldprog = prog;
-
-	for(i = 0; i < PRVM_MAXPROGS; i++)
+	mfunction_t *func = prog->xfunction;
+	int st = prog->xstatement;
+	if (stack_index > 0 && stack_index <= prog->depth)
 	{
-		if(!PRVM_ProgLoaded(i))
-			continue;
-		PRVM_SetProg(i);
-		PRVM_Crash();
+		func = prog->stack[prog->depth - stack_index].f;
+		st = prog->stack[prog->depth - stack_index].s;
 	}
-
-	prog = oldprog;
-}
-
-void PRVM_PrintState(void)
-{
-	int i;
-	if(prog->statestring)
+	if (prog->statestring)
 	{
 		Con_Printf("Caller-provided information: %s\n", prog->statestring);
 	}
-	if (prog->xfunction)
+	if (func)
 	{
 		for (i = -7; i <= 0;i++)
-			if (prog->xstatement + i >= prog->xfunction->first_statement)
-				PRVM_PrintStatement (prog->statements + prog->xstatement + i);
+			if (st + i >= func->first_statement)
+				PRVM_PrintStatement(prog, prog->statements + st + i);
 	}
-	else
-		Con_Print("null function executing??\n");
-	PRVM_StackTrace ();
+	PRVM_StackTrace(prog);
 }
 
-extern sizebuf_t vm_tempstringsbuf;
 extern cvar_t prvm_errordump;
-void Host_Savegame_to (const char *name);
-void PRVM_Crash(void)
+void PRVM_Crash(prvm_prog_t *prog)
 {
+	char vabuf[1024];
 	if (prog == NULL)
 		return;
+	if (!prog->loaded)
+		return;
 
-	prog->funcoffsets.SV_Shutdown = 0; // don't call SV_Shutdown on crash
+	PRVM_serverfunction(SV_Shutdown) = 0; // don't call SV_Shutdown on crash
 
 	if( prog->depth > 0 )
 	{
-		Con_Printf("QuakeC crash report for %s:\n", PRVM_NAME);
-		PRVM_PrintState();
+		Con_Printf("QuakeC crash report for %s:\n", prog->name);
+		PRVM_PrintState(prog, 0);
 	}
 
 	if(prvm_errordump.integer)
 	{
 		// make a savegame
-		Host_Savegame_to(va("crash-%s.dmp", PRVM_NAME));
+		Host_Savegame_to(prog, va(vabuf, sizeof(vabuf), "crash-%s.dmp", prog->name));
 	}
 
 	// dump the stack so host_error can shutdown functions
@@ -523,7 +557,7 @@ void PRVM_Crash(void)
 	prog->localstack_used = 0;
 
 	// delete all tempstrings (FIXME: is this safe in VM->engine->VM recursion?)
-	vm_tempstringsbuf.cursize = 0;
+	prog->tempstringsbuf.cursize = 0;
 
 	// reset the prog pointer
 	prog = NULL;
@@ -544,28 +578,29 @@ PRVM_EnterFunction
 Returns the new program statement counter
 ====================
 */
-int PRVM_EnterFunction (mfunction_t *f)
+static int PRVM_EnterFunction (prvm_prog_t *prog, mfunction_t *f)
 {
 	int		i, j, c, o;
 
 	if (!f)
-		PRVM_ERROR ("PRVM_EnterFunction: NULL function in %s", PRVM_NAME);
+		prog->error_cmd("PRVM_EnterFunction: NULL function in %s", prog->name);
 
 	prog->stack[prog->depth].s = prog->xstatement;
 	prog->stack[prog->depth].f = prog->xfunction;
 	prog->stack[prog->depth].profile_acc = -f->profile;
+	prog->stack[prog->depth].tprofile_acc = -f->tprofile + -f->tbprofile;
 	prog->stack[prog->depth].builtinsprofile_acc = -f->builtinsprofile;
 	prog->depth++;
 	if (prog->depth >=PRVM_MAX_STACK_DEPTH)
-		PRVM_ERROR ("stack overflow");
+		prog->error_cmd("stack overflow");
 
 // save off any locals that the new function steps on
 	c = f->locals;
 	if (prog->localstack_used + c > PRVM_LOCALSTACK_SIZE)
-		PRVM_ERROR ("PRVM_ExecuteProgram: locals stack overflow in %s", PRVM_NAME);
+		prog->error_cmd("PRVM_ExecuteProgram: locals stack overflow in %s", prog->name);
 
 	for (i=0 ; i < c ; i++)
-		prog->localstack[prog->localstack_used+i] = ((int *)prog->globals.generic)[f->parm_start + i];
+		prog->localstack[prog->localstack_used+i] = prog->globals.ip[f->parm_start + i];
 	prog->localstack_used += c;
 
 // copy parameters
@@ -574,7 +609,7 @@ int PRVM_EnterFunction (mfunction_t *f)
 	{
 		for (j=0 ; j<f->parm_size[i] ; j++)
 		{
-			((int *)prog->globals.generic)[o] = ((int *)prog->globals.generic)[OFS_PARM0+i*3+j];
+			prog->globals.ip[o] = prog->globals.ip[OFS_PARM0+i*3+j];
 			o++;
 		}
 	}
@@ -589,24 +624,24 @@ int PRVM_EnterFunction (mfunction_t *f)
 PRVM_LeaveFunction
 ====================
 */
-int PRVM_LeaveFunction (void)
+static int PRVM_LeaveFunction (prvm_prog_t *prog)
 {
 	int		i, c;
 	mfunction_t *f;
 
 	if (prog->depth <= 0)
-		PRVM_ERROR ("prog stack underflow in %s", PRVM_NAME);
+		prog->error_cmd("prog stack underflow in %s", prog->name);
 
 	if (!prog->xfunction)
-		PRVM_ERROR ("PR_LeaveFunction: NULL function in %s", PRVM_NAME);
+		prog->error_cmd("PR_LeaveFunction: NULL function in %s", prog->name);
 // restore locals from the stack
 	c = prog->xfunction->locals;
 	prog->localstack_used -= c;
 	if (prog->localstack_used < 0)
-		PRVM_ERROR ("PRVM_ExecuteProgram: locals stack underflow in %s", PRVM_NAME);
+		prog->error_cmd("PRVM_ExecuteProgram: locals stack underflow in %s", prog->name);
 
 	for (i=0 ; i < c ; i++)
-		((int *)prog->globals.generic)[prog->xfunction->parm_start + i] = prog->localstack[prog->localstack_used+i];
+		prog->globals.ip[prog->xfunction->parm_start + i] = prog->localstack[prog->localstack_used+i];
 
 // up stack
 	prog->depth--;
@@ -614,10 +649,12 @@ int PRVM_LeaveFunction (void)
 	--f->recursion;
 	prog->xfunction = prog->stack[prog->depth].f;
 	prog->stack[prog->depth].profile_acc += f->profile;
+	prog->stack[prog->depth].tprofile_acc += f->tprofile + f->tbprofile;
 	prog->stack[prog->depth].builtinsprofile_acc += f->builtinsprofile;
 	if(prog->depth > 0)
 	{
 		prog->stack[prog->depth-1].profile_acc += prog->stack[prog->depth].profile_acc;
+		prog->stack[prog->depth-1].tprofile_acc += prog->stack[prog->depth].tprofile_acc;
 		prog->stack[prog->depth-1].builtinsprofile_acc += prog->stack[prog->depth].builtinsprofile_acc;
 	}
 	if(!f->recursion)
@@ -627,13 +664,14 @@ int PRVM_LeaveFunction (void)
 		// or we would add it more than once
 		// so, let's only add to the function's profile if it is the outermost call
 		f->profile_total += prog->stack[prog->depth].profile_acc;
+		f->tprofile_total += prog->stack[prog->depth].tprofile_acc;
 		f->builtinsprofile_total += prog->stack[prog->depth].builtinsprofile_acc;
 	}
 	
 	return prog->stack[prog->depth].s;
 }
 
-void PRVM_Init_Exec(void)
+void PRVM_Init_Exec(prvm_prog_t *prog)
 {
 	// dump the stack
 	prog->depth = 0;
@@ -643,42 +681,97 @@ void PRVM_Init_Exec(void)
 }
 
 /*
-====================
-MVM_ExecuteProgram
-====================
+==================
+Coverage
+==================
 */
-// LordHavoc: optimized
-#define OPA ((prvm_eval_t *)&prog->globals.generic[(unsigned short) st->a])
-#define OPB ((prvm_eval_t *)&prog->globals.generic[(unsigned short) st->b])
-#define OPC ((prvm_eval_t *)&prog->globals.generic[(unsigned short) st->c])
+// Note: in these two calls, prog->xfunction is assumed to be sane.
+static const char *PRVM_WhereAmI(char *buf, size_t bufsize, prvm_prog_t *prog, mfunction_t *func, int statement)
+{
+	if (prog->statement_linenums)
+	{
+		if (prog->statement_columnnums)
+			return va(buf, bufsize, "%s:%i:%i(%s, %i)", PRVM_GetString(prog, func->s_file), prog->statement_linenums[statement], prog->statement_columnnums[statement], PRVM_GetString(prog, func->s_name), statement - func->first_statement);
+		else
+			return va(buf, bufsize, "%s:%i(%s, %i)", PRVM_GetString(prog, func->s_file), prog->statement_linenums[statement], PRVM_GetString(prog, func->s_name), statement - func->first_statement);
+	}
+	else
+		return va(buf, bufsize, "%s(%s, %i)", PRVM_GetString(prog, func->s_file), PRVM_GetString(prog, func->s_name), statement - func->first_statement);
+}
+static void PRVM_FunctionCoverageEvent(prvm_prog_t *prog, mfunction_t *func)
+{
+	++prog->functions_covered;
+	Con_Printf("prvm_coverage: %s just called %s for the first time. Coverage: %.2f%%.\n", prog->name, PRVM_GetString(prog, func->s_name), prog->functions_covered * 100.0 / prog->numfunctions);
+}
+void PRVM_ExplicitCoverageEvent(prvm_prog_t *prog, mfunction_t *func, int statement)
+{
+	char vabuf[128];
+	++prog->explicit_covered;
+	Con_Printf("prvm_coverage: %s just executed a coverage() statement at %s for the first time. Coverage: %.2f%%.\n", prog->name, PRVM_WhereAmI(vabuf, sizeof(vabuf), prog, func, statement), prog->explicit_covered * 100.0 / prog->numexplicitcoveragestatements);
+}
+static void PRVM_StatementCoverageEvent(prvm_prog_t *prog, mfunction_t *func, int statement)
+{
+	char vabuf[128];
+	++prog->statements_covered;
+	Con_Printf("prvm_coverage: %s just executed a statement at %s for the first time. Coverage: %.2f%%.\n", prog->name, PRVM_WhereAmI(vabuf, sizeof(vabuf), prog, func, statement), prog->statements_covered * 100.0 / prog->numstatements);
+}
+
+#ifdef __GNUC__
+#define HAVE_COMPUTED_GOTOS 1
+#endif
+
+#define OPA ((prvm_eval_t *)&prog->globals.fp[st->operand[0]])
+#define OPB ((prvm_eval_t *)&prog->globals.fp[st->operand[1]])
+#define OPC ((prvm_eval_t *)&prog->globals.fp[st->operand[2]])
 extern cvar_t prvm_traceqc;
 extern cvar_t prvm_statementprofiling;
-extern sizebuf_t vm_tempstringsbuf;
 extern qboolean prvm_runawaycheck;
-extern qboolean prvm_boundscheck;
-void MVM_ExecuteProgram (func_t fnum, const char *errormessage)
+
+#ifdef PROFILING
+#ifdef CONFIG_MENU
+/*
+====================
+MVM_ExecuteProgram
+====================
+*/
+void MVM_ExecuteProgram (prvm_prog_t *prog, func_t fnum, const char *errormessage)
 {
-	dstatement_t	*st, *startst;
-	mfunction_t	*f, *newf;
+	mstatement_t	*st, *startst;
+	mfunction_t		*func, *enterfunc;
 	prvm_edict_t	*ed;
 	prvm_eval_t	*ptr;
 	int		jumpcount, cachedpr_trace, exitdepth;
 	int		restorevm_tempstringsbuf_cursize;
 	double  calltime;
-
-	calltime = Sys_DoubleTime();
-
-	if (!fnum || fnum >= (unsigned int)prog->progs->numfunctions)
+	double tm, starttm;
+	prvm_vec_t tempfloat;
+	// these may become out of date when a builtin is called, and are updated accordingly
+	prvm_vec_t *cached_edictsfields = prog->edictsfields;
+	unsigned int cached_entityfields = prog->entityfields;
+	unsigned int cached_entityfields_3 = prog->entityfields - 3;
+	unsigned int cached_entityfieldsarea = prog->entityfieldsarea;
+	unsigned int cached_entityfieldsarea_entityfields = prog->entityfieldsarea - prog->entityfields;
+	unsigned int cached_entityfieldsarea_3 = prog->entityfieldsarea - 3;
+	unsigned int cached_entityfieldsarea_entityfields_3 = prog->entityfieldsarea - prog->entityfields - 3;
+	unsigned int cached_max_edicts = prog->max_edicts;
+	// these do not change
+	mstatement_t *cached_statements = prog->statements;
+	qboolean cached_allowworldwrites = prog->allowworldwrites;
+	unsigned int cached_flag = prog->flag;
+
+	calltime = Sys_DirtyTime();
+
+	if (!fnum || fnum >= (unsigned int)prog->numfunctions)
 	{
-		if (prog->globaloffsets.self >= 0 && PRVM_GLOBALFIELDVALUE(prog->globaloffsets.self)->edict)
-			PRVM_ED_Print(PRVM_PROG_TO_EDICT(PRVM_GLOBALFIELDVALUE(prog->globaloffsets.self)->edict), NULL);
-		PRVM_ERROR ("MVM_ExecuteProgram: %s", errormessage);
+		if (PRVM_allglobaledict(self))
+			PRVM_ED_Print(prog, PRVM_PROG_TO_EDICT(PRVM_allglobaledict(self)), NULL);
+		prog->error_cmd("MVM_ExecuteProgram: %s", errormessage);
 	}
 
-	f = &prog->functions[fnum];
+	func = &prog->functions[fnum];
 
 	// after executing this function, delete all tempstrings it created
-	restorevm_tempstringsbuf_cursize = vm_tempstringsbuf.cursize;
+	restorevm_tempstringsbuf_cursize = prog->tempstringsbuf.cursize;
 
 	prog->trace = prvm_traceqc.integer;
 
@@ -686,203 +779,106 @@ void MVM_ExecuteProgram (func_t fnum, const char *errormessage)
 	exitdepth = prog->depth;
 
 // make a stack frame
-	st = &prog->statements[PRVM_EnterFunction (f)];
+	st = &prog->statements[PRVM_EnterFunction(prog, func)];
 	// save the starting statement pointer for profiling
 	// (when the function exits or jumps, the (st - startst) integer value is
 	// added to the function's profile counter)
 	startst = st;
+	starttm = calltime;
 	// instead of counting instructions, we count jumps
 	jumpcount = 0;
 	// add one to the callcount of this function because otherwise engine-called functions aren't counted
-	prog->xfunction->callcount++;
+	if (prog->xfunction->callcount++ == 0 && (prvm_coverage.integer & 1))
+		PRVM_FunctionCoverageEvent(prog, prog->xfunction);
 
 chooseexecprogram:
 	cachedpr_trace = prog->trace;
-	if (prvm_runawaycheck)
+	if (prog->trace || prog->watch_global_type != ev_void || prog->watch_field_type != ev_void || prog->break_statement >= 0)
 	{
-#define PRVMRUNAWAYCHECK 1
-		if (prvm_statementprofiling.integer)
+#define PRVMSLOWINTERPRETER 1
+		if (prvm_timeprofiling.integer)
 		{
-#define PRVMSTATEMENTPROFILING 1
-			if (prvm_boundscheck)
-			{
-#define PRVMBOUNDSCHECK 1
-				if (prog->trace)
-				{
-#define PRVMTRACE 1
-#include "prvm_execprogram.h"
-#undef PRVMTRACE
-				}
-				else
-				{
-#include "prvm_execprogram.h"
-				}
-#undef PRVMBOUNDSCHECK
-			}
-			else
-			{
-				if (prog->trace)
-				{
-#define PRVMTRACE 1
+#define PRVMTIMEPROFILING 1
 #include "prvm_execprogram.h"
-#undef PRVMTRACE
-				}
-				else
-				{
-#include "prvm_execprogram.h"
-				}
-			}
-#undef PRVMSTATEMENTPROFILING
+#undef PRVMTIMEPROFILING
 		}
 		else
 		{
-			if (prvm_boundscheck)
-			{
-#define PRVMBOUNDSCHECK 1
-				if (prog->trace)
-				{
-#define PRVMTRACE 1
-#include "prvm_execprogram.h"
-#undef PRVMTRACE
-				}
-				else
-				{
-#include "prvm_execprogram.h"
-				}
-#undef PRVMBOUNDSCHECK
-			}
-			else
-			{
-				if (prog->trace)
-				{
-#define PRVMTRACE 1
-#include "prvm_execprogram.h"
-#undef PRVMTRACE
-				}
-				else
-				{
 #include "prvm_execprogram.h"
-				}
-			}
 		}
-#undef PRVMRUNAWAYCHECK
+#undef PRVMSLOWINTERPRETER
 	}
 	else
 	{
-		if (prvm_statementprofiling.integer)
+		if (prvm_timeprofiling.integer)
 		{
-#define PRVMSTATEMENTPROFILING 1
-			if (prvm_boundscheck)
-			{
-#define PRVMBOUNDSCHECK 1
-				if (prog->trace)
-				{
-#define PRVMTRACE 1
-#include "prvm_execprogram.h"
-#undef PRVMTRACE
-				}
-				else
-				{
+#define PRVMTIMEPROFILING 1
 #include "prvm_execprogram.h"
-				}
-#undef PRVMBOUNDSCHECK
-			}
-			else
-			{
-				if (prog->trace)
-				{
-#define PRVMTRACE 1
-#include "prvm_execprogram.h"
-#undef PRVMTRACE
-				}
-				else
-				{
-#include "prvm_execprogram.h"
-				}
-			}
-#undef PRVMSTATEMENTPROFILING
+#undef PRVMTIMEPROFILING
 		}
 		else
 		{
-			if (prvm_boundscheck)
-			{
-#define PRVMBOUNDSCHECK 1
-				if (prog->trace)
-				{
-#define PRVMTRACE 1
-#include "prvm_execprogram.h"
-#undef PRVMTRACE
-				}
-				else
-				{
 #include "prvm_execprogram.h"
-				}
-#undef PRVMBOUNDSCHECK
-			}
-			else
-			{
-				if (prog->trace)
-				{
-#define PRVMTRACE 1
-#include "prvm_execprogram.h"
-#undef PRVMTRACE
-				}
-				else
-				{
-#include "prvm_execprogram.h"
-				}
-			}
 		}
 	}
 
 cleanup:
-	if (developer.integer >= 200 && vm_tempstringsbuf.cursize > restorevm_tempstringsbuf_cursize)
-		Con_Printf("MVM_ExecuteProgram: %s used %i bytes of tempstrings\n", PRVM_GetString(prog->functions[fnum].s_name), vm_tempstringsbuf.cursize - restorevm_tempstringsbuf_cursize);
+	if (developer_insane.integer && prog->tempstringsbuf.cursize > restorevm_tempstringsbuf_cursize)
+		Con_DPrintf("MVM_ExecuteProgram: %s used %i bytes of tempstrings\n", PRVM_GetString(prog, prog->functions[fnum].s_name), prog->tempstringsbuf.cursize - restorevm_tempstringsbuf_cursize);
 	// delete tempstrings created by this function
-	vm_tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
+	prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
 
-	f->totaltime += (Sys_DoubleTime() - calltime);
+	tm = Sys_DirtyTime() - calltime;if (tm < 0 || tm >= 1800) tm = 0;
+	func->totaltime += tm;
 
-	SV_FlushBroadcastMessages();
+	if (prog == SVVM_prog)
+		SV_FlushBroadcastMessages();
 }
+#endif
 
 /*
 ====================
 CLVM_ExecuteProgram
 ====================
 */
-// LordHavoc: optimized
-#define OPA ((prvm_eval_t *)&prog->globals.generic[(unsigned short) st->a])
-#define OPB ((prvm_eval_t *)&prog->globals.generic[(unsigned short) st->b])
-#define OPC ((prvm_eval_t *)&prog->globals.generic[(unsigned short) st->c])
-extern cvar_t prvm_traceqc;
-extern cvar_t prvm_statementprofiling;
-extern sizebuf_t vm_tempstringsbuf;
-extern qboolean prvm_runawaycheck;
-extern qboolean prvm_boundscheck;
-void CLVM_ExecuteProgram (func_t fnum, const char *errormessage)
+void CLVM_ExecuteProgram (prvm_prog_t *prog, func_t fnum, const char *errormessage)
 {
-	dstatement_t	*st, *startst;
-	mfunction_t	*f, *newf;
+	mstatement_t	*st, *startst;
+	mfunction_t		*func, *enterfunc;
 	prvm_edict_t	*ed;
 	prvm_eval_t	*ptr;
 	int		jumpcount, cachedpr_trace, exitdepth;
 	int		restorevm_tempstringsbuf_cursize;
 	double  calltime;
-
-	calltime = Sys_DoubleTime();
-
-	if (!fnum || fnum >= (unsigned int)prog->progs->numfunctions)
+	double tm, starttm;
+	prvm_vec_t tempfloat;
+	// these may become out of date when a builtin is called, and are updated accordingly
+	prvm_vec_t *cached_edictsfields = prog->edictsfields;
+	unsigned int cached_entityfields = prog->entityfields;
+	unsigned int cached_entityfields_3 = prog->entityfields - 3;
+	unsigned int cached_entityfieldsarea = prog->entityfieldsarea;
+	unsigned int cached_entityfieldsarea_entityfields = prog->entityfieldsarea - prog->entityfields;
+	unsigned int cached_entityfieldsarea_3 = prog->entityfieldsarea - 3;
+	unsigned int cached_entityfieldsarea_entityfields_3 = prog->entityfieldsarea - prog->entityfields - 3;
+	unsigned int cached_max_edicts = prog->max_edicts;
+	// these do not change
+	mstatement_t *cached_statements = prog->statements;
+	qboolean cached_allowworldwrites = prog->allowworldwrites;
+	unsigned int cached_flag = prog->flag;
+
+	calltime = Sys_DirtyTime();
+
+	if (!fnum || fnum >= (unsigned int)prog->numfunctions)
 	{
-		if (prog->globaloffsets.self >= 0 && PRVM_GLOBALFIELDVALUE(prog->globaloffsets.self)->edict)
-			PRVM_ED_Print(PRVM_PROG_TO_EDICT(PRVM_GLOBALFIELDVALUE(prog->globaloffsets.self)->edict), NULL);
-		PRVM_ERROR ("CLVM_ExecuteProgram: %s", errormessage);
+		if (PRVM_allglobaledict(self))
+			PRVM_ED_Print(prog, PRVM_PROG_TO_EDICT(PRVM_allglobaledict(self)), NULL);
+		prog->error_cmd("CLVM_ExecuteProgram: %s", errormessage);
 	}
 
-	f = &prog->functions[fnum];
+	func = &prog->functions[fnum];
 
 	// after executing this function, delete all tempstrings it created
-	restorevm_tempstringsbuf_cursize = vm_tempstringsbuf.cursize;
+	restorevm_tempstringsbuf_cursize = prog->tempstringsbuf.cursize;
 
 	prog->trace = prvm_traceqc.integer;
 
@@ -890,203 +886,110 @@ void CLVM_ExecuteProgram (func_t fnum, const char *errormessage)
 	exitdepth = prog->depth;
 
 // make a stack frame
-	st = &prog->statements[PRVM_EnterFunction (f)];
+	st = &prog->statements[PRVM_EnterFunction(prog, func)];
 	// save the starting statement pointer for profiling
 	// (when the function exits or jumps, the (st - startst) integer value is
 	// added to the function's profile counter)
 	startst = st;
+	starttm = calltime;
 	// instead of counting instructions, we count jumps
 	jumpcount = 0;
 	// add one to the callcount of this function because otherwise engine-called functions aren't counted
-	prog->xfunction->callcount++;
+	if (prog->xfunction->callcount++ == 0 && (prvm_coverage.integer & 1))
+		PRVM_FunctionCoverageEvent(prog, prog->xfunction);
 
 chooseexecprogram:
 	cachedpr_trace = prog->trace;
-	if (prvm_runawaycheck)
+	if (prog->trace || prog->watch_global_type != ev_void || prog->watch_field_type != ev_void || prog->break_statement >= 0)
 	{
-#define PRVMRUNAWAYCHECK 1
-		if (prvm_statementprofiling.integer)
+#define PRVMSLOWINTERPRETER 1
+		if (prvm_timeprofiling.integer)
 		{
-#define PRVMSTATEMENTPROFILING 1
-			if (prvm_boundscheck)
-			{
-#define PRVMBOUNDSCHECK 1
-				if (prog->trace)
-				{
-#define PRVMTRACE 1
-#include "prvm_execprogram.h"
-#undef PRVMTRACE
-				}
-				else
-				{
-#include "prvm_execprogram.h"
-				}
-#undef PRVMBOUNDSCHECK
-			}
-			else
-			{
-				if (prog->trace)
-				{
-#define PRVMTRACE 1
+#define PRVMTIMEPROFILING 1
 #include "prvm_execprogram.h"
-#undef PRVMTRACE
-				}
-				else
-				{
-#include "prvm_execprogram.h"
-				}
-			}
-#undef PRVMSTATEMENTPROFILING
+#undef PRVMTIMEPROFILING
 		}
 		else
 		{
-			if (prvm_boundscheck)
-			{
-#define PRVMBOUNDSCHECK 1
-				if (prog->trace)
-				{
-#define PRVMTRACE 1
-#include "prvm_execprogram.h"
-#undef PRVMTRACE
-				}
-				else
-				{
-#include "prvm_execprogram.h"
-				}
-#undef PRVMBOUNDSCHECK
-			}
-			else
-			{
-				if (prog->trace)
-				{
-#define PRVMTRACE 1
-#include "prvm_execprogram.h"
-#undef PRVMTRACE
-				}
-				else
-				{
 #include "prvm_execprogram.h"
-				}
-			}
 		}
-#undef PRVMRUNAWAYCHECK
+#undef PRVMSLOWINTERPRETER
 	}
 	else
 	{
-		if (prvm_statementprofiling.integer)
+		if (prvm_timeprofiling.integer)
 		{
-#define PRVMSTATEMENTPROFILING 1
-			if (prvm_boundscheck)
-			{
-#define PRVMBOUNDSCHECK 1
-				if (prog->trace)
-				{
-#define PRVMTRACE 1
-#include "prvm_execprogram.h"
-#undef PRVMTRACE
-				}
-				else
-				{
+#define PRVMTIMEPROFILING 1
 #include "prvm_execprogram.h"
-				}
-#undef PRVMBOUNDSCHECK
-			}
-			else
-			{
-				if (prog->trace)
-				{
-#define PRVMTRACE 1
-#include "prvm_execprogram.h"
-#undef PRVMTRACE
-				}
-				else
-				{
-#include "prvm_execprogram.h"
-				}
-			}
-#undef PRVMSTATEMENTPROFILING
+#undef PRVMTIMEPROFILING
 		}
 		else
 		{
-			if (prvm_boundscheck)
-			{
-#define PRVMBOUNDSCHECK 1
-				if (prog->trace)
-				{
-#define PRVMTRACE 1
-#include "prvm_execprogram.h"
-#undef PRVMTRACE
-				}
-				else
-				{
 #include "prvm_execprogram.h"
-				}
-#undef PRVMBOUNDSCHECK
-			}
-			else
-			{
-				if (prog->trace)
-				{
-#define PRVMTRACE 1
-#include "prvm_execprogram.h"
-#undef PRVMTRACE
-				}
-				else
-				{
-#include "prvm_execprogram.h"
-				}
-			}
 		}
 	}
 
 cleanup:
-	if (developer.integer >= 200 && vm_tempstringsbuf.cursize > restorevm_tempstringsbuf_cursize)
-		Con_Printf("CLVM_ExecuteProgram: %s used %i bytes of tempstrings\n", PRVM_GetString(prog->functions[fnum].s_name), vm_tempstringsbuf.cursize - restorevm_tempstringsbuf_cursize);
+	if (developer_insane.integer && prog->tempstringsbuf.cursize > restorevm_tempstringsbuf_cursize)
+		Con_DPrintf("CLVM_ExecuteProgram: %s used %i bytes of tempstrings\n", PRVM_GetString(prog, prog->functions[fnum].s_name), prog->tempstringsbuf.cursize - restorevm_tempstringsbuf_cursize);
 	// delete tempstrings created by this function
-	vm_tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
+	prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
 
-	f->totaltime += (Sys_DoubleTime() - calltime);
+	tm = Sys_DirtyTime() - calltime;if (tm < 0 || tm >= 1800) tm = 0;
+	func->totaltime += tm;
 
-	SV_FlushBroadcastMessages();
+	if (prog == SVVM_prog)
+		SV_FlushBroadcastMessages();
 }
+#endif
 
 /*
 ====================
 SVVM_ExecuteProgram
 ====================
 */
-// LordHavoc: optimized
-#define OPA ((prvm_eval_t *)&prog->globals.generic[(unsigned short) st->a])
-#define OPB ((prvm_eval_t *)&prog->globals.generic[(unsigned short) st->b])
-#define OPC ((prvm_eval_t *)&prog->globals.generic[(unsigned short) st->c])
-extern cvar_t prvm_traceqc;
-extern cvar_t prvm_statementprofiling;
-extern sizebuf_t vm_tempstringsbuf;
-extern qboolean prvm_runawaycheck;
-extern qboolean prvm_boundscheck;
-void SVVM_ExecuteProgram (func_t fnum, const char *errormessage)
+#ifdef PROFILING
+void SVVM_ExecuteProgram (prvm_prog_t *prog, func_t fnum, const char *errormessage)
+#else
+void PRVM_ExecuteProgram (prvm_prog_t *prog, func_t fnum, const char *errormessage)
+#endif
 {
-	dstatement_t	*st, *startst;
-	mfunction_t	*f, *newf;
+	mstatement_t	*st, *startst;
+	mfunction_t		*func, *enterfunc;
 	prvm_edict_t	*ed;
 	prvm_eval_t	*ptr;
 	int		jumpcount, cachedpr_trace, exitdepth;
 	int		restorevm_tempstringsbuf_cursize;
 	double  calltime;
-
-	calltime = Sys_DoubleTime();
-
-	if (!fnum || fnum >= (unsigned int)prog->progs->numfunctions)
+	double tm, starttm;
+	prvm_vec_t tempfloat;
+	// these may become out of date when a builtin is called, and are updated accordingly
+	prvm_vec_t *cached_edictsfields = prog->edictsfields;
+	unsigned int cached_entityfields = prog->entityfields;
+	unsigned int cached_entityfields_3 = prog->entityfields - 3;
+	unsigned int cached_entityfieldsarea = prog->entityfieldsarea;
+	unsigned int cached_entityfieldsarea_entityfields = prog->entityfieldsarea - prog->entityfields;
+	unsigned int cached_entityfieldsarea_3 = prog->entityfieldsarea - 3;
+	unsigned int cached_entityfieldsarea_entityfields_3 = prog->entityfieldsarea - prog->entityfields - 3;
+	unsigned int cached_max_edicts = prog->max_edicts;
+	// these do not change
+	mstatement_t *cached_statements = prog->statements;
+	qboolean cached_allowworldwrites = prog->allowworldwrites;
+	unsigned int cached_flag = prog->flag;
+
+	calltime = Sys_DirtyTime();
+
+	if (!fnum || fnum >= (unsigned int)prog->numfunctions)
 	{
-		if (prog->globaloffsets.self >= 0 && PRVM_GLOBALFIELDVALUE(prog->globaloffsets.self)->edict)
-			PRVM_ED_Print(PRVM_PROG_TO_EDICT(PRVM_GLOBALFIELDVALUE(prog->globaloffsets.self)->edict), NULL);
-		PRVM_ERROR ("SVVM_ExecuteProgram: %s", errormessage);
+		if (PRVM_allglobaledict(self))
+			PRVM_ED_Print(prog, PRVM_PROG_TO_EDICT(PRVM_allglobaledict(self)), NULL);
+		prog->error_cmd("SVVM_ExecuteProgram: %s", errormessage);
 	}
 
-	f = &prog->functions[fnum];
+	func = &prog->functions[fnum];
 
 	// after executing this function, delete all tempstrings it created
-	restorevm_tempstringsbuf_cursize = vm_tempstringsbuf.cursize;
+	restorevm_tempstringsbuf_cursize = prog->tempstringsbuf.cursize;
 
 	prog->trace = prvm_traceqc.integer;
 
@@ -1094,162 +997,58 @@ void SVVM_ExecuteProgram (func_t fnum, const char *errormessage)
 	exitdepth = prog->depth;
 
 // make a stack frame
-	st = &prog->statements[PRVM_EnterFunction (f)];
+	st = &prog->statements[PRVM_EnterFunction(prog, func)];
 	// save the starting statement pointer for profiling
 	// (when the function exits or jumps, the (st - startst) integer value is
 	// added to the function's profile counter)
 	startst = st;
+	starttm = calltime;
 	// instead of counting instructions, we count jumps
 	jumpcount = 0;
 	// add one to the callcount of this function because otherwise engine-called functions aren't counted
-	prog->xfunction->callcount++;
+	if (prog->xfunction->callcount++ == 0 && (prvm_coverage.integer & 1))
+		PRVM_FunctionCoverageEvent(prog, prog->xfunction);
 
 chooseexecprogram:
 	cachedpr_trace = prog->trace;
-	if (prvm_runawaycheck)
+	if (prog->trace || prog->watch_global_type != ev_void || prog->watch_field_type != ev_void || prog->break_statement >= 0)
 	{
-#define PRVMRUNAWAYCHECK 1
-		if (prvm_statementprofiling.integer)
+#define PRVMSLOWINTERPRETER 1
+		if (prvm_timeprofiling.integer)
 		{
-#define PRVMSTATEMENTPROFILING 1
-			if (prvm_boundscheck)
-			{
-#define PRVMBOUNDSCHECK 1
-				if (prog->trace)
-				{
-#define PRVMTRACE 1
-#include "prvm_execprogram.h"
-#undef PRVMTRACE
-				}
-				else
-				{
-#include "prvm_execprogram.h"
-				}
-#undef PRVMBOUNDSCHECK
-			}
-			else
-			{
-				if (prog->trace)
-				{
-#define PRVMTRACE 1
+#define PRVMTIMEPROFILING 1
 #include "prvm_execprogram.h"
-#undef PRVMTRACE
-				}
-				else
-				{
-#include "prvm_execprogram.h"
-				}
-			}
-#undef PRVMSTATEMENTPROFILING
+#undef PRVMTIMEPROFILING
 		}
 		else
 		{
-			if (prvm_boundscheck)
-			{
-#define PRVMBOUNDSCHECK 1
-				if (prog->trace)
-				{
-#define PRVMTRACE 1
-#include "prvm_execprogram.h"
-#undef PRVMTRACE
-				}
-				else
-				{
-#include "prvm_execprogram.h"
-				}
-#undef PRVMBOUNDSCHECK
-			}
-			else
-			{
-				if (prog->trace)
-				{
-#define PRVMTRACE 1
-#include "prvm_execprogram.h"
-#undef PRVMTRACE
-				}
-				else
-				{
 #include "prvm_execprogram.h"
-				}
-			}
 		}
-#undef PRVMRUNAWAYCHECK
+#undef PRVMSLOWINTERPRETER
 	}
 	else
 	{
-		if (prvm_statementprofiling.integer)
+		if (prvm_timeprofiling.integer)
 		{
-#define PRVMSTATEMENTPROFILING 1
-			if (prvm_boundscheck)
-			{
-#define PRVMBOUNDSCHECK 1
-				if (prog->trace)
-				{
-#define PRVMTRACE 1
-#include "prvm_execprogram.h"
-#undef PRVMTRACE
-				}
-				else
-				{
+#define PRVMTIMEPROFILING 1
 #include "prvm_execprogram.h"
-				}
-#undef PRVMBOUNDSCHECK
-			}
-			else
-			{
-				if (prog->trace)
-				{
-#define PRVMTRACE 1
-#include "prvm_execprogram.h"
-#undef PRVMTRACE
-				}
-				else
-				{
-#include "prvm_execprogram.h"
-				}
-			}
-#undef PRVMSTATEMENTPROFILING
+#undef PRVMTIMEPROFILING
 		}
 		else
 		{
-			if (prvm_boundscheck)
-			{
-#define PRVMBOUNDSCHECK 1
-				if (prog->trace)
-				{
-#define PRVMTRACE 1
-#include "prvm_execprogram.h"
-#undef PRVMTRACE
-				}
-				else
-				{
 #include "prvm_execprogram.h"
-				}
-#undef PRVMBOUNDSCHECK
-			}
-			else
-			{
-				if (prog->trace)
-				{
-#define PRVMTRACE 1
-#include "prvm_execprogram.h"
-#undef PRVMTRACE
-				}
-				else
-				{
-#include "prvm_execprogram.h"
-				}
-			}
 		}
 	}
 
 cleanup:
-	if (developer.integer >= 200 && vm_tempstringsbuf.cursize > restorevm_tempstringsbuf_cursize)
-		Con_Printf("SVVM_ExecuteProgram: %s used %i bytes of tempstrings\n", PRVM_GetString(prog->functions[fnum].s_name), vm_tempstringsbuf.cursize - restorevm_tempstringsbuf_cursize);
+	if (developer_insane.integer && prog->tempstringsbuf.cursize > restorevm_tempstringsbuf_cursize)
+		Con_DPrintf("SVVM_ExecuteProgram: %s used %i bytes of tempstrings\n", PRVM_GetString(prog, prog->functions[fnum].s_name), prog->tempstringsbuf.cursize - restorevm_tempstringsbuf_cursize);
 	// delete tempstrings created by this function
-	vm_tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
+	prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
 
-	f->totaltime += (Sys_DoubleTime() - calltime);
+	tm = Sys_DirtyTime() - calltime;if (tm < 0 || tm >= 1800) tm = 0;
+	func->totaltime += tm;
 
-	SV_FlushBroadcastMessages();
+	if (prog == SVVM_prog)
+		SV_FlushBroadcastMessages();
 }