qcvm: -trace flag

[xonotic/gmqcc.git] / exec.c

diff --git a/exec.c b/exec.c
index b957a83a8722401f76a7e8f723e13f36661844f6..7f5c9710e019117ee22db575b9f67d5ff1fed424 100644 (file)
--- a/exec.c
+++ b/exec.c
@@ -1,4 +1,5 @@
 #include <errno.h>
+#include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
 
@@ -35,9 +36,12 @@ static void loaderror(const char *fmt, ...)
     printf(": %s\n", strerror(err));
 }
 
-static void printvmerr(const char *fmt, ...)
+static void qcvmerror(qc_program *prog, const char *fmt, ...)
 {
     va_list ap;
+
+    prog->vmerror++;
+
     va_start(ap, fmt);
     vprintf(fmt, ap);
     va_end(ap);
@@ -51,7 +55,7 @@ qc_program* prog_load(const char *filename)
     size_t      i;
     FILE *file;
 
-    file = fopen(filename, "rb");
+    file = util_fopen(filename, "rb");
     if (!file)
         return NULL;
 
@@ -508,7 +512,7 @@ static qcint prog_leavefunction(qc_program *prog)
         exit(1);
     }
 
-    return st.stmt;
+    return st.stmt - 1; /* offset the ++st */
 }
 
 bool prog_exec(qc_program *prog, prog_section_function *func, size_t flags, long maxjumps)
@@ -632,17 +636,42 @@ static prog_builtin qc_builtins[] = {
 };
 static size_t qc_builtins_count = sizeof(qc_builtins) / sizeof(qc_builtins[0]);
 
+static const char *arg0 = NULL;
+
+void usage()
+{
+    printf("usage: [-debug] %s file\n", arg0);
+    exit(1);
+}
+
 int main(int argc, char **argv)
 {
     size_t      i;
     qcint       fnmain = -1;
     qc_program *prog;
+    size_t      xflags = VMXF_DEFAULT;
 
-    if (argc != 2) {
-        printf("usage: %s file\n", argv[0]);
-        exit(1);
+    arg0 = argv[0];
+
+    if (argc < 2)
+        usage();
+
+    while (argc > 2) {
+        if (!strcmp(argv[1], "-trace")) {
+            --argc;
+            ++argv;
+            xflags |= VMXF_TRACE;
+        }
+        else if (!strcmp(argv[1], "-profile")) {
+            --argc;
+            ++argv;
+            xflags |= VMXF_PROFILE;
+        }
+        else
+            usage();
     }
 
+
     prog = prog_load(argv[1]);
     if (!prog) {
         printf("failed to load program '%s'\n", argv[1]);
@@ -655,14 +684,14 @@ int main(int argc, char **argv)
 
     for (i = 1; i < prog->functions_count; ++i) {
         const char *name = prog_getstring(prog, prog->functions[i].name);
-        printf("Found function: %s\n", name);
+        /* printf("Found function: %s\n", name); */
         if (!strcmp(name, "main"))
             fnmain = (qcint)i;
     }
     printf("Entity field space: %i\n", (int)prog->entityfields);
     if (fnmain > 0)
     {
-        prog_exec(prog, &prog->functions[fnmain], VMXF_TRACE, VM_JUMPS_DEFAULT);
+        prog_exec(prog, &prog->functions[fnmain], xflags, VM_JUMPS_DEFAULT);
     }
     else
         printf("No main function found\n");