X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=pr_exec.c;h=c516fec7f2e6820ac648d3806252a1bb77016851;hp=eda7404f8d03efa01e17d1db6de90f8b0cc42d98;hb=df8727697622029dd7a03047999ffc19b49e44ea;hpb=a133a79072591972ca0e0c48df62507da6b710f0 diff --git a/pr_exec.c b/pr_exec.c index eda7404f..c516fec7 100644 --- a/pr_exec.c +++ b/pr_exec.c @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -24,11 +24,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. typedef struct { int s; - dfunction_t *f; + mfunction_t *f; } prstack_t; -#define MAX_STACK_DEPTH 32 -prstack_t pr_stack[MAX_STACK_DEPTH]; +#define MAX_STACK_DEPTH 256 +// 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 @@ -36,8 +38,8 @@ int localstack[LOCALSTACK_SIZE]; int localstack_used; -qboolean pr_trace; -dfunction_t *pr_xfunction; +int pr_trace; +mfunction_t *pr_xfunction; int pr_xstatement; @@ -48,43 +50,43 @@ char *pr_opnames[] = "DONE", "MUL_F", -"MUL_V", +"MUL_V", "MUL_FV", "MUL_VF", - + "DIV", "ADD_F", -"ADD_V", - +"ADD_V", + "SUB_F", "SUB_V", "EQ_F", "EQ_V", -"EQ_S", +"EQ_S", "EQ_E", "EQ_FNC", - + "NE_F", -"NE_V", +"NE_V", "NE_S", -"NE_E", +"NE_E", "NE_FNC", - + "LE", "GE", "LT", -"GT", +"GT", "INDIRECT", "INDIRECT", -"INDIRECT", -"INDIRECT", "INDIRECT", -"INDIRECT", +"INDIRECT", +"INDIRECT", +"INDIRECT", -"ADDRESS", +"ADDRESS", "STORE_F", "STORE_V", @@ -101,16 +103,16 @@ char *pr_opnames[] = "STOREP_FNC", "RETURN", - + "NOT_F", "NOT_V", -"NOT_S", -"NOT_ENT", -"NOT_FNC", - +"NOT_S", +"NOT_ENT", +"NOT_FNC", + "IF", "IFNOT", - + "CALL0", "CALL1", "CALL2", @@ -120,13 +122,13 @@ char *pr_opnames[] = "CALL6", "CALL7", "CALL8", - + "STATE", -"GOTO", - +"GOTO", + "AND", -"OR", +"OR", "BITAND", "BITOR" @@ -146,36 +148,36 @@ PR_PrintStatement 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]); + 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"); } /* @@ -185,7 +187,7 @@ PR_StackTrace */ void PR_StackTrace (void) { - dfunction_t *f; + mfunction_t *f; int i; pr_stack[pr_depth].s = pr_xstatement; @@ -195,9 +197,9 @@ void PR_StackTrace (void) f = pr_stack[i].f; if (!f) - Con_Printf ("\n"); + Con_Print("\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); } } @@ -210,11 +212,18 @@ PR_Profile_f */ void PR_Profile_f (void) { - dfunction_t *f, *best; - int max; - int num; - int i; + mfunction_t *f, *best; + int i, num, max/*, howmany*/; + + if (!sv.active) + { + Con_Printf("no server running, can't profile\n"); + return; + } + //howmany = 10; + //if (Cmd_Argc() == 2) + // howmany = atoi(Cmd_Argv(1)); num = 0; do { @@ -231,48 +240,40 @@ void PR_Profile_f (void) } if (best) { - if (num < 10) - Con_Printf ("%7i %s\n", best->profile, pr_strings+best->s_name); + //if (num < howmany) + Con_Printf("%7i %7i %s\n", best->profile, best->builtinsprofile, PR_GetString(best->s_name)); num++; best->profile = 0; + best->builtinsprofile = 0; } } while (best); } - -/* -============ -PR_RunError - -Aborts the currently executing function -============ -*/ -void PR_RunError (char *error, ...) +void PR_PrintState(void) { - int i; - va_list argptr; - char string[1024]; - - va_start (argptr,error); - vsprintf (string,error,argptr); - va_end (argptr); - + int i; 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 (); - Con_Printf ("%s\n", string); +} + +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; localstack_used = 0; - - Host_Error ("Program error"); } /* @@ -290,23 +291,23 @@ PR_EnterFunction Returns the new program statement counter ==================== */ -int PR_EnterFunction (dfunction_t *f) +int PR_EnterFunction (mfunction_t *f) { int i, j, c, o; if (!f) - PR_RunError ("PR_EnterFunction: NULL function\n"); + Host_Error ("PR_EnterFunction: NULL function\n"); pr_stack[pr_depth].s = pr_xstatement; pr_stack[pr_depth].f = pr_xfunction; pr_depth++; if (pr_depth >= MAX_STACK_DEPTH) - PR_RunError ("stack overflow"); + Host_Error ("stack overflow"); // save off any locals that the new function steps on c = f->locals; if (localstack_used + c > LOCALSTACK_SIZE) - PR_RunError ("PR_ExecuteProgram: locals stack overflow\n"); + Host_Error ("PR_ExecuteProgram: locals stack overflow\n"); for (i=0 ; i < c ; i++) localstack[localstack_used+i] = ((int *)pr_globals)[f->parm_start + i]; @@ -340,12 +341,12 @@ int PR_LeaveFunction (void) Host_Error ("prog stack underflow"); if (!pr_xfunction) - PR_RunError ("PR_LeaveFunction: NULL function\n"); + Host_Error ("PR_LeaveFunction: NULL function\n"); // restore locals from the stack c = pr_xfunction->locals; localstack_used -= c; if (localstack_used < 0) - PR_RunError ("PR_ExecuteProgram: locals stack underflow\n"); + Host_Error ("PR_ExecuteProgram: locals stack underflow\n"); for (i=0 ; i < c ; i++) ((int *)pr_globals)[pr_xfunction->parm_start + i] = localstack[localstack_used+i]; @@ -356,11 +357,14 @@ int PR_LeaveFunction (void) 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(); } /* @@ -373,24 +377,25 @@ PR_ExecuteProgram #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; -void PR_ExecuteProgram (func_t fnum, char *errormessage) +extern cvar_t pr_traceqc; +void PR_ExecuteProgram (func_t fnum, const char *errormessage) { dstatement_t *st; - dfunction_t *f, *newf; + mfunction_t *f, *newf; edict_t *ed; 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)); + ED_Print(PROG_TO_EDICT(pr_global_struct->self)); Host_Error ("PR_ExecuteProgram: %s", errormessage); } 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; @@ -431,3 +436,6 @@ chooseexecprogram: } } +void PR_ReInitStrings (void) +{ +}