added __STD_VERSION_[MINOR/MAJOR]__, and vec_upload

[xonotic/gmqcc.git] / ir.c

diff --git a/ir.c b/ir.c
index ffaa76289189207bbb23b5074faf4fb5a72ab08b..dbb1d97a46ae58e8d881a3ec40a351aaa395ba49 100644 (file)
--- a/ir.c
+++ b/ir.c
@@ -193,6 +193,11 @@ uint16_t type_not_instr[TYPE_COUNT] = {
     AINSTR_END, /* array  */
 };
 
+/* protos */
+static void ir_gen_extparam(ir_builder *ir);
+
+/* error functions */
+
 static void irerror(lex_ctx ctx, const char *msg, ...)
 {
     va_list ap;
@@ -2448,25 +2453,12 @@ static bool gen_global_field(ir_value *global)
             return false;
         }
 
-        /* Now, in this case, a relocation would be impossible to code
-         * since it looks like this:
-         * .vector v = origin;     <- parse error, wtf is 'origin'?
-         * .vector origin;
-         *
-         * But we will need a general relocation support later anyway
-         * for functions... might as well support that here.
-         */
-        if (!fld->code.globaladdr) {
-            irerror(global->context, "FIXME: Relocation support");
-            return false;
-        }
-
         /* copy the field's value */
         ir_value_code_setaddr(global, vec_size(code_globals));
-        vec_push(code_globals, code_globals[fld->code.globaladdr]);
+        vec_push(code_globals, fld->code.fieldaddr);
         if (global->fieldtype == TYPE_VECTOR) {
-            vec_push(code_globals, code_globals[fld->code.globaladdr]+1);
-            vec_push(code_globals, code_globals[fld->code.globaladdr]+2);
+            vec_push(code_globals, fld->code.fieldaddr+1);
+            vec_push(code_globals, fld->code.fieldaddr+2);
         }
     }
     else
@@ -2684,10 +2676,8 @@ tailcall:
                 ir_value *param = instr->params[p];
                 ir_value *targetparam;
 
-                if (p-8 >= vec_size(ir->extparams)) {
-                    irerror(instr->context, "Not enough extparam-globals have been created");
-                    return false;
-                }
+                if (p-8 >= vec_size(ir->extparams))
+                    ir_gen_extparam(ir);
 
                 targetparam = ir->extparams[p-8];
 
@@ -2859,7 +2849,10 @@ static bool gen_global_function(ir_builder *ir, ir_value *global)
     if (vec_size(irfun->locals)) {
         ir_value *last = vec_last(irfun->locals);
         local_var_end = last->code.globaladdr;
-        local_var_end += type_sizeof[last->vtype];
+        if (last->vtype == TYPE_FIELD && last->fieldtype == TYPE_VECTOR)
+            local_var_end += type_sizeof[TYPE_VECTOR];
+        else
+            local_var_end += type_sizeof[last->vtype];
     }
     for (i = 0; i < vec_size(irfun->values); ++i)
     {
@@ -2875,7 +2868,7 @@ static bool gen_global_function(ir_builder *ir, ir_value *global)
     fun.locals = vec_size(code_globals) - fun.firstlocal;
 
     if (irfun->builtin)
-        fun.entry = irfun->builtin;
+        fun.entry = irfun->builtin+1;
     else {
         irfun->code_function_def = vec_size(code_functions);
         fun.entry = vec_size(code_statements);
@@ -3120,6 +3113,11 @@ static bool ir_builder_gen_global(ir_builder *self, ir_value *global, bool isloc
     }
 }
 
+static void ir_builder_prepare_field(ir_value *field)
+{
+    field->code.fieldaddr = code_alloc_field(type_sizeof[field->fieldtype]);
+}
+
 static bool ir_builder_gen_field(ir_builder *self, ir_value *field)
 {
     prog_section_def def;
@@ -3171,7 +3169,7 @@ static bool ir_builder_gen_field(ir_builder *self, ir_value *field)
         return false;
     }
 
-    fld.offset = code_alloc_field(type_sizeof[field->fieldtype]);
+    fld.offset = field->code.fieldaddr;
 
     vec_push(code_fields, fld);
 
@@ -3193,6 +3191,11 @@ bool ir_builder_generate(ir_builder *self, const char *filename)
 
     code_init();
 
+    for (i = 0; i < vec_size(self->fields); ++i)
+    {
+        ir_builder_prepare_field(self->fields[i]);
+    }
+
     for (i = 0; i < vec_size(self->globals); ++i)
     {
         if (!ir_builder_gen_global(self, self->globals[i], false)) {