optimized pose math to not use intermediate matrix

[xonotic/darkplaces.git] / prvm_execprogram.h

diff --git a/prvm_execprogram.h b/prvm_execprogram.h
index 665bf5423a53d62562b60c70ae110c81671f394e..e486419f600f9bb1e3f2de2a771b5a35f672db30 100644 (file)
--- a/prvm_execprogram.h
+++ b/prvm_execprogram.h
@@ -5,10 +5,9 @@
                {
                        st++;
 
-#if PRVMTRACE
-                       PRVM_PrintStatement(st);
-#endif
-#if PRVMSTATEMENTPROFILING
+#if PRVMSLOWINTERPRETER
+                       if (prog->trace)
+                               PRVM_PrintStatement(st);
                        prog->statement_profile[st - prog->statements]++;
 #endif
 
@@ -53,7 +52,7 @@
                                }
                                else
                                {
-                                       if( developer.integer >= 1 )
+                                       if (developer.integer)
                                        {
                                                prog->xfunction->profile += (st - startst);
                                                startst = st;
@@ -82,10 +81,10 @@
                                OPC->_float = OPA->_float < OPB->_float;
                                break;
                        case OP_AND:
-                               OPC->_float = FLOAT_IS_TRUE_FOR_INT(OPA->_int) && FLOAT_IS_TRUE_FOR_INT(OPA->_int); // TODO change this back to float, and add AND_I to be used by fteqcc for anything not a float
+                               OPC->_float = FLOAT_IS_TRUE_FOR_INT(OPA->_int) && FLOAT_IS_TRUE_FOR_INT(OPB->_int); // TODO change this back to float, and add AND_I to be used by fteqcc for anything not a float
                                break;
                        case OP_OR:
-                               OPC->_float = FLOAT_IS_TRUE_FOR_INT(OPA->_int) || FLOAT_IS_TRUE_FOR_INT(OPA->_int); // TODO change this back to float, and add OR_I to be used by fteqcc for anything not a float
+                               OPC->_float = FLOAT_IS_TRUE_FOR_INT(OPA->_int) || FLOAT_IS_TRUE_FOR_INT(OPB->_int); // TODO change this back to float, and add OR_I to be used by fteqcc for anything not a float
                                break;
                        case OP_NOT_F:
                                OPC->_float = !FLOAT_IS_TRUE_FOR_INT(OPA->_int);
@@ -152,36 +151,35 @@
                        case OP_STOREP_FLD:             // integers
                        case OP_STOREP_S:
                        case OP_STOREP_FNC:             // pointers
-#if PRVMBOUNDSCHECK
-                               if (OPB->_int < 0 || OPB->_int + 4 > prog->edictareasize)
+                               if (OPB->_int < 0 || OPB->_int + 1 > prog->entityfieldsarea)
                                {
                                        prog->xfunction->profile += (st - startst);
                                        prog->xstatement = st - prog->statements;
                                        PRVM_ERROR("%s attempted to write to an out of bounds edict (%i)", PRVM_NAME, OPB->_int);
                                        goto cleanup;
                                }
-#endif
-                               ptr = (prvm_eval_t *)((unsigned char *)prog->edictsfields + OPB->_int);
+                               if (OPB->_int < prog->progs->entityfields && !prog->allowworldwrites)
+                                       Con_DPrintf("WARNING: assignment to world.%s (field %i) in %s\n", PRVM_GetString(PRVM_ED_FieldAtOfs(OPB->_int)->s_name), OPB->_int, PRVM_NAME);
+                               ptr = (prvm_eval_t *)(prog->edictsfields + OPB->_int);
                                ptr->_int = OPA->_int;
                                break;
                        case OP_STOREP_V:
-#if PRVMBOUNDSCHECK
-                               if (OPB->_int < 0 || OPB->_int + 12 > prog->edictareasize)
+                               if (OPB->_int < 0 || OPB->_int + 3 > prog->entityfieldsarea)
                                {
                                        prog->xfunction->profile += (st - startst);
                                        prog->xstatement = st - prog->statements;
                                        PRVM_ERROR("%s attempted to write to an out of bounds edict (%i)", PRVM_NAME, OPB->_int);
                                        goto cleanup;
                                }
-#endif
-                               ptr = (prvm_eval_t *)((unsigned char *)prog->edictsfields + OPB->_int);
+                               if (OPB->_int < prog->progs->entityfields && !prog->allowworldwrites)
+                                       Con_DPrintf("WARNING: assignment to world.%s (field %i) in %s\n", PRVM_GetString(PRVM_ED_FieldAtOfs(OPB->_int)->s_name), OPB->_int, PRVM_NAME);
+                               ptr = (prvm_eval_t *)(prog->edictsfields + OPB->_int);
                                ptr->ivector[0] = OPA->ivector[0];
                                ptr->ivector[1] = OPA->ivector[1];
                                ptr->ivector[2] = OPA->ivector[2];
                                break;
 
                        case OP_ADDRESS:
-#if PRVMBOUNDSCHECK
                                if (OPA->edict < 0 || OPA->edict >= prog->max_edicts)
                                {
                                        prog->xfunction->profile += (st - startst);
@@ -196,7 +194,7 @@
                                        PRVM_ERROR("%s attempted to address an invalid field (%i) in an edict", PRVM_NAME, OPB->_int);
                                        goto cleanup;
                                }
-#endif
+#if 0
                                if (OPA->edict == 0 && !prog->allowworldwrites)
                                {
                                        prog->xfunction->profile += (st - startst);
@@ -204,8 +202,9 @@
                                        PRVM_ERROR("forbidden assignment to null/world entity in %s", PRVM_NAME);
                                        goto cleanup;
                                }
+#endif
                                ed = PRVM_PROG_TO_EDICT(OPA->edict);
-                               OPC->_int = (unsigned char *)((int *)ed->fields.vp + OPB->_int) - (unsigned char *)prog->edictsfields;
+                               OPC->_int = ed->fields.vp - prog->edictsfields + OPB->_int;
                                break;
 
                        case OP_LOAD_F:
@@ -213,7 +212,6 @@
                        case OP_LOAD_ENT:
                        case OP_LOAD_S:
                        case OP_LOAD_FNC:
-#if PRVMBOUNDSCHECK
                                if (OPA->edict < 0 || OPA->edict >= prog->max_edicts)
                                {
                                        prog->xfunction->profile += (st - startst);
@@ -228,13 +226,11 @@
                                        PRVM_ERROR("%s attempted to read an invalid field in an edict (%i)", PRVM_NAME, OPB->_int);
                                        goto cleanup;
                                }
-#endif
                                ed = PRVM_PROG_TO_EDICT(OPA->edict);
                                OPC->_int = ((prvm_eval_t *)((int *)ed->fields.vp + OPB->_int))->_int;
                                break;
 
                        case OP_LOAD_V:
-#if PRVMBOUNDSCHECK
                                if (OPA->edict < 0 || OPA->edict >= prog->max_edicts)
                                {
                                        prog->xfunction->profile += (st - startst);
@@ -249,7 +245,6 @@
                                        PRVM_ERROR("%s attempted to read an invalid field in an edict (%i)", PRVM_NAME, OPB->_int);
                                        goto cleanup;
                                }
-#endif
                                ed = PRVM_PROG_TO_EDICT(OPA->edict);
                                OPC->ivector[0] = ((prvm_eval_t *)((int *)ed->fields.vp + OPB->_int))->ivector[0];
                                OPC->ivector[1] = ((prvm_eval_t *)((int *)ed->fields.vp + OPB->_int))->ivector[1];
@@ -268,14 +263,12 @@
                                        st += st->b - 1;        // offset the s++
                                        startst = st;
                                        // no bounds check needed, it is done when loading progs
-#if PRVMRUNAWAYCHECK
-                                       if (++jumpcount == 10000000)
+                                       if (++jumpcount == 10000000 && prvm_runawaycheck)
                                        {
                                                prog->xstatement = st - prog->statements;
-                                               PRVM_Profile(1<<30, 1000000);
+                                               PRVM_Profile(1<<30, 1000000, 0);
                                                PRVM_ERROR("%s runaway loop counter hit limit of %d jumps\ntip: read above for list of most-executed functions", PRVM_NAME, jumpcount);
                                        }
-#endif
                                }
                                break;
 
@@ -289,14 +282,12 @@
                                        st += st->b - 1;        // offset the s++
                                        startst = st;
                                        // no bounds check needed, it is done when loading progs
-#if PRVMRUNAWAYCHECK
-                                       if (++jumpcount == 10000000)
+                                       if (++jumpcount == 10000000 && prvm_runawaycheck)
                                        {
                                                prog->xstatement = st - prog->statements;
-                                               PRVM_Profile(1<<30, 1000000);
+                                               PRVM_Profile(1<<30, 1000000, 0);
                                                PRVM_ERROR("%s runaway loop counter hit limit of %d jumps\ntip: read above for list of most-executed functions", PRVM_NAME, jumpcount);
                                        }
-#endif
                                }
                                break;
 
@@ -305,14 +296,12 @@
                                st += st->a - 1;        // offset the s++
                                startst = st;
                                // no bounds check needed, it is done when loading progs
-#if PRVMRUNAWAYCHECK
-                               if (++jumpcount == 10000000)
+                               if (++jumpcount == 10000000 && prvm_runawaycheck)
                                {
                                        prog->xstatement = st - prog->statements;
-                                       PRVM_Profile(1<<30, 1000000);
+                                       PRVM_Profile(1<<30, 1000000, 0);
                                        PRVM_ERROR("%s runaway loop counter hit limit of %d jumps\ntip: read above for list of most-executed functions", PRVM_NAME, jumpcount);
                                }
-#endif
                                break;
 
                        case OP_CALL0:
@@ -331,7 +320,6 @@
                                if (!OPA->function)
                                        PRVM_ERROR("NULL function in %s", PRVM_NAME);
 
-#if PRVMBOUNDSCHECK
                                if(!OPA->function || OPA->function >= (unsigned int)prog->progs->numfunctions)
                                {
                                        prog->xfunction->profile += (st - startst);
@@ -339,7 +327,6 @@
                                        PRVM_ERROR("%s CALL outside the program", PRVM_NAME);
                                        goto cleanup;
                                }
-#endif
 
                                newf = &prog->functions[OPA->function];
                                newf->callcount++;
@@ -555,7 +542,7 @@
                                        goto cleanup;
                                }
 #endif
-                               ptr = (prvm_eval_t *)((unsigned char *)prog->edictsfields + OPB->_int);
+                               ptr = (prvm_eval_t *)(prog->edictsfields + OPB->_int);
                                ptr->_int = OPA->_int;
                                break;
                        case OP_LOAD_I: