]> git.xonotic.org Git - xonotic/gmqcc.git/blobdiff - ir.c
prepare fields before generating globals so we avoid the need for relocating initiali...
[xonotic/gmqcc.git] / ir.c
diff --git a/ir.c b/ir.c
index 398744ed512f376d82874ed764236795284c5e5c..bf08a5d426a8d874128905d1f9120056d8bccf7a 100644 (file)
--- a/ir.c
+++ b/ir.c
 #include "ir.h"
 
 /***********************************************************************
- *IR Builder
+ * Type sizes used at multiple points in the IR codegen
  */
 
+const char *type_name[TYPE_COUNT] = {
+    "void",
+    "string",
+    "float",
+    "vector",
+    "entity",
+    "field",
+    "function",
+    "pointer",
+    "integer",
+    "variant",
+    "struct",
+    "union",
+    "array"
+};
+
+size_t type_sizeof[TYPE_COUNT] = {
+    1, /* TYPE_VOID     */
+    1, /* TYPE_STRING   */
+    1, /* TYPE_FLOAT    */
+    3, /* TYPE_VECTOR   */
+    1, /* TYPE_ENTITY   */
+    1, /* TYPE_FIELD    */
+    1, /* TYPE_FUNCTION */
+    1, /* TYPE_POINTER  */
+    1, /* TYPE_INTEGER  */
+    3, /* TYPE_VARIANT  */
+    0, /* TYPE_STRUCT   */
+    0, /* TYPE_UNION    */
+    0, /* TYPE_ARRAY    */
+};
+
+uint16_t type_store_instr[TYPE_COUNT] = {
+    INSTR_STORE_F, /* should use I when having integer support */
+    INSTR_STORE_S,
+    INSTR_STORE_F,
+    INSTR_STORE_V,
+    INSTR_STORE_ENT,
+    INSTR_STORE_FLD,
+    INSTR_STORE_FNC,
+    INSTR_STORE_ENT, /* should use I */
+#if 0
+    INSTR_STORE_I, /* integer type */
+#else
+    INSTR_STORE_F,
+#endif
+
+    INSTR_STORE_V, /* variant, should never be accessed */
+
+    AINSTR_END, /* struct */
+    AINSTR_END, /* union  */
+    AINSTR_END, /* array  */
+};
+
+uint16_t field_store_instr[TYPE_COUNT] = {
+    INSTR_STORE_FLD,
+    INSTR_STORE_FLD,
+    INSTR_STORE_FLD,
+    INSTR_STORE_V,
+    INSTR_STORE_FLD,
+    INSTR_STORE_FLD,
+    INSTR_STORE_FLD,
+    INSTR_STORE_FLD,
+#if 0
+    INSTR_STORE_FLD, /* integer type */
+#else
+    INSTR_STORE_FLD,
+#endif
+
+    INSTR_STORE_V, /* variant, should never be accessed */
+
+    AINSTR_END, /* struct */
+    AINSTR_END, /* union  */
+    AINSTR_END, /* array  */
+};
+
+uint16_t type_storep_instr[TYPE_COUNT] = {
+    INSTR_STOREP_F, /* should use I when having integer support */
+    INSTR_STOREP_S,
+    INSTR_STOREP_F,
+    INSTR_STOREP_V,
+    INSTR_STOREP_ENT,
+    INSTR_STOREP_FLD,
+    INSTR_STOREP_FNC,
+    INSTR_STOREP_ENT, /* should use I */
+#if 0
+    INSTR_STOREP_ENT, /* integer type */
+#else
+    INSTR_STOREP_F,
+#endif
+
+    INSTR_STOREP_V, /* variant, should never be accessed */
+
+    AINSTR_END, /* struct */
+    AINSTR_END, /* union  */
+    AINSTR_END, /* array  */
+};
+
+uint16_t type_eq_instr[TYPE_COUNT] = {
+    INSTR_EQ_F, /* should use I when having integer support */
+    INSTR_EQ_S,
+    INSTR_EQ_F,
+    INSTR_EQ_V,
+    INSTR_EQ_E,
+    INSTR_EQ_E, /* FLD has no comparison */
+    INSTR_EQ_FNC,
+    INSTR_EQ_E, /* should use I */
+#if 0
+    INSTR_EQ_I,
+#else
+    INSTR_EQ_F,
+#endif
+
+    INSTR_EQ_V, /* variant, should never be accessed */
+
+    AINSTR_END, /* struct */
+    AINSTR_END, /* union  */
+    AINSTR_END, /* array  */
+};
+
+uint16_t type_ne_instr[TYPE_COUNT] = {
+    INSTR_NE_F, /* should use I when having integer support */
+    INSTR_NE_S,
+    INSTR_NE_F,
+    INSTR_NE_V,
+    INSTR_NE_E,
+    INSTR_NE_E, /* FLD has no comparison */
+    INSTR_NE_FNC,
+    INSTR_NE_E, /* should use I */
+#if 0
+    INSTR_NE_I,
+#else
+    INSTR_NE_F,
+#endif
+
+    INSTR_NE_V, /* variant, should never be accessed */
+
+    AINSTR_END, /* struct */
+    AINSTR_END, /* union  */
+    AINSTR_END, /* array  */
+};
+
+uint16_t type_not_instr[TYPE_COUNT] = {
+    INSTR_NOT_F, /* should use I when having integer support */
+    INSTR_NOT_S,
+    INSTR_NOT_F,
+    INSTR_NOT_V,
+    INSTR_NOT_ENT,
+    INSTR_NOT_ENT,
+    INSTR_NOT_FNC,
+    INSTR_NOT_ENT, /* should use I */
+#if 0
+    INSTR_NOT_I, /* integer type */
+#else
+    INSTR_NOT_F,
+#endif
+
+    INSTR_NOT_V, /* variant, should never be accessed */
+
+    AINSTR_END, /* struct */
+    AINSTR_END, /* union  */
+    AINSTR_END, /* array  */
+};
+
+static void irerror(lex_ctx ctx, const char *msg, ...)
+{
+    va_list ap;
+    va_start(ap, msg);
+    con_cvprintmsg((void*)&ctx, LVL_ERROR, "internal error", msg, ap);
+    va_end(ap);
+}
+
+static bool irwarning(lex_ctx ctx, int warntype, const char *fmt, ...)
+{
+       va_list ap;
+       int lvl = LVL_WARNING;
+
+    if (warntype && !OPTS_WARN(warntype))
+        return false;
+
+    if (opts_werror)
+           lvl = LVL_ERROR;
+
+       va_start(ap, fmt);
+    con_vprintmsg(lvl, ctx.file, ctx.line, "warning", fmt, ap);
+       va_end(ap);
+
+       return opts_werror;
+}
+
+/***********************************************************************
+ * Vector utility functions
+ */
+
+bool GMQCC_WARN vec_ir_value_find(ir_value **vec, ir_value *what, size_t *idx)
+{
+    size_t i;
+    size_t len = vec_size(vec);
+    for (i = 0; i < len; ++i) {
+        if (vec[i] == what) {
+            if (idx) *idx = i;
+            return true;
+        }
+    }
+    return false;
+}
+
+bool GMQCC_WARN vec_ir_block_find(ir_block **vec, ir_block *what, size_t *idx)
+{
+    size_t i;
+    size_t len = vec_size(vec);
+    for (i = 0; i < len; ++i) {
+        if (vec[i] == what) {
+            if (idx) *idx = i;
+            return true;
+        }
+    }
+    return false;
+}
+
+bool GMQCC_WARN vec_ir_instr_find(ir_instr **vec, ir_instr *what, size_t *idx)
+{
+    size_t i;
+    size_t len = vec_size(vec);
+    for (i = 0; i < len; ++i) {
+        if (vec[i] == what) {
+            if (idx) *idx = i;
+            return true;
+        }
+    }
+    return false;
+}
+
+/***********************************************************************
+ * IR Builder
+ */
+
+static void ir_block_delete_quick(ir_block* self);
+static void ir_instr_delete_quick(ir_instr *self);
+static void ir_function_delete_quick(ir_function *self);
+
 ir_builder* ir_builder_new(const char *modulename)
 {
     ir_builder* self;
@@ -37,37 +278,51 @@ ir_builder* ir_builder_new(const char *modulename)
     if (!self)
         return NULL;
 
-    MEM_VECTOR_INIT(self, functions);
-    MEM_VECTOR_INIT(self, globals);
+    self->functions   = NULL;
+    self->globals     = NULL;
+    self->fields      = NULL;
+    self->extparams   = NULL;
+    self->filenames   = NULL;
+    self->filestrings = NULL;
+    self->htglobals   = util_htnew(IR_HT_SIZE);
+    self->htfields    = util_htnew(IR_HT_SIZE);
+    self->htfunctions = util_htnew(IR_HT_SIZE);
+
+    self->str_immediate = 0;
     self->name = NULL;
     if (!ir_builder_set_name(self, modulename)) {
         mem_d(self);
         return NULL;
     }
 
-    /* globals which always exist */
-
-    /* for now we give it a vector size */
-    ir_builder_create_global(self, "OFS_RETURN", TYPE_VARIANT);
-
     return self;
 }
 
-MEM_VEC_FUNCTIONS(ir_builder, ir_value*, globals)
-MEM_VEC_FUNCTIONS(ir_builder, ir_function*, functions)
-
 void ir_builder_delete(ir_builder* self)
 {
     size_t i;
+    util_htdel(self->htglobals);
+    util_htdel(self->htfields);
+    util_htdel(self->htfunctions);
     mem_d((void*)self->name);
-    for (i = 0; i != self->functions_count; ++i) {
-        ir_function_delete(self->functions[i]);
+    for (i = 0; i != vec_size(self->functions); ++i) {
+        ir_function_delete_quick(self->functions[i]);
+    }
+    vec_free(self->functions);
+    for (i = 0; i != vec_size(self->extparams); ++i) {
+        ir_value_delete(self->extparams[i]);
     }
-    MEM_VECTOR_CLEAR(self, functions);
-    for (i = 0; i != self->globals_count; ++i) {
+    vec_free(self->extparams);
+    for (i = 0; i != vec_size(self->globals); ++i) {
         ir_value_delete(self->globals[i]);
     }
-    MEM_VECTOR_CLEAR(self, globals);
+    vec_free(self->globals);
+    for (i = 0; i != vec_size(self->fields); ++i) {
+        ir_value_delete(self->fields[i]);
+    }
+    vec_free(self->fields);
+    vec_free(self->filenames);
+    vec_free(self->filestrings);
     mem_d(self);
 }
 
@@ -81,53 +336,79 @@ bool ir_builder_set_name(ir_builder *self, const char *name)
 
 ir_function* ir_builder_get_function(ir_builder *self, const char *name)
 {
-    size_t i;
-    for (i = 0; i < self->functions_count; ++i) {
-        if (!strcmp(name, self->functions[i]->name))
-            return self->functions[i];
-    }
-    return NULL;
+    return (ir_function*)util_htget(self->htfunctions, name);
 }
 
-ir_function* ir_builder_create_function(ir_builder *self, const char *name)
+ir_function* ir_builder_create_function(ir_builder *self, const char *name, int outtype)
 {
     ir_function *fn = ir_builder_get_function(self, name);
     if (fn) {
         return NULL;
     }
 
-    fn = ir_function_new(self);
-    if (!ir_function_set_name(fn, name) ||
-        !ir_builder_functions_add(self, fn) )
+    fn = ir_function_new(self, outtype);
+    if (!ir_function_set_name(fn, name))
     {
         ir_function_delete(fn);
         return NULL;
     }
+    vec_push(self->functions, fn);
+    util_htset(self->htfunctions, name, fn);
+
+    fn->value = ir_builder_create_global(self, fn->name, TYPE_FUNCTION);
+    if (!fn->value) {
+        ir_function_delete(fn);
+        return NULL;
+    }
+
+    fn->value->hasvalue = true;
+    fn->value->outtype = outtype;
+    fn->value->constval.vfunc = fn;
+    fn->value->context = fn->context;
+
     return fn;
 }
 
 ir_value* ir_builder_get_global(ir_builder *self, const char *name)
 {
-    size_t i;
-    for (i = 0; i < self->globals_count; ++i) {
-        if (!strcmp(self->globals[i]->name, name))
-            return self->globals[i];
-    }
-    return NULL;
+    return (ir_value*)util_htget(self->htglobals, name);
 }
 
 ir_value* ir_builder_create_global(ir_builder *self, const char *name, int vtype)
 {
-    ir_value *ve = ir_builder_get_global(self, name);
-    if (ve) {
-        return NULL;
+    ir_value *ve;
+
+    if (name && name[0] != '#')
+    {
+        ve = ir_builder_get_global(self, name);
+        if (ve) {
+            return NULL;
+        }
     }
 
     ve = ir_value_var(name, store_global, vtype);
-    if (!ir_builder_globals_add(self, ve)) {
-        ir_value_delete(ve);
+    vec_push(self->globals, ve);
+    util_htset(self->htglobals, name, ve);
+    return ve;
+}
+
+ir_value* ir_builder_get_field(ir_builder *self, const char *name)
+{
+    return (ir_value*)util_htget(self->htfields, name);
+}
+
+
+ir_value* ir_builder_create_field(ir_builder *self, const char *name, int vtype)
+{
+    ir_value *ve = ir_builder_get_field(self, name);
+    if (ve) {
         return NULL;
     }
+
+    ve = ir_value_var(name, store_global, TYPE_FIELD);
+    ve->fieldtype = vtype;
+    vec_push(self->fields, ve);
+    util_htset(self->htfields, name, ve);
     return ve;
 }
 
@@ -140,7 +421,7 @@ void ir_function_enumerate(ir_function*);
 bool ir_function_calculate_liferanges(ir_function*);
 bool ir_function_allocate_locals(ir_function*);
 
-ir_function* ir_function_new(ir_builder* owner)
+ir_function* ir_function_new(ir_builder* owner, int outtype)
 {
     ir_function *self;
     self = (ir_function*)mem_a(sizeof(*self));
@@ -148,6 +429,8 @@ ir_function* ir_function_new(ir_builder* owner)
     if (!self)
         return NULL;
 
+    memset(self, 0, sizeof(*self));
+
     self->name = NULL;
     if (!ir_function_set_name(self, "<@unnamed>")) {
         mem_d(self);
@@ -156,18 +439,21 @@ ir_function* ir_function_new(ir_builder* owner)
     self->owner = owner;
     self->context.file = "<@no context>";
     self->context.line = 0;
-    self->retype = TYPE_VOID;
-    MEM_VECTOR_INIT(self, params);
-    MEM_VECTOR_INIT(self, blocks);
-    MEM_VECTOR_INIT(self, values);
-    MEM_VECTOR_INIT(self, locals);
+    self->outtype = outtype;
+    self->value = NULL;
+    self->builtin = 0;
+
+    self->params = NULL;
+    self->blocks = NULL;
+    self->values = NULL;
+    self->locals = NULL;
+
+    self->code_function_def = -1;
+    self->allocated_locals = 0;
 
     self->run_id = 0;
     return self;
 }
-MEM_VEC_FUNCTIONS(ir_function, ir_value*, values)
-MEM_VEC_FUNCTIONS(ir_function, ir_block*, blocks)
-MEM_VEC_FUNCTIONS(ir_function, ir_value*, locals)
 
 bool ir_function_set_name(ir_function *self, const char *name)
 {
@@ -177,46 +463,166 @@ bool ir_function_set_name(ir_function *self, const char *name)
     return !!self->name;
 }
 
+static void ir_function_delete_quick(ir_function *self)
+{
+    size_t i;
+    mem_d((void*)self->name);
+
+    for (i = 0; i != vec_size(self->blocks); ++i)
+        ir_block_delete_quick(self->blocks[i]);
+    vec_free(self->blocks);
+
+    vec_free(self->params);
+
+    for (i = 0; i != vec_size(self->values); ++i)
+        ir_value_delete(self->values[i]);
+    vec_free(self->values);
+
+    for (i = 0; i != vec_size(self->locals); ++i)
+        ir_value_delete(self->locals[i]);
+    vec_free(self->locals);
+
+    /* self->value is deleted by the builder */
+
+    mem_d(self);
+}
+
 void ir_function_delete(ir_function *self)
 {
     size_t i;
     mem_d((void*)self->name);
 
-    for (i = 0; i != self->blocks_count; ++i)
+    for (i = 0; i != vec_size(self->blocks); ++i)
         ir_block_delete(self->blocks[i]);
-    MEM_VECTOR_CLEAR(self, blocks);
+    vec_free(self->blocks);
 
-    MEM_VECTOR_CLEAR(self, params);
+    vec_free(self->params);
 
-    for (i = 0; i != self->values_count; ++i)
+    for (i = 0; i != vec_size(self->values); ++i)
         ir_value_delete(self->values[i]);
-    MEM_VECTOR_CLEAR(self, values);
+    vec_free(self->values);
 
-    for (i = 0; i != self->locals_count; ++i)
+    for (i = 0; i != vec_size(self->locals); ++i)
         ir_value_delete(self->locals[i]);
-    MEM_VECTOR_CLEAR(self, locals);
+    vec_free(self->locals);
+
+    /* self->value is deleted by the builder */
 
     mem_d(self);
 }
 
-bool GMQCC_WARN ir_function_collect_value(ir_function *self, ir_value *v)
+void ir_function_collect_value(ir_function *self, ir_value *v)
 {
-    return ir_function_values_add(self, v);
+    vec_push(self->values, v);
 }
 
-ir_block* ir_function_create_block(ir_function *self, const char *label)
+ir_block* ir_function_create_block(lex_ctx ctx, ir_function *self, const char *label)
 {
     ir_block* bn = ir_block_new(self, label);
-    memcpy(&bn->context, &self->context, sizeof(self->context));
-    if (!ir_function_blocks_add(self, bn)) {
-        ir_block_delete(bn);
-        return NULL;
-    }
+    bn->context = ctx;
+    vec_push(self->blocks, bn);
     return bn;
 }
 
+bool ir_function_pass_tailcall(ir_function *self)
+{
+    size_t b, p;
+
+    for (b = 0; b < vec_size(self->blocks); ++b) {
+        ir_value *funcval;
+        ir_instr *ret, *call, *store = NULL;
+        ir_block *block = self->blocks[b];
+
+        if (!block->final || vec_size(block->instr) < 2)
+            continue;
+
+        ret = block->instr[vec_size(block->instr)-1];
+        if (ret->opcode != INSTR_DONE && ret->opcode != INSTR_RETURN)
+            continue;
+
+        call = block->instr[vec_size(block->instr)-2];
+        if (call->opcode >= INSTR_STORE_F && call->opcode <= INSTR_STORE_FNC) {
+            /* account for the unoptimized
+             * CALL
+             * STORE %return, %tmp
+             * RETURN %tmp
+             * version
+             */
+            if (vec_size(block->instr) < 3)
+                continue;
+
+            store = call;
+            call = block->instr[vec_size(block->instr)-3];
+        }
+
+        if (call->opcode < INSTR_CALL0 || call->opcode > INSTR_CALL8)
+            continue;
+
+        if (store) {
+            /* optimize out the STORE */
+            if (ret->_ops[0]   &&
+                ret->_ops[0]   == store->_ops[0] &&
+                store->_ops[1] == call->_ops[0])
+            {
+                ++optimization_count[OPTIM_MINOR];
+                call->_ops[0] = store->_ops[0];
+                vec_remove(block->instr, vec_size(block->instr) - 2, 1);
+                ir_instr_delete(store);
+            }
+            else
+                continue;
+        }
+
+        if (!call->_ops[0])
+            continue;
+
+        funcval = call->_ops[1];
+        if (!funcval)
+            continue;
+        if (funcval->vtype != TYPE_FUNCTION || funcval->constval.vfunc != self)
+            continue;
+
+        /* now we have a CALL and a RET, check if it's a tailcall */
+        if (ret->_ops[0] && call->_ops[0] != ret->_ops[0])
+            continue;
+
+        ++optimization_count[OPTIM_TAIL_RECURSION];
+        vec_shrinkby(block->instr, 2);
+
+        block->final = false; /* open it back up */
+
+        /* emite parameter-stores */
+        for (p = 0; p < vec_size(call->params); ++p) {
+            /* assert(call->params_count <= self->locals_count); */
+            if (!ir_block_create_store(block, call->context, self->locals[p], call->params[p])) {
+                irerror(call->context, "failed to create tailcall store instruction for parameter %i", (int)p);
+                return false;
+            }
+        }
+        if (!ir_block_create_jump(block, call->context, self->blocks[0])) {
+            irerror(call->context, "failed to create tailcall jump");
+            return false;
+        }
+
+        ir_instr_delete(call);
+        ir_instr_delete(ret);
+    }
+
+    return true;
+}
+
 bool ir_function_finalize(ir_function *self)
 {
+    if (self->builtin)
+        return true;
+
+    if (OPTS_OPTIMIZATION(OPTIM_TAIL_RECURSION)) {
+        if (!ir_function_pass_tailcall(self)) {
+            irerror(self->context, "tailcall optimization pass broke something in `%s`", self->name);
+            return false;
+        }
+    }
+
     if (!ir_function_naive_phi(self))
         return false;
 
@@ -224,34 +630,24 @@ bool ir_function_finalize(ir_function *self)
 
     if (!ir_function_calculate_liferanges(self))
         return false;
-
     if (!ir_function_allocate_locals(self))
         return false;
     return true;
 }
 
-ir_value* ir_function_get_local(ir_function *self, const char *name)
+ir_value* ir_function_create_local(ir_function *self, const char *name, int vtype, bool param)
 {
-    size_t i;
-    for (i = 0; i < self->locals_count; ++i) {
-        if (!strcmp(self->locals[i]->name, name))
-            return self->locals[i];
-    }
-    return NULL;
-}
+    ir_value *ve;
 
-ir_value* ir_function_create_local(ir_function *self, const char *name, int vtype)
-{
-    ir_value *ve = ir_function_get_local(self, name);
-    if (ve) {
+    if (param &&
+        vec_size(self->locals) &&
+        self->locals[vec_size(self->locals)-1]->store != store_param) {
+        irerror(self->context, "cannot add parameters after adding locals");
         return NULL;
     }
 
-    ve = ir_value_var(name, store_local, vtype);
-    if (!ir_function_locals_add(self, ve)) {
-        ir_value_delete(ve);
-        return NULL;
-    }
+    ve = ir_value_var(name, (param ? store_param : store_local), vtype);
+    vec_push(self->locals, ve);
     return ve;
 }
 
@@ -269,7 +665,7 @@ ir_block* ir_block_new(ir_function* owner, const char *name)
     memset(self, 0, sizeof(*self));
 
     self->label = NULL;
-    if (!ir_block_set_label(self, name)) {
+    if (name && !ir_block_set_label(self, name)) {
         mem_d(self);
         return NULL;
     }
@@ -277,34 +673,45 @@ ir_block* ir_block_new(ir_function* owner, const char *name)
     self->context.file = "<@no context>";
     self->context.line = 0;
     self->final = false;
-    MEM_VECTOR_INIT(self, instr);
-    MEM_VECTOR_INIT(self, entries);
-    MEM_VECTOR_INIT(self, exits);
+
+    self->instr   = NULL;
+    self->entries = NULL;
+    self->exits   = NULL;
 
     self->eid = 0;
     self->is_return = false;
     self->run_id = 0;
-    MEM_VECTOR_INIT(self, living);
+
+    self->living = NULL;
 
     self->generated = false;
 
     return self;
 }
-MEM_VEC_FUNCTIONS(ir_block, ir_instr*, instr)
-MEM_VEC_FUNCTIONS_ALL(ir_block, ir_block*, entries)
-MEM_VEC_FUNCTIONS_ALL(ir_block, ir_block*, exits)
-MEM_VEC_FUNCTIONS_ALL(ir_block, ir_value*, living)
+
+static void ir_block_delete_quick(ir_block* self)
+{
+    size_t i;
+    if (self->label) mem_d(self->label);
+    for (i = 0; i != vec_size(self->instr); ++i)
+        ir_instr_delete_quick(self->instr[i]);
+    vec_free(self->instr);
+    vec_free(self->entries);
+    vec_free(self->exits);
+    vec_free(self->living);
+    mem_d(self);
+}
 
 void ir_block_delete(ir_block* self)
 {
     size_t i;
-    mem_d(self->label);
-    for (i = 0; i != self->instr_count; ++i)
+    if (self->label) mem_d(self->label);
+    for (i = 0; i != vec_size(self->instr); ++i)
         ir_instr_delete(self->instr[i]);
-    MEM_VECTOR_CLEAR(self, instr);
-    MEM_VECTOR_CLEAR(self, entries);
-    MEM_VECTOR_CLEAR(self, exits);
-    MEM_VECTOR_CLEAR(self, living);
+    vec_free(self->instr);
+    vec_free(self->entries);
+    vec_free(self->exits);
+    vec_free(self->living);
     mem_d(self);
 }
 
@@ -320,7 +727,7 @@ bool ir_block_set_label(ir_block *self, const char *name)
  *IR Instructions
  */
 
-ir_instr* ir_instr_new(ir_block* owner, int op)
+ir_instr* ir_instr_new(lex_ctx ctx, ir_block* owner, int op)
 {
     ir_instr *self;
     self = (ir_instr*)mem_a(sizeof(*self));
@@ -328,20 +735,29 @@ ir_instr* ir_instr_new(ir_block* owner, int op)
         return NULL;
 
     self->owner = owner;
-    self->context.file = "<@no context>";
-    self->context.line = 0;
+    self->context = ctx;
     self->opcode = op;
     self->_ops[0] = NULL;
     self->_ops[1] = NULL;
     self->_ops[2] = NULL;
     self->bops[0] = NULL;
     self->bops[1] = NULL;
-    MEM_VECTOR_INIT(self, phi);
+
+    self->phi    = NULL;
+    self->params = NULL;
 
     self->eid = 0;
+
+    self->likely = true;
     return self;
 }
-MEM_VEC_FUNCTIONS(ir_instr, ir_phi_entry_t, phi)
+
+static void ir_instr_delete_quick(ir_instr *self)
+{
+    vec_free(self->phi);
+    vec_free(self->params);
+    mem_d(self);
+}
 
 void ir_instr_delete(ir_instr *self)
 {
@@ -352,17 +768,25 @@ void ir_instr_delete(ir_instr *self)
      * gcc doesn't care about an explicit: (void)foo(); to ignore the result,
      * I have to improvise here and use if(foo());
      */
-    for (i = 0; i < self->phi_count; ++i) {
+    for (i = 0; i < vec_size(self->phi); ++i) {
+        size_t idx;
+        if (vec_ir_instr_find(self->phi[i].value->writes, self, &idx))
+            vec_remove(self->phi[i].value->writes, idx, 1);
+        if (vec_ir_instr_find(self->phi[i].value->reads, self, &idx))
+            vec_remove(self->phi[i].value->reads, idx, 1);
+    }
+    vec_free(self->phi);
+    for (i = 0; i < vec_size(self->params); ++i) {
         size_t idx;
-        if (ir_value_writes_find(self->phi[i].value, self, &idx))
-            if (ir_value_writes_remove(self->phi[i].value, idx)) GMQCC_SUPRESS_EMPTY_BODY;
-        if (ir_value_reads_find(self->phi[i].value, self, &idx))
-            if (ir_value_reads_remove (self->phi[i].value, idx)) GMQCC_SUPRESS_EMPTY_BODY;
-    }
-    MEM_VECTOR_CLEAR(self, phi);
-    if (ir_instr_op(self, 0, NULL, false)) GMQCC_SUPRESS_EMPTY_BODY;
-    if (ir_instr_op(self, 1, NULL, false)) GMQCC_SUPRESS_EMPTY_BODY;
-    if (ir_instr_op(self, 2, NULL, false)) GMQCC_SUPRESS_EMPTY_BODY;
+        if (vec_ir_instr_find(self->params[i]->writes, self, &idx))
+            vec_remove(self->params[i]->writes, idx, 1);
+        if (vec_ir_instr_find(self->params[i]->reads, self, &idx))
+            vec_remove(self->params[i]->reads, idx, 1);
+    }
+    vec_free(self->params);
+    (void)!ir_instr_op(self, 0, NULL, false);
+    (void)!ir_instr_op(self, 1, NULL, false);
+    (void)!ir_instr_op(self, 2, NULL, false);
     mem_d(self);
 }
 
@@ -370,25 +794,16 @@ bool ir_instr_op(ir_instr *self, int op, ir_value *v, bool writing)
 {
     if (self->_ops[op]) {
         size_t idx;
-        if (writing && ir_value_writes_find(self->_ops[op], self, &idx))
-        {
-            if (!ir_value_writes_remove(self->_ops[op], idx))
-                return false;
-        }
-        else if (ir_value_reads_find(self->_ops[op], self, &idx))
-        {
-            if (!ir_value_reads_remove(self->_ops[op], idx))
-                return false;
-        }
+        if (writing && vec_ir_instr_find(self->_ops[op]->writes, self, &idx))
+            vec_remove(self->_ops[op]->writes, idx, 1);
+        else if (vec_ir_instr_find(self->_ops[op]->reads, self, &idx))
+            vec_remove(self->_ops[op]->reads, idx, 1);
     }
     if (v) {
-        if (writing) {
-            if (!ir_value_writes_add(v, self))
-                return false;
-        } else {
-            if (!ir_value_reads_add(v, self))
-                return false;
-        }
+        if (writing)
+            vec_push(v->writes, self);
+        else
+            vec_push(v->reads, self);
     }
     self->_ops[op] = v;
     return true;
@@ -398,63 +813,133 @@ bool ir_instr_op(ir_instr *self, int op, ir_value *v, bool writing)
  *IR Value
  */
 
+void ir_value_code_setaddr(ir_value *self, int32_t gaddr)
+{
+    self->code.globaladdr = gaddr;
+    if (self->members[0]) self->members[0]->code.globaladdr = gaddr;
+    if (self->members[1]) self->members[1]->code.globaladdr = gaddr;
+    if (self->members[2]) self->members[2]->code.globaladdr = gaddr;
+}
+
+int32_t ir_value_code_addr(const ir_value *self)
+{
+    if (self->store == store_return)
+        return OFS_RETURN + self->code.addroffset;
+    return self->code.globaladdr + self->code.addroffset;
+}
+
 ir_value* ir_value_var(const char *name, int storetype, int vtype)
 {
     ir_value *self;
     self = (ir_value*)mem_a(sizeof(*self));
     self->vtype = vtype;
     self->fieldtype = TYPE_VOID;
+    self->outtype = TYPE_VOID;
     self->store = storetype;
-    MEM_VECTOR_INIT(self, reads);
-    MEM_VECTOR_INIT(self, writes);
-    self->isconst = false;
+
+    self->reads  = NULL;
+    self->writes = NULL;
+
+    self->cvq          = CV_NONE;
+    self->hasvalue     = false;
     self->context.file = "<@no context>";
     self->context.line = 0;
     self->name = NULL;
-    ir_value_set_name(self, name);
+    if (name && !ir_value_set_name(self, name)) {
+        irerror(self->context, "out of memory");
+        mem_d(self);
+        return NULL;
+    }
 
     memset(&self->constval, 0, sizeof(self->constval));
     memset(&self->code,     0, sizeof(self->code));
 
-    MEM_VECTOR_INIT(self, life);
+    self->members[0] = NULL;
+    self->members[1] = NULL;
+    self->members[2] = NULL;
+    self->memberof = NULL;
+
+    self->life = NULL;
     return self;
 }
-MEM_VEC_FUNCTIONS(ir_value, ir_life_entry_t, life)
-MEM_VEC_FUNCTIONS_ALL(ir_value, ir_instr*, reads)
-MEM_VEC_FUNCTIONS_ALL(ir_value, ir_instr*, writes)
 
-ir_value* ir_value_out(ir_function *owner, const char *name, int storetype, int vtype)
+ir_value* ir_value_vector_member(ir_value *self, unsigned int member)
 {
-    ir_value *v = ir_value_var(name, storetype, vtype);
-    if (!v)
+    ir_value *m;
+    if (member >= 3)
         return NULL;
-    if (!ir_function_collect_value(owner, v))
+
+    if (self->members[member])
+        return self->members[member];
+
+    if (self->vtype == TYPE_VECTOR)
+    {
+        m = ir_value_var(self->name, self->store, TYPE_FLOAT);
+        if (!m)
+            return NULL;
+        m->context = self->context;
+
+        self->members[member] = m;
+        m->code.addroffset = member;
+    }
+    else if (self->vtype == TYPE_FIELD)
     {
-        ir_value_delete(v);
+        if (self->fieldtype != TYPE_VECTOR)
+            return NULL;
+        m = ir_value_var(self->name, self->store, TYPE_FIELD);
+        if (!m)
+            return NULL;
+        m->fieldtype = TYPE_FLOAT;
+        m->context = self->context;
+
+        self->members[member] = m;
+        m->code.addroffset = member;
+    }
+    else
+    {
+        irerror(self->context, "invalid member access on %s", self->name);
         return NULL;
     }
+
+    m->memberof = self;
+    return m;
+}
+
+ir_value* ir_value_out(ir_function *owner, const char *name, int storetype, int vtype)
+{
+    ir_value *v = ir_value_var(name, storetype, vtype);
+    if (!v)
+        return NULL;
+    ir_function_collect_value(owner, v);
     return v;
 }
 
 void ir_value_delete(ir_value* self)
 {
-    mem_d((void*)self->name);
-    if (self->isconst)
+    size_t i;
+    if (self->name)
+        mem_d((void*)self->name);
+    if (self->hasvalue)
     {
         if (self->vtype == TYPE_STRING)
             mem_d((void*)self->constval.vstring);
     }
-    MEM_VECTOR_CLEAR(self, reads);
-    MEM_VECTOR_CLEAR(self, writes);
-    MEM_VECTOR_CLEAR(self, life);
+    for (i = 0; i < 3; ++i) {
+        if (self->members[i])
+            ir_value_delete(self->members[i]);
+    }
+    vec_free(self->reads);
+    vec_free(self->writes);
+    vec_free(self->life);
     mem_d(self);
 }
 
-void ir_value_set_name(ir_value *self, const char *name)
+bool ir_value_set_name(ir_value *self, const char *name)
 {
     if (self->name)
         mem_d((void*)self->name);
     self->name = util_strdup(name);
+    return !!self->name;
 }
 
 bool ir_value_set_float(ir_value *self, float f)
@@ -462,7 +947,16 @@ bool ir_value_set_float(ir_value *self, float f)
     if (self->vtype != TYPE_FLOAT)
         return false;
     self->constval.vfloat = f;
-    self->isconst = true;
+    self->hasvalue = true;
+    return true;
+}
+
+bool ir_value_set_func(ir_value *self, int f)
+{
+    if (self->vtype != TYPE_FUNCTION)
+        return false;
+    self->constval.vint = f;
+    self->hasvalue = true;
     return true;
 }
 
@@ -471,16 +965,36 @@ bool ir_value_set_vector(ir_value *self, vector v)
     if (self->vtype != TYPE_VECTOR)
         return false;
     self->constval.vvec = v;
-    self->isconst = true;
+    self->hasvalue = true;
+    return true;
+}
+
+bool ir_value_set_field(ir_value *self, ir_value *fld)
+{
+    if (self->vtype != TYPE_FIELD)
+        return false;
+    self->constval.vpointer = fld;
+    self->hasvalue = true;
     return true;
 }
 
+static char *ir_strdup(const char *str)
+{
+    if (str && !*str) {
+        /* actually dup empty strings */
+        char *out = mem_a(1);
+        *out = 0;
+        return out;
+    }
+    return util_strdup(str);
+}
+
 bool ir_value_set_string(ir_value *self, const char *str)
 {
     if (self->vtype != TYPE_STRING)
         return false;
-    self->constval.vstring = util_strdup(str);
-    self->isconst = true;
+    self->constval.vstring = ir_strdup(str);
+    self->hasvalue = true;
     return true;
 }
 
@@ -490,7 +1004,7 @@ bool ir_value_set_int(ir_value *self, int i)
     if (self->vtype != TYPE_INTEGER)
         return false;
     self->constval.vint = i;
-    self->isconst = true;
+    self->hasvalue = true;
     return true;
 }
 #endif
@@ -498,7 +1012,7 @@ bool ir_value_set_int(ir_value *self, int i)
 bool ir_value_lives(ir_value *self, size_t at)
 {
     size_t i;
-    for (i = 0; i < self->life_count; ++i)
+    for (i = 0; i < vec_size(self->life); ++i)
     {
         ir_life_entry_t *life = &self->life[i];
         if (life->start <= at && at <= life->end)
@@ -512,9 +1026,8 @@ bool ir_value_lives(ir_value *self, size_t at)
 bool ir_value_life_insert(ir_value *self, size_t idx, ir_life_entry_t e)
 {
     size_t k;
-    if (!ir_value_life_add(self, e)) /* naive... */
-        return false;
-    for (k = self->life_count-1; k > idx; --k)
+    vec_push(self->life, e);
+    for (k = vec_size(self->life)-1; k > idx; --k)
         self->life[k] = self->life[k-1];
     self->life[idx] = e;
     return true;
@@ -528,7 +1041,7 @@ bool ir_value_life_merge(ir_value *self, size_t s)
     ir_life_entry_t new_entry;
 
     /* Find the first range >= s */
-    for (i = 0; i < self->life_count; ++i)
+    for (i = 0; i < vec_size(self->life); ++i)
     {
         before = life;
         life = &self->life[i];
@@ -536,7 +1049,7 @@ bool ir_value_life_merge(ir_value *self, size_t s)
             break;
     }
     /* nothing found? append */
-    if (i == self->life_count) {
+    if (i == vec_size(self->life)) {
         ir_life_entry_t e;
         if (life && life->end+1 == s)
         {
@@ -547,8 +1060,7 @@ bool ir_value_life_merge(ir_value *self, size_t s)
         if (life && life->end >= s)
             return false;
         e.start = e.end = s;
-        if (!ir_value_life_add(self, e))
-            return false; /* failing */
+        vec_push(self->life, e);
         return true;
     }
     /* found */
@@ -559,8 +1071,7 @@ bool ir_value_life_merge(ir_value *self, size_t s)
         {
             /* merge */
             before->end = life->end;
-            if (!ir_value_life_remove(self, i))
-                return false; /* failing */
+            vec_remove(self->life, i, 1);
             return true;
         }
         if (before->end + 1 == s)
@@ -588,19 +1099,18 @@ bool ir_value_life_merge_into(ir_value *self, const ir_value *other)
 {
     size_t i, myi;
 
-    if (!other->life_count)
+    if (!vec_size(other->life))
         return true;
 
-    if (!self->life_count) {
-        for (i = 0; i < other->life_count; ++i) {
-            if (!ir_value_life_add(self, other->life[i]))
-                return false;
-        }
+    if (!vec_size(self->life)) {
+        size_t count = vec_size(other->life);
+        ir_life_entry_t *life = vec_add(self->life, count);
+        memcpy(life, other->life, count * sizeof(*life));
         return true;
     }
 
     myi = 0;
-    for (i = 0; i < other->life_count; ++i)
+    for (i = 0; i < vec_size(other->life); ++i)
     {
         const ir_life_entry_t *life = &other->life[i];
         while (true)
@@ -617,28 +1127,27 @@ bool ir_value_life_merge_into(ir_value *self, const ir_value *other)
             }
 
             if (life->start <  entry->start &&
-                life->end   >= entry->start)
+                life->end+1 >= entry->start)
             {
                 /* starts earlier and overlaps */
                 entry->start = life->start;
             }
 
-            if (life->end     >  entry->end &&
-                life->start-1 <= entry->end)
+            if (life->end   >  entry->end &&
+                life->start <= entry->end+1)
             {
                 /* ends later and overlaps */
                 entry->end = life->end;
             }
 
             /* see if our change combines it with the next ranges */
-            while (myi+1 < self->life_count &&
+            while (myi+1 < vec_size(self->life) &&
                    entry->end+1 >= self->life[1+myi].start)
             {
                 /* overlaps with (myi+1) */
                 if (entry->end < self->life[1+myi].end)
                     entry->end = self->life[1+myi].end;
-                if (!ir_value_life_remove(self, myi+1))
-                    return false;
+                vec_remove(self->life, myi+1, 1);
                 entry = &self->life[myi];
             }
 
@@ -647,9 +1156,8 @@ bool ir_value_life_merge_into(ir_value *self, const ir_value *other)
             {
                 ++myi;
                 /* append if we're at the end */
-                if (myi >= self->life_count) {
-                    if (!ir_value_life_add(self, *life))
-                        return false;
+                if (myi >= vec_size(self->life)) {
+                    vec_push(self->life, *life);
                     break;
                 }
                 /* otherweise check the next range */
@@ -661,7 +1169,7 @@ bool ir_value_life_merge_into(ir_value *self, const ir_value *other)
     return true;
 }
 
-bool ir_values_overlap(ir_value *a, ir_value *b)
+bool ir_values_overlap(const ir_value *a, const ir_value *b)
 {
     /* For any life entry in A see if it overlaps with
      * any life entry in B.
@@ -673,25 +1181,20 @@ bool ir_values_overlap(ir_value *a, ir_value *b)
     ir_life_entry_t *la, *lb, *enda, *endb;
 
     /* first of all, if either has no life range, they cannot clash */
-    if (!a->life_count || !b->life_count)
+    if (!vec_size(a->life) || !vec_size(b->life))
         return false;
 
     la = a->life;
     lb = b->life;
-    enda = la + a->life_count;
-    endb = lb + b->life_count;
+    enda = la + vec_size(a->life);
+    endb = lb + vec_size(b->life);
     while (true)
     {
         /* check if the entries overlap, for that,
          * both must start before the other one ends.
          */
-#if defined(LIFE_RANGE_WITHOUT_LAST_READ)
-        if (la->start <= lb->end &&
-            lb->start <= la->end)
-#else
-        if (la->start <  lb->end &&
-            lb->start <  la->end)
-#endif
+        if (la->start < lb->end &&
+            lb->start < la->end)
         {
             return true;
         }
@@ -700,7 +1203,7 @@ bool ir_values_overlap(ir_value *a, ir_value *b)
          * one entry is earlier than the other
          * that earlier entry will be moved forward
          */
-        if (la->end < lb->end)
+        if (la->start < lb->start)
         {
             /* order: A B, move A forward
              * check if we hit the end with A
@@ -708,7 +1211,7 @@ bool ir_values_overlap(ir_value *a, ir_value *b)
             if (++la == enda)
                 break;
         }
-        else if (lb->end < la->end)
+        else /* if (lb->start < la->start)  actually <= */
         {
             /* order: B A, move B forward
              * check if we hit the end with B
@@ -724,27 +1227,36 @@ bool ir_values_overlap(ir_value *a, ir_value *b)
  *IR main operations
  */
 
-bool ir_block_create_store_op(ir_block *self, int op, ir_value *target, ir_value *what)
+bool ir_block_create_store_op(ir_block *self, lex_ctx ctx, int op, ir_value *target, ir_value *what)
 {
-    if (target->store == store_value) {
-        fprintf(stderr, "cannot store to an SSA value\n");
-        fprintf(stderr, "trying to store: %s <- %s\n", target->name, what->name);
+    ir_instr *in;
+    if (self->final) {
+        irerror(self->context, "unreachable statement (%s)", self->label);
+        return false;
+    }
+    in = ir_instr_new(ctx, self, op);
+    if (!in)
+        return false;
+
+    if (target->store == store_value &&
+        (op < INSTR_STOREP_F || op > INSTR_STOREP_FNC))
+    {
+        irerror(self->context, "cannot store to an SSA value");
+        irerror(self->context, "trying to store: %s <- %s", target->name, what->name);
+        irerror(self->context, "instruction: %s", asm_instr[op].m);
+        return false;
+    }
+
+    if (!ir_instr_op(in, 0, target, true) ||
+        !ir_instr_op(in, 1, what, false))
+    {
         return false;
-    } else {
-        ir_instr *in = ir_instr_new(self, op);
-        if (!in)
-            return false;
-        if (!ir_instr_op(in, 0, target, true) ||
-            !ir_instr_op(in, 1, what, false)  ||
-            !ir_block_instr_add(self, in) )
-        {
-            return false;
-        }
-        return true;
     }
+    vec_push(self->instr, in);
+    return true;
 }
 
-bool ir_block_create_store(ir_block *self, ir_value *target, ir_value *what)
+bool ir_block_create_store(ir_block *self, lex_ctx ctx, ir_value *target, ir_value *what)
 {
     int op = 0;
     int vtype;
@@ -753,50 +1265,23 @@ bool ir_block_create_store(ir_block *self, ir_value *target, ir_value *what)
     else
         vtype = target->vtype;
 
-    switch (vtype) {
-        case TYPE_FLOAT:
 #if 0
-            if (what->vtype == TYPE_INTEGER)
-                op = INSTR_CONV_ITOF;
-            else
+    if      (vtype == TYPE_FLOAT   && what->vtype == TYPE_INTEGER)
+        op = INSTR_CONV_ITOF;
+    else if (vtype == TYPE_INTEGER && what->vtype == TYPE_FLOAT)
+        op = INSTR_CONV_FTOI;
 #endif
-                op = INSTR_STORE_F;
-            break;
-        case TYPE_VECTOR:
+        op = type_store_instr[vtype];
+
+    if (OPTS_FLAG(ADJUST_VECTOR_FIELDS)) {
+        if (op == INSTR_STORE_FLD && what->fieldtype == TYPE_VECTOR)
             op = INSTR_STORE_V;
-            break;
-        case TYPE_ENTITY:
-            op = INSTR_STORE_ENT;
-            break;
-        case TYPE_STRING:
-            op = INSTR_STORE_S;
-            break;
-        case TYPE_FIELD:
-            op = INSTR_STORE_FLD;
-            break;
-#if 0
-        case TYPE_INTEGER:
-            if (what->vtype == TYPE_INTEGER)
-                op = INSTR_CONV_FTOI;
-            else
-                op = INSTR_STORE_I;
-            break;
-#endif
-        case TYPE_POINTER:
-#if 0
-            op = INSTR_STORE_I;
-#else
-            op = INSTR_STORE_ENT;
-#endif
-            break;
-        default:
-            /* Unknown type */
-            return false;
     }
-    return ir_block_create_store_op(self, op, target, what);
+
+    return ir_block_create_store_op(self, ctx, op, target, what);
 }
 
-bool ir_block_create_storep(ir_block *self, ir_value *target, ir_value *what)
+bool ir_block_create_storep(ir_block *self, lex_ctx ctx, ir_value *target, ir_value *what)
 {
     int op = 0;
     int vtype;
@@ -809,73 +1294,46 @@ bool ir_block_create_storep(ir_block *self, ir_value *target, ir_value *what)
      */
     vtype = what->vtype;
 
-    switch (vtype) {
-        case TYPE_FLOAT:
-            op = INSTR_STOREP_F;
-            break;
-        case TYPE_VECTOR:
+    op = type_storep_instr[vtype];
+    if (OPTS_FLAG(ADJUST_VECTOR_FIELDS)) {
+        if (op == INSTR_STOREP_FLD && what->fieldtype == TYPE_VECTOR)
             op = INSTR_STOREP_V;
-            break;
-        case TYPE_ENTITY:
-            op = INSTR_STOREP_ENT;
-            break;
-        case TYPE_STRING:
-            op = INSTR_STOREP_S;
-            break;
-        case TYPE_FIELD:
-            op = INSTR_STOREP_FLD;
-            break;
-#if 0
-        case TYPE_INTEGER:
-            op = INSTR_STOREP_I;
-            break;
-#endif
-        case TYPE_POINTER:
-#if 0
-            op = INSTR_STOREP_I;
-#else
-            op = INSTR_STOREP_ENT;
-#endif
-            break;
-        default:
-            /* Unknown type */
-            return false;
     }
-    return ir_block_create_store_op(self, op, target, what);
+
+    return ir_block_create_store_op(self, ctx, op, target, what);
 }
 
-bool ir_block_create_return(ir_block *self, ir_value *v)
+bool ir_block_create_return(ir_block *self, lex_ctx ctx, ir_value *v)
 {
     ir_instr *in;
     if (self->final) {
-        fprintf(stderr, "block already ended (%s)\n", self->label);
+        irerror(self->context, "unreachable statement (%s)", self->label);
         return false;
     }
     self->final = true;
     self->is_return = true;
-    in = ir_instr_new(self, INSTR_RETURN);
+    in = ir_instr_new(ctx, self, INSTR_RETURN);
     if (!in)
         return false;
 
-    if (!ir_instr_op(in, 0, v, false) ||
-        !ir_block_instr_add(self, in) )
-    {
+    if (v && !ir_instr_op(in, 0, v, false))
         return false;
-    }
+
+    vec_push(self->instr, in);
     return true;
 }
 
-bool ir_block_create_if(ir_block *self, ir_value *v,
+bool ir_block_create_if(ir_block *self, lex_ctx ctx, ir_value *v,
                         ir_block *ontrue, ir_block *onfalse)
 {
     ir_instr *in;
     if (self->final) {
-        fprintf(stderr, "block already ended (%s)\n", self->label);
+        irerror(self->context, "unreachable statement (%s)", self->label);
         return false;
     }
     self->final = true;
-    /*in = ir_instr_new(self, (v->vtype == TYPE_STRING ? INSTR_IF_S : INSTR_IF_F));*/
-    in = ir_instr_new(self, VINSTR_COND);
+    /*in = ir_instr_new(ctx, self, (v->vtype == TYPE_STRING ? INSTR_IF_S : INSTR_IF_F));*/
+    in = ir_instr_new(ctx, self, VINSTR_COND);
     if (!in)
         return false;
 
@@ -887,72 +1345,60 @@ bool ir_block_create_if(ir_block *self, ir_value *v,
     in->bops[0] = ontrue;
     in->bops[1] = onfalse;
 
-    if (!ir_block_instr_add(self, in))
-        return false;
+    vec_push(self->instr, in);
 
-    if (!ir_block_exits_add(self, ontrue)    ||
-        !ir_block_exits_add(self, onfalse)   ||
-        !ir_block_entries_add(ontrue, self)  ||
-        !ir_block_entries_add(onfalse, self) )
-    {
-        return false;
-    }
+    vec_push(self->exits, ontrue);
+    vec_push(self->exits, onfalse);
+    vec_push(ontrue->entries,  self);
+    vec_push(onfalse->entries, self);
     return true;
 }
 
-bool ir_block_create_jump(ir_block *self, ir_block *to)
+bool ir_block_create_jump(ir_block *self, lex_ctx ctx, ir_block *to)
 {
     ir_instr *in;
     if (self->final) {
-        fprintf(stderr, "block already ended (%s)\n", self->label);
+        irerror(self->context, "unreachable statement (%s)", self->label);
         return false;
     }
     self->final = true;
-    in = ir_instr_new(self, VINSTR_JUMP);
+    in = ir_instr_new(ctx, self, VINSTR_JUMP);
     if (!in)
         return false;
 
     in->bops[0] = to;
-    if (!ir_block_instr_add(self, in))
-        return false;
+    vec_push(self->instr, in);
 
-    if (!ir_block_exits_add(self, to) ||
-        !ir_block_entries_add(to, self) )
-    {
-        return false;
-    }
+    vec_push(self->exits, to);
+    vec_push(to->entries, self);
     return true;
 }
 
-bool ir_block_create_goto(ir_block *self, ir_block *to)
+bool ir_block_create_goto(ir_block *self, lex_ctx ctx, ir_block *to)
 {
     ir_instr *in;
     if (self->final) {
-        fprintf(stderr, "block already ended (%s)\n", self->label);
+        irerror(self->context, "unreachable statement (%s)", self->label);
         return false;
     }
     self->final = true;
-    in = ir_instr_new(self, INSTR_GOTO);
+    in = ir_instr_new(ctx, self, INSTR_GOTO);
     if (!in)
         return false;
 
     in->bops[0] = to;
-    if (!ir_block_instr_add(self, in))
-        return false;
+    vec_push(self->instr, in);
 
-    if (!ir_block_exits_add(self, to) ||
-        !ir_block_entries_add(to, self) )
-    {
-        return false;
-    }
+    vec_push(self->exits, to);
+    vec_push(to->entries, self);
     return true;
 }
 
-ir_instr* ir_block_create_phi(ir_block *self, const char *label, int ot)
+ir_instr* ir_block_create_phi(ir_block *self, lex_ctx ctx, const char *label, int ot)
 {
     ir_value *out;
     ir_instr *in;
-    in = ir_instr_new(self, VINSTR_PHI);
+    in = ir_instr_new(ctx, self, VINSTR_PHI);
     if (!in)
         return NULL;
     out = ir_value_out(self->owner, label, store_value, ot);
@@ -965,11 +1411,7 @@ ir_instr* ir_block_create_phi(ir_block *self, const char *label, int ot)
         ir_value_delete(out);
         return NULL;
     }
-    if (!ir_block_instr_add(self, in)) {
-        ir_instr_delete(in);
-        ir_value_delete(out);
-        return NULL;
-    }
+    vec_push(self->instr, in);
     return in;
 }
 
@@ -978,28 +1420,62 @@ ir_value* ir_phi_value(ir_instr *self)
     return self->_ops[0];
 }
 
-bool ir_phi_add(ir_instr* self, ir_block *b, ir_value *v)
+void ir_phi_add(ir_instr* self, ir_block *b, ir_value *v)
 {
     ir_phi_entry_t pe;
 
-    if (!ir_block_entries_find(self->owner, b, NULL)) {
+    if (!vec_ir_block_find(self->owner->entries, b, NULL)) {
         /* Must not be possible to cause this, otherwise the AST
          * is doing something wrong.
          */
-        fprintf(stderr, "Invalid entry block for PHI\n");
+        irerror(self->context, "Invalid entry block for PHI");
         abort();
     }
 
     pe.value = v;
     pe.from = b;
-    if (!ir_value_reads_add(v, self))
-        return false;
-    return ir_instr_phi_add(self, pe);
+    vec_push(v->reads, self);
+    vec_push(self->phi, pe);
+}
+
+/* call related code */
+ir_instr* ir_block_create_call(ir_block *self, lex_ctx ctx, const char *label, ir_value *func)
+{
+    ir_value *out;
+    ir_instr *in;
+    in = ir_instr_new(ctx, self, INSTR_CALL0);
+    if (!in)
+        return NULL;
+    out = ir_value_out(self->owner, label, (func->outtype == TYPE_VOID) ? store_return : store_value, func->outtype);
+    if (!out) {
+        ir_instr_delete(in);
+        return NULL;
+    }
+    if (!ir_instr_op(in, 0, out, true) ||
+        !ir_instr_op(in, 1, func, false))
+    {
+        ir_instr_delete(in);
+        ir_value_delete(out);
+        return NULL;
+    }
+    vec_push(self->instr, in);
+    return in;
+}
+
+ir_value* ir_call_value(ir_instr *self)
+{
+    return self->_ops[0];
+}
+
+void ir_call_param(ir_instr* self, ir_value *v)
+{
+    vec_push(self->params, v);
+    vec_push(v->reads, self);
 }
 
 /* binary op related code */
 
-ir_value* ir_block_create_binop(ir_block *self,
+ir_value* ir_block_create_binop(ir_block *self, lex_ctx ctx,
                                 const char *label, int opcode,
                                 ir_value *left, ir_value *right)
 {
@@ -1088,10 +1564,43 @@ ir_value* ir_block_create_binop(ir_block *self,
         return NULL;
     }
 
-    return ir_block_create_general_instr(self, label, opcode, left, right, ot);
+    return ir_block_create_general_instr(self, ctx, label, opcode, left, right, ot);
+}
+
+ir_value* ir_block_create_unary(ir_block *self, lex_ctx ctx,
+                                const char *label, int opcode,
+                                ir_value *operand)
+{
+    int ot = TYPE_FLOAT;
+    switch (opcode) {
+        case INSTR_NOT_F:
+        case INSTR_NOT_V:
+        case INSTR_NOT_S:
+        case INSTR_NOT_ENT:
+        case INSTR_NOT_FNC:
+#if 0
+        case INSTR_NOT_I:
+#endif
+            ot = TYPE_FLOAT;
+            break;
+        /* QC doesn't have other unary operations. We expect extensions to fill
+         * the above list, otherwise we assume out-type = in-type, eg for an
+         * unary minus
+         */
+        default:
+            ot = operand->vtype;
+            break;
+    };
+    if (ot == TYPE_VOID) {
+        /* The AST or parser were supposed to check this! */
+        return NULL;
+    }
+
+    /* let's use the general instruction creator and pass NULL for OPB */
+    return ir_block_create_general_instr(self, ctx, label, opcode, operand, NULL, ot);
 }
 
-ir_value* ir_block_create_general_instr(ir_block *self, const char *label,
+ir_value* ir_block_create_general_instr(ir_block *self, lex_ctx ctx, const char *label,
                                         int op, ir_value *a, ir_value *b, int outype)
 {
     ir_instr *instr;
@@ -1101,7 +1610,7 @@ ir_value* ir_block_create_general_instr(ir_block *self, const char *label,
     if (!out)
         return NULL;
 
-    instr = ir_instr_new(self, op);
+    instr = ir_instr_new(ctx, self, op);
     if (!instr) {
         ir_value_delete(out);
         return NULL;
@@ -1114,8 +1623,7 @@ ir_value* ir_block_create_general_instr(ir_block *self, const char *label,
         goto on_error;
     }
 
-    if (!ir_block_instr_add(self, instr))
-        goto on_error;
+    vec_push(self->instr, instr);
 
     return out;
 on_error:
@@ -1124,8 +1632,10 @@ on_error:
     return NULL;
 }
 
-ir_value* ir_block_create_fieldaddress(ir_block *self, const char *label, ir_value *ent, ir_value *field)
+ir_value* ir_block_create_fieldaddress(ir_block *self, lex_ctx ctx, const char *label, ir_value *ent, ir_value *field)
 {
+    ir_value *v;
+
     /* Support for various pointer types todo if so desired */
     if (ent->vtype != TYPE_ENTITY)
         return NULL;
@@ -1133,10 +1643,12 @@ ir_value* ir_block_create_fieldaddress(ir_block *self, const char *label, ir_val
     if (field->vtype != TYPE_FIELD)
         return NULL;
 
-    return ir_block_create_general_instr(self, label, INSTR_ADDRESS, ent, field, TYPE_POINTER);
+    v = ir_block_create_general_instr(self, ctx, label, INSTR_ADDRESS, ent, field, TYPE_POINTER);
+    v->fieldtype = field->fieldtype;
+    return v;
 }
 
-ir_value* ir_block_create_load_from_ent(ir_block *self, const char *label, ir_value *ent, ir_value *field, int outype)
+ir_value* ir_block_create_load_from_ent(ir_block *self, lex_ctx ctx, const char *label, ir_value *ent, ir_value *field, int outype)
 {
     int op;
     if (ent->vtype != TYPE_ENTITY)
@@ -1148,23 +1660,25 @@ ir_value* ir_block_create_load_from_ent(ir_block *self, const char *label, ir_va
 
     switch (outype)
     {
-        case TYPE_FLOAT:   op = INSTR_LOAD_F;   break;
-        case TYPE_VECTOR:  op = INSTR_LOAD_V;   break;
-        case TYPE_STRING:  op = INSTR_LOAD_S;   break;
-        case TYPE_FIELD:   op = INSTR_LOAD_FLD; break;
-        case TYPE_ENTITY:  op = INSTR_LOAD_ENT; break;
+        case TYPE_FLOAT:    op = INSTR_LOAD_F;   break;
+        case TYPE_VECTOR:   op = INSTR_LOAD_V;   break;
+        case TYPE_STRING:   op = INSTR_LOAD_S;   break;
+        case TYPE_FIELD:    op = INSTR_LOAD_FLD; break;
+        case TYPE_ENTITY:   op = INSTR_LOAD_ENT; break;
+        case TYPE_FUNCTION: op = INSTR_LOAD_FNC; break;
 #if 0
         case TYPE_POINTER: op = INSTR_LOAD_I;   break;
         case TYPE_INTEGER: op = INSTR_LOAD_I;   break;
 #endif
         default:
+            irerror(self->context, "invalid type for ir_block_create_load_from_ent: %s", type_name[outype]);
             return NULL;
     }
 
-    return ir_block_create_general_instr(self, label, op, ent, field, outype);
+    return ir_block_create_general_instr(self, ctx, label, op, ent, field, outype);
 }
 
-ir_value* ir_block_create_add(ir_block *self,
+ir_value* ir_block_create_add(ir_block *self, lex_ctx ctx,
                               const char *label,
                               ir_value *left, ir_value *right)
 {
@@ -1174,6 +1688,7 @@ ir_value* ir_block_create_add(ir_block *self,
     if (l == r) {
         switch (l) {
             default:
+                irerror(self->context, "invalid type for ir_block_create_add: %s", type_name[l]);
                 return NULL;
             case TYPE_FLOAT:
                 op = INSTR_ADD_F;
@@ -1195,12 +1710,15 @@ ir_value* ir_block_create_add(ir_block *self,
             op = INSTR_ADD_IF;
         else
 #endif
+        {
+            irerror(self->context, "invalid type for ir_block_create_add: %s", type_name[l]);
             return NULL;
+        }
     }
-    return ir_block_create_binop(self, label, op, left, right);
+    return ir_block_create_binop(self, ctx, label, op, left, right);
 }
 
-ir_value* ir_block_create_sub(ir_block *self,
+ir_value* ir_block_create_sub(ir_block *self, lex_ctx ctx,
                               const char *label,
                               ir_value *left, ir_value *right)
 {
@@ -1211,6 +1729,7 @@ ir_value* ir_block_create_sub(ir_block *self,
 
         switch (l) {
             default:
+                irerror(self->context, "invalid type for ir_block_create_sub: %s", type_name[l]);
                 return NULL;
             case TYPE_FLOAT:
                 op = INSTR_SUB_F;
@@ -1232,12 +1751,15 @@ ir_value* ir_block_create_sub(ir_block *self,
             op = INSTR_SUB_IF;
         else
 #endif
+        {
+            irerror(self->context, "invalid type for ir_block_create_sub: %s", type_name[l]);
             return NULL;
+        }
     }
-    return ir_block_create_binop(self, label, op, left, right);
+    return ir_block_create_binop(self, ctx, label, op, left, right);
 }
 
-ir_value* ir_block_create_mul(ir_block *self,
+ir_value* ir_block_create_mul(ir_block *self, lex_ctx ctx,
                               const char *label,
                               ir_value *left, ir_value *right)
 {
@@ -1248,6 +1770,7 @@ ir_value* ir_block_create_mul(ir_block *self,
 
         switch (l) {
             default:
+                irerror(self->context, "invalid type for ir_block_create_mul: %s", type_name[l]);
                 return NULL;
             case TYPE_FLOAT:
                 op = INSTR_MUL_F;
@@ -1276,13 +1799,15 @@ ir_value* ir_block_create_mul(ir_block *self,
         else if ( (l == TYPE_INTEGER && r == TYPE_FLOAT) )
             op = INSTR_MUL_IF;
 #endif
-        else
+        else {
+            irerror(self->context, "invalid type for ir_block_create_mul: %s", type_name[l]);
             return NULL;
+        }
     }
-    return ir_block_create_binop(self, label, op, left, right);
+    return ir_block_create_binop(self, ctx, label, op, left, right);
 }
 
-ir_value* ir_block_create_div(ir_block *self,
+ir_value* ir_block_create_div(ir_block *self, lex_ctx ctx,
                               const char *label,
                               ir_value *left, ir_value *right)
 {
@@ -1293,6 +1818,7 @@ ir_value* ir_block_create_div(ir_block *self,
 
         switch (l) {
             default:
+                irerror(self->context, "invalid type for ir_block_create_div: %s", type_name[l]);
                 return NULL;
             case TYPE_FLOAT:
                 op = INSTR_DIV_F;
@@ -1313,9 +1839,12 @@ ir_value* ir_block_create_div(ir_block *self,
             op = INSTR_DIV_IF;
         else
 #endif
+        {
+            irerror(self->context, "invalid type for ir_block_create_div: %s", type_name[l]);
             return NULL;
+        }
     }
-    return ir_block_create_binop(self, label, op, left, right);
+    return ir_block_create_binop(self, ctx, label, op, left, right);
 }
 
 /* PHI resolving breaks the SSA, and must thus be the last
@@ -1327,7 +1856,7 @@ bool ir_function_naive_phi(ir_function *self)
 {
     size_t i;
 
-    for (i = 0; i < self->blocks_count; ++i)
+    for (i = 0; i < vec_size(self->blocks); ++i)
     {
         if (!ir_block_naive_phi(self->blocks[i]))
             return false;
@@ -1335,6 +1864,7 @@ bool ir_function_naive_phi(ir_function *self)
     return true;
 }
 
+#if 0
 static bool ir_naive_phi_emit_store(ir_block *block, size_t iid, ir_value *old, ir_value *what)
 {
     ir_instr *instr;
@@ -1345,35 +1875,61 @@ static bool ir_naive_phi_emit_store(ir_block *block, size_t iid, ir_value *old,
         return false;
 
     /* we now move it up */
-    instr = block->instr[block->instr_count-1];
-    for (i = block->instr_count; i > iid; --i)
+    instr = vec_last(block->instr);
+    for (i = vec_size(block->instr)-1; i > iid; --i)
         block->instr[i] = block->instr[i-1];
     block->instr[i] = instr;
 
     return true;
 }
+#endif
 
 static bool ir_block_naive_phi(ir_block *self)
 {
-    size_t i, p, w;
+    size_t i, p; /*, w;*/
     /* FIXME: optionally, create_phi can add the phis
      * to a list so we don't need to loop through blocks
      * - anyway: "don't optimize YET"
      */
-    for (i = 0; i < self->instr_count; ++i)
+    for (i = 0; i < vec_size(self->instr); ++i)
     {
         ir_instr *instr = self->instr[i];
         if (instr->opcode != VINSTR_PHI)
             continue;
 
-        if (!ir_block_instr_remove(self, i))
-            return false;
+        vec_remove(self->instr, i, 1);
         --i; /* NOTE: i+1 below */
 
-        for (p = 0; p < instr->phi_count; ++p)
+        for (p = 0; p < vec_size(instr->phi); ++p)
         {
             ir_value *v = instr->phi[p].value;
-            for (w = 0; w < v->writes_count; ++w) {
+            ir_block *b = instr->phi[p].from;
+
+            if (v->store == store_value &&
+                vec_size(v->reads) == 1 &&
+                vec_size(v->writes) == 1)
+            {
+                /* replace the value */
+                if (!ir_instr_op(v->writes[0], 0, instr->_ops[0], true))
+                    return false;
+            }
+            else
+            {
+                /* force a move instruction */
+                ir_instr *prevjump = vec_last(b->instr);
+                vec_pop(b->instr);
+                b->final = false;
+                instr->_ops[0]->store = store_global;
+                if (!ir_block_create_store(b, instr->context, instr->_ops[0], v))
+                    return false;
+                instr->_ops[0]->store = store_value;
+                vec_push(b->instr, prevjump);
+                b->final = true;
+            }
+
+#if 0
+            ir_value *v = instr->phi[p].value;
+            for (w = 0; w < vec_size(v->writes); ++w) {
                 ir_value *old;
 
                 if (!v->writes[w]->_ops[0])
@@ -1386,14 +1942,14 @@ static bool ir_block_naive_phi(ir_block *self)
                 if (v->writes[w]->_ops[0] == v)
                     v->writes[w]->_ops[0] = instr->_ops[0];
 
-                if (old->store != store_value && old->store != store_local)
+                if (old->store != store_value && old->store != store_local && old->store != store_param)
                 {
                     /* If it originally wrote to a global we need to store the value
                      * there as welli
                      */
                     if (!ir_naive_phi_emit_store(self, i+1, old, v))
                         return false;
-                    if (i+1 < self->instr_count)
+                    if (i+1 < vec_size(self->instr))
                         instr = self->instr[i+1];
                     else
                         instr = NULL;
@@ -1406,11 +1962,11 @@ static bool ir_block_naive_phi(ir_block *self)
                 {
                     /* If it didn't, we can replace all reads by the phi target now. */
                     size_t r;
-                    for (r = 0; r < old->reads_count; ++r)
+                    for (r = 0; r < vec_size(old->reads); ++r)
                     {
                         size_t op;
                         ir_instr *ri = old->reads[r];
-                        for (op = 0; op < ri->phi_count; ++op) {
+                        for (op = 0; op < vec_size(ri->phi); ++op) {
                             if (ri->phi[op].value == old)
                                 ri->phi[op].value = v;
                         }
@@ -1421,6 +1977,7 @@ static bool ir_block_naive_phi(ir_block *self)
                     }
                 }
             }
+#endif
         }
         ir_instr_delete(instr);
     }
@@ -1436,21 +1993,13 @@ static bool ir_block_naive_phi(ir_block *self)
  * Though this implementation might run an additional time for if nests.
  */
 
-typedef struct
-{
-    ir_value* *v;
-    size_t    v_count;
-    size_t    v_alloc;
-} new_reads_t;
-MEM_VEC_FUNCTIONS_ALL(new_reads_t, ir_value*, v)
-
 /* Enumerate instructions used by value's life-ranges
  */
 static void ir_block_enumerate(ir_block *self, size_t *_eid)
 {
     size_t i;
     size_t eid = *_eid;
-    for (i = 0; i < self->instr_count; ++i)
+    for (i = 0; i < vec_size(self->instr); ++i)
     {
         self->instr[i]->eid = eid++;
     }
@@ -1466,7 +2015,7 @@ void ir_function_enumerate(ir_function *self)
 {
     size_t i;
     size_t instruction_id = 0;
-    for (i = 0; i < self->blocks_count; ++i)
+    for (i = 0; i < vec_size(self->blocks); ++i)
     {
         self->blocks[i]->eid = i;
         self->blocks[i]->run_id = 0;
@@ -1483,15 +2032,29 @@ bool ir_function_calculate_liferanges(ir_function *self)
     do {
         self->run_id++;
         changed = false;
-        for (i = 0; i != self->blocks_count; ++i)
+        for (i = 0; i != vec_size(self->blocks); ++i)
         {
             if (self->blocks[i]->is_return)
             {
+                vec_free(self->blocks[i]->living);
                 if (!ir_block_life_propagate(self->blocks[i], NULL, &changed))
                     return false;
             }
         }
     } while (changed);
+    if (vec_size(self->blocks)) {
+        ir_block *block = self->blocks[0];
+        for (i = 0; i < vec_size(block->living); ++i) {
+            ir_value *v = block->living[i];
+            if (v->memberof || v->store != store_local)
+                continue;
+            if (irwarning(v->context, WARN_USED_UNINITIALIZED,
+                          "variable `%s` may be used uninitialized in this function", v->name))
+            {
+                return false;
+            }
+        }
+    }
     return true;
 }
 
@@ -1500,9 +2063,125 @@ bool ir_function_calculate_liferanges(ir_function *self)
  * we can allocate their global-positions.
  * This is the counterpart to register-allocation in register machines.
  */
-bool ir_function_allocate_locals(ir_function *self)
+typedef struct {
+    ir_value **locals;
+    size_t    *sizes;
+    size_t    *positions;
+} function_allocator;
+
+static bool function_allocator_alloc(function_allocator *alloc, const ir_value *var)
 {
+    ir_value *slot;
+    size_t vsize = type_sizeof[var->vtype];
+
+    slot = ir_value_var("reg", store_global, var->vtype);
+    if (!slot)
+        return false;
+
+    if (!ir_value_life_merge_into(slot, var))
+        goto localerror;
+
+    vec_push(alloc->locals, slot);
+    vec_push(alloc->sizes, vsize);
+
     return true;
+
+localerror:
+    ir_value_delete(slot);
+    return false;
+}
+
+bool ir_function_allocate_locals(ir_function *self)
+{
+    size_t i, a;
+    bool   retval = true;
+    size_t pos;
+
+    ir_value *slot;
+    const ir_value *v;
+
+    function_allocator alloc;
+
+    if (!vec_size(self->locals) && !vec_size(self->values))
+        return true;
+
+    alloc.locals    = NULL;
+    alloc.sizes     = NULL;
+    alloc.positions = NULL;
+
+    for (i = 0; i < vec_size(self->locals); ++i)
+    {
+        if (!function_allocator_alloc(&alloc, self->locals[i]))
+            goto error;
+    }
+
+    /* Allocate a slot for any value that still exists */
+    for (i = 0; i < vec_size(self->values); ++i)
+    {
+        v = self->values[i];
+
+        if (!vec_size(v->life))
+            continue;
+
+        for (a = 0; a < vec_size(alloc.locals); ++a)
+        {
+            slot = alloc.locals[a];
+
+            if (ir_values_overlap(v, slot))
+                continue;
+
+            if (!ir_value_life_merge_into(slot, v))
+                goto error;
+
+            /* adjust size for this slot */
+            if (alloc.sizes[a] < type_sizeof[v->vtype])
+                alloc.sizes[a] = type_sizeof[v->vtype];
+
+            self->values[i]->code.local = a;
+            break;
+        }
+        if (a >= vec_size(alloc.locals)) {
+            self->values[i]->code.local = vec_size(alloc.locals);
+            if (!function_allocator_alloc(&alloc, v))
+                goto error;
+        }
+    }
+
+    if (!alloc.sizes) {
+        goto cleanup;
+    }
+
+    /* Adjust slot positions based on sizes */
+    vec_push(alloc.positions, 0);
+
+    if (vec_size(alloc.sizes))
+        pos = alloc.positions[0] + alloc.sizes[0];
+    else
+        pos = 0;
+    for (i = 1; i < vec_size(alloc.sizes); ++i)
+    {
+        pos = alloc.positions[i-1] + alloc.sizes[i-1];
+        vec_push(alloc.positions, pos);
+    }
+
+    self->allocated_locals = pos + vec_last(alloc.sizes);
+
+    /* Take over the actual slot positions */
+    for (i = 0; i < vec_size(self->values); ++i) {
+        self->values[i]->code.local = alloc.positions[self->values[i]->code.local];
+    }
+
+    goto cleanup;
+
+error:
+    retval = false;
+cleanup:
+    for (i = 0; i < vec_size(alloc.locals); ++i)
+        ir_value_delete(alloc.locals[i]);
+    vec_free(alloc.locals);
+    vec_free(alloc.sizes);
+    vec_free(alloc.positions);
+    return retval;
 }
 
 /* Get information about which operand
@@ -1528,6 +2207,15 @@ static void ir_op_read_write(int op, size_t *read, size_t *write)
         *write = 0;
         *read = 1;
         break;
+    case INSTR_STOREP_F:
+    case INSTR_STOREP_V:
+    case INSTR_STOREP_S:
+    case INSTR_STOREP_ENT:
+    case INSTR_STOREP_FLD:
+    case INSTR_STOREP_FNC:
+        *write = 0;
+        *read  = 7;
+        break;
     default:
         *write = 1;
         *read = 6;
@@ -1540,12 +2228,12 @@ static bool ir_block_living_add_instr(ir_block *self, size_t eid)
     size_t i;
     bool changed = false;
     bool tempbool;
-    for (i = 0; i != self->living_count; ++i)
+    for (i = 0; i != vec_size(self->living); ++i)
     {
         tempbool = ir_value_life_merge(self->living[i], eid);
         /* debug
         if (tempbool)
-            fprintf(stderr, "block_living_add_instr() value instruction added %s: %i\n", self->living[i]->_name, (int)eid);
+            irerror(self->context, "block_living_add_instr() value instruction added %s: %i", self->living[i]->_name, (int)eid);
         */
         changed = changed || tempbool;
     }
@@ -1555,17 +2243,19 @@ static bool ir_block_living_add_instr(ir_block *self, size_t eid)
 static bool ir_block_life_prop_previous(ir_block* self, ir_block *prev, bool *changed)
 {
     size_t i;
+
+    (void)changed;
+
     /* values which have been read in a previous iteration are now
      * in the "living" array even if the previous block doesn't use them.
      * So we have to remove whatever does not exist in the previous block.
      * They will be re-added on-read, but the liferange merge won't cause
      * a change.
      */
-    for (i = 0; i < self->living_count; ++i)
+    for (i = 0; i < vec_size(self->living); ++i)
     {
-        if (!ir_block_living_find(prev, self->living[i], NULL)) {
-            if (!ir_block_living_remove(self, i))
-                return false;
+        if (!vec_ir_value_find(prev->living, self->living[i], NULL)) {
+            vec_remove(self->living, i, 1);
             --i;
         }
     }
@@ -1573,14 +2263,13 @@ static bool ir_block_life_prop_previous(ir_block* self, ir_block *prev, bool *ch
     /* Whatever the previous block still has in its living set
      * must now be added to ours as well.
      */
-    for (i = 0; i < prev->living_count; ++i)
+    for (i = 0; i < vec_size(prev->living); ++i)
     {
-        if (ir_block_living_find(self, prev->living[i], NULL))
+        if (vec_ir_value_find(self->living, prev->living[i], NULL))
             continue;
-        if (!ir_block_living_add(self, prev->living[i]))
-            return false;
+        vec_push(self->living, prev->living[i]);
         /*
-        printf("%s got from prev: %s\n", self->label, prev->living[i]->_name);
+        irerror(self->contextt from prev: %s", self->label, prev->living[i]->_name);
         */
     }
     return true;
@@ -1594,50 +2283,56 @@ static bool ir_block_life_propagate(ir_block *self, ir_block *prev, bool *change
     size_t i, o, p;
     /* bitmasks which operands are read from or written to */
     size_t read, write;
-#if defined(LIFE_RANGE_WITHOUT_LAST_READ)
-    size_t rd;
-    new_reads_t new_reads;
-#endif
     char dbg_ind[16] = { '#', '0' };
     (void)dbg_ind;
 
-#if defined(LIFE_RANGE_WITHOUT_LAST_READ)
-    MEM_VECTOR_INIT(&new_reads, v);
-#endif
-
     if (prev)
     {
         if (!ir_block_life_prop_previous(self, prev, changed))
             return false;
     }
 
-    i = self->instr_count;
+    i = vec_size(self->instr);
     while (i)
     { --i;
         instr = self->instr[i];
 
         /* PHI operands are always read operands */
-        for (p = 0; p < instr->phi_count; ++p)
+        for (p = 0; p < vec_size(instr->phi); ++p)
         {
             value = instr->phi[p].value;
-#if ! defined(LIFE_RANGE_WITHOUT_LAST_READ)
-            if (!ir_block_living_find(self, value, NULL) &&
-                !ir_block_living_add(self, value))
-            {
-                goto on_error;
-            }
-#else
-            if (!new_reads_t_v_find(&new_reads, value, NULL))
-            {
-                if (!new_reads_t_v_add(&new_reads, value))
-                    goto on_error;
-            }
-#endif
+            if (value->memberof)
+                value = value->memberof;
+            if (!vec_ir_value_find(self->living, value, NULL))
+                vec_push(self->living, value);
+        }
+
+        /* call params are read operands too */
+        for (p = 0; p < vec_size(instr->params); ++p)
+        {
+            value = instr->params[p];
+            if (value->memberof)
+                value = value->memberof;
+            if (!vec_ir_value_find(self->living, value, NULL))
+                vec_push(self->living, value);
         }
 
         /* See which operands are read and write operands */
         ir_op_read_write(instr->opcode, &read, &write);
 
+        if (instr->opcode == INSTR_MUL_VF)
+        {
+            /* the float source will get an additional lifetime */
+            tempbool = ir_value_life_merge(instr->_ops[2], instr->eid+1);
+            *changed = *changed || tempbool;
+        }
+        else if (instr->opcode == INSTR_MUL_FV)
+        {
+            /* the float source will get an additional lifetime */
+            tempbool = ir_value_life_merge(instr->_ops[1], instr->eid+1);
+            *changed = *changed || tempbool;
+        }
+
         /* Go through the 3 main operands */
         for (o = 0; o < 3; ++o)
         {
@@ -1645,29 +2340,22 @@ static bool ir_block_life_propagate(ir_block *self, ir_block *prev, bool *change
                 continue;
 
             value = instr->_ops[o];
+            if (value->memberof)
+                value = value->memberof;
 
             /* We only care about locals */
+            /* we also calculate parameter liferanges so that locals
+             * can take up parameter slots */
             if (value->store != store_value &&
-                value->store != store_local)
+                value->store != store_local &&
+                value->store != store_param)
                 continue;
 
             /* read operands */
             if (read & (1<<o))
             {
-#if ! defined(LIFE_RANGE_WITHOUT_LAST_READ)
-                if (!ir_block_living_find(self, value, NULL) &&
-                    !ir_block_living_add(self, value))
-                {
-                    goto on_error;
-                }
-#else
-                /* fprintf(stderr, "read: %s\n", value->_name); */
-                if (!new_reads_t_v_find(&new_reads, value, NULL))
-                {
-                    if (!new_reads_t_v_add(&new_reads, value))
-                        goto on_error;
-                }
-#endif
+                if (!vec_ir_value_find(self->living, value, NULL))
+                    vec_push(self->living, value);
             }
 
             /* write operands */
@@ -1678,14 +2366,8 @@ static bool ir_block_life_propagate(ir_block *self, ir_block *prev, bool *change
             if (write & (1<<o))
             {
                 size_t idx;
-                bool in_living = ir_block_living_find(self, value, &idx);
-#if defined(LIFE_RANGE_WITHOUT_LAST_READ)
-                size_t readidx;
-                bool in_reads = new_reads_t_v_find(&new_reads, value, &readidx);
-                if (!in_living && !in_reads)
-#else
+                bool in_living = vec_ir_value_find(self->living, value, &idx);
                 if (!in_living)
-#endif
                 {
                     /* If the value isn't alive it hasn't been read before... */
                     /* TODO: See if the warning can be emitted during parsing or AST processing
@@ -1695,7 +2377,7 @@ static bool ir_block_life_propagate(ir_block *self, ir_block *prev, bool *change
                      * since this function is run multiple times.
                      */
                     /* For now: debug info: */
-                    fprintf(stderr, "Value only written %s\n", value->name);
+                    /* con_err( "Value only written %s\n", value->name); */
                     tempbool = ir_value_life_merge(value, instr->eid);
                     *changed = *changed || tempbool;
                     /*
@@ -1710,43 +2392,19 @@ static bool ir_block_life_propagate(ir_block *self, ir_block *prev, bool *change
                     tempbool = ir_value_life_merge(value, instr->eid);
                     /*
                     if (tempbool)
-                        fprintf(stderr, "value added id %s %i\n", value->name, (int)instr->eid);
+                        con_err( "value added id %s %i\n", value->name, (int)instr->eid);
                     */
                     *changed = *changed || tempbool;
                     /* Then remove */
-#if ! defined(LIFE_RANGE_WITHOUT_LAST_READ)
-                    if (!ir_block_living_remove(self, idx))
-                        goto on_error;
-#else
-                    if (in_reads)
-                    {
-                        if (!new_reads_t_v_remove(&new_reads, readidx))
-                            goto on_error;
-                    }
-#endif
+                    vec_remove(self->living, idx, 1);
                 }
             }
         }
         /* (A) */
         tempbool = ir_block_living_add_instr(self, instr->eid);
-        /*fprintf(stderr, "living added values\n");*/
+        /*con_err( "living added values\n");*/
         *changed = *changed || tempbool;
 
-#if defined(LIFE_RANGE_WITHOUT_LAST_READ)
-        /* new reads: */
-        for (rd = 0; rd < new_reads.v_count; ++rd)
-        {
-            if (!ir_block_living_find(self, new_reads.v[rd], NULL)) {
-                if (!ir_block_living_add(self, new_reads.v[rd]))
-                    goto on_error;
-            }
-            if (!i && !self->entries_count) {
-                /* fix the top */
-                *changed = *changed || ir_value_life_merge(new_reads.v[rd], instr->eid);
-            }
-        }
-        MEM_VECTOR_CLEAR(&new_reads, v);
-#endif
     }
 
     if (self->run_id == self->owner->run_id)
@@ -1754,18 +2412,13 @@ static bool ir_block_life_propagate(ir_block *self, ir_block *prev, bool *change
 
     self->run_id = self->owner->run_id;
 
-    for (i = 0; i < self->entries_count; ++i)
+    for (i = 0; i < vec_size(self->entries); ++i)
     {
         ir_block *entry = self->entries[i];
         ir_block_life_propagate(entry, self, changed);
     }
 
     return true;
-on_error:
-#if defined(LIFE_RANGE_WITHOUT_LAST_READ)
-    MEM_VECTOR_CLEAR(&new_reads, v);
-#endif
-    return false;
 }
 
 /***********************************************************************
@@ -1783,51 +2436,34 @@ on_error:
  *
  * Breaking conventions is annoying...
  */
-static bool ir_builder_gen_global(ir_builder *self, ir_value *global);
+static bool ir_builder_gen_global(ir_builder *self, ir_value *global, bool islocal);
 
 static bool gen_global_field(ir_value *global)
 {
-    if (global->isconst)
+    if (global->hasvalue)
     {
         ir_value *fld = global->constval.vpointer;
         if (!fld) {
-            printf("Invalid field constant with no field: %s\n", global->name);
-            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) {
-            printf("FIXME: Relocation support\n");
+            irerror(global->context, "Invalid field constant with no field: %s", global->name);
             return false;
         }
 
         /* copy the field's value */
-        global->code.globaladdr = code_globals_add(code_globals_data[fld->code.globaladdr]);
+        ir_value_code_setaddr(global, vec_size(code_globals));
+        vec_push(code_globals, fld->code.fieldaddr);
+        if (global->fieldtype == TYPE_VECTOR) {
+            vec_push(code_globals, fld->code.fieldaddr+1);
+            vec_push(code_globals, fld->code.fieldaddr+2);
+        }
     }
-    else
-    {
-        prog_section_field fld;
-
-        fld.name = global->code.name;
-        fld.offset = code_fields_elements;
-        fld.type = global->fieldtype;
-
-        if (fld.type == TYPE_VOID) {
-            printf("Field is missing a type: %s\n", global->name);
-            return false;
+    else
+    {
+        ir_value_code_setaddr(global, vec_size(code_globals));
+        vec_push(code_globals, 0);
+        if (global->fieldtype == TYPE_VECTOR) {
+            vec_push(code_globals, 0);
+            vec_push(code_globals, 0);
         }
-
-        if (code_fields_add(fld) < 0)
-            return false;
-
-        global->code.globaladdr = code_globals_add(fld.offset);
     }
     if (global->code.globaladdr < 0)
         return false;
@@ -1836,11 +2472,11 @@ static bool gen_global_field(ir_value *global)
 
 static bool gen_global_pointer(ir_value *global)
 {
-    if (global->isconst)
+    if (global->hasvalue)
     {
         ir_value *target = global->constval.vpointer;
         if (!target) {
-            printf("Invalid pointer constant: %s\n", global->name);
+            irerror(global->context, "Invalid pointer constant: %s", global->name);
             /* NULL pointers are pointing to the NULL constant, which also
              * sits at address 0, but still has an ir_value for itself.
              */
@@ -1856,15 +2492,17 @@ static bool gen_global_pointer(ir_value *global)
             /* FIXME: Check for the constant nullptr ir_value!
              * because then code.globaladdr being 0 is valid.
              */
-            printf("FIXME: Relocation support\n");
+            irerror(global->context, "FIXME: Relocation support");
             return false;
         }
 
-        global->code.globaladdr = code_globals_add(target->code.globaladdr);
+        ir_value_code_setaddr(global, vec_size(code_globals));
+        vec_push(code_globals, target->code.globaladdr);
     }
     else
     {
-        global->code.globaladdr = code_globals_add(0);
+        ir_value_code_setaddr(global, vec_size(code_globals));
+        vec_push(code_globals, 0);
     }
     if (global->code.globaladdr < 0)
         return false;
@@ -1874,7 +2512,6 @@ static bool gen_global_pointer(ir_value *global)
 static bool gen_blocks_recursive(ir_function *func, ir_block *block)
 {
     prog_section_statement stmt;
-    prog_section_statement *stptr;
     ir_instr *instr;
     ir_block *target;
     ir_block *ontrue;
@@ -1884,13 +2521,13 @@ static bool gen_blocks_recursive(ir_function *func, ir_block *block)
 
 tailcall:
     block->generated = true;
-    block->code_start = code_statements_elements;
-    for (i = 0; i < block->instr_count; ++i)
+    block->code_start = vec_size(code_statements);
+    for (i = 0; i < vec_size(block->instr); ++i)
     {
         instr = block->instr[i];
 
         if (instr->opcode == VINSTR_PHI) {
-            printf("cannot generate virtual instruction (phi)\n");
+            irerror(block->context, "cannot generate virtual instruction (phi)");
             return false;
         }
 
@@ -1906,11 +2543,10 @@ tailcall:
 
             /* otherwise we generate a jump instruction */
             stmt.opcode = INSTR_GOTO;
-            stmt.o1.s1 = (target->code_start-1) - code_statements_elements;
+            stmt.o1.s1 = (target->code_start) - vec_size(code_statements);
             stmt.o2.s1 = 0;
             stmt.o3.s1 = 0;
-            if (code_statements_add(stmt) < 0)
-                return false;
+            code_push_statement(&stmt, instr->context.line);
 
             /* no further instructions can be in this block */
             return true;
@@ -1923,20 +2559,19 @@ tailcall:
              * come first: eg. optimize IFs without ELSE...
              */
 
-            stmt.o1.u1 = instr->_ops[0]->code.globaladdr;
-
+            stmt.o1.u1 = ir_value_code_addr(instr->_ops[0]);
+            stmt.o2.u1 = 0;
             stmt.o3.s1 = 0;
+
             if (ontrue->generated) {
                 stmt.opcode = INSTR_IF;
-                stmt.o2.s1 = (ontrue->code_start-1) - code_statements_elements;
-                if (code_statements_add(stmt) < 0)
-                    return false;
+                stmt.o2.s1 = (ontrue->code_start) - vec_size(code_statements);
+                code_push_statement(&stmt, instr->context.line);
             }
             if (onfalse->generated) {
                 stmt.opcode = INSTR_IFNOT;
-                stmt.o2.s1 = (onfalse->code_start-1) - code_statements_elements;
-                if (code_statements_add(stmt) < 0)
-                    return false;
+                stmt.o2.s1 = (onfalse->code_start) - vec_size(code_statements);
+                code_push_statement(&stmt, instr->context.line);
             }
             if (!ontrue->generated) {
                 if (onfalse->generated) {
@@ -1952,23 +2587,41 @@ tailcall:
             }
             /* neither ontrue nor onfalse exist */
             stmt.opcode = INSTR_IFNOT;
-            stidx = code_statements_elements - 1;
-            if (code_statements_add(stmt) < 0)
-                return false;
-            stptr = &code_statements_data[stidx];
+            if (!instr->likely) {
+                /* Honor the likelyhood hint */
+                ir_block *tmp = onfalse;
+                stmt.opcode = INSTR_IF;
+                onfalse = ontrue;
+                ontrue = tmp;
+            }
+            stidx = vec_size(code_statements);
+            code_push_statement(&stmt, instr->context.line);
             /* on false we jump, so add ontrue-path */
             if (!gen_blocks_recursive(func, ontrue))
                 return false;
             /* fixup the jump address */
-            stptr->o2.s1 = (ontrue->code_start-1) - (stidx+1);
+            code_statements[stidx].o2.s1 = vec_size(code_statements) - stidx;
             /* generate onfalse path */
             if (onfalse->generated) {
+                /* fixup the jump address */
+                code_statements[stidx].o2.s1 = (onfalse->code_start) - (stidx);
+                stmt.opcode = vec_last(code_statements).opcode;
+                if (stmt.opcode == INSTR_GOTO ||
+                    stmt.opcode == INSTR_IF ||
+                    stmt.opcode == INSTR_IFNOT ||
+                    stmt.opcode == INSTR_RETURN ||
+                    stmt.opcode == INSTR_DONE)
+                {
+                    /* no use jumping from here */
+                    return true;
+                }
                 /* may have been generated in the previous recursive call */
                 stmt.opcode = INSTR_GOTO;
+                stmt.o1.s1 = (onfalse->code_start) - vec_size(code_statements);
                 stmt.o2.s1 = 0;
                 stmt.o3.s1 = 0;
-                stmt.o1.s1 = (onfalse->code_start-1) - code_statements_elements;
-                return (code_statements_add(stmt) >= 0);
+                code_push_statement(&stmt, instr->context.line);
+                return true;
             }
             /* if not, generate now */
             block = onfalse;
@@ -1976,12 +2629,93 @@ tailcall:
         }
 
         if (instr->opcode >= INSTR_CALL0 && instr->opcode <= INSTR_CALL8) {
-            printf("TODO: call instruction\n");
-            return false;
+            /* Trivial call translation:
+             * copy all params to OFS_PARM*
+             * if the output's storetype is not store_return,
+             * add append a STORE instruction!
+             *
+             * NOTES on how to do it better without much trouble:
+             * -) The liferanges!
+             *      Simply check the liferange of all parameters for
+             *      other CALLs. For each param with no CALL in its
+             *      liferange, we can store it in an OFS_PARM at
+             *      generation already. This would even include later
+             *      reuse.... probably... :)
+             */
+            size_t p, first;
+            ir_value *retvalue;
+
+            first = vec_size(instr->params);
+            if (first > 8)
+                first = 8;
+            for (p = 0; p < first; ++p)
+            {
+                ir_value *param = instr->params[p];
+
+                stmt.opcode = INSTR_STORE_F;
+                stmt.o3.u1 = 0;
+
+                if (param->vtype == TYPE_FIELD)
+                    stmt.opcode = field_store_instr[param->fieldtype];
+                else
+                    stmt.opcode = type_store_instr[param->vtype];
+                stmt.o1.u1 = ir_value_code_addr(param);
+                stmt.o2.u1 = OFS_PARM0 + 3 * p;
+                code_push_statement(&stmt, instr->context.line);
+            }
+            /* Now handle extparams */
+            first = vec_size(instr->params);
+            for (; p < first; ++p)
+            {
+                ir_builder *ir = func->owner;
+                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;
+                }
+
+                targetparam = ir->extparams[p-8];
+
+                stmt.opcode = INSTR_STORE_F;
+                stmt.o3.u1 = 0;
+
+                if (param->vtype == TYPE_FIELD)
+                    stmt.opcode = field_store_instr[param->fieldtype];
+                else
+                    stmt.opcode = type_store_instr[param->vtype];
+                stmt.o1.u1 = ir_value_code_addr(param);
+                stmt.o2.u1 = ir_value_code_addr(targetparam);
+                code_push_statement(&stmt, instr->context.line);
+            }
+
+            stmt.opcode = INSTR_CALL0 + vec_size(instr->params);
+            if (stmt.opcode > INSTR_CALL8)
+                stmt.opcode = INSTR_CALL8;
+            stmt.o1.u1 = ir_value_code_addr(instr->_ops[1]);
+            stmt.o2.u1 = 0;
+            stmt.o3.u1 = 0;
+            code_push_statement(&stmt, instr->context.line);
+
+            retvalue = instr->_ops[0];
+            if (retvalue && retvalue->store != store_return && vec_size(retvalue->life))
+            {
+                /* not to be kept in OFS_RETURN */
+                if (retvalue->vtype == TYPE_FIELD)
+                    stmt.opcode = field_store_instr[retvalue->vtype];
+                else
+                    stmt.opcode = type_store_instr[retvalue->vtype];
+                stmt.o1.u1 = OFS_RETURN;
+                stmt.o2.u1 = ir_value_code_addr(retvalue);
+                stmt.o3.u1 = 0;
+                code_push_statement(&stmt, instr->context.line);
+            }
+            continue;
         }
 
         if (instr->opcode == INSTR_STATE) {
-            printf("TODO: state instruction\n");
+            irerror(block->context, "TODO: state instruction");
             return false;
         }
 
@@ -1992,31 +2726,30 @@ tailcall:
 
         /* This is the general order of operands */
         if (instr->_ops[0])
-            stmt.o3.u1 = instr->_ops[0]->code.globaladdr;
+            stmt.o3.u1 = ir_value_code_addr(instr->_ops[0]);
 
         if (instr->_ops[1])
-            stmt.o1.u1 = instr->_ops[1]->code.globaladdr;
+            stmt.o1.u1 = ir_value_code_addr(instr->_ops[1]);
 
         if (instr->_ops[2])
-            stmt.o2.u1 = instr->_ops[2]->code.globaladdr;
+            stmt.o2.u1 = ir_value_code_addr(instr->_ops[2]);
 
         if (stmt.opcode == INSTR_RETURN || stmt.opcode == INSTR_DONE)
         {
             stmt.o1.u1 = stmt.o3.u1;
             stmt.o3.u1 = 0;
         }
-        else if ((stmt.opcode >= INSTR_STORE_F    &&
-                  stmt.opcode <= INSTR_STORE_FNC)    ||
-                 (stmt.opcode >= INSTR_NOT_F      &&
-                  stmt.opcode <= INSTR_NOT_FNC))
+        else if ((stmt.opcode >= INSTR_STORE_F &&
+                  stmt.opcode <= INSTR_STORE_FNC) ||
+                 (stmt.opcode >= INSTR_STOREP_F &&
+                  stmt.opcode <= INSTR_STOREP_FNC))
         {
             /* 2-operand instructions with A -> B */
             stmt.o2.u1 = stmt.o3.u1;
             stmt.o3.u1 = 0;
         }
 
-        if (code_statements_add(stmt) < 0)
-            return false;
+        code_push_statement(&stmt, instr->context.line);
     }
     return true;
 }
@@ -2024,12 +2757,13 @@ tailcall:
 static bool gen_function_code(ir_function *self)
 {
     ir_block *block;
+    prog_section_statement stmt;
 
     /* Starting from entry point, we generate blocks "as they come"
      * for now. Dead blocks will not be translated obviously.
      */
-    if (!self->blocks_count) {
-        printf("Function '%s' declared without body.\n", self->name);
+    if (!vec_size(self->blocks)) {
+        irerror(self->context, "Function '%s' declared without body.", self->name);
         return false;
     }
 
@@ -2038,169 +2772,494 @@ static bool gen_function_code(ir_function *self)
         return true;
 
     if (!gen_blocks_recursive(self, block)) {
-        printf("failed to generate blocks for '%s'\n", self->name);
+        irerror(self->context, "failed to generate blocks for '%s'", self->name);
         return false;
     }
+
+    /* otherwise code_write crashes since it debug-prints functions until AINSTR_END */
+    stmt.opcode = AINSTR_END;
+    stmt.o1.u1 = 0;
+    stmt.o2.u1 = 0;
+    stmt.o3.u1 = 0;
+    code_push_statement(&stmt, vec_last(code_linenums));
     return true;
 }
 
+static qcint ir_builder_filestring(ir_builder *ir, const char *filename)
+{
+    /* NOTE: filename pointers are copied, we never strdup them,
+     * thus we can use pointer-comparison to find the string.
+     */
+    size_t i;
+    qcint  str;
+
+    for (i = 0; i < vec_size(ir->filenames); ++i) {
+        if (ir->filenames[i] == filename)
+            return ir->filestrings[i];
+    }
+
+    str = code_genstring(filename);
+    vec_push(ir->filenames, filename);
+    vec_push(ir->filestrings, str);
+    return str;
+}
+
 static bool gen_global_function(ir_builder *ir, ir_value *global)
 {
     prog_section_function fun;
     ir_function          *irfun;
 
     size_t i;
+    size_t local_var_end;
 
-    if (!global->isconst ||
-        !global->constval.vfunc)
+    if (!global->hasvalue || (!global->constval.vfunc))
     {
-        printf("Invalid state of function-global: not constant: %s\n", global->name);
+        irerror(global->context, "Invalid state of function-global: not constant: %s", global->name);
         return false;
     }
 
     irfun = global->constval.vfunc;
 
     fun.name    = global->code.name;
-    fun.file    = code_cachedstring(global->context.file);
+    fun.file    = ir_builder_filestring(ir, global->context.file);
     fun.profile = 0; /* always 0 */
-    fun.nargs   = irfun->params_count;
+    fun.nargs   = vec_size(irfun->params);
+    if (fun.nargs > 8)
+        fun.nargs = 8;
 
     for (i = 0;i < 8; ++i) {
-        if (i >= fun.nargs)
+        if ((int32_t)i >= fun.nargs)
             fun.argsize[i] = 0;
-        else if (irfun->params[i] == TYPE_VECTOR)
-            fun.argsize[i] = 3;
         else
-            fun.argsize[i] = 1;
+            fun.argsize[i] = type_sizeof[irfun->params[i]];
     }
 
-    fun.firstlocal = code_globals_elements;
-    fun.locals = irfun->locals_count;
-    for (i = 0; i < irfun->locals_count; ++i) {
-        if (!ir_builder_gen_global(ir, irfun->locals[i])) {
-            printf("Failed to generate global %s\n", irfun->locals[i]->name);
+    fun.firstlocal = vec_size(code_globals);
+
+    local_var_end = fun.firstlocal;
+    for (i = 0; i < vec_size(irfun->locals); ++i) {
+        if (!ir_builder_gen_global(ir, irfun->locals[i], true)) {
+            irerror(irfun->locals[i]->context, "Failed to generate local %s", irfun->locals[i]->name);
             return false;
         }
     }
+    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];
+    }
+    for (i = 0; i < vec_size(irfun->values); ++i)
+    {
+        /* generate code.globaladdr for ssa values */
+        ir_value *v = irfun->values[i];
+        ir_value_code_setaddr(v, local_var_end + v->code.local);
+    }
+    for (i = 0; i < irfun->allocated_locals; ++i) {
+        /* fill the locals with zeros */
+        vec_push(code_globals, 0);
+    }
 
-    fun.entry      = code_statements_elements;
-    if (!gen_function_code(irfun)) {
-        printf("Failed to generate code for function %s\n", irfun->name);
+    fun.locals = vec_size(code_globals) - fun.firstlocal;
+
+    if (irfun->builtin)
+        fun.entry = irfun->builtin;
+    else {
+        irfun->code_function_def = vec_size(code_functions);
+        fun.entry = vec_size(code_statements);
+    }
+
+    vec_push(code_functions, fun);
+    return true;
+}
+
+static void ir_gen_extparam(ir_builder *ir)
+{
+    prog_section_def def;
+    ir_value        *global;
+    char             name[128];
+
+    snprintf(name, sizeof(name), "EXTPARM#%i", (int)(vec_size(ir->extparams)+8));
+    global = ir_value_var(name, store_global, TYPE_VECTOR);
+
+    def.name = code_genstring(name);
+    def.type = TYPE_VECTOR;
+    def.offset = vec_size(code_globals);
+
+    vec_push(code_defs, def);
+    ir_value_code_setaddr(global, def.offset);
+    vec_push(code_globals, 0);
+    vec_push(code_globals, 0);
+    vec_push(code_globals, 0);
+
+    vec_push(ir->extparams, global);
+}
+
+static bool gen_function_extparam_copy(ir_function *self)
+{
+    size_t i, ext, numparams;
+
+    ir_builder *ir = self->owner;
+    ir_value   *ep;
+    prog_section_statement stmt;
+
+    numparams = vec_size(self->params);
+    if (!numparams)
+        return true;
+
+    stmt.opcode = INSTR_STORE_F;
+    stmt.o3.s1 = 0;
+    for (i = 8; i < numparams; ++i) {
+        ext = i - 8;
+        if (ext >= vec_size(ir->extparams))
+            ir_gen_extparam(ir);
+
+        ep = ir->extparams[ext];
+
+        stmt.opcode = type_store_instr[self->locals[i]->vtype];
+        if (self->locals[i]->vtype == TYPE_FIELD &&
+            self->locals[i]->fieldtype == TYPE_VECTOR)
+        {
+            stmt.opcode = INSTR_STORE_V;
+        }
+        stmt.o1.u1 = ir_value_code_addr(ep);
+        stmt.o2.u1 = ir_value_code_addr(self->locals[i]);
+        code_push_statement(&stmt, self->context.line);
+    }
+
+    return true;
+}
+
+static bool gen_global_function_code(ir_builder *ir, ir_value *global)
+{
+    prog_section_function *fundef;
+    ir_function           *irfun;
+
+    (void)ir;
+
+    irfun = global->constval.vfunc;
+    if (!irfun) {
+        if (global->cvq == CV_NONE) {
+            irwarning(global->context, WARN_IMPLICIT_FUNCTION_POINTER,
+                      "function `%s` has no body and in QC implicitly becomes a function-pointer", global->name);
+        }
+        /* this was a function pointer, don't generate code for those */
+        return true;
+    }
+
+    if (irfun->builtin)
+        return true;
+
+    if (irfun->code_function_def < 0) {
+        irerror(irfun->context, "`%s`: IR global wasn't generated, failed to access function-def", irfun->name);
         return false;
     }
+    fundef = &code_functions[irfun->code_function_def];
 
-    return (code_functions_add(fun) >= 0);
+    fundef->entry = vec_size(code_statements);
+    if (!gen_function_extparam_copy(irfun)) {
+        irerror(irfun->context, "Failed to generate extparam-copy code for function %s", irfun->name);
+        return false;
+    }
+    if (!gen_function_code(irfun)) {
+        irerror(irfun->context, "Failed to generate code for function %s", irfun->name);
+        return false;
+    }
+    return true;
 }
 
-static bool ir_builder_gen_global(ir_builder *self, ir_value *global)
+static bool ir_builder_gen_global(ir_builder *self, ir_value *global, bool islocal)
 {
+    size_t           i;
     int32_t         *iptr;
     prog_section_def def;
 
     def.type   = global->vtype;
-    def.offset = code_globals_elements;
-    def.name   = global->code.name       = code_genstring(global->name);
+    def.offset = vec_size(code_globals);
+
+    if (global->name) {
+        if (global->name[0] == '#') {
+            if (!self->str_immediate)
+                self->str_immediate = code_genstring("IMMEDIATE");
+            def.name = global->code.name = self->str_immediate;
+        }
+        else
+            def.name = global->code.name = code_genstring(global->name);
+    }
+    else
+        def.name   = 0;
 
     switch (global->vtype)
     {
+    case TYPE_VOID:
+        if (!strcmp(global->name, "end_sys_globals")) {
+            /* TODO: remember this point... all the defs before this one
+             * should be checksummed and added to progdefs.h when we generate it.
+             */
+        }
+        else if (!strcmp(global->name, "end_sys_fields")) {
+            /* TODO: same as above but for entity-fields rather than globsl
+             */
+        }
+        else
+            irwarning(global->context, WARN_VOID_VARIABLES, "unrecognized variable of type void `%s`",
+                      global->name);
+        /* I'd argue setting it to 0 is sufficient, but maybe some depend on knowing how far
+         * the system fields actually go? Though the engine knows this anyway...
+         * Maybe this could be an -foption
+         * fteqcc creates data for end_sys_* - of size 1, so let's do the same
+         */
+        ir_value_code_setaddr(global, vec_size(code_globals));
+        vec_push(code_globals, 0);
+        /* Add the def */
+        vec_push(code_defs, def);
+        return true;
     case TYPE_POINTER:
-        if (code_defs_add(def) < 0)
-            return false;
+        vec_push(code_defs, def);
         return gen_global_pointer(global);
     case TYPE_FIELD:
-        if (code_defs_add(def) < 0)
-            return false;
+        vec_push(code_defs, def);
         return gen_global_field(global);
     case TYPE_ENTITY:
         /* fall through */
     case TYPE_FLOAT:
     {
-        if (code_defs_add(def) < 0)
-            return false;
-
-        if (global->isconst) {
-            iptr = (int32_t*)&global->constval.vfloat;
-            global->code.globaladdr = code_globals_add(*iptr);
-        } else
-            global->code.globaladdr = code_globals_add(0);
+        ir_value_code_setaddr(global, vec_size(code_globals));
+        if (global->hasvalue) {
+            iptr = (int32_t*)&global->constval.ivec[0];
+            vec_push(code_globals, *iptr);
+        } else {
+            vec_push(code_globals, 0);
+            if (!islocal)
+                def.type |= DEF_SAVEGLOBAL;
+        }
+        vec_push(code_defs, def);
 
         return global->code.globaladdr >= 0;
     }
     case TYPE_STRING:
     {
-        if (code_defs_add(def) < 0)
-            return false;
-        if (global->isconst)
-            global->code.globaladdr = code_globals_add(code_cachedstring(global->constval.vstring));
-        else
-            global->code.globaladdr = code_globals_add(0);
+        ir_value_code_setaddr(global, vec_size(code_globals));
+        if (global->hasvalue) {
+            vec_push(code_globals, code_genstring(global->constval.vstring));
+        } else {
+            vec_push(code_globals, 0);
+            if (!islocal)
+                def.type |= DEF_SAVEGLOBAL;
+        }
+        vec_push(code_defs, def);
         return global->code.globaladdr >= 0;
     }
     case TYPE_VECTOR:
     {
-        if (code_defs_add(def) < 0)
-            return false;
-
-        if (global->isconst) {
-            iptr = (int32_t*)&global->constval.vvec;
-            global->code.globaladdr = code_globals_add(iptr[0]);
-            if (code_globals_add(iptr[1]) < 0 || code_globals_add(iptr[2]) < 0)
+        size_t d;
+        ir_value_code_setaddr(global, vec_size(code_globals));
+        if (global->hasvalue) {
+            iptr = (int32_t*)&global->constval.ivec[0];
+            vec_push(code_globals, iptr[0]);
+            if (global->code.globaladdr < 0)
                 return false;
+            for (d = 1; d < type_sizeof[global->vtype]; ++d)
+            {
+                vec_push(code_globals, iptr[d]);
+            }
         } else {
-            global->code.globaladdr = code_globals_add(0);
-            if (code_globals_add(0) < 0 || code_globals_add(0) < 0)
+            vec_push(code_globals, 0);
+            if (global->code.globaladdr < 0)
                 return false;
+            for (d = 1; d < type_sizeof[global->vtype]; ++d)
+            {
+                vec_push(code_globals, 0);
+            }
+            if (!islocal)
+                def.type |= DEF_SAVEGLOBAL;
         }
+
+        vec_push(code_defs, def);
         return global->code.globaladdr >= 0;
     }
     case TYPE_FUNCTION:
-        if (code_defs_add(def) < 0)
-            return false;
-        code_globals_add(code_functions_elements);
-        return gen_global_function(self, global);
+        ir_value_code_setaddr(global, vec_size(code_globals));
+        if (!global->hasvalue) {
+            vec_push(code_globals, 0);
+            if (global->code.globaladdr < 0)
+                return false;
+        } else {
+            vec_push(code_globals, vec_size(code_functions));
+            if (!gen_global_function(self, global))
+                return false;
+            if (!islocal)
+                def.type |= DEF_SAVEGLOBAL;
+        }
+        vec_push(code_defs, def);
+        return true;
     case TYPE_VARIANT:
         /* assume biggest type */
-            global->code.globaladdr = code_globals_add(0);
-            code_globals_add(0);
-            code_globals_add(0);
+            ir_value_code_setaddr(global, vec_size(code_globals));
+            vec_push(code_globals, 0);
+            for (i = 1; i < type_sizeof[TYPE_VARIANT]; ++i)
+                vec_push(code_globals, 0);
             return true;
     default:
         /* refuse to create 'void' type or any other fancy business. */
-        printf("Invalid type for global variable %s\n", global->name);
+        irerror(global->context, "Invalid type for global variable `%s`: %s",
+                global->name, type_name[global->vtype]);
+        return false;
+    }
+}
+
+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;
+    prog_section_field fld;
+
+    (void)self;
+
+    def.type   = (uint16_t)field->vtype;
+    def.offset = (uint16_t)vec_size(code_globals);
+
+    /* create a global named the same as the field */
+    if (opts_standard == COMPILER_GMQCC) {
+        /* in our standard, the global gets a dot prefix */
+        size_t len = strlen(field->name);
+        char name[1024];
+
+        /* we really don't want to have to allocate this, and 1024
+         * bytes is more than enough for a variable/field name
+         */
+        if (len+2 >= sizeof(name)) {
+            irerror(field->context, "invalid field name size: %u", (unsigned int)len);
+            return false;
+        }
+
+        name[0] = '.';
+        memcpy(name+1, field->name, len); /* no strncpy - we used strlen above */
+        name[len+1] = 0;
+
+        def.name = code_genstring(name);
+        fld.name = def.name + 1; /* we reuse that string table entry */
+    } else {
+        /* in plain QC, there cannot be a global with the same name,
+         * and so we also name the global the same.
+         * FIXME: fteqcc should create a global as well
+         * check if it actually uses the same name. Probably does
+         */
+        def.name = code_genstring(field->name);
+        fld.name = def.name;
+    }
+
+    field->code.name = def.name;
+
+    vec_push(code_defs, def);
+
+    fld.type = field->fieldtype;
+
+    if (fld.type == TYPE_VOID) {
+        irerror(field->context, "field is missing a type: %s - don't know its size", field->name);
         return false;
     }
+
+    fld.offset = field->code.fieldaddr;
+
+    vec_push(code_fields, fld);
+
+    ir_value_code_setaddr(field, vec_size(code_globals));
+    vec_push(code_globals, fld.offset);
+    if (fld.type == TYPE_VECTOR) {
+        vec_push(code_globals, fld.offset+1);
+        vec_push(code_globals, fld.offset+2);
+    }
+
+    return field->code.globaladdr >= 0;
 }
 
 bool ir_builder_generate(ir_builder *self, const char *filename)
 {
+    prog_section_statement stmt;
     size_t i;
+    char   *lnofile = NULL;
 
     code_init();
 
-    /* FIXME: generate TYPE_FUNCTION globals and link them
-     * to their ir_function.
-     */
-
-    for (i = 0; i < self->functions_count; ++i)
+    for (i = 0; i < vec_size(self->fields); ++i)
     {
-        ir_value    *funval;
-        ir_function *fun = self->functions[i];
+        ir_builder_prepare_field(self->fields[i]);
+    }
 
-        funval = ir_builder_create_global(self, fun->name, TYPE_FUNCTION);
-        funval->isconst = true;
-        funval->constval.vfunc = fun;
-        funval->context = fun->context;
+    for (i = 0; i < vec_size(self->globals); ++i)
+    {
+        if (!ir_builder_gen_global(self, self->globals[i], false)) {
+            return false;
+        }
     }
 
-    for (i = 0; i < self->globals_count; ++i)
+    for (i = 0; i < vec_size(self->fields); ++i)
     {
-        if (!ir_builder_gen_global(self, self->globals[i])) {
+        if (!ir_builder_gen_field(self, self->fields[i])) {
             return false;
         }
     }
 
-    printf("writing '%s'...\n", filename);
-    return code_write(filename);
+    /* generate function code */
+    for (i = 0; i < vec_size(self->globals); ++i)
+    {
+        if (self->globals[i]->vtype == TYPE_FUNCTION) {
+            if (!gen_global_function_code(self, self->globals[i])) {
+                return false;
+            }
+        }
+    }
+
+    if (vec_size(code_globals) >= 65536) {
+        irerror(vec_last(self->globals)->context, "This progs file would require more globals than the metadata can handle. Bailing out.");
+        return false;
+    }
+
+    /* DP errors if the last instruction is not an INSTR_DONE
+     * and for debugging purposes we add an additional AINSTR_END
+     * to the end of functions, so here it goes:
+     */
+    stmt.opcode = INSTR_DONE;
+    stmt.o1.u1 = 0;
+    stmt.o2.u1 = 0;
+    stmt.o3.u1 = 0;
+    code_push_statement(&stmt, vec_last(code_linenums));
+
+    if (opts_pp_only)
+        return true;
+
+    if (vec_size(code_statements) != vec_size(code_linenums)) {
+        con_err("Linecounter wrong: %lu != %lu\n",
+                (unsigned long)vec_size(code_statements),
+                (unsigned long)vec_size(code_linenums));
+    } else if (OPTS_FLAG(LNO)) {
+        char *dot;
+        size_t filelen = strlen(filename);
+
+        memcpy(vec_add(lnofile, filelen+1), filename, filelen+1);
+        dot = strrchr(lnofile, '.');
+        if (!dot) {
+            vec_pop(lnofile);
+        } else {
+            vec_shrinkto(lnofile, dot - lnofile);
+        }
+        memcpy(vec_add(lnofile, 5), ".lno", 5);
+    }
+
+    if (lnofile)
+        con_out("writing '%s' and '%s'...\n", filename, lnofile);
+    else
+        con_out("writing '%s'\n", filename);
+    if (!code_write(filename, lnofile)) {
+        vec_free(lnofile);
+        return false;
+    }
+    vec_free(lnofile);
+    return true;
 }
 
 /***********************************************************************
@@ -2209,10 +3268,14 @@ bool ir_builder_generate(ir_builder *self, const char *filename)
 
 #define IND_BUFSZ 1024
 
+#ifdef WIN32
+# define strncat(dst, src, sz) strncat_s(dst, sz, src, _TRUNCATE)
+#endif
+
 const char *qc_opname(int op)
 {
     if (op < 0) return "<INVALID>";
-    if (op < ( sizeof(asm_instr) / sizeof(asm_instr[0]) ))
+    if (op < (int)( sizeof(asm_instr) / sizeof(asm_instr[0]) ))
         return asm_instr[op].m;
     switch (op) {
         case VINSTR_PHI:  return "PHI";
@@ -2224,171 +3287,227 @@ const char *qc_opname(int op)
 
 void ir_builder_dump(ir_builder *b, int (*oprintf)(const char*, ...))
 {
-       size_t i;
-       char indent[IND_BUFSZ];
-       indent[0] = '\t';
-       indent[1] = 0;
-
-       oprintf("module %s\n", b->name);
-       for (i = 0; i < b->globals_count; ++i)
-       {
-               oprintf("global ");
-               if (b->globals[i]->isconst)
-                       oprintf("%s = ", b->globals[i]->name);
-               ir_value_dump(b->globals[i], oprintf);
-               oprintf("\n");
-       }
-       for (i = 0; i < b->functions_count; ++i)
-               ir_function_dump(b->functions[i], indent, oprintf);
-       oprintf("endmodule %s\n", b->name);
+    size_t i;
+    char indent[IND_BUFSZ];
+    indent[0] = '\t';
+    indent[1] = 0;
+
+    oprintf("module %s\n", b->name);
+    for (i = 0; i < vec_size(b->globals); ++i)
+    {
+        oprintf("global ");
+        if (b->globals[i]->hasvalue)
+            oprintf("%s = ", b->globals[i]->name);
+        ir_value_dump(b->globals[i], oprintf);
+        oprintf("\n");
+    }
+    for (i = 0; i < vec_size(b->functions); ++i)
+        ir_function_dump(b->functions[i], indent, oprintf);
+    oprintf("endmodule %s\n", b->name);
 }
 
 void ir_function_dump(ir_function *f, char *ind,
                       int (*oprintf)(const char*, ...))
 {
-       size_t i;
-       oprintf("%sfunction %s\n", ind, f->name);
-       strncat(ind, "\t", IND_BUFSZ);
-       if (f->locals_count)
-       {
-               oprintf("%s%i locals:\n", ind, (int)f->locals_count);
-               for (i = 0; i < f->locals_count; ++i) {
-                       oprintf("%s\t", ind);
-                       ir_value_dump(f->locals[i], oprintf);
-                       oprintf("\n");
-               }
-       }
-       if (f->blocks_count)
-       {
-               oprintf("%slife passes (check): %i\n", ind, (int)f->run_id);
-               for (i = 0; i < f->blocks_count; ++i) {
-                   if (f->blocks[i]->run_id != f->run_id) {
-                       oprintf("%slife pass check fail! %i != %i\n", ind, (int)f->blocks[i]->run_id, (int)f->run_id);
-                   }
-                       ir_block_dump(f->blocks[i], ind, oprintf);
-               }
-
-       }
-       ind[strlen(ind)-1] = 0;
-       oprintf("%sendfunction %s\n", ind, f->name);
+    size_t i;
+    if (f->builtin != 0) {
+        oprintf("%sfunction %s = builtin %i\n", ind, f->name, -f->builtin);
+        return;
+    }
+    oprintf("%sfunction %s\n", ind, f->name);
+    strncat(ind, "\t", IND_BUFSZ);
+    if (vec_size(f->locals))
+    {
+        oprintf("%s%i locals:\n", ind, (int)vec_size(f->locals));
+        for (i = 0; i < vec_size(f->locals); ++i) {
+            oprintf("%s\t", ind);
+            ir_value_dump(f->locals[i], oprintf);
+            oprintf("\n");
+        }
+    }
+    oprintf("%sliferanges:\n", ind);
+    for (i = 0; i < vec_size(f->locals); ++i) {
+        size_t l;
+        ir_value *v = f->locals[i];
+        oprintf("%s\t%s: unique ", ind, v->name);
+        for (l = 0; l < vec_size(v->life); ++l) {
+            oprintf("[%i,%i] ", v->life[l].start, v->life[l].end);
+        }
+        oprintf("\n");
+    }
+    for (i = 0; i < vec_size(f->values); ++i) {
+        size_t l;
+        ir_value *v = f->values[i];
+        oprintf("%s\t%s: @%i ", ind, v->name, (int)v->code.local);
+        for (l = 0; l < vec_size(v->life); ++l) {
+            oprintf("[%i,%i] ", v->life[l].start, v->life[l].end);
+        }
+        oprintf("\n");
+    }
+    if (vec_size(f->blocks))
+    {
+        oprintf("%slife passes (check): %i\n", ind, (int)f->run_id);
+        for (i = 0; i < vec_size(f->blocks); ++i) {
+            if (f->blocks[i]->run_id != f->run_id) {
+                oprintf("%slife pass check fail! %i != %i\n", ind, (int)f->blocks[i]->run_id, (int)f->run_id);
+            }
+            ir_block_dump(f->blocks[i], ind, oprintf);
+        }
+
+    }
+    ind[strlen(ind)-1] = 0;
+    oprintf("%sendfunction %s\n", ind, f->name);
 }
 
 void ir_block_dump(ir_block* b, char *ind,
                    int (*oprintf)(const char*, ...))
 {
-       size_t i;
-       oprintf("%s:%s\n", ind, b->label);
-       strncat(ind, "\t", IND_BUFSZ);
+    size_t i;
+    oprintf("%s:%s\n", ind, b->label);
+    strncat(ind, "\t", IND_BUFSZ);
 
-       for (i = 0; i < b->instr_count; ++i)
-               ir_instr_dump(b->instr[i], ind, oprintf);
-       ind[strlen(ind)-1] = 0;
+    for (i = 0; i < vec_size(b->instr); ++i)
+        ir_instr_dump(b->instr[i], ind, oprintf);
+    ind[strlen(ind)-1] = 0;
 }
 
-void dump_phi(ir_instr *in, char *ind,
-              int (*oprintf)(const char*, ...))
+void dump_phi(ir_instr *in, int (*oprintf)(const char*, ...))
 {
-       size_t i;
-       oprintf("%s <- phi ", in->_ops[0]->name);
-       for (i = 0; i < in->phi_count; ++i)
-       {
-               oprintf("([%s] : %s) ", in->phi[i].from->label,
-                                       in->phi[i].value->name);
-       }
-       oprintf("\n");
+    size_t i;
+    oprintf("%s <- phi ", in->_ops[0]->name);
+    for (i = 0; i < vec_size(in->phi); ++i)
+    {
+        oprintf("([%s] : %s) ", in->phi[i].from->label,
+                                in->phi[i].value->name);
+    }
+    oprintf("\n");
 }
 
 void ir_instr_dump(ir_instr *in, char *ind,
                        int (*oprintf)(const char*, ...))
 {
-       size_t i;
-       const char *comma = NULL;
-
-       oprintf("%s (%i) ", ind, (int)in->eid);
-
-       if (in->opcode == VINSTR_PHI) {
-               dump_phi(in, ind, oprintf);
-               return;
-       }
-
-       strncat(ind, "\t", IND_BUFSZ);
-
-       if (in->_ops[0] && (in->_ops[1] || in->_ops[2])) {
-               ir_value_dump(in->_ops[0], oprintf);
-               if (in->_ops[1] || in->_ops[2])
-                       oprintf(" <- ");
-       }
-       oprintf("%s\t", qc_opname(in->opcode));
-       if (in->_ops[0] && !(in->_ops[1] || in->_ops[2])) {
-               ir_value_dump(in->_ops[0], oprintf);
-               comma = ",\t";
-       }
-       else
-       {
-               for (i = 1; i != 3; ++i) {
-                       if (in->_ops[i]) {
-                               if (comma)
-                                       oprintf(comma);
-                               ir_value_dump(in->_ops[i], oprintf);
-                               comma = ",\t";
-                       }
-               }
-       }
-       if (in->bops[0]) {
-               if (comma)
-                       oprintf(comma);
-               oprintf("[%s]", in->bops[0]->label);
-               comma = ",\t";
-       }
-       if (in->bops[1])
-               oprintf("%s[%s]", comma, in->bops[1]->label);
-       oprintf("\n");
-       ind[strlen(ind)-1] = 0;
+    size_t i;
+    const char *comma = NULL;
+
+    oprintf("%s (%i) ", ind, (int)in->eid);
+
+    if (in->opcode == VINSTR_PHI) {
+        dump_phi(in, oprintf);
+        return;
+    }
+
+    strncat(ind, "\t", IND_BUFSZ);
+
+    if (in->_ops[0] && (in->_ops[1] || in->_ops[2])) {
+        ir_value_dump(in->_ops[0], oprintf);
+        if (in->_ops[1] || in->_ops[2])
+            oprintf(" <- ");
+    }
+    if (in->opcode == INSTR_CALL0) {
+        oprintf("CALL%i\t", vec_size(in->params));
+    } else
+        oprintf("%s\t", qc_opname(in->opcode));
+
+    if (in->_ops[0] && !(in->_ops[1] || in->_ops[2])) {
+        ir_value_dump(in->_ops[0], oprintf);
+        comma = ",\t";
+    }
+    else
+    {
+        for (i = 1; i != 3; ++i) {
+            if (in->_ops[i]) {
+                if (comma)
+                    oprintf(comma);
+                ir_value_dump(in->_ops[i], oprintf);
+                comma = ",\t";
+            }
+        }
+    }
+    if (in->bops[0]) {
+        if (comma)
+            oprintf(comma);
+        oprintf("[%s]", in->bops[0]->label);
+        comma = ",\t";
+    }
+    if (in->bops[1])
+        oprintf("%s[%s]", comma, in->bops[1]->label);
+    if (vec_size(in->params)) {
+        oprintf("\tparams: ");
+        for (i = 0; i != vec_size(in->params); ++i) {
+            oprintf("%s, ", in->params[i]->name);
+        }
+    }
+    oprintf("\n");
+    ind[strlen(ind)-1] = 0;
+}
+
+void ir_value_dump_string(const char *str, int (*oprintf)(const char*, ...))
+{
+    oprintf("\"");
+    for (; *str; ++str) {
+        switch (*str) {
+            case '\n': oprintf("\\n"); break;
+            case '\r': oprintf("\\r"); break;
+            case '\t': oprintf("\\t"); break;
+            case '\v': oprintf("\\v"); break;
+            case '\f': oprintf("\\f"); break;
+            case '\b': oprintf("\\b"); break;
+            case '\a': oprintf("\\a"); break;
+            case '\\': oprintf("\\\\"); break;
+            case '"': oprintf("\\\""); break;
+            default: oprintf("%c", *str); break;
+        }
+    }
+    oprintf("\"");
 }
 
 void ir_value_dump(ir_value* v, int (*oprintf)(const char*, ...))
 {
-       if (v->isconst) {
-               switch (v->vtype) {
-                       case TYPE_VOID:
-                               oprintf("(void)");
-                               break;
-                       case TYPE_FLOAT:
-                               oprintf("%g", v->constval.vfloat);
-                               break;
-                       case TYPE_VECTOR:
-                               oprintf("'%g %g %g'",
-                                       v->constval.vvec.x,
-                                       v->constval.vvec.y,
-                                       v->constval.vvec.z);
-                               break;
-                       case TYPE_ENTITY:
-                               oprintf("(entity)");
-                               break;
-                       case TYPE_STRING:
-                               oprintf("\"%s\"", v->constval.vstring);
-                               break;
+    if (v->hasvalue) {
+        switch (v->vtype) {
+            default:
+            case TYPE_VOID:
+                oprintf("(void)");
+                break;
+            case TYPE_FUNCTION:
+                oprintf("fn:%s", v->name);
+                break;
+            case TYPE_FLOAT:
+                oprintf("%g", v->constval.vfloat);
+                break;
+            case TYPE_VECTOR:
+                oprintf("'%g %g %g'",
+                        v->constval.vvec.x,
+                        v->constval.vvec.y,
+                        v->constval.vvec.z);
+                break;
+            case TYPE_ENTITY:
+                oprintf("(entity)");
+                break;
+            case TYPE_STRING:
+                ir_value_dump_string(v->constval.vstring, oprintf);
+                break;
 #if 0
-                       case TYPE_INTEGER:
-                               oprintf("%i", v->constval.vint);
-                               break;
+            case TYPE_INTEGER:
+                oprintf("%i", v->constval.vint);
+                break;
 #endif
-                       case TYPE_POINTER:
-                               oprintf("&%s",
-                                       v->constval.vpointer->name);
-                               break;
-               }
-       } else {
-               oprintf("%s", v->name);
-       }
-}
-
-void ir_value_dump_life(ir_value *self, int (*oprintf)(const char*,...))
-{
-       size_t i;
-       oprintf("Life of %s:\n", self->name);
-       for (i = 0; i < self->life_count; ++i)
-       {
-               oprintf(" + [%i, %i]\n", self->life[i].start, self->life[i].end);
-       }
+            case TYPE_POINTER:
+                oprintf("&%s",
+                    v->constval.vpointer->name);
+                break;
+        }
+    } else {
+        oprintf("%s", v->name);
+    }
+}
+
+void ir_value_dump_life(const ir_value *self, int (*oprintf)(const char*,...))
+{
+    size_t i;
+    oprintf("Life of %12s:", self->name);
+    for (i = 0; i < vec_size(self->life); ++i)
+    {
+        oprintf(" + [%i, %i]\n", self->life[i].start, self->life[i].end);
+    }
 }