fix several bugs with viewport code (r_shadows works again, r_water

[xonotic/darkplaces.git] / prvm_execprogram.h

diff --git a/prvm_execprogram.h b/prvm_execprogram.h
index 17ea2fccca4b341d4789c05840f0275938c9b0ce..3f597763224dcf350bf478658de136eb554530a6 100644 (file)
--- a/prvm_execprogram.h
+++ b/prvm_execprogram.h
@@ -82,13 +82,13 @@
                                OPC->_float = OPA->_float < OPB->_float;
                                break;
                        case OP_AND:
-                               OPC->_float = OPA->_float && OPB->_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 = OPA->_float || OPB->_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 = !OPA->_float;
+                               OPC->_float = !FLOAT_IS_TRUE_FOR_INT(OPA->_int);
                                break;
                        case OP_NOT_V:
                                OPC->_float = !OPA->vector[0] && !OPA->vector[1] && !OPA->vector[2];
@@ -182,6 +182,13 @@
 
                        case OP_ADDRESS:
 #if PRVMBOUNDSCHECK
+                               if (OPA->edict < 0 || OPA->edict >= prog->max_edicts)
+                               {
+                                       prog->xfunction->profile += (st - startst);
+                                       prog->xstatement = st - prog->statements;
+                                       PRVM_ERROR ("%s Progs attempted to address an out of bounds edict number", PRVM_NAME);
+                                       goto cleanup;
+                               }
                                if ((unsigned int)(OPB->_int) >= (unsigned int)(prog->progs->entityfields))
                                {
                                        prog->xfunction->profile += (st - startst);
@@ -207,6 +214,13 @@
                        case OP_LOAD_S:
                        case OP_LOAD_FNC:
 #if PRVMBOUNDSCHECK
+                               if (OPA->edict < 0 || OPA->edict >= prog->max_edicts)
+                               {
+                                       prog->xfunction->profile += (st - startst);
+                                       prog->xstatement = st - prog->statements;
+                                       PRVM_ERROR ("%s Progs attempted to read an out of bounds edict number", PRVM_NAME);
+                                       goto cleanup;
+                               }
                                if ((unsigned int)(OPB->_int) >= (unsigned int)(prog->progs->entityfields))
                                {
                                        prog->xfunction->profile += (st - startst);
@@ -221,6 +235,13 @@
 
                        case OP_LOAD_V:
 #if PRVMBOUNDSCHECK
+                               if (OPA->edict < 0 || OPA->edict >= prog->max_edicts)
+                               {
+                                       prog->xfunction->profile += (st - startst);
+                                       prog->xstatement = st - prog->statements;
+                                       PRVM_ERROR ("%s Progs attempted to read an out of bounds edict number", PRVM_NAME);
+                                       goto cleanup;
+                               }
                                if (OPB->_int < 0 || OPB->_int + 2 >= prog->progs->entityfields)
                                {
                                        prog->xfunction->profile += (st - startst);
@@ -238,16 +259,20 @@
                //==================
 
                        case OP_IFNOT:
-                               if (!OPA->_int)
+                               if(!FLOAT_IS_TRUE_FOR_INT(OPA->_int))
+                               // TODO add an "int-if", and change this one to OPA->_float
+                               // although mostly unneeded, thanks to the only float being false being 0x0 and 0x80000000 (negative zero)
+                               // and entity, string, field values can never have that value
                                {
                                        prog->xfunction->profile += (st - startst);
                                        st += st->b - 1;        // offset the s++
                                        startst = st;
+                                       // no bounds check needed, it is done when loading progs
 #if PRVMRUNAWAYCHECK
                                        if (++jumpcount == 10000000)
                                        {
                                                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
@@ -255,16 +280,20 @@
                                break;
 
                        case OP_IF:
-                               if (OPA->_int)
+                               if(FLOAT_IS_TRUE_FOR_INT(OPA->_int))
+                               // TODO add an "int-if", and change this one, as well as the FLOAT_IS_TRUE_FOR_INT usages, to OPA->_float
+                               // although mostly unneeded, thanks to the only float being false being 0x0 and 0x80000000 (negative zero)
+                               // and entity, string, field values can never have that value
                                {
                                        prog->xfunction->profile += (st - startst);
                                        st += st->b - 1;        // offset the s++
                                        startst = st;
+                                       // no bounds check needed, it is done when loading progs
 #if PRVMRUNAWAYCHECK
                                        if (++jumpcount == 10000000)
                                        {
                                                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
@@ -275,11 +304,12 @@
                                prog->xfunction->profile += (st - startst);
                                st += st->a - 1;        // offset the s++
                                startst = st;
+                               // no bounds check needed, it is done when loading progs
 #if PRVMRUNAWAYCHECK
                                if (++jumpcount == 10000000)
                                {
                                        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
@@ -301,6 +331,16 @@
                                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);
+                                       prog->xstatement = st - prog->statements; // we better stay on the previously executed statement
+                                       PRVM_ERROR("%s CALL outside the program", PRVM_NAME);
+                                       goto cleanup;
+                               }
+#endif
+
                                newf = &prog->functions[OPA->function];
                                newf->callcount++;
 
@@ -520,7 +560,7 @@
                                break;
                        case OP_LOAD_I:
 #if PRBOUNDSCHECK
-                               if (OPA->edict < 0 || OPA->edict >= pr_edictareasize)
+                               if (OPA->edict < 0 || OPA->edict >= prog->max_edicts)
                                {
                                        prog->xfunction->profile += (st - startst);
                                        prog->xstatement = st - prog->statements;