]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
Remove execloop.h, we still use xmacros, but it's done with #include __FILE__ tricker...
authorDale Weiler <killfieldengine@gmail.com>
Sat, 10 Nov 2012 20:53:37 +0000 (20:53 +0000)
committerDale Weiler <killfieldengine@gmail.com>
Sat, 10 Nov 2012 20:53:37 +0000 (20:53 +0000)
Makefile
exec.c
execloop.h [deleted file]
lexer.c

index a51aed38ac21cc404c5abba7965af8e8b25cf7ac..e00e384fa1eb465cc2038230dba523e96dc7ac8c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
 CC     ?= clang
-CFLAGS += -Wall -I. -pedantic-errors
-
+CFLAGS += -Wall -I. -fomit-frame-pointer -fno-stack-protector -O3
 #turn on tons of warnings if clang is present
 ifeq ($(CC), clang)
        CFLAGS +=                  \
@@ -46,13 +45,11 @@ test_ir:  $(OBJ_I) $(OBJ)
        $(CC) -o $@ $^ $(CFLAGS)
 qcvm:     $(OBJ_X)
        $(CC) -o $@ $^ $(CFLAGS) -lm
-exec.o: execloop.h
-exec-standalone.o: execloop.h
 test: test_ast test_ir
 
 # compiler target
 gmqcc: $(OBJ_C) $(OBJ)
-       $(CC) -o $@ $^ $(CFLAGS) $(LIBS)
+       $(CC) -o $@ $^ $(CFLAGS)
 
 #all target is test and all
 all: test gmqcc
diff --git a/exec.c b/exec.c
index cbbe54685c550a324090cf2e8cfdef765de6b696..c6d4914bdedbd0d22afa26f1ec8e5df3827f5729 100644 (file)
--- a/exec.c
+++ b/exec.c
@@ -1,3 +1,27 @@
+/*
+ * Copyright (C) 2012
+ *     Wolfgang Bumiller
+ *     Dale Weiler
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef QCVM_LOOP
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
@@ -583,30 +607,31 @@ bool prog_exec(qc_program *prog, prog_section_function *func, size_t flags, long
         default:
         case 0:
         {
+#define QCVM_LOOP    1
 #define QCVM_PROFILE 0
 #define QCVM_TRACE   0
-#           include "execloop.h"
+#           include __FILE__
             break;
         }
         case (VMXF_TRACE):
         {
 #define QCVM_PROFILE 0
 #define QCVM_TRACE   1
-#           include "execloop.h"
+#           include __FILE__
             break;
         }
         case (VMXF_PROFILE):
         {
 #define QCVM_PROFILE 1
 #define QCVM_TRACE   0
-#           include "execloop.h"
+#           include __FILE__
             break;
         }
         case (VMXF_TRACE|VMXF_PROFILE):
         {
 #define QCVM_PROFILE 1
 #define QCVM_TRACE   1
-#           include "execloop.h"
+#           include __FILE__
             break;
         }
     };
@@ -976,3 +1001,357 @@ void prog_disasm_function(qc_program *prog, size_t id)
     }
 }
 #endif
+#else /* !QCVM_LOOP */
+/*
+ * Everything from here on is not including into the compilation of the
+ * executor.  This is simply code that is #included via #include __FILE__
+ * see when QCVM_LOOP is defined, the rest of the code above do not get
+ * re-included.  So this really just acts like one large macro, but it
+ * sort of isn't, which makes it nicer looking.
+ */
+
+#define OPA ( (qcany*) (prog->globals + st->o1.u1) )
+#define OPB ( (qcany*) (prog->globals + st->o2.u1) )
+#define OPC ( (qcany*) (prog->globals + st->o3.u1) )
+
+#define GLOBAL(x) ( (qcany*) (prog->globals + (x)) )
+
+/* to be consistent with current darkplaces behaviour */
+#if !defined(FLOAT_IS_TRUE_FOR_INT)
+#   define FLOAT_IS_TRUE_FOR_INT(x) ( (x) & 0x7FFFFFFF )
+#endif
+
+while (1) {
+       prog_section_function  *newf;
+       qcany          *ed;
+       qcany          *ptr;
+
+    ++st;
+
+#if QCVM_PROFILE
+    prog->profile[st - prog->code]++;
+#endif
+
+#if QCVM_TRACE
+    prog_print_statement(prog, st);
+#endif
+
+    switch (st->opcode)
+    {
+        default:
+            qcvmerror(prog, "Illegal instruction in %s\n", prog->filename);
+            goto cleanup;
+
+               case INSTR_DONE:
+               case INSTR_RETURN:
+                       /* TODO: add instruction count to function profile count */
+                       GLOBAL(OFS_RETURN)->ivector[0] = OPA->ivector[0];
+                       GLOBAL(OFS_RETURN)->ivector[1] = OPA->ivector[1];
+                       GLOBAL(OFS_RETURN)->ivector[2] = OPA->ivector[2];
+
+            st = prog->code + prog_leavefunction(prog);
+            if (!prog->stack_count)
+                goto cleanup;
+
+            break;
+
+               case INSTR_MUL_F:
+                       OPC->_float = OPA->_float * OPB->_float;
+                       break;
+               case INSTR_MUL_V:
+                       OPC->_float = OPA->vector[0]*OPB->vector[0] +
+                                     OPA->vector[1]*OPB->vector[1] +
+                                     OPA->vector[2]*OPB->vector[2];
+                       break;
+               case INSTR_MUL_FV:
+                       OPC->vector[0] = OPA->_float * OPB->vector[0];
+                       OPC->vector[1] = OPA->_float * OPB->vector[1];
+                       OPC->vector[2] = OPA->_float * OPB->vector[2];
+                       break;
+               case INSTR_MUL_VF:
+                       OPC->vector[0] = OPB->_float * OPA->vector[0];
+                       OPC->vector[1] = OPB->_float * OPA->vector[1];
+                       OPC->vector[2] = OPB->_float * OPA->vector[2];
+                       break;
+               case INSTR_DIV_F:
+                       if (OPB->_float != 0.0f)
+                               OPC->_float = OPA->_float / OPB->_float;
+                       else
+                               OPC->_float = 0;
+                       break;
+
+               case INSTR_ADD_F:
+                       OPC->_float = OPA->_float + OPB->_float;
+                       break;
+               case INSTR_ADD_V:
+                       OPC->vector[0] = OPA->vector[0] + OPB->vector[0];
+                       OPC->vector[1] = OPA->vector[1] + OPB->vector[1];
+                       OPC->vector[2] = OPA->vector[2] + OPB->vector[2];
+                       break;
+               case INSTR_SUB_F:
+                       OPC->_float = OPA->_float - OPB->_float;
+                       break;
+               case INSTR_SUB_V:
+                       OPC->vector[0] = OPA->vector[0] - OPB->vector[0];
+                       OPC->vector[1] = OPA->vector[1] - OPB->vector[1];
+                       OPC->vector[2] = OPA->vector[2] - OPB->vector[2];
+                       break;
+
+               case INSTR_EQ_F:
+                       OPC->_float = (OPA->_float == OPB->_float);
+                       break;
+               case INSTR_EQ_V:
+                       OPC->_float = ((OPA->vector[0] == OPB->vector[0]) &&
+                                          (OPA->vector[1] == OPB->vector[1]) &&
+                                          (OPA->vector[2] == OPB->vector[2]) );
+                       break;
+               case INSTR_EQ_S:
+                       OPC->_float = !strcmp(prog_getstring(prog, OPA->string),
+                                             prog_getstring(prog, OPB->string));
+                       break;
+               case INSTR_EQ_E:
+                       OPC->_float = (OPA->_int == OPB->_int);
+                       break;
+               case INSTR_EQ_FNC:
+                       OPC->_float = (OPA->function == OPB->function);
+                       break;
+               case INSTR_NE_F:
+                       OPC->_float = (OPA->_float != OPB->_float);
+                       break;
+               case INSTR_NE_V:
+                       OPC->_float = ((OPA->vector[0] != OPB->vector[0]) ||
+                                      (OPA->vector[1] != OPB->vector[1]) ||
+                                      (OPA->vector[2] != OPB->vector[2]) );
+                       break;
+               case INSTR_NE_S:
+                       OPC->_float = !!strcmp(prog_getstring(prog, OPA->string),
+                                              prog_getstring(prog, OPB->string));
+                       break;
+               case INSTR_NE_E:
+                       OPC->_float = (OPA->_int != OPB->_int);
+                       break;
+               case INSTR_NE_FNC:
+                       OPC->_float = (OPA->function != OPB->function);
+                       break;
+
+               case INSTR_LE:
+                       OPC->_float = (OPA->_float <= OPB->_float);
+                       break;
+               case INSTR_GE:
+                       OPC->_float = (OPA->_float >= OPB->_float);
+                       break;
+               case INSTR_LT:
+                       OPC->_float = (OPA->_float < OPB->_float);
+                       break;
+               case INSTR_GT:
+                       OPC->_float = (OPA->_float > OPB->_float);
+                       break;
+
+               case INSTR_LOAD_F:
+               case INSTR_LOAD_S:
+               case INSTR_LOAD_FLD:
+               case INSTR_LOAD_ENT:
+               case INSTR_LOAD_FNC:
+                       if (OPA->edict < 0 || OPA->edict >= prog->entities) {
+                           qcvmerror(prog, "progs `%s` attempted to read an out of bounds entity", prog->filename);
+                               goto cleanup;
+                       }
+                       if ((unsigned int)(OPB->_int) >= (unsigned int)(prog->entityfields)) {
+                               qcvmerror(prog, "prog `%s` attempted to read an invalid field from entity (%i)",
+                                         prog->filename,
+                                         OPB->_int);
+                               goto cleanup;
+                       }
+                       ed = prog_getedict(prog, OPA->edict);
+                       OPC->_int = ((qcany*)( ((qcint*)ed) + OPB->_int ))->_int;
+                       break;
+               case INSTR_LOAD_V:
+                       if (OPA->edict < 0 || OPA->edict >= prog->entities) {
+                           qcvmerror(prog, "progs `%s` attempted to read an out of bounds entity", prog->filename);
+                               goto cleanup;
+                       }
+                       if (OPB->_int < 0 || OPB->_int + 3 > prog->entityfields)
+                       {
+                               qcvmerror(prog, "prog `%s` attempted to read an invalid field from entity (%i)",
+                                         prog->filename,
+                                         OPB->_int + 2);
+                               goto cleanup;
+                       }
+                       ed = prog_getedict(prog, OPA->edict);
+                       OPC->ivector[0] = ((qcany*)( ((qcint*)ed) + OPB->_int ))->ivector[0];
+                       OPC->ivector[1] = ((qcany*)( ((qcint*)ed) + OPB->_int ))->ivector[1];
+                       OPC->ivector[2] = ((qcany*)( ((qcint*)ed) + OPB->_int ))->ivector[2];
+                       break;
+
+               case INSTR_ADDRESS:
+                       if (OPA->edict < 0 || OPA->edict >= prog->entities) {
+                               qcvmerror(prog, "prog `%s` attempted to address an out of bounds entity %i", prog->filename, OPA->edict);
+                               goto cleanup;
+                       }
+                       if ((unsigned int)(OPB->_int) >= (unsigned int)(prog->entityfields))
+                       {
+                               qcvmerror(prog, "prog `%s` attempted to read an invalid field from entity (%i)",
+                                         prog->filename,
+                                         OPB->_int);
+                               goto cleanup;
+                       }
+
+                       ed = prog_getedict(prog, OPA->edict);
+                       OPC->_int = ((qcint*)ed) - prog->entitydata;
+                       OPC->_int += OPB->_int;
+                       break;
+
+               case INSTR_STORE_F:
+               case INSTR_STORE_S:
+               case INSTR_STORE_ENT:
+               case INSTR_STORE_FLD:
+               case INSTR_STORE_FNC:
+                       OPB->_int = OPA->_int;
+                       break;
+               case INSTR_STORE_V:
+                       OPB->ivector[0] = OPA->ivector[0];
+                       OPB->ivector[1] = OPA->ivector[1];
+                       OPB->ivector[2] = OPA->ivector[2];
+                       break;
+
+               case INSTR_STOREP_F:
+               case INSTR_STOREP_S:
+               case INSTR_STOREP_ENT:
+               case INSTR_STOREP_FLD:
+               case INSTR_STOREP_FNC:
+                       if (OPB->_int < 0 || OPB->_int >= prog->entitydata_count) {
+                               qcvmerror(prog, "`%s` attempted to write to an out of bounds edict (%i)", prog->filename, OPB->_int);
+                               goto cleanup;
+                       }
+                       if (OPB->_int < prog->entityfields && !prog->allowworldwrites)
+                               qcvmerror(prog, "`%s` tried to assign to world.%s (field %i)\n",
+                                         prog->filename,
+                                         prog_getstring(prog, prog_entfield(prog, OPB->_int)->name),
+                                         OPB->_int);
+                       ptr = (qcany*)(prog->entitydata + OPB->_int);
+                       ptr->_int = OPA->_int;
+                       break;
+               case INSTR_STOREP_V:
+                       if (OPB->_int < 0 || OPB->_int + 2 >= prog->entitydata_count) {
+                               qcvmerror(prog, "`%s` attempted to write to an out of bounds edict (%i)", prog->filename, OPB->_int);
+                               goto cleanup;
+                       }
+                       if (OPB->_int < prog->entityfields && !prog->allowworldwrites)
+                               qcvmerror(prog, "`%s` tried to assign to world.%s (field %i)\n",
+                                         prog->filename,
+                                         prog_getstring(prog, prog_entfield(prog, OPB->_int)->name),
+                                         OPB->_int);
+                       ptr = (qcany*)(prog->entitydata + OPB->_int);
+                       ptr->ivector[0] = OPA->ivector[0];
+                       ptr->ivector[1] = OPA->ivector[1];
+                       ptr->ivector[2] = OPA->ivector[2];
+                       break;
+
+               case INSTR_NOT_F:
+                       OPC->_float = !FLOAT_IS_TRUE_FOR_INT(OPA->_int);
+                       break;
+               case INSTR_NOT_V:
+                       OPC->_float = !OPA->vector[0] &&
+                                     !OPA->vector[1] &&
+                                     !OPA->vector[2];
+                       break;
+               case INSTR_NOT_S:
+                       OPC->_float = !OPA->string ||
+                                     !*prog_getstring(prog, OPA->string);
+                       break;
+               case INSTR_NOT_ENT:
+                       OPC->_float = (OPA->edict == 0);
+                       break;
+               case INSTR_NOT_FNC:
+                       OPC->_float = !OPA->function;
+                       break;
+
+               case INSTR_IF:
+                   /* this is consistent with darkplaces' behaviour */
+                       if(FLOAT_IS_TRUE_FOR_INT(OPA->_int))
+                       {
+                               st += st->o2.s1 - 1;    /* offset the s++ */
+                               if (++jumpcount >= maxjumps)
+                                       qcvmerror(prog, "`%s` hit the runaway loop counter limit of %li jumps", prog->filename, jumpcount);
+                       }
+                       break;
+               case INSTR_IFNOT:
+                       if(!FLOAT_IS_TRUE_FOR_INT(OPA->_int))
+                       {
+                               st += st->o2.s1 - 1;    /* offset the s++ */
+                               if (++jumpcount >= maxjumps)
+                                       qcvmerror(prog, "`%s` hit the runaway loop counter limit of %li jumps", prog->filename, jumpcount);
+                       }
+                       break;
+
+               case INSTR_CALL0:
+               case INSTR_CALL1:
+               case INSTR_CALL2:
+               case INSTR_CALL3:
+               case INSTR_CALL4:
+               case INSTR_CALL5:
+               case INSTR_CALL6:
+               case INSTR_CALL7:
+               case INSTR_CALL8:
+                       prog->argc = st->opcode - INSTR_CALL0;
+                       if (!OPA->function)
+                               qcvmerror(prog, "NULL function in `%s`", prog->filename);
+
+                       if(!OPA->function || OPA->function >= (unsigned int)prog->functions_count)
+                       {
+                               qcvmerror(prog, "CALL outside the program in `%s`", prog->filename);
+                               goto cleanup;
+                       }
+
+                       newf = &prog->functions[OPA->function];
+                       newf->profile++;
+
+                       prog->statement = (st - prog->code) + 1;
+
+                       if (newf->entry < 0)
+                       {
+                               /* negative statements are built in functions */
+                               int builtinnumber = -newf->entry;
+                               if (builtinnumber < prog->builtins_count && prog->builtins[builtinnumber])
+                                       prog->builtins[builtinnumber](prog);
+                               else
+                                       qcvmerror(prog, "No such builtin #%i in %s! Try updating your gmqcc sources",
+                                                 builtinnumber, prog->filename);
+                       }
+                       else
+                               st = prog->code + prog_enterfunction(prog, newf) - 1; /* offset st++ */
+                       if (prog->vmerror)
+                               goto cleanup;
+                       break;
+
+               case INSTR_STATE:
+                   qcvmerror(prog, "`%s` tried to execute a STATE operation", prog->filename);
+                       break;
+
+               case INSTR_GOTO:
+                       st += st->o1.s1 - 1;    /* offset the s++ */
+                       if (++jumpcount == 10000000)
+                                       qcvmerror(prog, "`%s` hit the runaway loop counter limit of %li jumps", prog->filename, jumpcount);
+                       break;
+
+               case INSTR_AND:
+                       OPC->_float = FLOAT_IS_TRUE_FOR_INT(OPA->_int) &&
+                                     FLOAT_IS_TRUE_FOR_INT(OPB->_int);
+                       break;
+               case INSTR_OR:
+                       OPC->_float = FLOAT_IS_TRUE_FOR_INT(OPA->_int) ||
+                                     FLOAT_IS_TRUE_FOR_INT(OPB->_int);
+                       break;
+
+               case INSTR_BITAND:
+                       OPC->_float = ((int)OPA->_float) & ((int)OPB->_float);
+                       break;
+               case INSTR_BITOR:
+                       OPC->_float = ((int)OPA->_float) | ((int)OPB->_float);
+                       break;
+    }
+}
+
+#undef QCVM_PROFILE
+#undef QCVM_TRACE
+#endif /* !QCVM_LOOP */
diff --git a/execloop.h b/execloop.h
deleted file mode 100644 (file)
index 1af144a..0000000
+++ /dev/null
@@ -1,349 +0,0 @@
-#if 0
-    /* Expected variables */
-    qc_program     *prog;
-#endif
-
-#define OPA ( (qcany*) (prog->globals + st->o1.u1) )
-#define OPB ( (qcany*) (prog->globals + st->o2.u1) )
-#define OPC ( (qcany*) (prog->globals + st->o3.u1) )
-
-#define GLOBAL(x) ( (qcany*) (prog->globals + (x)) )
-
-/* to be consistent with current darkplaces behaviour */
-#if !defined(FLOAT_IS_TRUE_FOR_INT)
-#   define FLOAT_IS_TRUE_FOR_INT(x) ( (x) & 0x7FFFFFFF )
-#endif
-
-while (1) {
-       prog_section_function  *newf;
-       qcany          *ed;
-       qcany          *ptr;
-
-    ++st;
-
-#if QCVM_PROFILE
-    prog->profile[st - prog->code]++;
-#endif
-
-#if QCVM_TRACE
-    prog_print_statement(prog, st);
-#endif
-
-    switch (st->opcode)
-    {
-        default:
-            qcvmerror(prog, "Illegal instruction in %s\n", prog->filename);
-            goto cleanup;
-
-               case INSTR_DONE:
-               case INSTR_RETURN:
-                       /* TODO: add instruction count to function profile count */
-                       GLOBAL(OFS_RETURN)->ivector[0] = OPA->ivector[0];
-                       GLOBAL(OFS_RETURN)->ivector[1] = OPA->ivector[1];
-                       GLOBAL(OFS_RETURN)->ivector[2] = OPA->ivector[2];
-
-            st = prog->code + prog_leavefunction(prog);
-            if (!prog->stack_count)
-                goto cleanup;
-
-            break;
-
-               case INSTR_MUL_F:
-                       OPC->_float = OPA->_float * OPB->_float;
-                       break;
-               case INSTR_MUL_V:
-                       OPC->_float = OPA->vector[0]*OPB->vector[0] +
-                                     OPA->vector[1]*OPB->vector[1] +
-                                     OPA->vector[2]*OPB->vector[2];
-                       break;
-               case INSTR_MUL_FV:
-                       OPC->vector[0] = OPA->_float * OPB->vector[0];
-                       OPC->vector[1] = OPA->_float * OPB->vector[1];
-                       OPC->vector[2] = OPA->_float * OPB->vector[2];
-                       break;
-               case INSTR_MUL_VF:
-                       OPC->vector[0] = OPB->_float * OPA->vector[0];
-                       OPC->vector[1] = OPB->_float * OPA->vector[1];
-                       OPC->vector[2] = OPB->_float * OPA->vector[2];
-                       break;
-               case INSTR_DIV_F:
-                       if (OPB->_float != 0.0f)
-                               OPC->_float = OPA->_float / OPB->_float;
-                       else
-                               OPC->_float = 0;
-                       break;
-
-               case INSTR_ADD_F:
-                       OPC->_float = OPA->_float + OPB->_float;
-                       break;
-               case INSTR_ADD_V:
-                       OPC->vector[0] = OPA->vector[0] + OPB->vector[0];
-                       OPC->vector[1] = OPA->vector[1] + OPB->vector[1];
-                       OPC->vector[2] = OPA->vector[2] + OPB->vector[2];
-                       break;
-               case INSTR_SUB_F:
-                       OPC->_float = OPA->_float - OPB->_float;
-                       break;
-               case INSTR_SUB_V:
-                       OPC->vector[0] = OPA->vector[0] - OPB->vector[0];
-                       OPC->vector[1] = OPA->vector[1] - OPB->vector[1];
-                       OPC->vector[2] = OPA->vector[2] - OPB->vector[2];
-                       break;
-
-               case INSTR_EQ_F:
-                       OPC->_float = (OPA->_float == OPB->_float);
-                       break;
-               case INSTR_EQ_V:
-                       OPC->_float = ((OPA->vector[0] == OPB->vector[0]) &&
-                                          (OPA->vector[1] == OPB->vector[1]) &&
-                                          (OPA->vector[2] == OPB->vector[2]) );
-                       break;
-               case INSTR_EQ_S:
-                       OPC->_float = !strcmp(prog_getstring(prog, OPA->string),
-                                             prog_getstring(prog, OPB->string));
-                       break;
-               case INSTR_EQ_E:
-                       OPC->_float = (OPA->_int == OPB->_int);
-                       break;
-               case INSTR_EQ_FNC:
-                       OPC->_float = (OPA->function == OPB->function);
-                       break;
-               case INSTR_NE_F:
-                       OPC->_float = (OPA->_float != OPB->_float);
-                       break;
-               case INSTR_NE_V:
-                       OPC->_float = ((OPA->vector[0] != OPB->vector[0]) ||
-                                      (OPA->vector[1] != OPB->vector[1]) ||
-                                      (OPA->vector[2] != OPB->vector[2]) );
-                       break;
-               case INSTR_NE_S:
-                       OPC->_float = !!strcmp(prog_getstring(prog, OPA->string),
-                                              prog_getstring(prog, OPB->string));
-                       break;
-               case INSTR_NE_E:
-                       OPC->_float = (OPA->_int != OPB->_int);
-                       break;
-               case INSTR_NE_FNC:
-                       OPC->_float = (OPA->function != OPB->function);
-                       break;
-
-               case INSTR_LE:
-                       OPC->_float = (OPA->_float <= OPB->_float);
-                       break;
-               case INSTR_GE:
-                       OPC->_float = (OPA->_float >= OPB->_float);
-                       break;
-               case INSTR_LT:
-                       OPC->_float = (OPA->_float < OPB->_float);
-                       break;
-               case INSTR_GT:
-                       OPC->_float = (OPA->_float > OPB->_float);
-                       break;
-
-               case INSTR_LOAD_F:
-               case INSTR_LOAD_S:
-               case INSTR_LOAD_FLD:
-               case INSTR_LOAD_ENT:
-               case INSTR_LOAD_FNC:
-                       if (OPA->edict < 0 || OPA->edict >= prog->entities) {
-                           qcvmerror(prog, "progs `%s` attempted to read an out of bounds entity", prog->filename);
-                               goto cleanup;
-                       }
-                       if ((unsigned int)(OPB->_int) >= (unsigned int)(prog->entityfields)) {
-                               qcvmerror(prog, "prog `%s` attempted to read an invalid field from entity (%i)",
-                                         prog->filename,
-                                         OPB->_int);
-                               goto cleanup;
-                       }
-                       ed = prog_getedict(prog, OPA->edict);
-                       OPC->_int = ((qcany*)( ((qcint*)ed) + OPB->_int ))->_int;
-                       break;
-               case INSTR_LOAD_V:
-                       if (OPA->edict < 0 || OPA->edict >= prog->entities) {
-                           qcvmerror(prog, "progs `%s` attempted to read an out of bounds entity", prog->filename);
-                               goto cleanup;
-                       }
-                       if (OPB->_int < 0 || OPB->_int + 3 > prog->entityfields)
-                       {
-                               qcvmerror(prog, "prog `%s` attempted to read an invalid field from entity (%i)",
-                                         prog->filename,
-                                         OPB->_int + 2);
-                               goto cleanup;
-                       }
-                       ed = prog_getedict(prog, OPA->edict);
-                       OPC->ivector[0] = ((qcany*)( ((qcint*)ed) + OPB->_int ))->ivector[0];
-                       OPC->ivector[1] = ((qcany*)( ((qcint*)ed) + OPB->_int ))->ivector[1];
-                       OPC->ivector[2] = ((qcany*)( ((qcint*)ed) + OPB->_int ))->ivector[2];
-                       break;
-
-               case INSTR_ADDRESS:
-                       if (OPA->edict < 0 || OPA->edict >= prog->entities) {
-                               qcvmerror(prog, "prog `%s` attempted to address an out of bounds entity %i", prog->filename, OPA->edict);
-                               goto cleanup;
-                       }
-                       if ((unsigned int)(OPB->_int) >= (unsigned int)(prog->entityfields))
-                       {
-                               qcvmerror(prog, "prog `%s` attempted to read an invalid field from entity (%i)",
-                                         prog->filename,
-                                         OPB->_int);
-                               goto cleanup;
-                       }
-
-                       ed = prog_getedict(prog, OPA->edict);
-                       OPC->_int = ((qcint*)ed) - prog->entitydata;
-                       OPC->_int += OPB->_int;
-                       break;
-
-               case INSTR_STORE_F:
-               case INSTR_STORE_S:
-               case INSTR_STORE_ENT:
-               case INSTR_STORE_FLD:
-               case INSTR_STORE_FNC:
-                       OPB->_int = OPA->_int;
-                       break;
-               case INSTR_STORE_V:
-                       OPB->ivector[0] = OPA->ivector[0];
-                       OPB->ivector[1] = OPA->ivector[1];
-                       OPB->ivector[2] = OPA->ivector[2];
-                       break;
-
-               case INSTR_STOREP_F:
-               case INSTR_STOREP_S:
-               case INSTR_STOREP_ENT:
-               case INSTR_STOREP_FLD:
-               case INSTR_STOREP_FNC:
-                       if (OPB->_int < 0 || OPB->_int >= prog->entitydata_count) {
-                               qcvmerror(prog, "`%s` attempted to write to an out of bounds edict (%i)", prog->filename, OPB->_int);
-                               goto cleanup;
-                       }
-                       if (OPB->_int < prog->entityfields && !prog->allowworldwrites)
-                               qcvmerror(prog, "`%s` tried to assign to world.%s (field %i)\n",
-                                         prog->filename,
-                                         prog_getstring(prog, prog_entfield(prog, OPB->_int)->name),
-                                         OPB->_int);
-                       ptr = (qcany*)(prog->entitydata + OPB->_int);
-                       ptr->_int = OPA->_int;
-                       break;
-               case INSTR_STOREP_V:
-                       if (OPB->_int < 0 || OPB->_int + 2 >= prog->entitydata_count) {
-                               qcvmerror(prog, "`%s` attempted to write to an out of bounds edict (%i)", prog->filename, OPB->_int);
-                               goto cleanup;
-                       }
-                       if (OPB->_int < prog->entityfields && !prog->allowworldwrites)
-                               qcvmerror(prog, "`%s` tried to assign to world.%s (field %i)\n",
-                                         prog->filename,
-                                         prog_getstring(prog, prog_entfield(prog, OPB->_int)->name),
-                                         OPB->_int);
-                       ptr = (qcany*)(prog->entitydata + OPB->_int);
-                       ptr->ivector[0] = OPA->ivector[0];
-                       ptr->ivector[1] = OPA->ivector[1];
-                       ptr->ivector[2] = OPA->ivector[2];
-                       break;
-
-               case INSTR_NOT_F:
-                       OPC->_float = !FLOAT_IS_TRUE_FOR_INT(OPA->_int);
-                       break;
-               case INSTR_NOT_V:
-                       OPC->_float = !OPA->vector[0] &&
-                                     !OPA->vector[1] &&
-                                     !OPA->vector[2];
-                       break;
-               case INSTR_NOT_S:
-                       OPC->_float = !OPA->string ||
-                                     !*prog_getstring(prog, OPA->string);
-                       break;
-               case INSTR_NOT_ENT:
-                       OPC->_float = (OPA->edict == 0);
-                       break;
-               case INSTR_NOT_FNC:
-                       OPC->_float = !OPA->function;
-                       break;
-
-               case INSTR_IF:
-                   /* this is consistent with darkplaces' behaviour */
-                       if(FLOAT_IS_TRUE_FOR_INT(OPA->_int))
-                       {
-                               st += st->o2.s1 - 1;    /* offset the s++ */
-                               if (++jumpcount >= maxjumps)
-                                       qcvmerror(prog, "`%s` hit the runaway loop counter limit of %li jumps", prog->filename, jumpcount);
-                       }
-                       break;
-               case INSTR_IFNOT:
-                       if(!FLOAT_IS_TRUE_FOR_INT(OPA->_int))
-                       {
-                               st += st->o2.s1 - 1;    /* offset the s++ */
-                               if (++jumpcount >= maxjumps)
-                                       qcvmerror(prog, "`%s` hit the runaway loop counter limit of %li jumps", prog->filename, jumpcount);
-                       }
-                       break;
-
-               case INSTR_CALL0:
-               case INSTR_CALL1:
-               case INSTR_CALL2:
-               case INSTR_CALL3:
-               case INSTR_CALL4:
-               case INSTR_CALL5:
-               case INSTR_CALL6:
-               case INSTR_CALL7:
-               case INSTR_CALL8:
-                       prog->argc = st->opcode - INSTR_CALL0;
-                       if (!OPA->function)
-                               qcvmerror(prog, "NULL function in `%s`", prog->filename);
-
-                       if(!OPA->function || OPA->function >= (unsigned int)prog->functions_count)
-                       {
-                               qcvmerror(prog, "CALL outside the program in `%s`", prog->filename);
-                               goto cleanup;
-                       }
-
-                       newf = &prog->functions[OPA->function];
-                       newf->profile++;
-
-                       prog->statement = (st - prog->code) + 1;
-
-                       if (newf->entry < 0)
-                       {
-                               /* negative statements are built in functions */
-                               int builtinnumber = -newf->entry;
-                               if (builtinnumber < prog->builtins_count && prog->builtins[builtinnumber])
-                                       prog->builtins[builtinnumber](prog);
-                               else
-                                       qcvmerror(prog, "No such builtin #%i in %s! Try updating your gmqcc sources",
-                                                 builtinnumber, prog->filename);
-                       }
-                       else
-                               st = prog->code + prog_enterfunction(prog, newf) - 1; /* offset st++ */
-                       if (prog->vmerror)
-                               goto cleanup;
-                       break;
-
-               case INSTR_STATE:
-                   qcvmerror(prog, "`%s` tried to execute a STATE operation", prog->filename);
-                       break;
-
-               case INSTR_GOTO:
-                       st += st->o1.s1 - 1;    /* offset the s++ */
-                       if (++jumpcount == 10000000)
-                                       qcvmerror(prog, "`%s` hit the runaway loop counter limit of %li jumps", prog->filename, jumpcount);
-                       break;
-
-               case INSTR_AND:
-                       OPC->_float = FLOAT_IS_TRUE_FOR_INT(OPA->_int) &&
-                                     FLOAT_IS_TRUE_FOR_INT(OPB->_int);
-                       break;
-               case INSTR_OR:
-                       OPC->_float = FLOAT_IS_TRUE_FOR_INT(OPA->_int) ||
-                                     FLOAT_IS_TRUE_FOR_INT(OPB->_int);
-                       break;
-
-               case INSTR_BITAND:
-                       OPC->_float = ((int)OPA->_float) & ((int)OPB->_float);
-                       break;
-               case INSTR_BITOR:
-                       OPC->_float = ((int)OPA->_float) | ((int)OPB->_float);
-                       break;
-    }
-}
-
-#undef QCVM_PROFILE
-#undef QCVM_TRACE
diff --git a/lexer.c b/lexer.c
index 7e6f40f44d4151aa24ea376127e8aed4fe054fe2..0526b52cc4a44a0afec49926a0000ea58928b655 100644 (file)
--- a/lexer.c
+++ b/lexer.c
@@ -1111,6 +1111,7 @@ int lex_do(lex_file *lex)
         if (sscanf(lex->tok.value, " %f %f %f ",
                    &lex->tok.constval.v.x, &lex->tok.constval.v.y, &lex->tok.constval.v.z) == 3)
 #endif
+
         {
              lex->tok.ttype = TOKEN_VECTORCONST;
         }