dfunction_t *f;
} prstack_t;
-#define MAX_STACK_DEPTH 32
+#define MAX_STACK_DEPTH 256
prstack_t pr_stack[MAX_STACK_DEPTH];
int pr_depth = 0;
int localstack_used;
-qboolean pr_trace;
+int pr_trace;
dfunction_t *pr_xfunction;
int pr_xstatement;
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]);
for ( ; i<10 ; i++)
Con_Printf (" ");
}
-
+
if (s->op == OP_IF || s->op == OP_IFNOT)
Con_Printf ("%sbranch %i",PR_GlobalString((unsigned short) s->a),s->b);
else if (s->op == OP_GOTO)
}
else if ( (unsigned)(s->op - OP_STORE_F) < 6)
{
- Con_Printf ("%s",PR_GlobalString((unsigned short) s->a));
+ Con_Printf ("%s", PR_GlobalString((unsigned short) s->a));
Con_Printf ("%s", PR_GlobalStringNoContents((unsigned short) s->b));
}
else
{
if (s->a)
- Con_Printf ("%s",PR_GlobalString((unsigned short) s->a));
+ Con_Printf ("%s", PR_GlobalString((unsigned short) s->a));
if (s->b)
- Con_Printf ("%s",PR_GlobalString((unsigned short) s->b));
+ Con_Printf ("%s", PR_GlobalString((unsigned short) s->b));
if (s->c)
Con_Printf ("%s", PR_GlobalStringNoContents((unsigned short) s->c));
}
if (!f)
Con_Printf ("<NULL FUNCTION>\n");
else
- Con_Printf ("%12s : %s : statement %i\n", pr_strings + f->s_file, pr_strings + f->s_name, pr_stack[i].s - f->first_statement);
+ Con_Printf ("%12s : %s : statement %i\n", PR_GetString(f->s_file), PR_GetString(f->s_name), pr_stack[i].s - f->first_statement);
}
}
if (best)
{
if (num < 10)
- Con_Printf ("%7i %s\n", best->profile, pr_strings+best->s_name);
+ Con_Printf ("%7i %s\n", best->profile, PR_GetString(best->s_name));
num++;
best->profile = 0;
}
void PR_Crash(void)
{
int i;
- if (!pr_depth)
+ if (pr_depth < 1)
{
// kill the stack just to be sure
pr_depth = 0;
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();
}
/*
#define OPB ((eval_t *)&pr_globals[(unsigned short) st->b])
#define OPC ((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)
{
dstatement_t *st;
f = &pr_functions[fnum];
- pr_trace = false;
+ pr_trace = pr_traceqc.integer;
// we know we're done when pr_depth drops to this
exitdepth = pr_depth;
}
}
+// LordHavoc: grabbed these from QWSV, works around a gcc 2.95.3 compiler bug
+#define MAX_PRSTR 65536
+static char *pr_strtbl[MAX_PRSTR];
+static int num_prstr;
+
+char *PR_GetString (int num)
+{
+ return num >= 0 ? pr_strings + num : pr_strtbl[-num];
+}
+
+int PR_SetString (char *s)
+{
+ if (s >= pr_strings)
+ return (int) (s - pr_strings);
+ else
+ {
+ int i;
+ for (i = 0; i <= num_prstr; i++)
+ if (pr_strtbl[i] == s)
+ return -i;
+ if (num_prstr >= (MAX_PRSTR - 1))
+ Host_Error ("PR_Setstring: ran out of string table slots");
+ pr_strtbl[++num_prstr] = s;
+ return -num_prstr;
+ }
+}
+
+void PR_ReInitStrings (void)
+{
+ num_prstr = 0;
+}