changed printf format for size_t printing
[cparser] / ast2firm.c
index 1f81df3..4145de9 100644 (file)
@@ -1,7 +1,24 @@
+/*
+ * This file is part of cparser.
+ * Copyright (C) 2007-2008 Matthias Braun <matze@braunis.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
 #include <config.h>
 
-#define _GNU_SOURCE
-
 #include <assert.h>
 #include <string.h>
 #include <stdbool.h>
@@ -13,6 +30,7 @@
 
 #include "adt/error.h"
 #include "adt/array.h"
+#include "symbol_t.h"
 #include "token_t.h"
 #include "type_t.h"
 #include "ast_t.h"
@@ -41,12 +59,14 @@ static ir_node **imature_blocks;
 
 static const declaration_t *current_function_decl;
 static ir_node             *current_function_name;
+static ir_node             *current_funcsig;
 
 static struct obstack asm_obst;
 
 typedef enum declaration_kind_t {
        DECLARATION_KIND_UNKNOWN,
        DECLARATION_KIND_FUNCTION,
+       DECLARATION_KIND_VARIABLE_LENGTH_ARRAY,
        DECLARATION_KIND_GLOBAL_VARIABLE,
        DECLARATION_KIND_LOCAL_VARIABLE,
        DECLARATION_KIND_LOCAL_VARIABLE_ENTITY,
@@ -193,10 +213,13 @@ static ir_mode *get_ptrmode(unsigned size, char *name)
        return res;
 }
 
-static ir_mode *_atomic_modes[ATOMIC_TYPE_LAST];
+static ir_mode *_atomic_modes[ATOMIC_TYPE_LAST+1];
 
 static ir_mode *mode_int, *mode_uint;
 
+static ir_node *expression_to_firm(const expression_t *expression);
+static inline ir_mode *get_ir_mode(type_t *type);
+
 /**
  * Initialises the atomic modes depending on the machine size.
  */
@@ -223,12 +246,10 @@ static void init_atomic_modes(void) {
        _atomic_modes[ATOMIC_TYPE_LONG_DOUBLE] = mode_E;
        _atomic_modes[ATOMIC_TYPE_BOOL]        = get_umode(int_size);
 
-#ifdef PROVIDE_COMPLEX
        _atomic_modes[ATOMIC_TYPE_BOOL]                  = _atomic_modes[ATOMIC_TYPE_INT];
        _atomic_modes[ATOMIC_TYPE_FLOAT_IMAGINARY]       = _atomic_modes[ATOMIC_TYPE_FLOAT];
        _atomic_modes[ATOMIC_TYPE_DOUBLE_IMAGINARY]      = _atomic_modes[ATOMIC_TYPE_DOUBLE];
        _atomic_modes[ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY] = _atomic_modes[ATOMIC_TYPE_LONG_DOUBLE];
-#endif
 
        /* Hmm, pointers should be machine size */
        set_modeP_data(get_ptrmode(machine_size >> 3, NULL));
@@ -241,59 +262,13 @@ static void init_atomic_modes(void) {
 static ir_mode *get_atomic_mode(const atomic_type_t* atomic_type)
 {
        ir_mode *res = NULL;
-       if ((unsigned)atomic_type->akind < (unsigned)ATOMIC_TYPE_LAST)
+       if ((unsigned)atomic_type->akind <= (unsigned)ATOMIC_TYPE_LAST)
                res = _atomic_modes[(unsigned)atomic_type->akind];
        if (res == NULL)
                panic("Encountered unknown atomic type");
        return res;
 }
 
-static unsigned get_type_size(type_t *type);
-
-static unsigned get_atomic_type_size(const atomic_type_t *type)
-{
-       switch(type->akind) {
-       case ATOMIC_TYPE_CHAR:
-       case ATOMIC_TYPE_SCHAR:
-       case ATOMIC_TYPE_UCHAR:
-               return 1;
-
-       case ATOMIC_TYPE_SHORT:
-       case ATOMIC_TYPE_USHORT:
-               return 2;
-
-       case ATOMIC_TYPE_BOOL:
-       case ATOMIC_TYPE_INT:
-       case ATOMIC_TYPE_UINT:
-               return machine_size >> 3;
-
-       case ATOMIC_TYPE_LONG:
-       case ATOMIC_TYPE_ULONG:
-               return machine_size > 16 ? machine_size >> 3 : 4;
-
-       case ATOMIC_TYPE_LONGLONG:
-       case ATOMIC_TYPE_ULONGLONG:
-               return machine_size > 16 ? 8 : 4;
-
-       case ATOMIC_TYPE_FLOAT:
-               return 4;
-
-       case ATOMIC_TYPE_DOUBLE:
-               return 8;
-
-       case ATOMIC_TYPE_LONG_DOUBLE:
-               return 12;
-
-       case ATOMIC_TYPE_VOID:
-               return 1;
-
-       case ATOMIC_TYPE_INVALID:
-       case ATOMIC_TYPE_LAST:
-               break;
-       }
-       panic("Trying to determine size of invalid atomic type");
-}
-
 static unsigned get_compound_type_size(compound_type_t *type)
 {
        ir_type *irtype = get_ir_type((type_t*) type);
@@ -302,12 +277,13 @@ static unsigned get_compound_type_size(compound_type_t *type)
 
 static unsigned get_array_type_size(array_type_t *type)
 {
+       assert(!type->is_vla);
        ir_type *irtype = get_ir_type((type_t*) type);
        return get_type_size_bytes(irtype);
 }
 
 
-static unsigned get_type_size(type_t *type)
+static unsigned get_type_size_const(type_t *type)
 {
        type = skip_typeref(type);
 
@@ -315,7 +291,7 @@ static unsigned get_type_size(type_t *type)
        case TYPE_ERROR:
                panic("error type occured");
        case TYPE_ATOMIC:
-               return get_atomic_type_size(&type->atomic);
+               return get_atomic_type_size(type->atomic.akind);
        case TYPE_ENUM:
                return get_mode_size_bytes(mode_int);
        case TYPE_COMPOUND_UNION:
@@ -329,7 +305,7 @@ static unsigned get_type_size(type_t *type)
        case TYPE_ARRAY:
                return get_array_type_size(&type->array);
        case TYPE_BUILTIN:
-               return get_type_size(type->builtin.real_type);
+               return get_type_size_const(type->builtin.real_type);
        case TYPE_BITFIELD:
                panic("type size of bitfield request");
        case TYPE_TYPEDEF:
@@ -340,6 +316,30 @@ static unsigned get_type_size(type_t *type)
        panic("Trying to determine size of invalid type");
 }
 
+static ir_node *get_type_size(type_t *type)
+{
+       type = skip_typeref(type);
+
+       if(is_type_array(type) && type->array.is_vla) {
+               ir_node *size_node = type->array.size_node;
+               if(size_node == NULL) {
+                       size_node = expression_to_firm(type->array.size_expression);
+                       assert(!is_Const(size_node));
+                       type->array.size_node = size_node;
+               }
+
+               ir_node *elem_size = get_type_size(type->array.element_type);
+               ir_mode *mode      = get_irn_mode(size_node);
+               ir_node *real_size = new_d_Mul(NULL, size_node, elem_size, mode);
+               return real_size;
+       }
+
+       ir_mode *mode = get_ir_mode(type_size_t);
+       symconst_symbol sym;
+       sym.type_p = get_ir_type(type);
+       return new_SymConst(mode, sym, symconst_type_size);
+}
+
 static unsigned count_parameters(const function_type_t *function_type)
 {
        unsigned count = 0;
@@ -360,8 +360,12 @@ static ir_type *create_atomic_type(const atomic_type_t *type)
        ident   *id     = get_mode_ident(mode);
        ir_type *irtype = new_d_type_primitive(id, mode, dbgi);
 
+       /* TODO: this is x86 specific, we should fiddle this into
+        * lang_features.h somehow... */
        if(type->akind == ATOMIC_TYPE_LONG_DOUBLE
-                       || type->akind == ATOMIC_TYPE_DOUBLE) {
+                       || type->akind == ATOMIC_TYPE_DOUBLE
+                       || type->akind == ATOMIC_TYPE_LONGLONG
+                       || type->akind == ATOMIC_TYPE_ULONGLONG) {
                set_type_alignment_bytes(irtype, 4);
        }
 
@@ -785,9 +789,6 @@ static ir_type *create_union_type(compound_type_t *type, ir_type *irtype,
        return irtype;
 }
 
-static ir_node *expression_to_firm(const expression_t *expression);
-static inline ir_mode *get_ir_mode(type_t *type);
-
 static ir_type *create_enum_type(enum_type_t *const type)
 {
        type->type.firm_type = ir_type_int;
@@ -1049,14 +1050,14 @@ static ir_node *const_to_firm(const const_expression_t *cnst)
        return new_d_Const(dbgi, mode, tv);
 }
 
-static ir_node *char_const_to_firm(const const_expression_t *cnst)
+static ir_node *character_constant_to_firm(const const_expression_t *cnst)
 {
        dbg_info *dbgi = get_dbg_info(&cnst->base.source_position);
        ir_mode  *mode = get_ir_mode(cnst->base.type);
 
        long long int v = 0;
-       for (size_t i = 0; i < cnst->v.chars.size; ++i) {
-               v = (v << 8) | ((unsigned char)cnst->v.chars.begin[i]);
+       for (size_t i = 0; i < cnst->v.character.size; ++i) {
+               v = (v << 8) | ((unsigned char)cnst->v.character.begin[i]);
        }
        char    buf[128];
        size_t  len = snprintf(buf, sizeof(buf), "%lld", v);
@@ -1065,6 +1066,20 @@ static ir_node *char_const_to_firm(const const_expression_t *cnst)
        return new_d_Const(dbgi, mode, tv);
 }
 
+static ir_node *wide_character_constant_to_firm(const const_expression_t *cnst)
+{
+       dbg_info *dbgi = get_dbg_info(&cnst->base.source_position);
+       ir_mode  *mode = get_ir_mode(cnst->base.type);
+
+       long long int v = cnst->v.wide_character.begin[0];
+
+       char    buf[128];
+       size_t  len = snprintf(buf, sizeof(buf), "%lld", v);
+       tarval *tv = new_tarval_from_str(buf, len, mode);
+
+       return new_d_Const(dbgi, mode, tv);
+}
+
 static ir_node *create_symconst(dbg_info *dbgi, ir_mode *mode,
                                 ir_entity *entity)
 {
@@ -1267,6 +1282,9 @@ static ir_node *reference_expression_to_firm(const reference_expression_t *ref)
                return deref_address(irtype, sel, dbgi);
        }
 
+       case DECLARATION_KIND_VARIABLE_LENGTH_ARRAY:
+               return declaration->v.vla_base;
+
        case DECLARATION_KIND_COMPOUND_MEMBER:
        case DECLARATION_KIND_LABEL_BLOCK:
                panic("not implemented reference type");
@@ -1302,6 +1320,9 @@ static ir_node *reference_addr(const reference_expression_t *ref)
                return sel;
        }
 
+       case DECLARATION_KIND_VARIABLE_LENGTH_ARRAY:
+               return declaration->v.vla_base;
+
        case DECLARATION_KIND_ENUM_ENTRY:
                panic("trying to reference enum entry");
 
@@ -1598,8 +1619,7 @@ static ir_node *create_incdec(const unary_expression_t *expression)
        ir_node *offset;
        if(is_type_pointer(type)) {
                pointer_type_t *pointer_type = &type->pointer;
-               unsigned        elem_size    = get_type_size(pointer_type->points_to);
-               offset = new_Const_long(mode_int, elem_size);
+               offset                       = get_type_size(pointer_type->points_to);
        } else {
                assert(is_type_arithmetic(type));
                offset = new_Const(mode, get_mode_one(mode));
@@ -1847,6 +1867,8 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression)
                        node = do_strict_conv(dbgi, node);
                        return node;
                } else {
+                       /* make sure firm type is constructed */
+                       (void) get_ir_type(type);
                        return value_node;
                }
        }
@@ -1873,25 +1895,10 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression)
        panic("invalid UNEXPR type found");
 }
 
-static ir_node *create_lazy_op(const binary_expression_t *expression)
+static ir_node *produce_condition_result(const expression_t *expression,
+                                         dbg_info *dbgi)
 {
-       dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
-       type_t   *type = expression->base.type;
-       ir_mode  *mode = get_ir_mode(type);
-
-       if(is_constant_expression(expression->left)) {
-               long val = fold_constant(expression->left);
-               expression_kind_t ekind = expression->base.kind;
-               if((ekind == EXPR_BINARY_LOGICAL_AND && val != 0)
-                               || (ekind == EXPR_BINARY_LOGICAL_OR && val == 0)) {
-                       return expression_to_firm(expression->right);
-               } else {
-                       assert((ekind == EXPR_BINARY_LOGICAL_AND && val == 0)
-                                       || (ekind == EXPR_BINARY_LOGICAL_OR && val != 0));
-                       return new_Const(mode, get_mode_one(mode));
-               }
-       }
-
+       ir_mode *mode      = get_ir_mode(expression->base.type);
        ir_node *cur_block = get_cur_block();
 
        ir_node *one_block = new_immBlock();
@@ -1903,8 +1910,7 @@ static ir_node *create_lazy_op(const binary_expression_t *expression)
        ir_node *jmp_zero   = new_d_Jmp(dbgi);
 
        set_cur_block(cur_block);
-       create_condition_evaluation((const expression_t*) expression,
-                                   one_block, zero_block);
+       create_condition_evaluation(expression, one_block, zero_block);
        mature_immBlock(one_block);
        mature_immBlock(zero_block);
 
@@ -1919,6 +1925,28 @@ static ir_node *create_lazy_op(const binary_expression_t *expression)
        return val;
 }
 
+static ir_node *create_lazy_op(const binary_expression_t *expression)
+{
+       dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
+       type_t   *type = expression->base.type;
+       ir_mode  *mode = get_ir_mode(type);
+
+       if(is_constant_expression(expression->left)) {
+               long val = fold_constant(expression->left);
+               expression_kind_t ekind = expression->base.kind;
+               if((ekind == EXPR_BINARY_LOGICAL_AND && val != 0)
+                               || (ekind == EXPR_BINARY_LOGICAL_OR && val == 0)) {
+                       return expression_to_firm(expression->right);
+               } else {
+                       assert((ekind == EXPR_BINARY_LOGICAL_AND && val == 0)
+                                       || (ekind == EXPR_BINARY_LOGICAL_OR && val != 0));
+                       return new_Const(mode, get_mode_one(mode));
+               }
+       }
+
+       return produce_condition_result((const expression_t*) expression, dbgi);
+}
+
 typedef ir_node * (*create_arithmetic_func)(dbg_info *dbgi, ir_node *left,
                                             ir_node *right, ir_mode *mode);
 
@@ -1946,7 +1974,7 @@ static ir_node *pointer_arithmetic(ir_node  *const pointer,
 {
        pointer_type_t *const pointer_type = &type->pointer;
        type_t         *const points_to    = pointer_type->points_to;
-       const unsigned        elem_size    = get_type_size(points_to);
+       const unsigned        elem_size    = get_type_size_const(points_to);
 
        assert(elem_size >= 1);
        if (elem_size > 1) {
@@ -2023,13 +2051,14 @@ static ir_node *create_sub(const binary_expression_t *expression)
                return new_d_Sub(dbgi, left, right, mode);
        } else if (is_type_pointer(type_left) && is_type_pointer(type_right)) {
                const pointer_type_t *const ptr_type = &type_left->pointer;
-               const unsigned elem_size             = get_type_size(ptr_type->points_to);
-               ir_mode *const mode   = get_ir_mode(type);
-               ir_node *const sub    = new_d_Sub(dbgi, left, right, mode);
-               ir_node *const cnst   = new_Const_long(mode_int, (long)elem_size);
-               ir_node *const no_mem = new_NoMem();
-               ir_node *const div    = new_d_Div(dbgi, no_mem, sub, cnst, mode,
-                                                 op_pin_state_floats);
+
+               ir_node *const elem_size = get_type_size(ptr_type->points_to);
+               ir_mode *const mode      = get_ir_mode(type);
+               ir_node *const conv_size = new_d_Conv(dbgi, elem_size, mode);
+               ir_node *const sub       = new_d_Sub(dbgi, left, right, mode);
+               ir_node *const no_mem    = new_NoMem();
+               ir_node *const div       = new_d_DivRL(dbgi, no_mem, sub, conv_size, mode,
+                                                      op_pin_state_floats);
                return new_d_Proj(dbgi, div, mode, pn_Div_res);
        }
 
@@ -2235,8 +2264,7 @@ static ir_node *array_access_addr(const array_access_expression_t *expression)
        assert(is_type_pointer(ref_type));
        pointer_type_t *pointer_type = &ref_type->pointer;
 
-       unsigned elem_size       = get_type_size(pointer_type->points_to);
-       ir_node *elem_size_const = new_Const_long(mode_uint, elem_size);
+       ir_node *elem_size_const = get_type_size(pointer_type->points_to);
        ir_node *real_offset     = new_d_Mul(dbgi, offset, elem_size_const,
                                             mode_uint);
        ir_node *result          = new_d_Add(dbgi, base_addr, real_offset, mode_P_data);
@@ -2334,13 +2362,13 @@ static ir_node *compound_literal_to_firm(
 
        set_entity_variability(entity, variability_uninitialized);
 
-       /* create initialisation code TODO */
+       /* create initialisation code */
        initializer_t *initializer = expression->initializer;
        create_local_initializer(initializer, dbgi, entity, type);
 
        /* create a sel for the compound literal address */
-       ir_node   *frame = get_local_frame(entity);
-       ir_node   *sel   = new_d_simpleSel(dbgi, new_NoMem(), frame, entity);
+       ir_node *frame = get_local_frame(entity);
+       ir_node *sel   = new_d_simpleSel(dbgi, new_NoMem(), frame, entity);
        return sel;
 }
 
@@ -2355,10 +2383,14 @@ static ir_node *sizeof_to_firm(const typeprop_expression_t *expression)
                assert(type != NULL);
        }
 
-       ir_mode *const mode = get_ir_mode(expression->base.type);
-       symconst_symbol sym;
-       sym.type_p = get_ir_type(type);
-       return new_SymConst(mode, sym, symconst_type_size);
+       type = skip_typeref(type);
+       /* Â§ 6.5.3.4 (2) if the type is a VLA, evaluate the expression. */
+       if(is_type_array(type) && type->array.is_vla
+                       && expression->tp_expression != NULL) {
+               expression_to_firm(expression->tp_expression);
+       }
+
+       return get_type_size(type);
 }
 
 /**
@@ -2520,23 +2552,23 @@ typedef enum gcc_type_class
 
 static ir_node *classify_type_to_firm(const classify_type_expression_t *const expr)
 {
-       const type_t *const type = expr->type_expression->base.type;
+       const type_t *const type = skip_typeref(expr->type_expression->base.type);
 
        gcc_type_class tc;
        switch (type->kind)
        {
                case TYPE_ATOMIC: {
                        const atomic_type_t *const atomic_type = &type->atomic;
-                       switch (atomic_type->akind) {
+                       switch ((atomic_type_kind_t) atomic_type->akind) {
                                /* should not be reached */
                                case ATOMIC_TYPE_INVALID:
                                        tc = no_type_class;
-                                       break;
+                                       goto make_const;
 
                                /* gcc cannot do that */
                                case ATOMIC_TYPE_VOID:
                                        tc = void_type_class;
-                                       break;
+                                       goto make_const;
 
                                case ATOMIC_TYPE_CHAR:      /* gcc handles this as integer */
                                case ATOMIC_TYPE_SCHAR:     /* gcc handles this as integer */
@@ -2551,46 +2583,49 @@ static ir_node *classify_type_to_firm(const classify_type_expression_t *const ex
                                case ATOMIC_TYPE_ULONGLONG:
                                case ATOMIC_TYPE_BOOL:      /* gcc handles this as integer */
                                        tc = integer_type_class;
-                                       break;
+                                       goto make_const;
 
                                case ATOMIC_TYPE_FLOAT:
                                case ATOMIC_TYPE_DOUBLE:
                                case ATOMIC_TYPE_LONG_DOUBLE:
                                        tc = real_type_class;
-                                       break;
+                                       goto make_const;
 
-#ifdef PROVIDE_COMPLEX
                                case ATOMIC_TYPE_FLOAT_COMPLEX:
                                case ATOMIC_TYPE_DOUBLE_COMPLEX:
                                case ATOMIC_TYPE_LONG_DOUBLE_COMPLEX:
                                        tc = complex_type_class;
-                                       break;
+                                       goto make_const;
                                case ATOMIC_TYPE_FLOAT_IMAGINARY:
                                case ATOMIC_TYPE_DOUBLE_IMAGINARY:
                                case ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY:
                                        tc = complex_type_class;
-                                       break;
-#endif
-
-                               default:
-                                       panic("Unimplemented case in classify_type_to_firm().");
+                                       goto make_const;
                        }
-                       break;
+                       panic("Unexpected atomic type in classify_type_to_firm().");
                }
 
+               case TYPE_BITFIELD:        tc = integer_type_class; goto make_const;
                case TYPE_ARRAY:           /* gcc handles this as pointer */
                case TYPE_FUNCTION:        /* gcc handles this as pointer */
-               case TYPE_POINTER:         tc = pointer_type_class; break;
-               case TYPE_COMPOUND_STRUCT: tc = record_type_class;  break;
-               case TYPE_COMPOUND_UNION:  tc = union_type_class;   break;
+               case TYPE_POINTER:         tc = pointer_type_class; goto make_const;
+               case TYPE_COMPOUND_STRUCT: tc = record_type_class;  goto make_const;
+               case TYPE_COMPOUND_UNION:  tc = union_type_class;   goto make_const;
 
                /* gcc handles this as integer */
-               case TYPE_ENUM:            tc = integer_type_class; break;
-
-               default:
-                       panic("Unimplemented case in classify_type_to_firm().");
+               case TYPE_ENUM:            tc = integer_type_class; goto make_const;
+
+               case TYPE_BUILTIN:
+               /* typedef/typeof should be skipped already */
+               case TYPE_TYPEDEF:
+               case TYPE_TYPEOF:
+               case TYPE_INVALID:
+               case TYPE_ERROR:
+                       break;
        }
+       panic("unexpected TYPE classify_type_to_firm().");
 
+make_const: ;
        dbg_info *const dbgi = get_dbg_info(&expr->base.source_position);
        ir_mode  *const mode = mode_int;
        tarval   *const tv   = new_tarval_from_long(tc, mode);
@@ -2610,6 +2645,20 @@ static ir_node *function_name_to_firm(
        return current_function_name;
 }
 
+static ir_node *funcsig_to_firm(
+               const string_literal_expression_t *const expr)
+{
+       if (current_funcsig == NULL) {
+               const source_position_t *const src_pos = &expr->base.source_position;
+               ir_entity *ent = get_irg_entity(current_ir_graph);
+               const char *const name = get_entity_ld_name(ent);
+               const string_t string = { name, strlen(name) + 1 };
+               current_funcsig = string_to_firm(src_pos, "__FUNCSIG__", &string);
+       }
+
+       return current_funcsig;
+}
+
 static ir_node *statement_expression_to_firm(const statement_expression_t *expr)
 {
        statement_t *statement = expr->statement;
@@ -2630,8 +2679,7 @@ static ir_node *va_start_expression_to_firm(
        ir_node   *const arg_sel     =
                new_d_simpleSel(dbgi, no_mem, arg_base, parm_ent);
 
-       size_t     const parm_size   = get_type_size(expr->parameter->type);
-       ir_node   *const cnst        = new_Const_long(mode_uint, parm_size);
+       ir_node   *const cnst        = get_type_size(expr->parameter->type);
        ir_node   *const add         = new_d_Add(dbgi, arg_sel, cnst, mode_P_data);
        set_value_for_expression(expr->ap, add);
 
@@ -2645,8 +2693,7 @@ static ir_node *va_arg_expression_to_firm(const va_arg_expression_t *const expr)
        dbg_info *const dbgi   = get_dbg_info(&expr->base.source_position);
        ir_node  *const res    = deref_address(irtype, ap, dbgi);
 
-       size_t    const parm_size = get_type_size(expr->base.type);
-       ir_node  *const cnst      = new_Const_long(mode_uint, parm_size);
+       ir_node  *const cnst      = get_type_size(expr->base.type);
        ir_node  *const add       = new_d_Add(dbgi, ap, cnst, mode_P_data);
        set_value_for_expression(expr->ap, add);
 
@@ -2705,8 +2752,10 @@ static ir_node *builtin_prefetch_to_firm(
 static ir_node *_expression_to_firm(const expression_t *expression)
 {
        switch(expression->kind) {
-       case EXPR_CHAR_CONST:
-               return char_const_to_firm(&expression->conste);
+       case EXPR_CHARACTER_CONSTANT:
+               return character_constant_to_firm(&expression->conste);
+       case EXPR_WIDE_CHARACTER_CONSTANT:
+               return wide_character_constant_to_firm(&expression->conste);
        case EXPR_CONST:
                return const_to_firm(&expression->conste);
        case EXPR_STRING_LITERAL:
@@ -2735,7 +2784,10 @@ static ir_node *_expression_to_firm(const expression_t *expression)
                return classify_type_to_firm(&expression->classify_type);
        case EXPR_FUNCTION:
        case EXPR_PRETTY_FUNCTION:
+       case EXPR_FUNCDNAME:
                return function_name_to_firm(&expression->string);
+       case EXPR_FUNCSIG:
+               return funcsig_to_firm(&expression->string);
        case EXPR_STATEMENT:
                return statement_expression_to_firm(&expression->statement);
        case EXPR_VA_START:
@@ -2766,7 +2818,17 @@ static ir_node *expression_to_firm(const expression_t *expression)
 
        if(res != NULL && get_irn_mode(res) == mode_b) {
                ir_mode *mode = get_ir_mode(expression->base.type);
-               res           = create_conv(NULL, res, mode);
+               if(is_Const(res)) {
+                       if(is_Const_null(res)) {
+                               return new_Const_long(mode, 0);
+                       } else {
+                               assert(is_Const_one(res));
+                               return new_Const_long(mode, 1);
+                       }
+               }
+
+               dbg_info *dbgi        = get_dbg_info(&expression->base.source_position);
+               return produce_condition_result(expression, dbgi);
        }
 
        return res;
@@ -2901,7 +2963,7 @@ static __attribute__((unused)) void debug_print_type_path(const type_path_t *pat
                if(is_type_compound(type)) {
                        fprintf(stderr, ".%s", entry->compound_entry->symbol->string);
                } else if(is_type_array(type)) {
-                       fprintf(stderr, "[%u]", entry->index);
+                       fprintf(stderr, "[%zd]", entry->index);
                } else {
                        fprintf(stderr, "-INVALID-");
                }
@@ -2977,8 +3039,9 @@ static void descend_into_subtype(type_path_t *path)
 
                top->compound_entry = entry;
                top->index          = 0;
-               path->top_type      = entry->type;
                len                 = get_compound_size(&top_type->compound);
+               if(entry != NULL)
+                       path->top_type = entry->type;
        } else {
                assert(is_type_array(top_type));
                assert(top_type->array.size > 0);
@@ -3177,15 +3240,23 @@ static ir_initializer_t *create_ir_initializer_list(
 }
 
 static ir_initializer_t *create_ir_initializer_string(
-               const initializer_string_t *initializer)
+               const initializer_string_t *initializer, type_t *type)
 {
-       size_t            len           = initializer->string.size;
+       type = skip_typeref(type);
+
+       size_t            string_len    = initializer->string.size;
+       assert(type->kind == TYPE_ARRAY && type->array.size_constant);
+       size_t            len           = type->array.size;
        ir_initializer_t *irinitializer = create_initializer_compound(len);
 
        const char *string = initializer->string.begin;
        ir_mode    *mode   = get_type_mode(ir_type_const_char);
 
        for(size_t i = 0; i < len; ++i) {
+               char c = 0;
+               if(i < string_len)
+                       c = string[i];
+
                tarval           *tv = new_tarval_from_long(string[i], mode);
                ir_initializer_t *char_initializer = create_initializer_tarval(tv);
 
@@ -3196,15 +3267,21 @@ static ir_initializer_t *create_ir_initializer_string(
 }
 
 static ir_initializer_t *create_ir_initializer_wide_string(
-               const initializer_wide_string_t *initializer)
+               const initializer_wide_string_t *initializer, type_t *type)
 {
-       size_t            len           = initializer->string.size;
+       size_t            string_len    = initializer->string.size;
+       assert(type->kind == TYPE_ARRAY && type->array.size_constant);
+       size_t            len           = type->array.size;
        ir_initializer_t *irinitializer = create_initializer_compound(len);
 
        const wchar_rep_t *string = initializer->string.begin;
        ir_mode           *mode   = get_type_mode(ir_type_wchar_t);
 
        for(size_t i = 0; i < len; ++i) {
+               wchar_rep_t c = 0;
+               if(i < string_len) {
+                       c = string[i];
+               }
                tarval *tv = new_tarval_from_long(string[i], mode);
                ir_initializer_t *char_initializer = create_initializer_tarval(tv);
 
@@ -3219,10 +3296,11 @@ static ir_initializer_t *create_ir_initializer(
 {
        switch(initializer->kind) {
                case INITIALIZER_STRING:
-                       return create_ir_initializer_string(&initializer->string);
+                       return create_ir_initializer_string(&initializer->string, type);
 
                case INITIALIZER_WIDE_STRING:
-                       return create_ir_initializer_wide_string(&initializer->wide_string);
+                       return create_ir_initializer_wide_string(&initializer->wide_string,
+                                                                type);
 
                case INITIALIZER_LIST:
                        return create_ir_initializer_list(&initializer->list, type);
@@ -3236,6 +3314,102 @@ static ir_initializer_t *create_ir_initializer(
        panic("unknown initializer");
 }
 
+static void create_dynamic_initializer_sub(ir_initializer_t *initializer,
+               ir_type *type, dbg_info *dbgi, ir_node *base_addr)
+{
+       switch(get_initializer_kind(initializer)) {
+       case IR_INITIALIZER_NULL: {
+               /* TODO: implement this for compound types... */
+               assert(type != NULL);
+
+               ir_mode *mode = get_type_mode(type);
+               tarval  *zero = get_mode_null(mode);
+               ir_node *cnst = new_d_Const(dbgi, mode, zero);
+
+               /* TODO: bitfields */
+               ir_node *mem    = get_store();
+               ir_node *store  = new_d_Store(dbgi, mem, base_addr, cnst);
+               ir_node *proj_m = new_Proj(store, mode_M, pn_Store_M);
+               set_store(proj_m);
+               return;
+       }
+       case IR_INITIALIZER_CONST: {
+               ir_node *node = get_initializer_const_value(initializer);
+               ir_mode *mode = get_irn_mode(node);
+               assert(get_type_mode(type) == mode);
+
+               /* TODO: bitfields... */
+               ir_node *mem    = get_store();
+               ir_node *store  = new_d_Store(dbgi, mem, base_addr, node);
+               ir_node *proj_m = new_Proj(store, mode_M, pn_Store_M);
+               set_store(proj_m);
+               return;
+       }
+       case IR_INITIALIZER_TARVAL: {
+               tarval  *tv   = get_initializer_tarval_value(initializer);
+               ir_mode *mode = get_tarval_mode(tv);
+               ir_node *cnst = new_d_Const(dbgi, mode, tv);
+               assert(get_type_mode(type) == mode);
+
+               /* TODO: bitfields... */
+               ir_node *mem    = get_store();
+               ir_node *store  = new_d_Store(dbgi, mem, base_addr, cnst);
+               ir_node *proj_m = new_Proj(store, mode_M, pn_Store_M);
+               set_store(proj_m);
+               return;
+       }
+       case IR_INITIALIZER_COMPOUND: {
+               assert(is_compound_type(type));
+               int n_members;
+               if(is_Array_type(type)) {
+                       assert(has_array_upper_bound(type, 0));
+                       n_members = get_array_upper_bound_int(type, 0);
+               } else {
+                       n_members = get_compound_n_members(type);
+               }
+
+               if(get_initializer_compound_n_entries(initializer)
+                               != (unsigned) n_members)
+                       panic("initializer doesn't match compound type");
+
+               for(int i = 0; i < n_members; ++i) {
+                       ir_node *addr;
+                       ir_type *irtype;
+                       if(is_Array_type(type)) {
+                               ir_entity *entity   = get_array_element_entity(type);
+                               tarval    *index_tv = new_tarval_from_long(i, mode_uint);
+                               ir_node   *cnst     = new_d_Const(dbgi, mode_uint, index_tv);
+                               ir_node   *in[1]    = { cnst };
+                               irtype = get_array_element_type(type);
+                               addr   = new_d_Sel(dbgi, new_NoMem(), base_addr, 1, in, entity);
+                       } else {
+                               ir_entity *member = get_compound_member(type, i);
+
+                               irtype = get_entity_type(member);
+                               addr   = new_d_simpleSel(dbgi, new_NoMem(), base_addr, member);
+                       }
+
+                       ir_initializer_t *sub_init
+                               = get_initializer_compound_value(initializer, i);
+
+                       create_dynamic_initializer_sub(sub_init, irtype, dbgi, addr);
+               }
+               return;
+       }
+       }
+
+       panic("invalid IR_INITIALIZER found");
+}
+
+static void create_dynamic_initializer(ir_initializer_t *initializer,
+               dbg_info *dbgi, ir_entity *entity)
+{
+       ir_node *frame     = get_local_frame(entity);
+       ir_node *base_addr = new_d_simpleSel(dbgi, new_NoMem(), frame, entity);
+       ir_type *type      = get_entity_type(entity);
+
+       create_dynamic_initializer_sub(initializer, type, dbgi, base_addr);
+}
 
 static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi,
                                      ir_entity *entity, type_t *type)
@@ -3254,6 +3428,23 @@ static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi,
                return;
        }
 
+       if(!is_constant_initializer(initializer)) {
+               ir_initializer_t *irinitializer
+                       = create_ir_initializer(initializer, type);
+
+               create_dynamic_initializer(irinitializer, dbgi, entity);
+               return;
+       }
+
+       /* create the ir_initializer */
+       ir_graph *const old_current_ir_graph = current_ir_graph;
+       current_ir_graph = get_const_code_irg();
+
+       ir_initializer_t *irinitializer = create_ir_initializer(initializer, type);
+
+       assert(current_ir_graph == get_const_code_irg());
+       current_ir_graph = old_current_ir_graph;
+
        /* create a "template" entity which is copied to the entity on the stack */
        ident     *const id          = unique_ident("initializer");
        ir_type   *const irtype      = get_ir_type(type);
@@ -3265,17 +3456,10 @@ static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi,
        set_entity_visibility(init_entity, visibility_local);
        set_entity_allocation(init_entity, allocation_static);
 
-       ir_graph *const old_current_ir_graph = current_ir_graph;
-       current_ir_graph = get_const_code_irg();
-
-       ir_initializer_t *irinitializer = create_ir_initializer(initializer, type);
        set_entity_initializer(init_entity, irinitializer);
 
-       assert(current_ir_graph == get_const_code_irg());
-       current_ir_graph = old_current_ir_graph;
-
-       ir_node *const src_addr  = create_symconst(dbgi, mode_P_data, init_entity);
-       ir_node *const copyb     = new_d_CopyB(dbgi, memory, addr, src_addr, irtype);
+       ir_node *const src_addr = create_symconst(dbgi, mode_P_data, init_entity);
+       ir_node *const copyb    = new_d_CopyB(dbgi, memory, addr, src_addr, irtype);
 
        ir_node *const copyb_mem = new_Proj(copyb, mode_M, pn_CopyB_M_regular);
        set_store(copyb_mem);
@@ -3331,6 +3515,32 @@ static void create_declaration_initializer(declaration_t *declaration)
        }
 }
 
+static void create_variable_length_array(declaration_t *declaration)
+{
+       dbg_info *dbgi      = get_dbg_info(&declaration->source_position);
+       type_t   *type      = declaration->type;
+       ir_node  *mem       = get_store();
+       ir_type  *el_type   = get_ir_type(type->array.element_type);
+
+       /* make sure size_node is calculated */
+       get_type_size(type);
+       ir_node  *elems = type->array.size_node;
+       ir_node  *alloc = new_d_Alloc(dbgi, mem, elems, el_type, stack_alloc);
+
+       ir_node  *proj_m = new_d_Proj(dbgi, alloc, mode_M, pn_Alloc_M);
+       ir_node  *addr   = new_d_Proj(dbgi, alloc, mode_P_data, pn_Alloc_res);
+       set_store(proj_m);
+
+       /* initializers are not allowed for VLAs */
+       assert(declaration->init.initializer == NULL);
+
+       declaration->declaration_kind = DECLARATION_KIND_VARIABLE_LENGTH_ARRAY;
+       declaration->v.vla_base       = addr;
+
+       /* TODO: record VLA somewhere so we create the free node when we leave
+        * it's scope */
+}
+
 /**
  * Creates a Firm local variable from a declaration.
  */
@@ -3341,7 +3551,11 @@ static void create_local_variable(declaration_t *declaration)
        bool needs_entity = declaration->address_taken;
        type_t *type = skip_typeref(declaration->type);
 
-       if(is_type_array(type) || is_type_compound(type)) {
+       /* is it a variable length array? */
+       if(is_type_array(type) && !type->array.size_constant) {
+               create_variable_length_array(declaration);
+               return;
+       } else if(is_type_array(type) || is_type_compound(type)) {
                needs_entity = true;
        }
 
@@ -3526,8 +3740,6 @@ static void create_local_declaration(declaration_t *declaration)
        case STORAGE_CLASS_STATIC:
                create_local_static_variable(declaration);
                return;
-       case STORAGE_CLASS_ENUM_ENTRY:
-               panic("enum entry declaration in local block found");
        case STORAGE_CLASS_EXTERN:
                create_global_variable(declaration);
                create_declaration_initializer(declaration);
@@ -3545,6 +3757,7 @@ static void create_local_declaration(declaration_t *declaration)
                        create_local_variable(declaration);
                }
                return;
+       case STORAGE_CLASS_ENUM_ENTRY:
        case STORAGE_CLASS_TYPEDEF:
        case STORAGE_CLASS_THREAD:
        case STORAGE_CLASS_THREAD_EXTERN:
@@ -4053,6 +4266,10 @@ static void statement_to_firm(statement_t *statement)
        switch(statement->kind) {
        case STATEMENT_INVALID:
                panic("invalid statement found");
+               return;
+       case STATEMENT_EMPTY:
+               /* nothing */
+               return;
        case STATEMENT_COMPOUND:
                compound_statement_to_firm(&statement->compound);
                return;
@@ -4124,10 +4341,12 @@ static int count_local_declarations(const declaration_t *      decl,
 }
 
 static int count_decls_in_expression(const expression_t *expression) {
+       int count = 0;
+
        if(expression == NULL)
                return 0;
 
-       switch(expression->base.kind) {
+       switch((expression_kind_t) expression->base.kind) {
        case EXPR_STATEMENT:
                return count_decls_in_stmts(expression->statement.statement);
        EXPR_BINARY_CASES {
@@ -4138,7 +4357,6 @@ static int count_decls_in_expression(const expression_t *expression) {
        EXPR_UNARY_CASES
                return count_decls_in_expression(expression->unary.value);
        case EXPR_CALL: {
-               int count = 0;
                call_argument_t *argument = expression->call.arguments;
                for( ; argument != NULL; argument = argument->next) {
                        count += count_decls_in_expression(argument->expression);
@@ -4146,7 +4364,66 @@ static int count_decls_in_expression(const expression_t *expression) {
                return count;
        }
 
-       default:
+       case EXPR_UNKNOWN:
+       case EXPR_INVALID:
+               panic("unexpected expression kind");
+
+       case EXPR_COMPOUND_LITERAL:
+               /* TODO... */
+               break;
+
+       case EXPR_CONDITIONAL:
+               count += count_decls_in_expression(expression->conditional.condition);
+               count += count_decls_in_expression(expression->conditional.true_expression);
+               count += count_decls_in_expression(expression->conditional.false_expression);
+               return count;
+
+       case EXPR_BUILTIN_PREFETCH:
+               count += count_decls_in_expression(expression->builtin_prefetch.adr);
+               count += count_decls_in_expression(expression->builtin_prefetch.rw);
+               count += count_decls_in_expression(expression->builtin_prefetch.locality);
+               return count;
+
+       case EXPR_BUILTIN_CONSTANT_P:
+               count += count_decls_in_expression(expression->builtin_constant.value);
+               return count;
+
+       case EXPR_SELECT:
+               count += count_decls_in_expression(expression->select.compound);
+               return count;
+
+       case EXPR_ARRAY_ACCESS:
+               count += count_decls_in_expression(expression->array_access.array_ref);
+               count += count_decls_in_expression(expression->array_access.index);
+               return count;
+
+       case EXPR_CLASSIFY_TYPE:
+               count += count_decls_in_expression(expression->classify_type.type_expression);
+               return count;
+
+       case EXPR_SIZEOF:
+       case EXPR_ALIGNOF: {
+               expression_t *tp_expression = expression->typeprop.tp_expression;
+               if (tp_expression != NULL) {
+                       count += count_decls_in_expression(tp_expression);
+               }
+               return count;
+       }
+
+       case EXPR_OFFSETOF:
+       case EXPR_REFERENCE:
+       case EXPR_CONST:
+       case EXPR_CHARACTER_CONSTANT:
+       case EXPR_WIDE_CHARACTER_CONSTANT:
+       case EXPR_STRING_LITERAL:
+       case EXPR_WIDE_STRING_LITERAL:
+       case EXPR_FUNCTION:
+       case EXPR_PRETTY_FUNCTION:
+       case EXPR_FUNCSIG:
+       case EXPR_FUNCDNAME:
+       case EXPR_BUILTIN_SYMBOL:
+       case EXPR_VA_START:
+       case EXPR_VA_ARG:
                break;
        }
 
@@ -4162,6 +4439,9 @@ static int count_decls_in_stmts(const statement_t *stmt)
        int count = 0;
        for (; stmt != NULL; stmt = stmt->base.next) {
                switch (stmt->kind) {
+                       case STATEMENT_EMPTY:
+                               break;
+
                        case STATEMENT_DECLARATION: {
                                const declaration_statement_t *const decl_stmt = &stmt->declaration;
                                count += count_local_declarations(decl_stmt->declarations_begin,
@@ -4357,6 +4637,7 @@ static void create_function(declaration_t *declaration)
 
        current_function_decl = declaration;
        current_function_name = NULL;
+       current_funcsig       = NULL;
 
        assert(imature_blocks == NULL);
        imature_blocks = NEW_ARR_F(ir_node*, 0);
@@ -4444,7 +4725,6 @@ static void create_function(declaration_t *declaration)
        }
        set_type_size_bytes(frame_type, offset);
        set_type_alignment_bytes(frame_type, align_all);
-       set_type_state(frame_type, layout_fixed);
 
        irg_vrfy(irg);
 }