X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=prvm_exec.c;h=4c6ae4527201b44984476dd8d28bc64694b18550;hb=3ec243e3da001772d9e1676c2ea599ebac8071b7;hp=47ab908973b5058bde5b1b3f8e0e25963a05d6d0;hpb=b5f7d001ffda50c978688c764f0ccab6ddd36d57;p=xonotic%2Fdarkplaces.git

diff --git a/prvm_exec.c b/prvm_exec.c
index 47ab9089..4c6ae452 100644
--- a/prvm_exec.c
+++ b/prvm_exec.c
@@ -204,6 +204,8 @@ void PRVM_Profile_f (void)
 	if(!PRVM_SetProgFromString(Cmd_Argv(1)))
 		return;
 
+	Con_Printf( "%s Profile:\n[Profile] [BuiltinProfile] [CallCount]\n", PRVM_NAME );
+
 	num = 0;
 	do
 	{
@@ -221,10 +223,11 @@ void PRVM_Profile_f (void)
 		if (best)
 		{
 			//if (num < howmany)
-				Con_Printf("%s: %7i %7i %s\n", PRVM_NAME, best->profile, best->builtinsprofile, PRVM_GetString(best->s_name));
+				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;
+			best->callcount = 0;
 		}
 	} while (best);
 
@@ -243,7 +246,7 @@ void PRVM_CrashAll()
 		PRVM_SetProg(i);
 		PRVM_Crash();
 	}
-	
+
 	prog = oldprog;
 }
 
@@ -263,21 +266,21 @@ void PRVM_PrintState(void)
 
 void PRVM_Crash()
 {
-	if (prog->depth < 1)
-	{
-		// kill the stack just to be sure
-		prog->depth = 0;
-		prog->localstack_used = 0;
+	if (prog == NULL)
 		return;
-	}
 
-	Con_Printf("QuakeC crash report for %s:\n", PRVM_NAME);
-	PRVM_PrintState();
+	if( prog->depth > 0 )
+	{
+		Con_Printf("QuakeC crash report for %s:\n", PRVM_NAME);
+		PRVM_PrintState();
+	}
 
 	// dump the stack so host_error can shutdown functions
 	prog->depth = 0;
 	prog->localstack_used = 0;
 
+	// reset the prog pointer
+	prog = NULL;
 }
 
 /*
@@ -314,7 +317,7 @@ int PRVM_EnterFunction (mfunction_t *f)
 		PRVM_ERROR ("PRVM_ExecuteProgram: locals stack overflow in %s\n", PRVM_NAME);
 
 	for (i=0 ; i < c ; i++)
-		prog->localstack[prog->localstack_used+i] = ((int *)prog->globals)[f->parm_start + i];
+		prog->localstack[prog->localstack_used+i] = ((int *)prog->globals.generic)[f->parm_start + i];
 	prog->localstack_used += c;
 
 // copy parameters
@@ -323,7 +326,7 @@ int PRVM_EnterFunction (mfunction_t *f)
 	{
 		for (j=0 ; j<f->parm_size[i] ; j++)
 		{
-			((int *)prog->globals)[o] = ((int *)prog->globals)[OFS_PARM0+i*3+j];
+			((int *)prog->globals.generic)[o] = ((int *)prog->globals.generic)[OFS_PARM0+i*3+j];
 			o++;
 		}
 	}
@@ -353,7 +356,7 @@ int PRVM_LeaveFunction (void)
 		PRVM_ERROR ("PRVM_ExecuteProgram: locals stack underflow in %s\n", PRVM_NAME);
 
 	for (i=0 ; i < c ; i++)
-		((int *)prog->globals)[prog->xfunction->parm_start + i] = prog->localstack[prog->localstack_used+i];
+		((int *)prog->globals.generic)[prog->xfunction->parm_start + i] = prog->localstack[prog->localstack_used+i];
 
 // up stack
 	prog->depth--;
@@ -376,13 +379,13 @@ PRVM_ExecuteProgram
 ====================
 */
 // LordHavoc: optimized
-#define OPA ((prvm_eval_t *)&prog->globals[(unsigned short) st->a])
-#define OPB ((prvm_eval_t *)&prog->globals[(unsigned short) st->b])
-#define OPC ((prvm_eval_t *)&prog->globals[(unsigned short) st->c])
+#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_boundscheck;
 extern cvar_t prvm_traceqc;
 extern int		PRVM_ED_FindFieldOffset (const char *field);
-extern ddef_t*	PRVM_ED_FindGlobal(const char *name); 
+extern ddef_t*	PRVM_ED_FindGlobal(const char *name);
 void PRVM_ExecuteProgram (func_t fnum, const char *errormessage)
 {
 	dstatement_t	*st;
@@ -395,7 +398,7 @@ void PRVM_ExecuteProgram (func_t fnum, const char *errormessage)
 	{
 		if (prog->self && PRVM_G_INT(prog->self->ofs))
 			PRVM_ED_Print(PRVM_PROG_TO_EDICT(PRVM_G_INT(prog->self->ofs)));
-		PRVM_ERROR ("PR_ExecuteProgram: %s", errormessage);
+		PRVM_ERROR ("PRVM_ExecuteProgram: %s", errormessage);
 	}
 
 	f = &prog->functions[fnum];