removed \n from all Host_Error, Sys_Error, PRVM_ERROR, PF_ERROR calls, since Host_Err...

[xonotic/darkplaces.git] / prvm_exec.c

diff --git a/prvm_exec.c b/prvm_exec.c
index adaf7967eb16f057997a96d779a225966580a3aa..2f8c97aeebc3d12de5e056dc07e4ed1261029017 100644 (file)
--- a/prvm_exec.c
+++ b/prvm_exec.c
@@ -19,6 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "quakedef.h"
+#include "progsvm.h"
 
 char *prvm_opnames[] =
 {
@@ -122,37 +123,44 @@ PRVM_PrintStatement
 */
 void PRVM_PrintStatement (dstatement_t *s)
 {
-       int             i;
+       size_t i;
+
+       if( prog->statement_linenums ) {
+               int opnum;
+
+               opnum = s - prog->statements;
+               Con_Printf( "%s:%i: ", PRVM_GetString( prog->xfunction->s_file ), prog->statement_linenums[ opnum ] );
+       }
 
        if ( (unsigned)s->op < sizeof(prvm_opnames)/sizeof(prvm_opnames[0]))
        {
-               Con_Printf ("%s ",  prvm_opnames[s->op]);
+               Con_Printf("%s ",  prvm_opnames[s->op]);
                i = strlen(prvm_opnames[s->op]);
                for ( ; i<10 ; i++)
-                       Con_Printf (" ");
+                       Con_Print(" ");
        }
 
        if (s->op == OP_IF || s->op == OP_IFNOT)
-               Con_Printf ("%sbranch %i",PRVM_GlobalString((unsigned short) s->a),s->b);
+               Con_Printf("%sbranch %i",PRVM_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", PRVM_GlobalString((unsigned short) s->a));
-               Con_Printf ("%s", PRVM_GlobalStringNoContents((unsigned short) s->b));
+               Con_Print(PRVM_GlobalString((unsigned short) s->a));
+               Con_Print(PRVM_GlobalStringNoContents((unsigned short) s->b));
        }
        else
        {
                if (s->a)
-                       Con_Printf ("%s", PRVM_GlobalString((unsigned short) s->a));
+                       Con_Print(PRVM_GlobalString((unsigned short) s->a));
                if (s->b)
-                       Con_Printf ("%s", PRVM_GlobalString((unsigned short) s->b));
+                       Con_Print(PRVM_GlobalString((unsigned short) s->b));
                if (s->c)
-                       Con_Printf ("%s", PRVM_GlobalStringNoContents((unsigned short) s->c));
+                       Con_Print(PRVM_GlobalStringNoContents((unsigned short) s->c));
        }
-       Con_Printf ("\n");
+       Con_Print("\n");
 }
 
 /*
@@ -172,9 +180,9 @@ void PRVM_StackTrace (void)
                f = prog->stack[i].f;
 
                if (!f)
-                       Con_Printf ("<NULL FUNCTION>\n");
+                       Con_Print("<NULL FUNCTION>\n");
                else
-                       Con_Printf ("%12s : %s : statement %i\n", PRVM_GetString(f->s_file), PRVM_GetString(f->s_name), prog->stack[i].s - f->first_statement);
+                       Con_Printf("%12s : %s : statement %i\n", PRVM_GetString(f->s_file), PRVM_GetString(f->s_name), prog->stack[i].s - f->first_statement);
        }
 }
 
@@ -203,6 +211,8 @@ void PRVM_Profile_f (void)
        if(!PRVM_SetProgFromString(Cmd_Argv(1)))
                return;
 
+       Con_Printf( "%s Profile:\n[Profile] [BuiltinProfile] [CallCount]\n", PRVM_NAME );
+
        num = 0;
        do
        {
@@ -220,10 +230,11 @@ void PRVM_Profile_f (void)
                if (best)
                {
                        //if (num < howmany)
-                               Con_Printf ("%s: %7i %7i %s\n", PRVM_NAME, best->profile, best->builtinsprofile, PRVM_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;
+                       best->callcount = 0;
                }
        } while (best);
 
@@ -233,7 +244,8 @@ void PRVM_Profile_f (void)
 void PRVM_CrashAll()
 {
        int i;
-       PRVM_Begin; 
+       prvm_prog_t *oldprog = prog;
+
        for(i = 0; i < PRVM_MAXPROGS; i++)
        {
                if(!PRVM_ProgLoaded(i))
@@ -241,36 +253,41 @@ void PRVM_CrashAll()
                PRVM_SetProg(i);
                PRVM_Crash();
        }
-       PRVM_End;
+
+       prog = oldprog;
 }
 
-void PRVM_Crash()
+void PRVM_PrintState(void)
 {
        int i;
-       
-       if (prog->depth < 1)
-       {
-               // kill the stack just to be sure
-               prog->depth = 0;
-               prog->localstack_used = 0;
-               return;
-       }
-
-       Con_Printf("QuakeC crash report for %s:\n", PRVM_NAME);
        if (prog->xfunction)
        {
-               for (i = -4;i <= 0;i++)
+               for (i = -7; i <= 0;i++)
                        if (prog->xstatement + i >= prog->xfunction->first_statement)
                                PRVM_PrintStatement (prog->statements + prog->xstatement + i);
        }
        else
-               Con_Printf("null function executing??\n");
+               Con_Print("null function executing??\n");
        PRVM_StackTrace ();
+}
+
+void PRVM_Crash()
+{
+       if (prog == NULL)
+               return;
+
+       if( prog->depth > 0 )
+       {
+               Con_Printf("QuakeC crash report for %s:\n", PRVM_NAME);
+               PRVM_PrintState();
+       }
 
        // dump the stack so host_error can shutdown functions
        prog->depth = 0;
        prog->localstack_used = 0;
 
+       // reset the prog pointer
+       prog = NULL;
 }
 
 /*
@@ -293,7 +310,7 @@ int PRVM_EnterFunction (mfunction_t *f)
        int             i, j, c, o;
 
        if (!f)
-               PRVM_ERROR ("PRVM_EnterFunction: NULL function in %s\n", PRVM_NAME);
+               PRVM_ERROR ("PRVM_EnterFunction: NULL function in %s", PRVM_NAME);
 
        prog->stack[prog->depth].s = prog->xstatement;
        prog->stack[prog->depth].f = prog->xfunction;
@@ -304,10 +321,10 @@ int PRVM_EnterFunction (mfunction_t *f)
 // save off any locals that the new function steps on
        c = f->locals;
        if (prog->localstack_used + c > PRVM_LOCALSTACK_SIZE)
-               PRVM_ERROR ("PRVM_ExecuteProgram: locals stack overflow in %s\n", PRVM_NAME);
+               PRVM_ERROR ("PRVM_ExecuteProgram: locals stack overflow in %s", PRVM_NAME);
 
        for (i=0 ; i < c ; i++)
-               prog->localstack[prog->localstack_used+i] = ((int *)prog->globals)[f->parm_start + i];
+               prog->localstack[prog->localstack_used+i] = ((int *)prog->globals.generic)[f->parm_start + i];
        prog->localstack_used += c;
 
 // copy parameters
@@ -316,7 +333,7 @@ int PRVM_EnterFunction (mfunction_t *f)
        {
                for (j=0 ; j<f->parm_size[i] ; j++)
                {
-                       ((int *)prog->globals)[o] = ((int *)prog->globals)[OFS_PARM0+i*3+j];
+                       ((int *)prog->globals.generic)[o] = ((int *)prog->globals.generic)[OFS_PARM0+i*3+j];
                        o++;
                }
        }
@@ -338,15 +355,15 @@ int PRVM_LeaveFunction (void)
                PRVM_ERROR ("prog stack underflow in %s", PRVM_NAME);
 
        if (!prog->xfunction)
-               PRVM_ERROR ("PR_LeaveFunction: NULL function in %s\n", PRVM_NAME);
+               PRVM_ERROR ("PR_LeaveFunction: NULL function in %s", PRVM_NAME);
 // restore locals from the stack
        c = prog->xfunction->locals;
        prog->localstack_used -= c;
        if (prog->localstack_used < 0)
-               PRVM_ERROR ("PRVM_ExecuteProgram: locals stack underflow in %s\n", PRVM_NAME);
+               PRVM_ERROR ("PRVM_ExecuteProgram: locals stack underflow in %s", PRVM_NAME);
 
        for (i=0 ; i < c ; i++)
-               ((int *)prog->globals)[prog->xfunction->parm_start + i] = prog->localstack[prog->localstack_used+i];
+               ((int *)prog->globals.generic)[prog->xfunction->parm_start + i] = prog->localstack[prog->localstack_used+i];
 
 // up stack
        prog->depth--;
@@ -369,13 +386,13 @@ PRVM_ExecuteProgram
 ====================
 */
 // LordHavoc: optimized
-#define OPA ((prvm_eval_t *)&prog->globals[(unsigned short) st->a])
-#define OPB ((prvm_eval_t *)&prog->globals[(unsigned short) st->b])
-#define OPC ((prvm_eval_t *)&prog->globals[(unsigned short) st->c])
+#define OPA ((prvm_eval_t *)&prog->globals.generic[(unsigned short) st->a])
+#define OPB ((prvm_eval_t *)&prog->globals.generic[(unsigned short) st->b])
+#define OPC ((prvm_eval_t *)&prog->globals.generic[(unsigned short) st->c])
 extern cvar_t prvm_boundscheck;
 extern cvar_t prvm_traceqc;
 extern int             PRVM_ED_FindFieldOffset (const char *field);
-extern ddef_t* PRVM_ED_FindGlobal(const char *name); 
+extern ddef_t* PRVM_ED_FindGlobal(const char *name);
 void PRVM_ExecuteProgram (func_t fnum, const char *errormessage)
 {
        dstatement_t    *st;
@@ -384,11 +401,11 @@ void PRVM_ExecuteProgram (func_t fnum, const char *errormessage)
        prvm_eval_t     *ptr;
        int             profile, startprofile, cachedpr_trace, exitdepth;
 
-       if (!fnum || fnum >= prog->progs->numfunctions)
+       if (!fnum || fnum >= (unsigned int)prog->progs->numfunctions)
        {
                if (prog->self && PRVM_G_INT(prog->self->ofs))
-                       PRVM_ED_Print (PRVM_PROG_TO_EDICT(PRVM_G_INT(prog->self->ofs)));
-               PRVM_ERROR ("PR_ExecuteProgram: %s", errormessage);
+                       PRVM_ED_Print(PRVM_PROG_TO_EDICT(PRVM_G_INT(prog->self->ofs)));
+               PRVM_ERROR ("PRVM_ExecuteProgram: %s", errormessage);
        }
 
        f = &prog->functions[fnum];