X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=ast.c;h=c039679adb6574d2738ea5588738ac467bc320ee;hb=7fec608417d47be97704ac605f9f125060679801;hp=66752444f6fb697d014badd08489565292f7831b;hpb=aef49d966729acec5bd76fd72e42ff0950b7f3c8;p=xonotic%2Fgmqcc.git

diff --git a/ast.c b/ast.c
index 6675244..c039679 100644
--- a/ast.c
+++ b/ast.c
@@ -32,9 +32,18 @@
     if (!self) {                                                    \
         return NULL;                                                \
     }                                                               \
-    ast_node_init((ast_node*)self, ctx);                            \
+    ast_node_init((ast_node*)self, ctx, TYPE_##T);                  \
     ( (ast_node*)self )->node.destroy = (ast_node_delete*)destroyfn
 
+/* error handling */
+static void asterror(lex_ctx ctx, const char *msg, ...)
+{
+    va_list ap;
+    va_start(ap, msg);
+    cvprintmsg(ctx, LVL_ERROR, "error", msg, ap);
+    va_end(ap);
+}
+
 /* It must not be possible to get here. */
 static GMQCC_NORETURN void _ast_node_destroy(ast_node *self)
 {
@@ -43,26 +52,36 @@ static GMQCC_NORETURN void _ast_node_destroy(ast_node *self)
 }
 
 /* Initialize main ast node aprts */
-static void ast_node_init(ast_node *self, lex_ctx ctx)
+static void ast_node_init(ast_node *self, lex_ctx ctx, int nodetype)
 {
     self->node.context = ctx;
     self->node.destroy = &_ast_node_destroy;
     self->node.keep    = false;
+    self->node.nodetype = nodetype;
 }
 
 /* General expression initialization */
 static void ast_expression_init(ast_expression *self,
                                 ast_expression_codegen *codegen)
 {
-    self->expression.codegen = codegen;
-    self->expression.vtype   = TYPE_VOID;
-    self->expression.next    = NULL;
+    self->expression.codegen  = codegen;
+    self->expression.vtype    = TYPE_VOID;
+    self->expression.next     = NULL;
+    self->expression.outl     = NULL;
+    self->expression.outr     = NULL;
+    self->expression.variadic = false;
+    MEM_VECTOR_INIT(&self->expression, params);
 }
 
 static void ast_expression_delete(ast_expression *self)
 {
+    size_t i;
     if (self->expression.next)
         ast_delete(self->expression.next);
+    for (i = 0; i < self->expression.params_count; ++i) {
+        ast_delete(self->expression.params[i]);
+    }
+    MEM_VECTOR_CLEAR(&self->expression, params);
 }
 
 static void ast_expression_delete_full(ast_expression *self)
@@ -71,9 +90,70 @@ static void ast_expression_delete_full(ast_expression *self)
     mem_d(self);
 }
 
-static ast_expression* ast_type_copy(lex_ctx ctx, const ast_expression *ex)
+MEM_VEC_FUNCTIONS(ast_expression_common, ast_value*, params)
+
+ast_value* ast_value_copy(const ast_value *self)
+{
+    size_t i;
+    const ast_expression_common *fromex;
+    ast_expression_common *selfex;
+    ast_value *cp = ast_value_new(self->expression.node.context, self->name, self->expression.vtype);
+    if (self->expression.next) {
+        cp->expression.next = ast_type_copy(self->expression.node.context, self->expression.next);
+        if (!cp->expression.next) {
+            ast_value_delete(cp);
+            return NULL;
+        }
+    }
+    fromex   = &self->expression;
+    selfex = &cp->expression;
+    selfex->variadic = fromex->variadic;
+    for (i = 0; i < fromex->params_count; ++i) {
+        ast_value *v = ast_value_copy(fromex->params[i]);
+        if (!v || !ast_expression_common_params_add(selfex, v)) {
+            ast_value_delete(cp);
+            return NULL;
+        }
+    }
+    return cp;
+}
+
+bool ast_type_adopt_impl(ast_expression *self, const ast_expression *other)
+{
+    size_t i;
+    const ast_expression_common *fromex;
+    ast_expression_common *selfex;
+    self->expression.vtype = other->expression.vtype;
+    if (other->expression.next) {
+        self->expression.next = (ast_expression*)ast_type_copy(ast_ctx(self), other->expression.next);
+        if (!self->expression.next)
+            return false;
+    }
+    fromex   = &other->expression;
+    selfex = &self->expression;
+    selfex->variadic = fromex->variadic;
+    for (i = 0; i < fromex->params_count; ++i) {
+        ast_value *v = ast_value_copy(fromex->params[i]);
+        if (!v || !ast_expression_common_params_add(selfex, v))
+            return false;
+    }
+    return true;
+}
+
+static ast_expression* ast_shallow_type(lex_ctx ctx, int vtype)
 {
-    const ast_expression_common *cpex;
+    ast_instantiate(ast_expression, ctx, ast_expression_delete_full);
+    ast_expression_init(self, NULL);
+    self->expression.codegen = NULL;
+    self->expression.next    = NULL;
+    self->expression.vtype   = vtype;
+    return self;
+}
+
+ast_expression* ast_type_copy(lex_ctx ctx, const ast_expression *ex)
+{
+    size_t i;
+    const ast_expression_common *fromex;
     ast_expression_common *selfex;
 
     if (!ex)
@@ -81,28 +161,62 @@ static ast_expression* ast_type_copy(lex_ctx ctx, const ast_expression *ex)
     else
     {
         ast_instantiate(ast_expression, ctx, ast_expression_delete_full);
+        ast_expression_init(self, NULL);
 
-        cpex   = &ex->expression;
+        fromex   = &ex->expression;
         selfex = &self->expression;
 
-        selfex->vtype = cpex->vtype;
-        if (cpex->next)
+        /* This may never be codegen()d */
+        selfex->codegen = NULL;
+
+        selfex->vtype = fromex->vtype;
+        if (fromex->next)
         {
-            selfex->next = ast_type_copy(ctx, cpex->next);
+            selfex->next = ast_type_copy(ctx, fromex->next);
             if (!selfex->next) {
-                mem_d(self);
+                ast_expression_delete_full(self);
                 return NULL;
             }
         }
         else
             selfex->next = NULL;
 
-        /* This may never be codegen()d */
-        selfex->codegen = NULL;
+        selfex->variadic = fromex->variadic;
+        for (i = 0; i < fromex->params_count; ++i) {
+            ast_value *v = ast_value_copy(fromex->params[i]);
+            if (!v || !ast_expression_common_params_add(selfex, v)) {
+                ast_expression_delete_full(self);
+                return NULL;
+            }
+        }
+
         return self;
     }
 }
 
+bool ast_compare_type(ast_expression *a, ast_expression *b)
+{
+    if (a->expression.vtype != b->expression.vtype)
+        return false;
+    if (!a->expression.next != !b->expression.next)
+        return false;
+    if (a->expression.params_count != b->expression.params_count)
+        return false;
+    if (a->expression.variadic != b->expression.variadic)
+        return false;
+    if (a->expression.params_count) {
+        size_t i;
+        for (i = 0; i < a->expression.params_count; ++i) {
+            if (!ast_compare_type((ast_expression*)a->expression.params[i],
+                                  (ast_expression*)b->expression.params[i]))
+                return false;
+        }
+    }
+    if (a->expression.next)
+        return ast_compare_type(a->expression.next, b->expression.next);
+    return true;
+}
+
 ast_value* ast_value_new(lex_ctx ctx, const char *name, int t)
 {
     ast_instantiate(ast_value, ctx, ast_value_delete);
@@ -113,24 +227,19 @@ ast_value* ast_value_new(lex_ctx ctx, const char *name, int t)
     self->name = name ? util_strdup(name) : NULL;
     self->expression.vtype = t;
     self->expression.next  = NULL;
-    MEM_VECTOR_INIT(self, params);
     self->isconst = false;
+    self->uses    = 0;
     memset(&self->constval, 0, sizeof(self->constval));
 
     self->ir_v    = NULL;
 
     return self;
 }
-MEM_VEC_FUNCTIONS(ast_value, ast_value*, params)
 
 void ast_value_delete(ast_value* self)
 {
-    size_t i;
     if (self->name)
         mem_d((void*)self->name);
-    for (i = 0; i < self->params_count; ++i)
-        ast_value_delete(self->params[i]); /* delete, the ast_function is expected to die first */
-    MEM_VECTOR_CLEAR(self, params);
     if (self->isconst) {
         switch (self->expression.vtype)
         {
@@ -152,6 +261,11 @@ void ast_value_delete(ast_value* self)
     mem_d(self);
 }
 
+bool GMQCC_WARN ast_value_params_add(ast_value *self, ast_value *p)
+{
+    return ast_expression_common_params_add(&self->expression, p);
+}
+
 bool ast_value_set_name(ast_value *self, const char *name)
 {
     if (self->name)
@@ -193,6 +307,81 @@ void ast_binary_delete(ast_binary *self)
     mem_d(self);
 }
 
+ast_binstore* ast_binstore_new(lex_ctx ctx, int storop, int op,
+                               ast_expression* left, ast_expression* right)
+{
+    ast_instantiate(ast_binstore, ctx, ast_binstore_delete);
+    ast_expression_init((ast_expression*)self, (ast_expression_codegen*)&ast_binstore_codegen);
+
+    self->opstore = storop;
+    self->opbin   = op;
+    self->dest    = left;
+    self->source  = right;
+
+    self->expression.vtype = left->expression.vtype;
+    if (left->expression.next) {
+        self->expression.next = ast_type_copy(ctx, left);
+        if (!self->expression.next) {
+            ast_delete(self);
+            return NULL;
+        }
+    }
+    else
+        self->expression.next = NULL;
+
+    return self;
+}
+
+void ast_binstore_delete(ast_binstore *self)
+{
+    ast_unref(self->dest);
+    ast_unref(self->source);
+    ast_expression_delete((ast_expression*)self);
+    mem_d(self);
+}
+
+ast_unary* ast_unary_new(lex_ctx ctx, int op,
+                         ast_expression *expr)
+{
+    ast_instantiate(ast_unary, ctx, ast_unary_delete);
+    ast_expression_init((ast_expression*)self, (ast_expression_codegen*)&ast_unary_codegen);
+
+    self->op = op;
+    self->operand = expr;
+
+    if (op >= INSTR_NOT_F && op <= INSTR_NOT_FNC) {
+        self->expression.vtype = TYPE_FLOAT;
+    } else
+        asterror(ctx, "cannot determine type of unary operation %s", asm_instr[op].m);
+
+    return self;
+}
+
+void ast_unary_delete(ast_unary *self)
+{
+    ast_unref(self->operand);
+    ast_expression_delete((ast_expression*)self);
+    mem_d(self);
+}
+
+ast_return* ast_return_new(lex_ctx ctx, ast_expression *expr)
+{
+    ast_instantiate(ast_return, ctx, ast_return_delete);
+    ast_expression_init((ast_expression*)self, (ast_expression_codegen*)&ast_return_codegen);
+
+    self->operand = expr;
+
+    return self;
+}
+
+void ast_return_delete(ast_return *self)
+{
+    if (self->operand)
+        ast_unref(self->operand);
+    ast_expression_delete((ast_expression*)self);
+    mem_d(self);
+}
+
 ast_entfield* ast_entfield_new(lex_ctx ctx, ast_expression *entity, ast_expression *field)
 {
     const ast_expression *outtype;
@@ -213,12 +402,14 @@ ast_entfield* ast_entfield_new(lex_ctx ctx, ast_expression *entity, ast_expressi
 
     ast_expression_init((ast_expression*)self, (ast_expression_codegen*)&ast_entfield_codegen);
 
-    self->expression.vtype = outtype->expression.vtype;
-    self->expression.next  = ast_type_copy(ctx, outtype->expression.next);
-
     self->entity = entity;
     self->field  = field;
 
+    if (!ast_type_adopt(self, outtype)) {
+        ast_entfield_delete(self);
+        return NULL;
+    }
+
     return self;
 }
 
@@ -230,6 +421,52 @@ void ast_entfield_delete(ast_entfield *self)
     mem_d(self);
 }
 
+ast_member* ast_member_new(lex_ctx ctx, ast_expression *owner, unsigned int field)
+{
+    ast_instantiate(ast_member, ctx, ast_member_delete);
+    if (field >= 3) {
+        mem_d(self);
+        return NULL;
+    }
+
+    if (owner->expression.vtype != TYPE_VECTOR &&
+        owner->expression.vtype != TYPE_FIELD) {
+        asterror(ctx, "member-access on an invalid owner of type %s", type_name[owner->expression.vtype]);
+        mem_d(self);
+        return NULL;
+    }
+
+    ast_expression_init((ast_expression*)self, (ast_expression_codegen*)&ast_member_codegen);
+    self->expression.node.keep = true; /* keep */
+
+    if (owner->expression.vtype == TYPE_VECTOR) {
+        self->expression.vtype = TYPE_FLOAT;
+        self->expression.next  = NULL;
+    } else {
+        self->expression.vtype = TYPE_FIELD;
+        self->expression.next = ast_shallow_type(ctx, TYPE_FLOAT);
+    }
+
+    self->owner = owner;
+    self->field = field;
+
+    return self;
+}
+
+void ast_member_delete(ast_member *self)
+{
+    /* The owner is always an ast_value, which has .keep=true,
+     * also: ast_members are usually deleted after the owner, thus
+     * this will cause invalid access
+    ast_unref(self->owner);
+     * once we allow (expression).x to access a vector-member, we need
+     * to change this: preferably by creating an alternate ast node for this
+     * purpose that is not garbage-collected.
+    */
+    ast_expression_delete((ast_expression*)self);
+    mem_d(self);
+}
+
 ast_ifthen* ast_ifthen_new(lex_ctx ctx, ast_expression *cond, ast_expression *ontrue, ast_expression *onfalse)
 {
     ast_instantiate(ast_ifthen, ctx, ast_ifthen_delete);
@@ -330,6 +567,10 @@ ast_call* ast_call_new(lex_ctx ctx,
 
     self->func = funcexpr;
 
+    self->expression.vtype = funcexpr->expression.next->expression.vtype;
+    if (funcexpr->expression.next->expression.next)
+        self->expression.next = ast_type_copy(ctx, funcexpr->expression.next->expression.next);
+
     return self;
 }
 MEM_VEC_FUNCTIONS(ast_call, ast_expression*, params)
@@ -349,7 +590,7 @@ void ast_call_delete(ast_call *self)
 }
 
 ast_store* ast_store_new(lex_ctx ctx, int op,
-                         ast_value *dest, ast_expression *source)
+                         ast_expression *dest, ast_expression *source)
 {
     ast_instantiate(ast_store, ctx, ast_store_delete);
     ast_expression_init((ast_expression*)self, (ast_expression_codegen*)&ast_store_codegen);
@@ -377,11 +618,21 @@ ast_block* ast_block_new(lex_ctx ctx)
 
     MEM_VECTOR_INIT(self, locals);
     MEM_VECTOR_INIT(self, exprs);
+    MEM_VECTOR_INIT(self, collect);
 
     return self;
 }
 MEM_VEC_FUNCTIONS(ast_block, ast_value*, locals)
 MEM_VEC_FUNCTIONS(ast_block, ast_expression*, exprs)
+MEM_VEC_FUNCTIONS(ast_block, ast_expression*, collect)
+
+bool ast_block_collect(ast_block *self, ast_expression *expr)
+{
+    if (!ast_block_collect_add(self, expr))
+        return false;
+    expr->expression.node.keep = true;
+    return true;
+}
 
 void ast_block_delete(ast_block *self)
 {
@@ -392,10 +643,28 @@ void ast_block_delete(ast_block *self)
     for (i = 0; i < self->locals_count; ++i)
         ast_delete(self->locals[i]);
     MEM_VECTOR_CLEAR(self, locals);
+    for (i = 0; i < self->collect_count; ++i)
+        ast_delete(self->collect[i]);
+    MEM_VECTOR_CLEAR(self, collect);
     ast_expression_delete((ast_expression*)self);
     mem_d(self);
 }
 
+bool ast_block_set_type(ast_block *self, ast_expression *from)
+{
+    if (self->expression.next)
+        ast_delete(self->expression.next);
+    self->expression.vtype = from->expression.vtype;
+    if (from->expression.next) {
+        self->expression.next = ast_type_copy(self->expression.node.context, from->expression.next);
+        if (!self->expression.next)
+            return false;
+    }
+    else
+        self->expression.next = NULL;
+    return true;
+}
+
 ast_function* ast_function_new(lex_ctx ctx, const char *name, ast_value *vtype)
 {
     ast_instantiate(ast_function, ctx, ast_function_delete);
@@ -411,7 +680,6 @@ ast_function* ast_function_new(lex_ctx ctx, const char *name, ast_value *vtype)
     self->vtype = vtype;
     self->name = name ? util_strdup(name) : NULL;
     MEM_VECTOR_INIT(self, blocks);
-    MEM_VECTOR_INIT(self, params);
 
     self->labelcount = 0;
     self->builtin = 0;
@@ -429,7 +697,6 @@ ast_function* ast_function_new(lex_ctx ctx, const char *name, ast_value *vtype)
 }
 
 MEM_VEC_FUNCTIONS(ast_function, ast_block*, blocks)
-MEM_VEC_FUNCTIONS(ast_function, ast_value*, params)
 
 void ast_function_delete(ast_function *self)
 {
@@ -448,46 +715,23 @@ void ast_function_delete(ast_function *self)
     for (i = 0; i < self->blocks_count; ++i)
         ast_delete(self->blocks[i]);
     MEM_VECTOR_CLEAR(self, blocks);
-    /* ast_delete, not unref, there must only have been references
-     * to the parameter values inside the blocks deleted above.
-     */
-    for (i = 0; i < self->params_count; ++i)
-        ast_delete(self->params[i]);
-    MEM_VECTOR_CLEAR(self, params);
     mem_d(self);
 }
 
-static void ast_util_hexitoa(char *buf, size_t size, unsigned int num)
-{
-    unsigned int base = 10;
-#define checknul() do { if (size == 1) { *buf = 0; return; } } while (0)
-#define addch(x) do { *buf++ = (x); --size; checknul(); } while (0)
-    if (size < 1)
-        return;
-    checknul();
-    if (!num)
-        addch('0');
-    else {
-        while (num)
-        {
-            int digit = num % base;
-            num /= base;
-            addch('0' + digit);
-        }
-    }
-
-    *buf = 0;
-#undef addch
-#undef checknul
-}
-
 const char* ast_function_label(ast_function *self, const char *prefix)
 {
-    size_t id = (self->labelcount++);
+    size_t id  = (self->labelcount++);
     size_t len = strlen(prefix);
-    strncpy(self->labelbuf, prefix, sizeof(self->labelbuf));
-    ast_util_hexitoa(self->labelbuf + len, sizeof(self->labelbuf)-len, id);
-    return self->labelbuf;
+
+    char *from = self->labelbuf + sizeof(self->labelbuf)-1;
+    *from-- = 0;
+    do {
+        unsigned int digit = id % 10;
+        *from = digit + '0';
+        id /= 10;
+    } while (id);
+    memcpy(from - len, prefix, len);
+    return from - len;
 }
 
 /*********************************************************************/
@@ -507,7 +751,7 @@ bool ast_value_codegen(ast_value *self, ast_function *func, bool lvalue, ir_valu
      * on all the globals.
      */
     if (!self->ir_v) {
-        printf("ast_value used before generated (%s)\n", self->name);
+        asterror(ast_ctx(self), "ast_value used before generated (%s)", self->name);
         return false;
     }
     *out = self->ir_v;
@@ -522,6 +766,7 @@ bool ast_global_codegen(ast_value *self, ir_builder *ir)
         ir_function *func = ir_builder_create_function(ir, self->name, self->expression.next->expression.vtype);
         if (!func)
             return false;
+        func->context = ast_ctx(self);
 
         self->constval.vfunc->ir_func = func;
         self->ir_v = func->value;
@@ -529,11 +774,25 @@ bool ast_global_codegen(ast_value *self, ir_builder *ir)
         return true;
     }
 
+    if (self->expression.vtype == TYPE_FIELD) {
+        v = ir_builder_create_field(ir, self->name, self->expression.next->expression.vtype);
+        if (!v)
+            return false;
+        v->context = ast_ctx(self);
+        if (self->isconst) {
+            asterror(ast_ctx(self), "TODO: constant field pointers with value");
+            goto error;
+        }
+        self->ir_v = v;
+        return true;
+    }
+
     v = ir_builder_create_global(ir, self->name, self->expression.vtype);
     if (!v) {
-        printf("ir_builder_create_global failed\n");
+        asterror(ast_ctx(self), "ir_builder_create_global failed");
         return false;
     }
+    v->context = ast_ctx(self);
 
     if (self->isconst) {
         switch (self->expression.vtype)
@@ -551,13 +810,13 @@ bool ast_global_codegen(ast_value *self, ir_builder *ir)
                     goto error;
                 break;
             case TYPE_FUNCTION:
-                printf("global of type function not properly generated\n");
+                asterror(ast_ctx(self), "global of type function not properly generated");
                 goto error;
                 /* Cannot generate an IR value for a function,
                  * need a pointer pointing to a function rather.
                  */
             default:
-                printf("TODO: global constant type %i\n", self->expression.vtype);
+                asterror(ast_ctx(self), "TODO: global constant type %i", self->expression.vtype);
                 break;
         }
     }
@@ -585,6 +844,7 @@ bool ast_local_codegen(ast_value *self, ir_function *func, bool param)
     v = ir_function_create_local(func, self->name, self->expression.vtype, param);
     if (!v)
         return false;
+    v->context = ast_ctx(self);
 
     /* A constant local... hmmm...
      * I suppose the IR will have to deal with this
@@ -605,7 +865,7 @@ bool ast_local_codegen(ast_value *self, ir_function *func, bool param)
                     goto error;
                 break;
             default:
-                printf("TODO: global constant type %i\n", self->expression.vtype);
+                asterror(ast_ctx(self), "TODO: global constant type %i", self->expression.vtype);
                 break;
         }
     }
@@ -623,30 +883,25 @@ bool ast_function_codegen(ast_function *self, ir_builder *ir)
 {
     ir_function *irf;
     ir_value    *dummy;
+    ast_expression_common *ec;
     size_t    i;
 
     irf = self->ir_func;
     if (!irf) {
-        printf("ast_function's related ast_value was not generated yet\n");
-        return false;
-    }
-
-    if (!self->builtin && self->vtype->params_count != self->params_count) {
-        printf("ast_function's parameter variables doesn't match the declared parameter count\n");
-        printf("%i != %i\n", self->vtype->params_count, self->params_count);
+        asterror(ast_ctx(self), "ast_function's related ast_value was not generated yet");
         return false;
     }
 
     /* fill the parameter list */
-    for (i = 0; i < self->vtype->params_count; ++i)
+    ec = &self->vtype->expression;
+    for (i = 0; i < ec->params_count; ++i)
     {
-        if (!ir_function_params_add(irf, self->vtype->params[i]->expression.vtype))
-            return false;
-    }
-    /* generate the parameter locals */
-    for (i = 0; i < self->params_count; ++i) {
-        if (!ast_local_codegen(self->params[i], self->ir_func, true))
+        if (!ir_function_params_add(irf, ec->params[i]->expression.vtype))
             return false;
+        if (!self->builtin) {
+            if (!ast_local_codegen(ec->params[i], self->ir_func, true))
+                return false;
+        }
     }
 
     if (self->builtin) {
@@ -654,9 +909,16 @@ bool ast_function_codegen(ast_function *self, ir_builder *ir)
         return true;
     }
 
+    if (!self->blocks_count) {
+        asterror(ast_ctx(self), "function `%s` has no body", self->name);
+        return false;
+    }
+
     self->curblock = ir_function_create_block(irf, "entry");
-    if (!self->curblock)
+    if (!self->curblock) {
+        asterror(ast_ctx(self), "failed to allocate entry block for `%s`", self->name);
         return false;
+    }
 
     for (i = 0; i < self->blocks_count; ++i) {
         ast_expression_codegen *gen = self->blocks[i]->expression.codegen;
@@ -667,6 +929,9 @@ bool ast_function_codegen(ast_function *self, ir_builder *ir)
     /* TODO: check return types */
     if (!self->curblock->is_return)
     {
+        return ir_block_create_return(self->curblock, NULL);
+        /* From now on the parser has to handle this situation */
+#if 0
         if (!self->vtype->expression.next ||
             self->vtype->expression.next->expression.vtype == TYPE_VOID)
         {
@@ -675,8 +940,10 @@ bool ast_function_codegen(ast_function *self, ir_builder *ir)
         else
         {
             /* error("missing return"); */
+            asterror(ast_ctx(self), "function `%s` missing return value", self->name);
             return false;
         }
+#endif
     }
     return true;
 }
@@ -696,6 +963,10 @@ bool ast_block_codegen(ast_block *self, ast_function *func, bool lvalue, ir_valu
      * of the form: (a, b, c) = x should not assign to c...
      */
     (void)lvalue;
+    if (self->expression.outr) {
+        *out = self->expression.outr;
+        return true;
+    }
 
     /* output is NULL at first, we'll have each expression
      * assign to out output, thus, a comma-operator represention
@@ -708,8 +979,11 @@ bool ast_block_codegen(ast_block *self, ast_function *func, bool lvalue, ir_valu
     /* generate locals */
     for (i = 0; i < self->locals_count; ++i)
     {
-        if (!ast_local_codegen(self->locals[i], func->ir_func, false))
+        if (!ast_local_codegen(self->locals[i], func->ir_func, false)) {
+            if (opts_debug)
+                asterror(ast_ctx(self), "failed to generate local `%s`", self->locals[i]->name);
             return false;
+        }
     }
 
     for (i = 0; i < self->exprs_count; ++i)
@@ -719,6 +993,8 @@ bool ast_block_codegen(ast_block *self, ast_function *func, bool lvalue, ir_valu
             return false;
     }
 
+    self->expression.outr = *out;
+
     return true;
 }
 
@@ -727,10 +1003,21 @@ bool ast_store_codegen(ast_store *self, ast_function *func, bool lvalue, ir_valu
     ast_expression_codegen *cgen;
     ir_value *left, *right;
 
+    if (lvalue && self->expression.outl) {
+        *out = self->expression.outl;
+        return true;
+    }
+
+    if (!lvalue && self->expression.outr) {
+        *out = self->expression.outr;
+        return true;
+    }
+
     cgen = self->dest->expression.codegen;
     /* lvalue! */
     if (!(*cgen)((ast_expression*)(self->dest), func, true, &left))
         return false;
+    self->expression.outl = left;
 
     cgen = self->source->expression.codegen;
     /* rvalue! */
@@ -739,6 +1026,7 @@ bool ast_store_codegen(ast_store *self, ast_function *func, bool lvalue, ir_valu
 
     if (!ir_block_create_store_op(func->curblock, self->op, left, right))
         return false;
+    self->expression.outr = right;
 
     /* Theoretically, an assinment returns its left side as an
      * lvalue, if we don't need an lvalue though, we return
@@ -760,7 +1048,11 @@ bool ast_binary_codegen(ast_binary *self, ast_function *func, bool lvalue, ir_va
     /* In the context of a binary operation, we can disregard
      * the lvalue flag.
      */
-     (void)lvalue;
+    (void)lvalue;
+    if (self->expression.outr) {
+        *out = self->expression.outr;
+        return true;
+    }
 
     cgen = self->left->expression.codegen;
     /* lvalue! */
@@ -776,6 +1068,120 @@ bool ast_binary_codegen(ast_binary *self, ast_function *func, bool lvalue, ir_va
                                  self->op, left, right);
     if (!*out)
         return false;
+    self->expression.outr = *out;
+
+    return true;
+}
+
+bool ast_binstore_codegen(ast_binstore *self, ast_function *func, bool lvalue, ir_value **out)
+{
+    ast_expression_codegen *cgen;
+    ir_value *leftl, *leftr, *right, *bin;
+
+    if (lvalue && self->expression.outl) {
+        *out = self->expression.outl;
+        return true;
+    }
+
+    if (!lvalue && self->expression.outr) {
+        *out = self->expression.outr;
+        return true;
+    }
+
+    /* for a binstore we need both an lvalue and an rvalue for the left side */
+    /* rvalue of destination! */
+    cgen = self->dest->expression.codegen;
+    if (!(*cgen)((ast_expression*)(self->dest), func, false, &leftr))
+        return false;
+
+    /* source as rvalue only */
+    cgen = self->source->expression.codegen;
+    if (!(*cgen)((ast_expression*)(self->source), func, false, &right))
+        return false;
+
+    /* now the binary */
+    bin = ir_block_create_binop(func->curblock, ast_function_label(func, "binst"),
+                                self->opbin, leftr, right);
+    self->expression.outr = bin;
+
+    /* now store them */
+    cgen = self->dest->expression.codegen;
+    /* lvalue of destination */
+    if (!(*cgen)((ast_expression*)(self->dest), func, true, &leftl))
+        return false;
+    self->expression.outl = leftl;
+
+    if (!ir_block_create_store_op(func->curblock, self->opstore, leftl, bin))
+        return false;
+    self->expression.outr = bin;
+
+    /* Theoretically, an assinment returns its left side as an
+     * lvalue, if we don't need an lvalue though, we return
+     * the right side as an rvalue, otherwise we have to
+     * somehow know whether or not we need to dereference the pointer
+     * on the left side - that is: OP_LOAD if it was an address.
+     * Also: in original QC we cannot OP_LOADP *anyway*.
+     */
+    *out = (lvalue ? leftl : bin);
+
+    return true;
+}
+
+bool ast_unary_codegen(ast_unary *self, ast_function *func, bool lvalue, ir_value **out)
+{
+    ast_expression_codegen *cgen;
+    ir_value *operand;
+
+    /* In the context of a unary operation, we can disregard
+     * the lvalue flag.
+     */
+    (void)lvalue;
+    if (self->expression.outr) {
+        *out = self->expression.outr;
+        return true;
+    }
+
+    cgen = self->operand->expression.codegen;
+    /* lvalue! */
+    if (!(*cgen)((ast_expression*)(self->operand), func, false, &operand))
+        return false;
+
+    *out = ir_block_create_unary(func->curblock, ast_function_label(func, "unary"),
+                                 self->op, operand);
+    if (!*out)
+        return false;
+    self->expression.outr = *out;
+
+    return true;
+}
+
+bool ast_return_codegen(ast_return *self, ast_function *func, bool lvalue, ir_value **out)
+{
+    ast_expression_codegen *cgen;
+    ir_value *operand;
+
+    /* In the context of a return operation, we can disregard
+     * the lvalue flag.
+     */
+    (void)lvalue;
+    if (self->expression.outr) {
+        asterror(ast_ctx(self), "internal error: ast_return cannot be reused, it bears no result!");
+        return false;
+    }
+    self->expression.outr = (ir_value*)1;
+
+    if (self->operand) {
+        cgen = self->operand->expression.codegen;
+        /* lvalue! */
+        if (!(*cgen)((ast_expression*)(self->operand), func, false, &operand))
+            return false;
+
+        if (!ir_block_create_return(func->curblock, operand))
+            return false;
+    } else {
+        if (!ir_block_create_return(func->curblock, NULL))
+            return false;
+    }
 
     return true;
 }
@@ -790,6 +1196,16 @@ bool ast_entfield_codegen(ast_entfield *self, ast_function *func, bool lvalue, i
      * value in a temp.
      */
 
+    if (lvalue && self->expression.outl) {
+        *out = self->expression.outl;
+        return true;
+    }
+
+    if (!lvalue && self->expression.outr) {
+        *out = self->expression.outr;
+        return true;
+    }
+
     cgen = self->entity->expression.codegen;
     if (!(*cgen)((ast_expression*)(self->entity), func, false, &ent))
         return false;
@@ -806,13 +1222,50 @@ bool ast_entfield_codegen(ast_entfield *self, ast_function *func, bool lvalue, i
         *out = ir_block_create_load_from_ent(func->curblock, ast_function_label(func, "efv"),
                                              ent, field, self->expression.vtype);
     }
-    if (!*out)
+    if (!*out) {
+        asterror(ast_ctx(self), "failed to create %s instruction (output type %s)",
+                 (lvalue ? "ADDRESS" : "FIELD"),
+                 type_name[self->expression.vtype]);
         return false;
+    }
+
+    if (lvalue)
+        self->expression.outl = *out;
+    else
+        self->expression.outr = *out;
 
     /* Hm that should be it... */
     return true;
 }
 
+bool ast_member_codegen(ast_member *self, ast_function *func, bool lvalue, ir_value **out)
+{
+    ast_expression_codegen *cgen;
+    ir_value *vec;
+
+    /* in QC this is always an lvalue */
+    (void)lvalue;
+    if (self->expression.outl) {
+        *out = self->expression.outl;
+        return true;
+    }
+
+    cgen = self->owner->expression.codegen;
+    if (!(*cgen)((ast_expression*)(self->owner), func, true, &vec))
+        return false;
+
+    if (vec->vtype != TYPE_VECTOR &&
+        !(vec->vtype == TYPE_FIELD && self->owner->expression.next->expression.vtype == TYPE_VECTOR))
+    {
+        return false;
+    }
+
+    *out = ir_value_vector_member(vec, self->field);
+    self->expression.outl = *out;
+
+    return (*out != NULL);
+}
+
 bool ast_ifthen_codegen(ast_ifthen *self, ast_function *func, bool lvalue, ir_value **out)
 {
     ast_expression_codegen *cgen;
@@ -823,12 +1276,20 @@ bool ast_ifthen_codegen(ast_ifthen *self, ast_function *func, bool lvalue, ir_va
     ir_block *cond = func->curblock;
     ir_block *ontrue;
     ir_block *onfalse;
+    ir_block *ontrue_endblock;
+    ir_block *onfalse_endblock;
     ir_block *merge;
 
     /* We don't output any value, thus also don't care about r/lvalue */
     (void)out;
     (void)lvalue;
 
+    if (self->expression.outr) {
+        asterror(ast_ctx(self), "internal error: ast_ifthen cannot be reused, it bears no result!");
+        return false;
+    }
+    self->expression.outr = (ir_value*)1;
+
     /* generate the condition */
     func->curblock = cond;
     cgen = self->cond->expression.codegen;
@@ -850,6 +1311,9 @@ bool ast_ifthen_codegen(ast_ifthen *self, ast_function *func, bool lvalue, ir_va
         cgen = self->on_true->expression.codegen;
         if (!(*cgen)((ast_expression*)(self->on_true), func, false, &dummy))
             return false;
+
+        /* we now need to work from the current endpoint */
+        ontrue_endblock = func->curblock;
     } else
         ontrue = NULL;
 
@@ -867,6 +1331,9 @@ bool ast_ifthen_codegen(ast_ifthen *self, ast_function *func, bool lvalue, ir_va
         cgen = self->on_false->expression.codegen;
         if (!(*cgen)((ast_expression*)(self->on_false), func, false, &dummy))
             return false;
+
+        /* we now need to work from the current endpoint */
+        onfalse_endblock = func->curblock;
     } else
         onfalse = NULL;
 
@@ -876,9 +1343,9 @@ bool ast_ifthen_codegen(ast_ifthen *self, ast_function *func, bool lvalue, ir_va
         return false;
 
     /* add jumps ot the merge block */
-    if (ontrue && !ir_block_create_jump(ontrue, merge))
+    if (ontrue && !ontrue_endblock->final && !ir_block_create_jump(ontrue_endblock, merge))
         return false;
-    if (onfalse && !ir_block_create_jump(onfalse, merge))
+    if (onfalse && !onfalse_endblock->final && !ir_block_create_jump(onfalse_endblock, merge))
         return false;
 
     /* we create the if here, that way all blocks are ordered :)
@@ -909,6 +1376,10 @@ bool ast_ternary_codegen(ast_ternary *self, ast_function *func, bool lvalue, ir_
     ir_block *onfalse;
     ir_block *merge;
 
+    /* Ternary can never create an lvalue... */
+    if (lvalue)
+        return false;
+
     /* In theory it shouldn't be possible to pass through a node twice, but
      * in case we add any kind of optimization pass for the AST itself, it
      * may still happen, thus we remember a created ir_value and simply return one
@@ -919,10 +1390,6 @@ bool ast_ternary_codegen(ast_ternary *self, ast_function *func, bool lvalue, ir_
         return true;
     }
 
-    /* Ternary can never create an lvalue... */
-    if (lvalue)
-        return false;
-
     /* In the following, contraty to ast_ifthen, we assume both paths exist. */
 
     /* generate the condition */
@@ -1034,6 +1501,12 @@ bool ast_loop_codegen(ast_loop *self, ast_function *func, bool lvalue, ir_value
     (void)lvalue;
     (void)out;
 
+    if (self->expression.outr) {
+        asterror(ast_ctx(self), "internal error: ast_loop cannot be reused, it bears no result!");
+        return false;
+    }
+    self->expression.outr = (ir_value*)1;
+
     /* NOTE:
      * Should we ever need some kind of block ordering, better make this function
      * move blocks around than write a block ordering algorithm later... after all
@@ -1190,7 +1663,7 @@ bool ast_loop_codegen(ast_loop *self, ast_function *func, bool lvalue, ir_value
         else if (bpostcond)  tmpblock = bpostcond;
         else if (bprecond)   tmpblock = bprecond;
         else                 tmpblock = bout;
-        if (!ir_block_create_jump(end_bbody, tmpblock))
+        if (!end_bbody->final && !ir_block_create_jump(end_bbody, tmpblock))
             return false;
     }
 
@@ -1238,9 +1711,14 @@ bool ast_call_codegen(ast_call *self, ast_function *func, bool lvalue, ir_value
 
     ir_value *funval = NULL;
 
-    /* return values are never rvalues */
+    /* return values are never lvalues */
     (void)lvalue;
 
+    if (self->expression.outr) {
+        *out = self->expression.outr;
+        return true;
+    }
+
     cgen = self->func->expression.codegen;
     if (!(*cgen)((ast_expression*)(self->func), func, false, &funval))
         return false;
@@ -1274,7 +1752,9 @@ bool ast_call_codegen(ast_call *self, ast_function *func, bool lvalue, ir_value
     }
 
     *out = ir_call_value(callinstr);
+    self->expression.outr = *out;
 
+    MEM_VECTOR_CLEAR(&params, v);
     return true;
 error:
     MEM_VECTOR_CLEAR(&params, v);