X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=prvm_exec.c;h=c43fbef42791ec12bd23e9933b1a94bbe6afd8c5;hb=311fb92b9f69eef090638eb8142d8e1ea89046e1;hp=65ee31b2328a7175f9284c0699a7bb8f5393a6d8;hpb=91efd4d4260983eae86f644ff1813cc391d3c27e;p=xonotic%2Fdarkplaces.git

diff --git a/prvm_exec.c b/prvm_exec.c
index 65ee31b2..c43fbef4 100644
--- a/prvm_exec.c
+++ b/prvm_exec.c
@@ -199,19 +199,19 @@ PRVM_PrintFunction_f
 
 ============
 */
-void PRVM_PrintFunction_f (void)
+void PRVM_PrintFunction_f(cmd_state_t *cmd)
 {
 	prvm_prog_t *prog;
-	if (Cmd_Argc() != 3)
+	if (Cmd_Argc(cmd) != 3)
 	{
 		Con_Printf("usage: prvm_printfunction <program name> <function name>\n");
 		return;
 	}
 
-	if (!(prog = PRVM_FriendlyProgFromString(Cmd_Argv(1))))
+	if (!(prog = PRVM_FriendlyProgFromString(Cmd_Argv(cmd, 1))))
 		return;
 
-	PRVM_PrintFunctionStatements(prog, Cmd_Argv(2));
+	PRVM_PrintFunctionStatements(prog, Cmd_Argv(cmd, 2));
 }
 
 /*
@@ -433,16 +433,16 @@ PRVM_CallProfile_f
 
 ============
 */
-void PRVM_CallProfile_f (void)
+void PRVM_CallProfile_f(cmd_state_t *cmd)
 {
 	prvm_prog_t *prog;
-	if (Cmd_Argc() != 2)
+	if (Cmd_Argc(cmd) != 2)
 	{
 		Con_Print("prvm_callprofile <program name>\n");
 		return;
 	}
 
-	if (!(prog = PRVM_FriendlyProgFromString(Cmd_Argv(1))))
+	if (!(prog = PRVM_FriendlyProgFromString(Cmd_Argv(cmd, 1))))
 		return;
 
 	PRVM_CallProfile(prog);
@@ -454,7 +454,7 @@ PRVM_Profile_f
 
 ============
 */
-void PRVM_Profile_f (void)
+void PRVM_Profile_f(cmd_state_t *cmd)
 {
 	prvm_prog_t *prog;
 	int howmany;
@@ -466,21 +466,21 @@ void PRVM_Profile_f (void)
 	}
 
 	howmany = 1<<30;
-	if (Cmd_Argc() == 3)
-		howmany = atoi(Cmd_Argv(2));
-	else if (Cmd_Argc() != 2)
+	if (Cmd_Argc(cmd) == 3)
+		howmany = atoi(Cmd_Argv(cmd, 2));
+	else if (Cmd_Argc(cmd) != 2)
 	{
 		Con_Print("prvm_profile <program name>\n");
 		return;
 	}
 
-	if (!(prog = PRVM_FriendlyProgFromString(Cmd_Argv(1))))
+	if (!(prog = PRVM_FriendlyProgFromString(Cmd_Argv(cmd, 1))))
 		return;
 
 	PRVM_Profile(prog, howmany, 0, 0);
 }
 
-void PRVM_ChildProfile_f (void)
+void PRVM_ChildProfile_f(cmd_state_t *cmd)
 {
 	prvm_prog_t *prog;
 	int howmany;
@@ -492,15 +492,15 @@ void PRVM_ChildProfile_f (void)
 	}
 
 	howmany = 1<<30;
-	if (Cmd_Argc() == 3)
-		howmany = atoi(Cmd_Argv(2));
-	else if (Cmd_Argc() != 2)
+	if (Cmd_Argc(cmd) == 3)
+		howmany = atoi(Cmd_Argv(cmd, 2));
+	else if (Cmd_Argc(cmd) != 2)
 	{
 		Con_Print("prvm_childprofile <program name>\n");
 		return;
 	}
 
-	if (!(prog = PRVM_FriendlyProgFromString(Cmd_Argv(1))))
+	if (!(prog = PRVM_FriendlyProgFromString(Cmd_Argv(cmd, 1))))
 		return;
 
 	PRVM_Profile(prog, howmany, 0, 1);
@@ -737,7 +737,7 @@ MVM_ExecuteProgram
 void MVM_ExecuteProgram (prvm_prog_t *prog, func_t fnum, const char *errormessage)
 {
 	mstatement_t	*st, *startst;
-	mfunction_t	*f, *newf;
+	mfunction_t		*func, *enterfunc;
 	prvm_edict_t	*ed;
 	prvm_eval_t	*ptr;
 	int		jumpcount, cachedpr_trace, exitdepth;
@@ -746,7 +746,7 @@ void MVM_ExecuteProgram (prvm_prog_t *prog, func_t fnum, const char *errormessag
 	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;
+	prvm_vec_t *cached_edictsfields = prog->edictsfields.fp;
 	unsigned int cached_entityfields = prog->entityfields;
 	unsigned int cached_entityfields_3 = prog->entityfields - 3;
 	unsigned int cached_entityfieldsarea = prog->entityfieldsarea;
@@ -768,7 +768,7 @@ void MVM_ExecuteProgram (prvm_prog_t *prog, func_t fnum, const char *errormessag
 		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 = prog->tempstringsbuf.cursize;
@@ -779,7 +779,7 @@ void MVM_ExecuteProgram (prvm_prog_t *prog, func_t fnum, const char *errormessag
 	exitdepth = prog->depth;
 
 // make a stack frame
-	st = &prog->statements[PRVM_EnterFunction(prog, 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)
@@ -793,7 +793,7 @@ void MVM_ExecuteProgram (prvm_prog_t *prog, func_t fnum, const char *errormessag
 
 chooseexecprogram:
 	cachedpr_trace = prog->trace;
-	if (prvm_statementprofiling.integer || prog->trace || prog->watch_global_type != ev_void || prog->watch_field_type != ev_void || prog->break_statement >= 0 || (prvm_coverage.integer & 4))
+	if (prog->trace || prog->watch_global_type != ev_void || prog->watch_field_type != ev_void || prog->break_statement >= 0)
 	{
 #define PRVMSLOWINTERPRETER 1
 		if (prvm_timeprofiling.integer)
@@ -829,7 +829,7 @@ cleanup:
 	prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
 
 	tm = Sys_DirtyTime() - calltime;if (tm < 0 || tm >= 1800) tm = 0;
-	f->totaltime += tm;
+	func->totaltime += tm;
 
 	if (prog == SVVM_prog)
 		SV_FlushBroadcastMessages();
@@ -844,7 +844,7 @@ CLVM_ExecuteProgram
 void CLVM_ExecuteProgram (prvm_prog_t *prog, func_t fnum, const char *errormessage)
 {
 	mstatement_t	*st, *startst;
-	mfunction_t	*f, *newf;
+	mfunction_t		*func, *enterfunc;
 	prvm_edict_t	*ed;
 	prvm_eval_t	*ptr;
 	int		jumpcount, cachedpr_trace, exitdepth;
@@ -853,7 +853,7 @@ void CLVM_ExecuteProgram (prvm_prog_t *prog, func_t fnum, const char *errormessa
 	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;
+	prvm_vec_t *cached_edictsfields = prog->edictsfields.fp;
 	unsigned int cached_entityfields = prog->entityfields;
 	unsigned int cached_entityfields_3 = prog->entityfields - 3;
 	unsigned int cached_entityfieldsarea = prog->entityfieldsarea;
@@ -875,7 +875,7 @@ void CLVM_ExecuteProgram (prvm_prog_t *prog, func_t fnum, const char *errormessa
 		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 = prog->tempstringsbuf.cursize;
@@ -886,7 +886,7 @@ void CLVM_ExecuteProgram (prvm_prog_t *prog, func_t fnum, const char *errormessa
 	exitdepth = prog->depth;
 
 // make a stack frame
-	st = &prog->statements[PRVM_EnterFunction(prog, 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)
@@ -900,7 +900,7 @@ void CLVM_ExecuteProgram (prvm_prog_t *prog, func_t fnum, const char *errormessa
 
 chooseexecprogram:
 	cachedpr_trace = prog->trace;
-	if (prvm_statementprofiling.integer || prog->trace || prog->watch_global_type != ev_void || prog->watch_field_type != ev_void || prog->break_statement >= 0 || (prvm_coverage.integer & 4))
+	if (prog->trace || prog->watch_global_type != ev_void || prog->watch_field_type != ev_void || prog->break_statement >= 0)
 	{
 #define PRVMSLOWINTERPRETER 1
 		if (prvm_timeprofiling.integer)
@@ -936,7 +936,7 @@ cleanup:
 	prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
 
 	tm = Sys_DirtyTime() - calltime;if (tm < 0 || tm >= 1800) tm = 0;
-	f->totaltime += tm;
+	func->totaltime += tm;
 
 	if (prog == SVVM_prog)
 		SV_FlushBroadcastMessages();
@@ -955,7 +955,7 @@ void PRVM_ExecuteProgram (prvm_prog_t *prog, func_t fnum, const char *errormessa
 #endif
 {
 	mstatement_t	*st, *startst;
-	mfunction_t	*f, *newf;
+	mfunction_t		*func, *enterfunc;
 	prvm_edict_t	*ed;
 	prvm_eval_t	*ptr;
 	int		jumpcount, cachedpr_trace, exitdepth;
@@ -964,7 +964,7 @@ void PRVM_ExecuteProgram (prvm_prog_t *prog, func_t fnum, const char *errormessa
 	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;
+	prvm_vec_t *cached_edictsfields = prog->edictsfields.fp;
 	unsigned int cached_entityfields = prog->entityfields;
 	unsigned int cached_entityfields_3 = prog->entityfields - 3;
 	unsigned int cached_entityfieldsarea = prog->entityfieldsarea;
@@ -986,7 +986,7 @@ void PRVM_ExecuteProgram (prvm_prog_t *prog, func_t fnum, const char *errormessa
 		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 = prog->tempstringsbuf.cursize;
@@ -997,7 +997,7 @@ void PRVM_ExecuteProgram (prvm_prog_t *prog, func_t fnum, const char *errormessa
 	exitdepth = prog->depth;
 
 // make a stack frame
-	st = &prog->statements[PRVM_EnterFunction(prog, 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)
@@ -1011,7 +1011,7 @@ void PRVM_ExecuteProgram (prvm_prog_t *prog, func_t fnum, const char *errormessa
 
 chooseexecprogram:
 	cachedpr_trace = prog->trace;
-	if (prvm_statementprofiling.integer || prog->trace || prog->watch_global_type != ev_void || prog->watch_field_type != ev_void || prog->break_statement >= 0 || (prvm_coverage.integer & 4))
+	if (prog->trace || prog->watch_global_type != ev_void || prog->watch_field_type != ev_void || prog->break_statement >= 0)
 	{
 #define PRVMSLOWINTERPRETER 1
 		if (prvm_timeprofiling.integer)
@@ -1047,7 +1047,7 @@ cleanup:
 	prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
 
 	tm = Sys_DirtyTime() - calltime;if (tm < 0 || tm >= 1800) tm = 0;
-	f->totaltime += tm;
+	func->totaltime += tm;
 
 	if (prog == SVVM_prog)
 		SV_FlushBroadcastMessages();