]> git.xonotic.org Git - xonotic/gmqcc.git/blobdiff - gmqcc.h
Merge branch 'master' into blub/bc3
[xonotic/gmqcc.git] / gmqcc.h
diff --git a/gmqcc.h b/gmqcc.h
index 2e49982e08a05ad8ec10752ade17057a851caa21..a296e16523cd02f1663433ee52ab60d0572878f4 100644 (file)
--- a/gmqcc.h
+++ b/gmqcc.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012 
- *     Dale Weiler
+ * Copyright (C) 2012
+ *     Dale Weiler, Wolfgang Bumiller
  *
  * 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
 #   endif /* !true  */
 #   define false (0)
 #   define true  (1)
-#   define bool _Bool
-#   if __STDC_VERSION__ < 199901L && __GNUC__ < 3
-        typedef int  _Bool
-#   endif
-#   endif /* !__cplusplus */
+#   ifdef __STDC_VERSION__
+#       if __STDC_VERSION__ < 199901L && __GNUC__ < 3
+            typedef int  bool;
+#       else
+            typedef _Bool bool;
+#       endif
+#   else
+        typedef int bool;
+#   endif /* !__STDC_VERSION__ */
+#endif    /* !__cplusplus      */
 
 /*
  * Of some functions which are generated we want to make sure
 #else
 #   define GMQCC_WARN
 #endif
+/*
+ * This is a hack to silent clang regarding empty
+ * body if statements.
+ */
+#define GMQCC_SUPPRESS_EMPTY_BODY do { } while (0)
+
+/*
+ * Inline is not supported in < C90, however some compilers
+ * like gcc and clang might have an inline attribute we can
+ * use if present.
+ */
+#ifdef __STDC_VERSION__
+#    if __STDC_VERSION__ < 199901L
+#       if defined(__GNUC__) || defined (__CLANG__)
+#           if __GNUC__ < 2
+#               define GMQCC_INLINE
+#           else
+#               define GMQCC_INLINE __attribute__ ((always_inline))
+#           endif
+#       else
+#           define GMQCC_INLINE
+#       endif
+#    else
+#       define GMQCC_INLINE inline
+#    endif
+#else
+#    define GMQCC_INLINE
+#endif /* !__STDC_VERSION__ */
+
+/*
+ * noreturn is present in GCC and clang
+ * it's required for _ast_node_destory otherwise -Wmissing-noreturn
+ * in clang complains about there being no return since abort() is
+ * called.
+ */
+#if (defined(__GNUC__) && __GNUC__ >= 2) || defined(__CLANG__)
+#    define GMQCC_NORETURN __attribute__ ((noreturn))
+#else
+#    define GMQCC_NORETURN
+#endif
 
 /*
  * stdint.h and inttypes.h -less subset
     typedef int            int16_t;
     typedef unsigned int   uint16_t;
 #endif
-#if   INT_MAX   == 0x7FFFFFFF 
+#if   INT_MAX   == 0x7FFFFFFF
     typedef int            int32_t;
     typedef unsigned int   uint32_t;
+    typedef long           int64_t;
+    typedef unsigned long  uint64_t;
 #elif LONG_MAX  == 0x7FFFFFFF
     typedef long           int32_t;
     typedef unsigned long  uint32_t;
+
+    /*
+     * It's nearly impossible to figure out a 64bit type at
+     * this point without making assumptions about the build
+     * enviroment.  So if clang or gcc is detected use some
+     * compiler builtins to create a 64 signed and unsigned
+     * type.
+     */
+#   if defined(__GNUC__) || defined (__CLANG__)
+        typedef int          int64_t  __attribute__((__mode__(__DI__)));
+        typedef unsigned int uint64_t __attribute__((__mode__(__DI__)));
+#   else
+        /*
+         * Incoorectly size the types so static assertions below will
+         * fail.  There is no valid way to get a 64bit type at this point
+         * without making assumptions of too many things.
+         */
+        typedef struct { char _fail : 0; } int64_t;
+        typedef struct { char _fail : 0; } uint64_t;
+#   endif
 #endif
 #ifdef _LP64 /* long pointer == 64 */
     typedef unsigned long  uintptr_t;
 #else
     typedef unsigned int   uintptr_t;
     typedef int            intptr_t;
-#endif 
+#endif
 /* Ensure type sizes are correct: */
 typedef char uint8_size_is_correct  [sizeof(uint8_t)  == 1?1:-1];
-typedef char uint16_size_if_correct [sizeof(uint16_t) == 2?1:-1];
+typedef char uint16_size_is_correct [sizeof(uint16_t) == 2?1:-1];
 typedef char uint32_size_is_correct [sizeof(uint32_t) == 4?1:-1];
+typedef char uint64_size_is_correct [sizeof(uint64_t) == 8?1:-1];
 typedef char int16_size_if_correct  [sizeof(int16_t)  == 2?1:-1];
 typedef char int32_size_is_correct  [sizeof(int32_t)  == 4?1:-1];
+typedef char int64_size_is_correct  [sizeof(int64_t)  == 8?1:-1];
 /* intptr_t / uintptr_t correct size check */
 typedef char uintptr_size_is_correct[sizeof(intptr_t) == sizeof(int*)?1:-1];
 typedef char intptr_size_is_correct [sizeof(uintptr_t)== sizeof(int*)?1:-1];
 
-//===================================================================
-//============================ lex.c ================================
-//===================================================================
-struct lex_file {
-    FILE *file;        /* file handler */
-    char *name;        /* name of file */
-    char  peek  [5];  
-    char  lastok[8192];
-    
-    int   last;    /* last token                   */
-    int   current; /* current token                */
-    int   length;  /* bytes left to parse          */
-    int   size;    /* never changes (size of file) */
-    int   line;    /* what line are we on?         */
-};
-
-/*
- * It's important that this table never exceed 32 keywords, the ascii
- * table starts at 33 (and we don't want conflicts)
- */
-enum {
-    TOKEN_DO       ,
-    TOKEN_ELSE     ,
-    TOKEN_IF       ,
-    TOKEN_WHILE    ,
-    TOKEN_BREAK    ,
-    TOKEN_CONTINUE ,
-    TOKEN_RETURN   ,
-    TOKEN_GOTO     ,
-    TOKEN_FOR      ,   // extension
-    TOKEN_TYPEDEF  ,   // extension
-
-    // ensure the token types are out of the
-    // bounds of anyothers that may conflict.
-    TOKEN_FLOAT    = 110,
-    TOKEN_VECTOR        ,
-    TOKEN_STRING        ,
-    TOKEN_ENTITY        ,
-    TOKEN_VOID
-};
-
-/*
- * Lexer state constants, these are numbers for where exactly in
- * the lexing the lexer is at. Or where it decided to stop if a lexer
- * error occurs.  These numbers must be > where the ascii-table ends
- * and > the last type token which is TOKEN_VOID
- */
-enum {
-    LEX_COMMENT = 1128, 
-    LEX_CHRLIT        ,
-    LEX_STRLIT        ,
-    LEX_IDENT
-};
-
-int              lex_token  (struct lex_file *);
-void             lex_reset  (struct lex_file *);
-void             lex_close  (struct lex_file *);
-struct lex_file *lex_include(struct lex_file *, char *);
-struct lex_file *lex_open   (FILE *);
-
-//===================================================================
-//========================== error.c ================================
-//===================================================================
-#define ERROR_LEX      (SHRT_MAX+0)
-#define ERROR_PARSE    (SHRT_MAX+1)
-#define ERROR_INTERNAL (SHRT_MAX+2)
-#define ERROR_COMPILER (SHRT_MAX+3)
-#define ERROR_PREPRO   (SHRT_MAX+4)
-int error(struct lex_file *, int, const char *, ...);
-
-//===================================================================
-//========================== parse.c ================================
-//===================================================================
-int parse_gen(struct lex_file *);
-
-//===================================================================
-//========================== typedef.c ==============================
-//===================================================================
-typedef struct typedef_node_t {
-    char      *name;
-} typedef_node;
-
-void          typedef_init();
-void          typedef_clear();
-typedef_node *typedef_find(const char *);
-int           typedef_add (struct lex_file *file, const char *, const char *);
-
-
-//===================================================================
-//=========================== util.c ================================
-//===================================================================
+/*===================================================================*/
+/*=========================== util.c ================================*/
+/*===================================================================*/
 void *util_memory_a      (unsigned int, unsigned int, const char *);
 void  util_memory_d      (void       *, unsigned int, const char *);
 void  util_meminfo       ();
 
 bool  util_strupper      (const char *);
 bool  util_strdigit      (const char *);
+bool  util_strncmpexact  (const char *, const char *, size_t);
 char *util_strdup        (const char *);
-char *util_strrq         (char *);
-char *util_strrnl        (char *);
+char *util_strrq         (const char *);
+char *util_strrnl        (const char *);
 char *util_strsws        (const char *);
 char *util_strchp        (const char *, const char *);
 void  util_debug         (const char *, const char *, ...);
 int   util_getline       (char **, size_t *, FILE *);
 void  util_endianswap    (void *,  int, int);
 
-uint32_t util_crc32(const char *, int, register const short); 
+size_t util_strtocmd    (const char *, char *, size_t);
+size_t util_strtononcmd (const char *, char *, size_t);
+
+uint32_t util_crc32(const char *, int, register const short);
 
 #ifdef NOTRACK
 #    define mem_a(x) malloc(x)
@@ -226,7 +211,17 @@ uint32_t util_crc32(const char *, int, register const short);
 #    define mem_d(x) util_memory_d((x), __LINE__, __FILE__)
 #endif
 
+/*
+ * TODO: make these safer to use.  Currently this only works on
+ * x86 and x86_64, some systems will likely not like this. Such
+ * as BE systems.
+ */
+#define FLT2INT(Y) *((int32_t*)&(Y))
+#define INT2FLT(Y) *((float  *)&(Y))
+
 /* Builds vector type (usefull for inside structures) */
+#define VECTOR_SNAP(X,Y) X ## Y
+#define VECTOR_FILL(X,Y) VECTOR_SNAP(X,Y)
 #define VECTOR_TYPE(T,N)                                        \
     T*     N##_data      = NULL;                                \
     long   N##_elements  = 0;                                   \
@@ -234,14 +229,14 @@ uint32_t util_crc32(const char *, int, register const short);
 /* Builds vector add */
 #define VECTOR_CORE(T,N)                                        \
     int    N##_add(T element) {                                 \
+        void *temp = NULL;                                      \
         if (N##_elements == N##_allocated) {                    \
             if (N##_allocated == 0) {                           \
                 N##_allocated = 12;                             \
             } else {                                            \
                 N##_allocated *= 2;                             \
             }                                                   \
-            void *temp = mem_a(N##_allocated * sizeof(T));      \
-            if  (!temp) {                                       \
+            if  (!(temp = mem_a(N##_allocated * sizeof(T)))) {  \
                 mem_d(temp);                                    \
                 return -1;                                      \
             }                                                   \
@@ -257,17 +252,23 @@ uint32_t util_crc32(const char *, int, register const short);
         elements--;                                             \
         while (N##_add(*++elements) != -1 && len--);            \
         return N##_elements;                                    \
-    }
-/* Builds a full vector inspot */
+    }                                                           \
+    typedef char VECTOR_FILL(extra_semicolon_##N,__COUNTER__)
+#define VECTOR_PROT(T,N)                                        \
+    extern T*     N##_data     ;                                \
+    extern long   N##_elements ;                                \
+    extern long   N##_allocated;                                \
+    int           N##_add(T);                                   \
+    int           N##_put(T *, size_t)
 #define VECTOR_MAKE(T,N) \
     VECTOR_TYPE(T,N);    \
     VECTOR_CORE(T,N)
-/* Builds a vector add function pointer for inside structures */
-#define VECTOR_IMPL(T,N) int (*N##_add)(T)
 
-//===================================================================
-//=========================== code.c ================================
-//===================================================================
+/*===================================================================*/
+/*=========================== code.c ================================*/
+/*===================================================================*/
+
+/* Note: if you change the order, fix type_sizeof in ir.c */
 enum {
     TYPE_VOID     ,
     TYPE_STRING   ,
@@ -277,10 +278,44 @@ enum {
     TYPE_FIELD    ,
     TYPE_FUNCTION ,
     TYPE_POINTER  ,
-    /* TYPE_INTEGER  , */
+    TYPE_INTEGER  ,
+    TYPE_QUATERNION  ,
+    TYPE_MATRIX  ,
     TYPE_VARIANT  ,
+
+    TYPE_COUNT
 };
 
+extern const char *type_name[TYPE_COUNT];
+
+extern size_t type_sizeof[TYPE_COUNT];
+extern uint16_t type_store_instr[TYPE_COUNT];
+/* could use type_store_instr + INSTR_STOREP_F - INSTR_STORE_F
+ * but this breaks when TYPE_INTEGER is added, since with the enhanced
+ * instruction set, the old ones are left untouched, thus the _I instructions
+ * are at a seperate place.
+ */
+extern uint16_t type_storep_instr[TYPE_COUNT];
+
+typedef struct {
+    uint32_t offset;      /* Offset in file of where data begins  */
+    uint32_t length;      /* Length of section (how many of)      */
+} prog_section;
+
+typedef struct {
+    uint32_t     version;      /* Program version (6)     */
+    uint16_t     crc16;        /* What is this?           */
+    uint16_t     skip;         /* see propsal.txt         */
+
+    prog_section statements;   /* prog_section_statement  */
+    prog_section defs;         /* prog_section_def        */
+    prog_section fields;       /* prog_section_field      */
+    prog_section functions;    /* prog_section_function   */
+    prog_section strings;      /* What is this?           */
+    prog_section globals;      /* What is this?           */
+    uint32_t     entfield;     /* Number of entity fields */
+} prog_header;
+
 /*
  * Each paramater incerements by 3 since vector types hold
  * 3 components (x,y,z).
@@ -298,23 +333,23 @@ enum {
 
 typedef struct {
     uint16_t opcode;
-    
+
     /* operand 1 */
     union {
         int16_t  s1; /* signed   */
         uint16_t u1; /* unsigned */
-    };
+    } o1;
     /* operand 2 */
     union {
-        int16_t  s2; /* signed   */
-        uint16_t u2; /* unsigned */
-    };
+        int16_t  s1; /* signed   */
+        uint16_t u1; /* unsigned */
+    } o2;
     /* operand 3 */
     union {
-        int16_t  s3; /* signed   */
-        uint16_t u3; /* unsigned */
-    };
-    
+        int16_t  s1; /* signed   */
+        uint16_t u1; /* unsigned */
+    } o3;
+
     /*
      * This is the same as the structure in darkplaces
      * {
@@ -356,8 +391,8 @@ typedef struct {
     uint8_t   argsize[8]; /* size of arguments (keep 8 always?)   */
 } prog_section_function;
 
-/* 
- * Instructions 
+/*
+ * Instructions
  * These are the external instructions supported by the interperter
  * this is what things compile to (from the C code).
  */
@@ -365,8 +400,8 @@ enum {
     INSTR_DONE,
     INSTR_MUL_F,
     INSTR_MUL_V,
-    INSTR_MUL_FV,
     INSTR_MUL_VF,
+    INSTR_MUL_FV,
     INSTR_DIV_F,
     INSTR_ADD_F,
     INSTR_ADD_V,
@@ -429,18 +464,43 @@ enum {
     INSTR_BITAND,
     INSTR_BITOR,
 
-    /* Virtual instructions used by the IR
+/* warning: will be reordered */
+    INSTR_MUL_Q,
+    INSTR_MUL_QF,
+    INSTR_MUL_M,
+    INSTR_MUL_MF,
+    INSTR_EQ_Q,
+    INSTR_EQ_M,
+    INSTR_NE_Q,
+    INSTR_NE_M,
+    INSTR_LOAD_Q,
+    INSTR_LOAD_M,
+    INSTR_STORE_Q,
+    INSTR_STORE_M,
+    INSTR_STOREP_Q,
+    INSTR_STOREP_M,
+    INSTR_INV_Q,
+    INSTR_INV_M,
+    /*
+     * Virtual instructions used by the assembler
+     * keep at the end but before virtual instructions
+     * for the IR below.
+     */
+    AINSTR_END,
+
+    /*
+     * Virtual instructions used by the IR
      * Keep at the end!
      */
     VINSTR_PHI,
     VINSTR_JUMP,
-    VINSTR_COND,
+    VINSTR_COND
 };
 
 /*
  * The symbols below are created by the following
  * expanded macros:
- * 
+ *
  * VECTOR_MAKE(prog_section_statement, code_statements);
  * VECTOR_MAKE(prog_section_def,       code_defs      );
  * VECTOR_MAKE(prog_section_field,     code_fields    );
@@ -448,123 +508,485 @@ enum {
  * VECTOR_MAKE(int,                    code_globals   );
  * VECTOR_MAKE(char,                   code_chars     );
  */
-int         code_statements_add(prog_section_statement);
-int         code_defs_add      (prog_section_def);
-int         code_fields_add    (prog_section_field);
-int         code_functions_add (prog_section_function);
-int         code_globals_add   (int);
-int         code_chars_add     (char);
-int         code_statements_put(prog_section_statement*, size_t);
-int         code_defs_put      (prog_section_def*,       size_t);
-int         code_fields_put    (prog_section_field*,     size_t);
-int         code_functions_put (prog_section_function*,  size_t);
-int         code_globals_put   (int*,                    size_t);
-int         code_chars_put     (char*,                   size_t);
-extern long code_statements_elements;
-extern long code_chars_elements;
-extern long code_globals_elements;
-extern long code_functions_elements;
-extern long code_fields_elements;
-extern long code_defs_elements;
+VECTOR_PROT(prog_section_statement, code_statements);
+VECTOR_PROT(prog_section_statement, code_statements);
+VECTOR_PROT(prog_section_def,       code_defs      );
+VECTOR_PROT(prog_section_field,     code_fields    );
+VECTOR_PROT(prog_section_function,  code_functions );
+VECTOR_PROT(int,                    code_globals   );
+VECTOR_PROT(char,                   code_chars     );
+
+typedef float   qcfloat;
+typedef int32_t qcint;
 
 /*
  * code_write -- writes out the compiled file
  * code_init  -- prepares the code file
  */
-void code_write ();
-void code_init  ();
+bool     code_write       (const char *filename);
+void     code_init        ();
+uint32_t code_genstring   (const char *string);
+uint32_t code_cachedstring(const char *string);
+qcint    code_alloc_field (size_t qcsize);
 
-//===================================================================
-//========================= assembler.c =============================
-//===================================================================
+/*===================================================================*/
+/*========================= assembler.c =============================*/
+/*===================================================================*/
 static const struct {
     const char  *m; /* menomic     */
-    const size_t o; /* operands    */ 
+    const size_t o; /* operands    */
     const size_t l; /* menomic len */
-} const asm_instr[] = {
-    [INSTR_DONE]       = { "DONE"      , 1, 4 },
-    [INSTR_MUL_F]      = { "MUL_F"     , 3, 5 },
-    [INSTR_MUL_V]      = { "MUL_V"     , 3, 5 },
-    [INSTR_MUL_FV]     = { "MUL_FV"    , 3, 6 },
-    [INSTR_MUL_VF]     = { "MUL_VF"    , 3, 6 },
-    [INSTR_DIV_F]      = { "DIV"       , 0, 3 },
-    [INSTR_ADD_F]      = { "ADD_F"     , 3, 5 },
-    [INSTR_ADD_V]      = { "ADD_V"     , 3, 5 },
-    [INSTR_SUB_F]      = { "SUB_F"     , 3, 5 },
-    [INSTR_SUB_V]      = { "DUB_V"     , 3, 5 },
-    [INSTR_EQ_F]       = { "EQ_F"      , 0, 4 },
-    [INSTR_EQ_V]       = { "EQ_V"      , 0, 4 },
-    [INSTR_EQ_S]       = { "EQ_S"      , 0, 4 },
-    [INSTR_EQ_E]       = { "EQ_E"      , 0, 4 },
-    [INSTR_EQ_FNC]     = { "ES_FNC"    , 0, 6 },
-    [INSTR_NE_F]       = { "NE_F"      , 0, 4 },
-    [INSTR_NE_V]       = { "NE_V"      , 0, 4 },
-    [INSTR_NE_S]       = { "NE_S"      , 0, 4 },
-    [INSTR_NE_E]       = { "NE_E"      , 0, 4 },
-    [INSTR_NE_FNC]     = { "NE_FNC"    , 0, 6 },
-    [INSTR_LE]         = { "LE"        , 0, 2 },
-    [INSTR_GE]         = { "GE"        , 0, 2 },
-    [INSTR_LT]         = { "LT"        , 0, 2 },
-    [INSTR_GT]         = { "GT"        , 0, 2 },
-    [INSTR_LOAD_F]     = { "FIELD_F"   , 0, 7 },
-    [INSTR_LOAD_V]     = { "FIELD_V"   , 0, 7 },
-    [INSTR_LOAD_S]     = { "FIELD_S"   , 0, 7 },
-    [INSTR_LOAD_ENT]   = { "FIELD_ENT" , 0, 9 },
-    [INSTR_LOAD_FLD]   = { "FIELD_FLD" , 0, 9 },
-    [INSTR_LOAD_FNC]   = { "FIELD_FNC" , 0, 9 },
-    [INSTR_ADDRESS]    = { "ADDRESS"   , 0, 7 },
-    [INSTR_STORE_F]    = { "STORE_F"   , 0, 7 },
-    [INSTR_STORE_V]    = { "STORE_V"   , 0, 7 },
-    [INSTR_STORE_S]    = { "STORE_S"   , 0, 7 },
-    [INSTR_STORE_ENT]  = { "STORE_ENT" , 0, 9 },
-    [INSTR_STORE_FLD]  = { "STORE_FLD" , 0, 9 },
-    [INSTR_STORE_FNC]  = { "STORE_FNC" , 0, 9 },
-    [INSTR_STOREP_F]   = { "STOREP_F"  , 0, 8 },
-    [INSTR_STOREP_V]   = { "STOREP_V"  , 0, 8 },
-    [INSTR_STOREP_S]   = { "STOREP_S"  , 0, 8 },
-    [INSTR_STOREP_ENT] = { "STOREP_ENT", 0, 10},
-    [INSTR_STOREP_FLD] = { "STOREP_FLD", 0, 10},
-    [INSTR_STOREP_FNC] = { "STOREP_FNC", 0, 10},
-    [INSTR_RETURN]     = { "RETURN"    , 0, 6 },
-    [INSTR_NOT_F]      = { "NOT_F"     , 0, 5 },
-    [INSTR_NOT_V]      = { "NOT_V"     , 0, 5 },
-    [INSTR_NOT_S]      = { "NOT_S"     , 0, 5 },
-    [INSTR_NOT_ENT]    = { "NOT_ENT"   , 0, 7 },
-    [INSTR_NOT_FNC]    = { "NOT_FNC"   , 0, 7 },
-    [INSTR_IF]         = { "IF"        , 0, 2 },
-    [INSTR_IFNOT]      = { "IFNOT"     , 0, 5 },
-    [INSTR_CALL0]      = { "CALL0"     , 0, 5 },
-    [INSTR_CALL1]      = { "CALL1"     , 0, 5 },
-    [INSTR_CALL2]      = { "CALL2"     , 0, 5 },
-    [INSTR_CALL3]      = { "CALL3"     , 0, 5 },
-    [INSTR_CALL4]      = { "CALL4"     , 0, 5 },
-    [INSTR_CALL5]      = { "CALL5"     , 0, 5 },
-    [INSTR_CALL6]      = { "CALL6"     , 0, 5 },
-    [INSTR_CALL7]      = { "CALL7"     , 0, 5 },
-    [INSTR_CALL8]      = { "CALL8"     , 0, 5 },
-    [INSTR_STATE]      = { "STATE"     , 0, 5 },
-    [INSTR_GOTO]       = { "GOTO"      , 0, 4 },
-    [INSTR_AND]        = { "AND"       , 0, 3 },
-    [INSTR_OR]         = { "OR"        , 0, 2 },
-    [INSTR_BITAND]     = { "BITAND"    , 0, 6 },
-    [INSTR_BITOR]      = { "BITOR"     , 0, 5 }
+} asm_instr[] = {
+    { "DONE"      , 1, 4 },
+    { "MUL_F"     , 3, 5 },
+    { "MUL_V"     , 3, 5 },
+    { "MUL_VF"    , 3, 6 },
+    { "MUL_FV"    , 3, 6 },
+    { "DIV"       , 0, 3 },
+    { "ADD_F"     , 3, 5 },
+    { "ADD_V"     , 3, 5 },
+    { "SUB_F"     , 3, 5 },
+    { "DUB_V"     , 3, 5 },
+    { "EQ_F"      , 0, 4 },
+    { "EQ_V"      , 0, 4 },
+    { "EQ_S"      , 0, 4 },
+    { "EQ_E"      , 0, 4 },
+    { "EQ_FNC"    , 0, 6 },
+    { "NE_F"      , 0, 4 },
+    { "NE_V"      , 0, 4 },
+    { "NE_S"      , 0, 4 },
+    { "NE_E"      , 0, 4 },
+    { "NE_FNC"    , 0, 6 },
+    { "LE"        , 0, 2 },
+    { "GE"        , 0, 2 },
+    { "LT"        , 0, 2 },
+    { "GT"        , 0, 2 },
+    { "FIELD_F"   , 0, 7 },
+    { "FIELD_V"   , 0, 7 },
+    { "FIELD_S"   , 0, 7 },
+    { "FIELD_ENT" , 0, 9 },
+    { "FIELD_FLD" , 0, 9 },
+    { "FIELD_FNC" , 0, 9 },
+    { "ADDRESS"   , 0, 7 },
+    { "STORE_F"   , 0, 7 },
+    { "STORE_V"   , 0, 7 },
+    { "STORE_S"   , 0, 7 },
+    { "STORE_ENT" , 0, 9 },
+    { "STORE_FLD" , 0, 9 },
+    { "STORE_FNC" , 0, 9 },
+    { "STOREP_F"  , 0, 8 },
+    { "STOREP_V"  , 0, 8 },
+    { "STOREP_S"  , 0, 8 },
+    { "STOREP_ENT", 0, 10},
+    { "STOREP_FLD", 0, 10},
+    { "STOREP_FNC", 0, 10},
+    { "RETURN"    , 0, 6 },
+    { "NOT_F"     , 0, 5 },
+    { "NOT_V"     , 0, 5 },
+    { "NOT_S"     , 0, 5 },
+    { "NOT_ENT"   , 0, 7 },
+    { "NOT_FNC"   , 0, 7 },
+    { "IF"        , 0, 2 },
+    { "IFNOT"     , 0, 5 },
+    { "CALL0"     , 1, 5 },
+    { "CALL1"     , 2, 5 },
+    { "CALL2"     , 3, 5 },
+    { "CALL3"     , 4, 5 },
+    { "CALL4"     , 5, 5 },
+    { "CALL5"     , 6, 5 },
+    { "CALL6"     , 7, 5 },
+    { "CALL7"     , 8, 5 },
+    { "CALL8"     , 9, 5 },
+    { "STATE"     , 0, 5 },
+    { "GOTO"      , 0, 4 },
+    { "AND"       , 0, 3 },
+    { "OR"        , 0, 2 },
+    { "BITAND"    , 0, 6 },
+    { "BITOR"     , 0, 5 },
+
+    { "MUL_Q"     , 3, 5 },
+    { "MUL_QF"    , 3, 6 },
+    { "MUL_M"     , 3, 5 },
+    { "MUL_MF"    , 3, 6 },
+    { "EQ_Q"      , 0, 4 },
+    { "EQ_M"      , 0, 4 },
+    { "NE_Q"      , 0, 4 },
+    { "NE_M"      , 0, 4 },
+    { "FIELD_Q"   , 0, 7 },
+    { "FIELD_M"   , 0, 7 },
+    { "STORE_Q"   , 0, 7 },
+    { "STORE_M"   , 0, 7 },
+    { "STOREP_Q"  , 0, 8 },
+    { "STOREP_M"  , 0, 8 },
+    { "INV_Q"     , 0, 5 },
+    { "INV_M"     , 0, 5 },
+
+    { "END"       , 0, 3 } /* virtual assembler instruction */
 };
 
 void asm_init (const char *, FILE **);
 void asm_close(FILE *);
 void asm_parse(FILE *);
-//======================================================================
-//============================= main.c =================================
-//======================================================================
+/*===================================================================*/
+/*============================= ast.c ===============================*/
+/*===================================================================*/
+#define MEM_VECTOR_PROTO(Towner, Tmem, mem)                   \
+    bool GMQCC_WARN Towner##_##mem##_add(Towner*, Tmem);      \
+    bool GMQCC_WARN Towner##_##mem##_remove(Towner*, size_t)
+
+#define MEM_VECTOR_PROTO_ALL(Towner, Tmem, mem)                    \
+    MEM_VECTOR_PROTO(Towner, Tmem, mem);                           \
+    bool GMQCC_WARN Towner##_##mem##_find(Towner*, Tmem, size_t*); \
+    void Towner##_##mem##_clear(Towner*)
+
+#define MEM_VECTOR_MAKE(Twhat, name) \
+    Twhat  *name;                    \
+    size_t name##_count;             \
+    size_t name##_alloc
+
+#define MEM_VEC_FUN_ADD(Tself, Twhat, mem)                           \
+bool GMQCC_WARN Tself##_##mem##_add(Tself *self, Twhat f)            \
+{                                                                    \
+    Twhat *reall;                                                    \
+    if (self->mem##_count == self->mem##_alloc) {                    \
+        if (!self->mem##_alloc) {                                    \
+            self->mem##_alloc = 16;                                  \
+        } else {                                                     \
+            self->mem##_alloc *= 2;                                  \
+        }                                                            \
+        reall = (Twhat*)mem_a(sizeof(Twhat) * self->mem##_alloc);    \
+        if (!reall) {                                                \
+            return false;                                            \
+        }                                                            \
+        memcpy(reall, self->mem, sizeof(Twhat) * self->mem##_count); \
+        mem_d(self->mem);                                            \
+        self->mem = reall;                                           \
+    }                                                                \
+    self->mem[self->mem##_count++] = f;                              \
+    return true;                                                     \
+}
+
+#define MEM_VEC_FUN_REMOVE(Tself, Twhat, mem)                        \
+bool GMQCC_WARN Tself##_##mem##_remove(Tself *self, size_t idx)      \
+{                                                                    \
+    size_t i;                                                        \
+    Twhat *reall;                                                    \
+    if (idx >= self->mem##_count) {                                  \
+        return true; /* huh... */                                    \
+    }                                                                \
+    for (i = idx; i < self->mem##_count-1; ++i) {                    \
+        self->mem[i] = self->mem[i+1];                               \
+    }                                                                \
+    self->mem##_count--;                                             \
+    if (self->mem##_count < self->mem##_count/2) {                   \
+        self->mem##_alloc /= 2;                                      \
+        reall = (Twhat*)mem_a(sizeof(Twhat) * self->mem##_count);    \
+        if (!reall) {                                                \
+            return false;                                            \
+        }                                                            \
+        memcpy(reall, self->mem, sizeof(Twhat) * self->mem##_count); \
+        mem_d(self->mem);                                            \
+        self->mem = reall;                                           \
+    }                                                                \
+    return true;                                                     \
+}
+
+#define MEM_VEC_FUN_FIND(Tself, Twhat, mem)                     \
+bool GMQCC_WARN Tself##_##mem##_find(Tself *self, Twhat obj, size_t *idx) \
+{                                                               \
+    size_t i;                                                   \
+    for (i = 0; i < self->mem##_count; ++i) {                   \
+        if (self->mem[i] == obj) {                              \
+            if (idx) {                                          \
+                *idx = i;                                       \
+            }                                                   \
+            return true;                                        \
+        }                                                       \
+    }                                                           \
+    return false;                                               \
+}
+
+#define MEM_VEC_FUN_APPEND(Tself, Twhat, mem)                        \
+bool GMQCC_WARN Tself##_##mem##_append(Tself *s, Twhat *p, size_t c) \
+{                                                                    \
+    Twhat *reall;                                                    \
+    if (s->mem##_count+c >= s->mem##_alloc) {                        \
+        if (!s->mem##_alloc) {                                       \
+            s->mem##_alloc = c < 16 ? 16 : c;                        \
+        } else {                                                     \
+            s->mem##_alloc *= 2;                                     \
+            if (s->mem##_count+c >= s->mem##_alloc) {                \
+                s->mem##_alloc = s->mem##_count+c;                   \
+            }                                                        \
+        }                                                            \
+        reall = (Twhat*)mem_a(sizeof(Twhat) * s->mem##_alloc);       \
+        if (!reall) {                                                \
+            return false;                                            \
+        }                                                            \
+        memcpy(reall, s->mem, sizeof(Twhat) * s->mem##_count);       \
+        mem_d(s->mem);                                               \
+        s->mem = reall;                                              \
+    }                                                                \
+    memcpy(&s->mem[s->mem##_count], p, c*sizeof(*p));                \
+    s->mem##_count += c;                                             \
+    return true;                                                     \
+}
+
+#define MEM_VEC_FUN_RESIZE(Tself, Twhat, mem)                    \
+bool GMQCC_WARN Tself##_##mem##_resize(Tself *s, size_t c)       \
+{                                                                \
+    Twhat *reall;                                                \
+    if (c > s->mem##_alloc) {                                    \
+        reall = (Twhat*)mem_a(sizeof(Twhat) * c);                \
+        if (!reall) { return false; }                            \
+        memcpy(reall, s->mem, sizeof(Twhat) * s->mem##_count);   \
+        s->mem##_alloc = c;                                      \
+        mem_d(s->mem);                                           \
+        s->mem = reall;                                          \
+        return true;                                             \
+    }                                                            \
+    s->mem##_count = c;                                          \
+    if (c < (s->mem##_alloc / 2)) {                              \
+        reall = (Twhat*)mem_a(sizeof(Twhat) * c);                \
+        if (!reall) { return false; }                            \
+        memcpy(reall, s->mem, sizeof(Twhat) * c);                \
+        mem_d(s->mem);                                           \
+        s->mem = reall;                                          \
+    }                                                            \
+    return true;                                                 \
+}
+
+#define MEM_VEC_FUN_CLEAR(Tself, mem)   \
+void Tself##_##mem##_clear(Tself *self) \
+{                                       \
+    if (!self->mem)                     \
+        return;                         \
+    mem_d((void*) self->mem);           \
+    self->mem = NULL;                   \
+    self->mem##_count = 0;              \
+    self->mem##_alloc = 0;              \
+}
+
+#define MEM_VECTOR_CLEAR(owner, mem)  \
+    if ((owner)->mem)                 \
+        mem_d((void*)((owner)->mem)); \
+    (owner)->mem = NULL;              \
+    (owner)->mem##_count = 0;         \
+    (owner)->mem##_alloc = 0
+
+#define MEM_VECTOR_INIT(owner, mem) \
+{                                   \
+    (owner)->mem = NULL;            \
+    (owner)->mem##_count = 0;       \
+    (owner)->mem##_alloc = 0;       \
+}
+
+#define MEM_VECTOR_MOVE(from, mem, to, tm)   \
+{                                            \
+    (to)->tm = (from)->mem;                  \
+    (to)->tm##_count = (from)->mem##_count;  \
+    (to)->tm##_alloc = (from)->mem##_alloc;  \
+    (from)->mem = NULL;                      \
+    (from)->mem##_count = 0;                 \
+    (from)->mem##_alloc = 0;                 \
+}
+
+#define MEM_VEC_FUNCTIONS(Tself, Twhat, mem) \
+MEM_VEC_FUN_REMOVE(Tself, Twhat, mem)        \
+MEM_VEC_FUN_ADD(Tself, Twhat, mem)
+
+#define MEM_VEC_FUNCTIONS_ALL(Tself, Twhat, mem) \
+MEM_VEC_FUNCTIONS(Tself, Twhat, mem)             \
+MEM_VEC_FUN_CLEAR(Tself, mem)                    \
+MEM_VEC_FUN_FIND(Tself, Twhat, mem)
+
+enum store_types {
+    store_global,
+    store_local,  /* local, assignable for now, should get promoted later */
+    store_param,  /* parameters, they are locals with a fixed position */
+    store_value,  /* unassignable */
+    store_return  /* unassignable, at OFS_RETURN */
+};
+
+typedef struct {
+    float x, y, z;
+} vector;
+
+typedef float matrix[4][4]; /* OpenGL layout */
+typedef float quaternion[4]; /* order: x, y, z, w */
+#define MATRIX(axis, elem) ((4*(axis)) + (elem))
+#define QUAT_X 0
+#define QUAT_Y 1
+#define QUAT_Z 2
+#define QUAT_W 3
+
+/*
+ * A shallow copy of a lex_file to remember where which ast node
+ * came from.
+ */
+typedef struct {
+    const char *file;
+    size_t      line;
+} lex_ctx;
+
+/*===================================================================*/
+/*============================= exec.c ==============================*/
+/*===================================================================*/
+
+/* darkplaces has (or will have) a 64 bit prog loader
+ * where the 32 bit qc program is autoconverted on load.
+ * Since we may want to support that as well, let's redefine
+ * float and int here.
+ */
+typedef union {
+    qcint   _int;
+    qcint    string;
+    qcint    function;
+    qcint    edict;
+    qcfloat _float;
+    qcfloat vector[3];
+    qcint   ivector[3];
+} qcany;
+
+typedef char qcfloat_size_is_correct [sizeof(qcfloat) == 4 ?1:-1];
+typedef char qcint_size_is_correct   [sizeof(qcint)   == 4 ?1:-1];
+
+enum {
+    VMERR_OK,
+    VMERR_TEMPSTRING_ALLOC,
+
+    VMERR_END
+};
+
+#define VM_JUMPS_DEFAULT 1000000
+
+/* execute-flags */
+#define VMXF_DEFAULT 0x0000     /* default flags - nothing */
+#define VMXF_TRACE   0x0001     /* trace: print statements before executing */
+#define VMXF_PROFILE 0x0002     /* profile: increment the profile counters */
+
+struct qc_program_s;
+
+typedef int (*prog_builtin)(struct qc_program_s *prog);
+
+typedef struct {
+    qcint                  stmt;
+    size_t                 localsp;
+    prog_section_function *function;
+} qc_exec_stack;
+
+typedef struct qc_program_s {
+    char           *filename;
+
+    MEM_VECTOR_MAKE(prog_section_statement, code);
+    MEM_VECTOR_MAKE(prog_section_def,       defs);
+    MEM_VECTOR_MAKE(prog_section_def,       fields);
+    MEM_VECTOR_MAKE(prog_section_function,  functions);
+    MEM_VECTOR_MAKE(char,                   strings);
+    MEM_VECTOR_MAKE(qcint,                  globals);
+    MEM_VECTOR_MAKE(qcint,                  entitydata);
+
+    size_t tempstring_start;
+    size_t tempstring_at;
+
+    qcint  vmerror;
+
+    MEM_VECTOR_MAKE(size_t, profile);
+
+    MEM_VECTOR_MAKE(prog_builtin, builtins);
+
+    /* size_t ip; */
+    qcint  entities;
+    size_t entityfields;
+    bool   allowworldwrites;
+
+    MEM_VECTOR_MAKE(qcint,         localstack);
+    MEM_VECTOR_MAKE(qc_exec_stack, stack);
+    size_t statement;
+
+    int    argc; /* current arg count for debugging */
+} qc_program;
+
+qc_program* prog_load(const char *filename);
+void        prog_delete(qc_program *prog);
+
+bool prog_exec(qc_program *prog, prog_section_function *func, size_t flags, long maxjumps);
+
+char*             prog_getstring (qc_program *prog, qcint str);
+prog_section_def* prog_entfield  (qc_program *prog, qcint off);
+prog_section_def* prog_getdef    (qc_program *prog, qcint off);
+qcany*            prog_getedict  (qc_program *prog, qcint e);
+qcint             prog_tempstring(qc_program *prog, const char *_str);
+
+/*===================================================================*/
+/*======================= main.c commandline ========================*/
+/*===================================================================*/
+
+#if 0
+/* Helpers to allow for a whole lot of flags. Otherwise we'd limit
+ * to 32 or 64 -f options...
+ */
+typedef struct {
+    size_t  idx; /* index into an array of 32 bit words */
+    uint8_t bit; /* index _into_ the 32 bit word, thus just uint8 */
+} longbit;
+#define LONGBIT(bit) { ((bit)/32), ((bit)%32) }
+#else
+typedef uint32_t longbit;
+#define LONGBIT(bit) (bit)
+#endif
+
+/* Used to store the list of flags with names */
+typedef struct {
+    const char *name;
+    longbit    bit;
+} opts_flag_def;
+
+/*===================================================================*/
+/* list of -f flags, like -fdarkplaces-string-table-bug */
+enum {
+# define GMQCC_DEFINE_FLAG(X) X,
+#  include "flags.def"
+# undef GMQCC_DEFINE_FLAG
+    COUNT_FLAGS
+};
+static const opts_flag_def opts_flag_list[] = {
+# define GMQCC_DEFINE_FLAG(X) { #X, LONGBIT(X) },
+#  include "flags.def"
+# undef GMQCC_DEFINE_FLAG
+    { NULL, LONGBIT(0) }
+};
+
+enum {
+# define GMQCC_DEFINE_FLAG(X) X,
+#  include "warns.def"
+# undef GMQCC_DEFINE_FLAG
+    COUNT_WARNINGS
+};
+static const opts_flag_def opts_warn_list[] = {
+# define GMQCC_DEFINE_FLAG(X) { #X, LONGBIT(X) },
+#  include "warns.def"
+# undef GMQCC_DEFINE_FLAG
+    { NULL, LONGBIT(0) }
+};
+
+/* other options: */
 enum {
     COMPILER_QCC,     /* circa  QuakeC */
     COMPILER_FTEQCC,  /* fteqcc QuakeC */
     COMPILER_QCCX,    /* qccx   QuakeC */
     COMPILER_GMQCC    /* this   QuakeC */
 };
-extern bool opts_debug;
-extern bool opts_memchk;
-extern bool opts_darkplaces_stringtablebug;
-extern bool opts_omit_nullcode;
-extern int  opts_compiler;
+extern uint32_t    opts_O;      /* -Ox */
+extern const char *opts_output; /* -o file */
+extern int         opts_standard;
+extern bool        opts_debug;
+extern bool        opts_memchk;
+
+/*===================================================================*/
+#define OPTS_FLAG(i) (!! (opts_flags[(i)/32] & (1<< ((i)%32))))
+extern uint32_t opts_flags[1 + (COUNT_FLAGS / 32)];
+#define OPTS_WARN(i) (!! (opts_warn[(i)/32] & (1<< ((i)%32))))
+extern uint32_t opts_warn[1 + (COUNT_WARNINGS / 32)];
+
 #endif