merged q1bsp and q3bsp surface rendering

[xonotic/darkplaces.git] / pr_exec.c

diff --git a/pr_exec.c b/pr_exec.c
index e0421bd98643142c3e7d62d2d16cbf5bcedb8ead..c516fec7f2e6820ac648d3806252a1bb77016851 100644 (file)
--- 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.
 
@@ -28,7 +28,9 @@ typedef struct
 } 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
@@ -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"
@@ -149,33 +151,33 @@ void PR_PrintStatement (dstatement_t *s)
 
        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");
 }
 
 /*
@@ -195,9 +197,9 @@ void PR_StackTrace (void)
                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", PR_GetString(f->s_file), PR_GetString(f->s_name), pr_stack[i].s - f->first_statement);
        }
 }
 
@@ -213,6 +215,12 @@ void PR_Profile_f (void)
        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));
@@ -233,7 +241,7 @@ void PR_Profile_f (void)
                if (best)
                {
                        //if (num < howmany)
-                               Con_Printf ("%7i %7i %s\n", best->profile, best->builtinsprofile, PR_GetString(best->s_name));
+                               Con_Printf("%7i %7i %s\n", best->profile, best->builtinsprofile, PR_GetString(best->s_name));
                        num++;
                        best->profile = 0;
                        best->builtinsprofile = 0;
@@ -241,28 +249,27 @@ void PR_Profile_f (void)
        } 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;
@@ -379,10 +386,10 @@ void PR_ExecuteProgram (func_t fnum, const char *errormessage)
        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);
        }