#include "quakedef.h"
-typedef struct
+typedef struct prstack_s
{
int s;
mfunction_t *f;
} prstack_t;
#define MAX_STACK_DEPTH 256
-prstack_t pr_stack[MAX_STACK_DEPTH];
+// 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
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_Printf (" ");
+ 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_Printf ("\n");
+ Con_Print("\n");
}
/*
f = pr_stack[i].f;
if (!f)
- Con_Printf ("<NULL FUNCTION>\n");
+ Con_Print("<NULL FUNCTION>\n");
else
- Con_Printf ("%12s : %s : statement %i\n", PR_GetString(f->s_file), PR_GetString(f->s_name), pr_stack[i].s - f->first_statement);
+ Con_Printf("%12s : %s : statement %i\n", PRVM_GetString(f->s_file), PRVM_GetString(f->s_name), pr_stack[i].s - f->first_statement);
}
}
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));
best = NULL;
for (i=0 ; i<progs->numfunctions ; i++)
{
- f = &pr_functions[i];
+ f = &prog->functions[i];
if (f->profile > max)
{
max = f->profile;
if (best)
{
//if (num < howmany)
- Con_Printf ("%7i %7i %s\n", best->profile, best->builtinsprofile, PR_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;
} while (best);
}
-
-void PR_Crash(void)
+void PR_PrintState(void)
{
int i;
- if (pr_depth < 1)
- {
- // kill the stack just to be sure
- pr_depth = 0;
- localstack_used = 0;
- return;
- }
-
- Con_Printf("QuakeC crash report:\n");
if (pr_xfunction)
{
- for (i = -4;i <= 0;i++)
+ for (i = -7;i <= 0;i++)
if (pr_xstatement + i >= pr_xfunction->first_statement)
PR_PrintStatement (pr_statements + pr_xstatement + i);
}
else
- Con_Printf("null function executing??\n");
+ Con_Print("null function executing??\n");
PR_StackTrace ();
+}
+
+void PR_Crash(void)
+{
+ if (pr_depth > 0)
+ {
+ Con_Print("QuakeC crash report:\n");
+ PR_PrintState();
+ }
// dump the stack so host_error can shutdown functions
pr_depth = 0;
/*
============================================================================
-PR_ExecuteProgram
+PRVM_ExecuteProgram
The interpretation main loop
============================================================================
// save off any locals that the new function steps on
c = f->locals;
if (localstack_used + c > LOCALSTACK_SIZE)
- Host_Error ("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];
c = pr_xfunction->locals;
localstack_used -= c;
if (localstack_used < 0)
- Host_Error ("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];
/*
====================
-PR_ExecuteProgram
+PRVM_ExecuteProgram
====================
*/
// 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;
extern cvar_t pr_traceqc;
-void PR_ExecuteProgram (func_t fnum, const char *errormessage)
+void PRVM_ExecuteProgram (func_t fnum, const char *errormessage)
{
dstatement_t *st;
mfunction_t *f, *newf;
- edict_t *ed;
- eval_t *ptr;
+ 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: %s", errormessage);
+ 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];
+ f = &prog->functions[fnum];
pr_trace = pr_traceqc.integer;
projects / xonotic / darkplaces.git / blobdiff