X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=pr_exec.c;h=ad83e34d0a61988b3cee2520533efbe9682dade6;hp=368f485bd358015fc592c0985413c72cfd4e66ff;hb=6a0bf78cdb1b3ddeeb1a21d80b4b3b7e6f2720ef;hpb=dbce962f09403fd5888d0bd858ceefc90bc3ea2b diff --git a/pr_exec.c b/pr_exec.c index 368f485b..ad83e34d 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,7 +148,7 @@ 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]); @@ -154,7 +156,7 @@ void PR_PrintStatement (dstatement_t *s) 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) @@ -163,15 +165,15 @@ void PR_PrintStatement (dstatement_t *s) } 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)); } @@ -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; @@ -197,7 +199,7 @@ void PR_StackTrace (void) if (!f) Con_Printf ("\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,12 @@ 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*/; + //howmany = 10; + //if (Cmd_Argc() == 2) + // howmany = atoi(Cmd_Argv(1)); num = 0; do { @@ -231,10 +234,11 @@ 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); } @@ -243,7 +247,7 @@ void PR_Profile_f (void) void PR_Crash(void) { int i; - if (!pr_depth) + if (pr_depth < 1) { // kill the stack just to be sure pr_depth = 0; @@ -282,7 +286,7 @@ 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; @@ -348,11 +352,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(); } /* @@ -365,10 +372,11 @@ 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; @@ -382,7 +390,7 @@ void PR_ExecuteProgram (func_t fnum, char *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; @@ -423,3 +431,6 @@ chooseexecprogram: } } +void PR_ReInitStrings (void) +{ +}