always transmit const source_position_t * instead of source_position_t
[cparser] / ast2firm.c
index 78f3f6e..be8549e 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>
 
 #include "adt/error.h"
 #include "adt/array.h"
+#include "symbol_t.h"
 #include "token_t.h"
 #include "type_t.h"
 #include "ast_t.h"
 #include "parser.h"
+#include "diagnostic.h"
 #include "lang_features.h"
+#include "types.h"
 #include "driver/firm_opt.h"
 #include "driver/firm_cmdline.h"
 
@@ -29,8 +49,6 @@ static ir_type *ir_type_void;
 static ir_type *ir_type_int;
 
 static type_t *type_const_char;
-static type_t *type_void;
-static type_t *type_int;
 
 static int       next_value_number_function;
 static ir_node  *continue_label;
@@ -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,
@@ -60,15 +80,11 @@ static int count_decls_in_stmts(const statement_t *stmt);
 
 ir_node *uninitialized_local_var(ir_graph *irg, ir_mode *mode, int pos)
 {
-       (void) pos;
-#if 0
-       const declaration_t *declaration = & value_numbers[pos]->declaration;
+       const declaration_t *declaration = get_irg_loc_description(irg, pos);
 
-       print_warning_prefix(declaration->source_position);
-       fprintf(stderr, "variable '%s' might be used uninitialized\n",
-                       declaration->symbol->string);
-#endif
-       fprintf(stderr, "Some variable might be used uninitialized\n");
+       warningf(&declaration->source_position,
+                "variable '%#T' might be used uninitialized",
+                declaration->type, declaration->symbol);
        return new_r_Unknown(irg, mode);
 }
 
@@ -197,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.
  */
@@ -227,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));
@@ -245,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->atype < (unsigned)ATOMIC_TYPE_LAST)
-               res = _atomic_modes[(unsigned)atomic_type->atype];
+       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->atype) {
-       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);
@@ -306,18 +277,21 @@ 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);
 
        switch(type->kind) {
+       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:
@@ -331,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:
@@ -342,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;
@@ -355,18 +353,19 @@ static unsigned count_parameters(const function_type_t *function_type)
 }
 
 
-
-
-static long fold_constant(const expression_t *expression);
-
 static ir_type *create_atomic_type(const atomic_type_t *type)
 {
+       dbg_info *dbgi  = get_dbg_info(&type->type.source_position);
        ir_mode *mode   = get_atomic_mode(type);
        ident   *id     = get_mode_ident(mode);
-       ir_type *irtype = new_type_primitive(id, mode);
-
-       if(type->atype == ATOMIC_TYPE_LONG_DOUBLE
-                       || type->atype == ATOMIC_TYPE_DOUBLE) {
+       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_LONGLONG
+                       || type->akind == ATOMIC_TYPE_ULONGLONG) {
                set_type_alignment_bytes(irtype, 4);
        }
 
@@ -380,7 +379,8 @@ static ir_type *create_method_type(const function_type_t *function_type)
        ident   *id           = unique_ident("functiontype");
        int      n_parameters = count_parameters(function_type);
        int      n_results    = return_type == type_void ? 0 : 1;
-       ir_type *irtype       = new_type_method(id, n_parameters, n_results);
+       dbg_info *dbgi        = get_dbg_info(&function_type->type.source_position);
+       ir_type *irtype       = new_d_type_method(id, n_parameters, n_results, dbgi);
 
        if(return_type != type_void) {
                ir_type *restype = get_ir_type(return_type);
@@ -410,8 +410,9 @@ static ir_type *create_pointer_type(pointer_type_t *type)
         * again (might be a struct). We therefore first create a void* pointer
         * and then set the real points_to type
         */
-       ir_type *ir_type = new_type_pointer(unique_ident("pointer"),
-                                           ir_type_void, mode_P_data);
+       dbg_info *dbgi   = get_dbg_info(&type->type.source_position);
+       ir_type *ir_type = new_d_type_pointer(unique_ident("pointer"),
+                                           ir_type_void, mode_P_data, dbgi);
        type->type.firm_type  = ir_type;
 
        ir_points_to = get_ir_type(points_to);
@@ -425,25 +426,27 @@ static ir_type *create_array_type(array_type_t *type)
        type_t  *element_type    = type->element_type;
        ir_type *ir_element_type = get_ir_type(element_type);
 
-       ident   *id      = unique_ident("array");
-       ir_type *ir_type = new_type_array(id, 1, ir_element_type);
+       ident    *id      = unique_ident("array");
+       dbg_info *dbgi    = get_dbg_info(&type->type.source_position);
+       ir_type  *ir_type = new_d_type_array(id, 1, ir_element_type, dbgi);
 
-       if(type->size != NULL) {
-               int n_elements = fold_constant(type->size);
+       const int align = get_type_alignment_bytes(ir_element_type);
+       set_type_alignment_bytes(ir_type, align);
+
+       if(type->size_constant) {
+               int n_elements = type->size;
 
                set_array_bounds_int(ir_type, 0, 0, n_elements);
 
                size_t elemsize = get_type_size_bytes(ir_element_type);
-               int align = get_type_alignment_bytes(ir_element_type);
                if(elemsize % align > 0) {
                        elemsize += align - (elemsize % align);
                }
                set_type_size_bytes(ir_type, n_elements * elemsize);
-               set_type_alignment_bytes(ir_type, align);
-               set_type_state(ir_type, layout_fixed);
        } else {
                set_array_lower_bound_int(ir_type, 0, 0);
        }
+       set_type_state(ir_type, layout_fixed);
 
        return ir_type;
 }
@@ -476,7 +479,8 @@ static ir_type *get_signed_int_type_for_bit_size(ir_type *base_tp,
        char name[32];
        snprintf(name, sizeof(name), "I%u", size);
        ident *id = new_id_from_str(name);
-       res = new_type_primitive(mangle_u(get_type_ident(base_tp), id), mode);
+       dbg_info *dbgi = get_dbg_info(&builtin_source_position);
+       res = new_d_type_primitive(mangle_u(get_type_ident(base_tp), id), mode, dbgi);
        set_primitive_base_type(res, base_tp);
 
        return res;
@@ -511,7 +515,8 @@ static ir_type *get_unsigned_int_type_for_bit_size(ir_type *base_tp,
 
        snprintf(name, sizeof(name), "U%u", size);
        ident *id = new_id_from_str(name);
-       res = new_type_primitive(mangle_u(get_type_ident(base_tp), id), mode);
+       dbg_info *dbgi = get_dbg_info(&builtin_source_position);
+       res = new_d_type_primitive(mangle_u(get_type_ident(base_tp), id), mode, dbgi);
        set_primitive_base_type(res, base_tp);
 
        return res;
@@ -525,7 +530,7 @@ static ir_type *create_bitfield_type(bitfield_type_t *const type)
 
        unsigned size = fold_constant(type->size);
 
-       assert(!is_type_floating(base));
+       assert(!is_type_float(base));
        if(is_type_signed(base)) {
                return get_signed_int_type_for_bit_size(irbase, size);
        } else {
@@ -535,28 +540,65 @@ static ir_type *create_bitfield_type(bitfield_type_t *const type)
 
 #define INVALID_TYPE ((ir_type_ptr)-1)
 
-static ir_type *create_struct_type(compound_type_t *type)
+static ir_type *create_union_type(compound_type_t *type, ir_type *irtype,
+                                  size_t *outer_offset, size_t *outer_align);
+
+static ir_type *create_struct_type(compound_type_t *type, ir_type *irtype,
+                                   size_t *outer_offset, size_t *outer_align)
 {
-       symbol_t *symbol = type->declaration->symbol;
-       ident    *id;
-       if(symbol != NULL) {
-               id = unique_ident(symbol->string);
-       } else {
-               id = unique_ident("__anonymous_struct");
+       declaration_t *declaration = type->declaration;
+       if(declaration->v.irtype != NULL) {
+               return declaration->v.irtype;
        }
-       ir_type *irtype = new_type_struct(id);
-
-       type->type.firm_type = irtype;
 
        size_t align_all  = 1;
        size_t offset     = 0;
        size_t bit_offset = 0;
-       declaration_t *entry = type->declaration->context.declarations;
+       if(irtype == NULL) {
+               symbol_t *symbol = declaration->symbol;
+               ident    *id;
+               if(symbol != NULL) {
+                       id = unique_ident(symbol->string);
+               } else {
+                       id = unique_ident("__anonymous_struct");
+               }
+               dbg_info *dbgi  = get_dbg_info(&type->type.source_position);
+
+               irtype = new_d_type_struct(id, dbgi);
+
+               declaration->v.irtype = irtype;
+               type->type.firm_type  = irtype;
+       } else {
+               offset    = *outer_offset;
+               align_all = *outer_align;
+       }
+
+       declaration_t *entry = declaration->scope.declarations;
        for( ; entry != NULL; entry = entry->next) {
                if(entry->namespc != NAMESPACE_NORMAL)
                        continue;
 
-               type_t  *entry_type  = skip_typeref(entry->type);
+               symbol_t *symbol     = entry->symbol;
+               type_t   *entry_type = skip_typeref(entry->type);
+               dbg_info *dbgi       = get_dbg_info(&entry->source_position);
+               ident    *ident;
+               if(symbol != NULL) {
+                       ident = new_id_from_str(symbol->string);
+               } else {
+                       if(entry_type->kind == TYPE_COMPOUND_STRUCT) {
+                               create_struct_type(&entry_type->compound, irtype, &offset,
+                                                  &align_all);
+                               continue;
+                       } else if(entry_type->kind == TYPE_COMPOUND_UNION) {
+                               create_union_type(&entry_type->compound, irtype, &offset,
+                                                 &align_all);
+                               continue;
+                       } else {
+                               assert(entry_type->kind == TYPE_BITFIELD);
+                       }
+                       ident = unique_ident("anon");
+               }
+
                ir_type *base_irtype;
                if(entry_type->kind == TYPE_BITFIELD) {
                        base_irtype = get_ir_type(entry_type->bitfield.base);
@@ -567,16 +609,8 @@ static ir_type *create_struct_type(compound_type_t *type)
                size_t entry_alignment = get_type_alignment_bytes(base_irtype);
                size_t misalign        = offset % entry_alignment;
 
-               dbg_info  *dbgi   = get_dbg_info(&entry->source_position);
-               ir_entity *entity = NULL;
-               if(entry->symbol != NULL) {
-                       ident   *ident        = new_id_from_str(entry->symbol->string);
-                       ir_type *entry_irtype = get_ir_type(entry_type);
-                       entity = new_d_entity(irtype, ident, entry_irtype, dbgi);
-               } else {
-                       /* only bitfields are allowed to be anonymous */
-                       assert(entry_type->kind == TYPE_BITFIELD);
-               }
+               ir_type   *entry_irtype = get_ir_type(entry_type);
+               ir_entity *entity = new_d_entity(irtype, ident, entry_irtype, dbgi);
 
                size_t base;
                size_t bits_remainder;
@@ -617,60 +651,107 @@ static ir_type *create_struct_type(compound_type_t *type)
                        align_all = entry_alignment;
                }
 
-               if(entity != NULL) {
-                       set_entity_offset(entity, base);
-                       set_entity_offset_bits_remainder(entity,
-                                                        (unsigned char) bits_remainder);
-                       add_struct_member(irtype, entity);
-                       entry->declaration_kind = DECLARATION_KIND_COMPOUND_MEMBER;
-                       entry->v.entity         = entity;
-               }
+               set_entity_offset(entity, base);
+               set_entity_offset_bits_remainder(entity,
+                                                (unsigned char) bits_remainder);
+               //add_struct_member(irtype, entity);
+               entry->declaration_kind = DECLARATION_KIND_COMPOUND_MEMBER;
+               assert(entry->v.entity == NULL);
+               entry->v.entity         = entity;
        }
 
        size_t misalign = offset % align_all;
-       if(misalign > 0) {
+       if(misalign > 0 || bit_offset > 0) {
                offset += align_all - misalign;
        }
-       set_type_alignment_bytes(irtype, align_all);
-       set_type_size_bytes(irtype, offset);
-       set_type_state(irtype, layout_fixed);
+
+       if(outer_offset != NULL) {
+               *outer_offset = offset;
+               *outer_align  = align_all;
+       } else {
+               set_type_alignment_bytes(irtype, align_all);
+               set_type_size_bytes(irtype, offset);
+               set_type_state(irtype, layout_fixed);
+       }
 
        return irtype;
 }
 
-static ir_type *create_union_type(compound_type_t *type)
+static ir_type *create_union_type(compound_type_t *type, ir_type *irtype,
+                                  size_t *outer_offset, size_t *outer_align)
 {
        declaration_t *declaration = type->declaration;
-       symbol_t      *symbol      = declaration->symbol;
-       ident         *id;
-       if(symbol != NULL) {
-               id = unique_ident(symbol->string);
+       if(declaration->v.irtype != NULL) {
+               return declaration->v.irtype;
+       }
+
+       size_t align_all = 1;
+       size_t offset    = 0;
+       size_t size      = 0;
+
+       if(irtype == NULL) {
+               symbol_t      *symbol      = declaration->symbol;
+               ident         *id;
+               if(symbol != NULL) {
+                       id = unique_ident(symbol->string);
+               } else {
+                       id = unique_ident("__anonymous_union");
+               }
+               dbg_info *dbgi = get_dbg_info(&type->type.source_position);
+
+               irtype = new_d_type_union(id, dbgi);
+
+               declaration->v.irtype = irtype;
+               type->type.firm_type  = irtype;
        } else {
-               id = unique_ident("__anonymous_union");
+               offset    = *outer_offset;
+               align_all = *outer_align;
        }
-       ir_type *irtype = new_type_union(id);
 
        type->type.firm_type = irtype;
 
-       int align_all = 1;
-       int size      = 0;
-       declaration_t *entry = declaration->context.declarations;
+       declaration_t *entry = declaration->scope.declarations;
        for( ; entry != NULL; entry = entry->next) {
                if(entry->namespc != NAMESPACE_NORMAL)
                        continue;
 
-               ident   *ident         = new_id_from_str(entry->symbol->string);
-               ir_type *entry_ir_type = get_ir_type(entry->type);
+               symbol_t *symbol        = entry->symbol;
+               type_t   *entry_type    = skip_typeref(entry->type);
+               ir_type  *entry_ir_type = get_ir_type(entry_type);
+
+               ident *ident;
+               if(symbol != NULL) {
+                       ident = new_id_from_str(entry->symbol->string);
+               } else {
+                       size_t offs = offset;
+                       if(entry_type->kind == TYPE_COMPOUND_STRUCT) {
+                               create_struct_type(&entry_type->compound, irtype, &offs,
+                                                  &align_all);
+                               continue;
+                       } else if(entry_type->kind == TYPE_COMPOUND_UNION) {
+                               create_union_type(&entry_type->compound, irtype, &offs,
+                                                 &align_all);
+                               continue;
+                       } else {
+                               panic("anonymous union member must be struct or union");
+                       }
+                       size_t entry_size = offs - offset;
+                       if(entry_size > size) {
+                               size = entry_size;
+                       }
+                       ident = unique_ident("anon");
+               }
 
-               int entry_size      = get_type_size_bytes(entry_ir_type);
-               int entry_alignment = get_type_alignment_bytes(entry_ir_type);
+               size_t entry_size      = get_type_size_bytes(entry_ir_type);
+               size_t entry_alignment = get_type_alignment_bytes(entry_ir_type);
 
                dbg_info  *const dbgi   = get_dbg_info(&entry->source_position);
                ir_entity *const entity = new_d_entity(irtype, ident, entry_ir_type,
                                                       dbgi);
-               add_union_member(irtype, entity);
+               //add_union_member(irtype, entity);
                set_entity_offset(entity, 0);
                entry->declaration_kind = DECLARATION_KIND_COMPOUND_MEMBER;
+               assert(entry->v.entity == NULL);
                entry->v.entity         = entity;
 
                if(entry_size > size) {
@@ -684,21 +765,35 @@ static ir_type *create_union_type(compound_type_t *type)
                }
        }
 
-       set_type_alignment_bytes(irtype, align_all);
-       set_type_size_bytes(irtype, size);
-       set_type_state(irtype, layout_fixed);
+       if(outer_offset != NULL) {
+               assert(*outer_offset == offset);
+
+               size_t misalign = offset % align_all;
+               if (misalign != 0)
+                       size += align_all - misalign;
+               *outer_offset += size;
+
+               if(align_all > *outer_align) {
+                       if(align_all % *outer_align != 0) {
+                               panic("uneven alignments not supported yet");
+                       }
+                       *outer_align = align_all;
+               }
+       } else {
+               set_type_alignment_bytes(irtype, align_all);
+               set_type_size_bytes(irtype, size);
+               set_type_state(irtype, layout_fixed);
+               declaration->v.irtype = 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;
 
-       ir_mode *const mode    = get_ir_mode((type_t*) type);
+       ir_mode *const mode    = mode_int;
        tarval  *const one     = get_mode_one(mode);
        tarval  *      tv_next = get_tarval_null(mode);
 
@@ -737,6 +832,8 @@ static ir_type *get_ir_type(type_t *type)
 
        ir_type *firm_type = NULL;
        switch(type->kind) {
+       case TYPE_ERROR:
+               panic("error type occured");
        case TYPE_ATOMIC:
                firm_type = create_atomic_type(&type->atomic);
                break;
@@ -750,10 +847,10 @@ static ir_type *get_ir_type(type_t *type)
                firm_type = create_array_type(&type->array);
                break;
        case TYPE_COMPOUND_STRUCT:
-               firm_type = create_struct_type(&type->compound);
+               firm_type = create_struct_type(&type->compound, NULL, NULL, NULL);
                break;
        case TYPE_COMPOUND_UNION:
-               firm_type = create_union_type(&type->compound);
+               firm_type = create_union_type(&type->compound, NULL, NULL, NULL);
                break;
        case TYPE_ENUM:
                firm_type = create_enum_type(&type->enumt);
@@ -932,8 +1029,8 @@ static ir_entity* get_function_entity(declaration_t *declaration)
 
 static ir_node *const_to_firm(const const_expression_t *cnst)
 {
-       dbg_info *dbgi = get_dbg_info(&cnst->expression.source_position);
-       ir_mode  *mode = get_ir_mode(cnst->expression.datatype);
+       dbg_info *dbgi = get_dbg_info(&cnst->base.source_position);
+       ir_mode  *mode = get_ir_mode(cnst->base.type);
 
        char    buf[128];
        tarval *tv;
@@ -953,6 +1050,36 @@ static ir_node *const_to_firm(const const_expression_t *cnst)
        return new_d_Const(dbgi, mode, tv);
 }
 
+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.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);
+       tarval *tv = new_tarval_from_str(buf, len, mode);
+
+       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)
 {
@@ -964,14 +1091,14 @@ static ir_node *create_symconst(dbg_info *dbgi, ir_mode *mode,
 
 static ir_node *string_to_firm(const source_position_t *const src_pos,
                                const char *const id_prefix,
-                               const char *const string)
+                               const string_t *const value)
 {
-       ir_type *const global_type = get_glob_type();
-       ir_type *const type        = new_type_array(unique_ident("strtype"), 1,
-                                                   ir_type_const_char);
+       ir_type  *const global_type = get_glob_type();
+       dbg_info *const dbgi        = get_dbg_info(src_pos);
+       ir_type  *const type        = new_d_type_array(unique_ident("strtype"), 1,
+                                                      ir_type_const_char, dbgi);
 
        ident     *const id     = unique_ident(id_prefix);
-       dbg_info  *const dbgi   = get_dbg_info(src_pos);
        ir_entity *const entity = new_d_entity(global_type, id, type, dbgi);
        set_entity_ld_ident(entity, id);
        set_entity_variability(entity, variability_constant);
@@ -980,7 +1107,8 @@ static ir_node *string_to_firm(const source_position_t *const src_pos,
        ir_type *const elem_type = ir_type_const_char;
        ir_mode *const mode      = get_type_mode(elem_type);
 
-       const size_t slen = strlen(string) + 1;
+       const char* const string = value->begin;
+       const size_t      slen   = value->size;
 
        set_array_lower_bound_int(type, 0, 0);
        set_array_upper_bound_int(type, 0, slen);
@@ -1001,8 +1129,8 @@ static ir_node *string_to_firm(const source_position_t *const src_pos,
 static ir_node *string_literal_to_firm(
                const string_literal_expression_t* literal)
 {
-       return string_to_firm(&literal->expression.source_position, "Lstr",
-                             literal->value);
+       return string_to_firm(&literal->base.source_position, "Lstr",
+                             &literal->value);
 }
 
 static ir_node *wide_string_literal_to_firm(
@@ -1010,11 +1138,11 @@ static ir_node *wide_string_literal_to_firm(
 {
        ir_type *const global_type = get_glob_type();
        ir_type *const elem_type   = ir_type_wchar_t;
-       ir_type *const type        = new_type_array(unique_ident("strtype"), 1,
-                                                   elem_type);
+       dbg_info *const dbgi       = get_dbg_info(&literal->base.source_position);
+       ir_type *const type        = new_d_type_array(unique_ident("strtype"), 1,
+                                                   elem_type, dbgi);
 
        ident     *const id     = unique_ident("Lstr");
-       dbg_info  *const dbgi   = get_dbg_info(&literal->expression.source_position);
        ir_entity *const entity = new_d_entity(global_type, id, type, dbgi);
        set_entity_ld_ident(entity, id);
        set_entity_variability(entity, variability_constant);
@@ -1041,10 +1169,13 @@ static ir_node *wide_string_literal_to_firm(
        return create_symconst(dbgi, mode_P_data, entity);
 }
 
-static ir_node *deref_address(ir_type *const irtype, ir_node *const addr,
+static ir_node *deref_address(type_t *const type, ir_node *const addr,
                               dbg_info *const dbgi)
 {
-       if(is_compound_type(irtype) || is_Array_type(irtype)) {
+       ir_type *irtype = get_ir_type(type);
+       if (is_compound_type(irtype)
+                       || is_Method_type(irtype)
+                       || is_Array_type(irtype)) {
                return addr;
        }
 
@@ -1053,6 +1184,11 @@ static ir_node *deref_address(ir_type *const irtype, ir_node *const addr,
        ir_node *const load     = new_d_Load(dbgi, memory, addr, mode);
        ir_node *const load_mem = new_d_Proj(dbgi, load, mode_M, pn_Load_M);
        ir_node *const load_res = new_d_Proj(dbgi, load, mode,   pn_Load_res);
+
+       if(type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) {
+               set_Load_volatility(load, volatility_is_volatile);
+       }
+
        set_store(load_mem);
        return load_res;
 }
@@ -1113,7 +1249,7 @@ static ir_node *get_local_frame(ir_entity *const ent)
 
 static ir_node *reference_expression_to_firm(const reference_expression_t *ref)
 {
-       dbg_info      *dbgi        = get_dbg_info(&ref->expression.source_position);
+       dbg_info      *dbgi        = get_dbg_info(&ref->base.source_position);
        declaration_t *declaration = ref->declaration;
        type_t        *type        = skip_typeref(declaration->type);
 
@@ -1140,18 +1276,19 @@ static ir_node *reference_expression_to_firm(const reference_expression_t *ref)
        }
        case DECLARATION_KIND_GLOBAL_VARIABLE: {
                ir_node *const addr   = get_global_var_address(dbgi, declaration);
-               ir_type *const irtype = get_entity_type(declaration->v.entity);
-               return deref_address(irtype, addr, dbgi);
+               return deref_address(declaration->type, addr, dbgi);
        }
 
        case DECLARATION_KIND_LOCAL_VARIABLE_ENTITY: {
                ir_entity *entity = declaration->v.entity;
                ir_node   *frame  = get_local_frame(entity);
                ir_node   *sel    = new_d_simpleSel(dbgi, new_NoMem(), frame, entity);
-               ir_type   *irtype = get_entity_type(entity);
-               return deref_address(irtype, sel, dbgi);
+               return deref_address(declaration->type, 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");
@@ -1162,7 +1299,7 @@ static ir_node *reference_expression_to_firm(const reference_expression_t *ref)
 
 static ir_node *reference_addr(const reference_expression_t *ref)
 {
-       dbg_info      *dbgi        = get_dbg_info(&ref->expression.source_position);
+       dbg_info      *dbgi        = get_dbg_info(&ref->base.source_position);
        declaration_t *declaration = ref->declaration;
 
        switch((declaration_kind_t) declaration->declaration_kind) {
@@ -1171,7 +1308,7 @@ static ir_node *reference_addr(const reference_expression_t *ref)
        case DECLARATION_KIND_LOCAL_VARIABLE:
                panic("local variable without entity has no address");
        case DECLARATION_KIND_FUNCTION: {
-               type_t *const  type = skip_typeref(ref->expression.datatype);
+               type_t *const  type = skip_typeref(ref->base.type);
                ir_mode *const mode = get_ir_mode(type);
                return create_symconst(dbgi, mode, declaration->v.entity);
        }
@@ -1187,6 +1324,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");
 
@@ -1200,12 +1340,12 @@ static ir_node *reference_addr(const reference_expression_t *ref)
 
 static ir_node *process_builtin_call(const call_expression_t *call)
 {
-       dbg_info *dbgi = get_dbg_info(&call->expression.source_position);
+       dbg_info *dbgi = get_dbg_info(&call->base.source_position);
 
        assert(call->function->kind == EXPR_BUILTIN_SYMBOL);
        builtin_symbol_expression_t *builtin = &call->function->builtin_symbol;
 
-       type_t *type = skip_typeref(builtin->expression.datatype);
+       type_t *type = skip_typeref(builtin->base.type);
        assert(is_type_pointer(type));
 
        type_t   *function_type = skip_typeref(type->pointer.points_to);
@@ -1255,7 +1395,7 @@ static ir_node *call_expression_to_firm(const call_expression_t *call)
        }
        ir_node *callee = expression_to_firm(function);
 
-       type_t *type = skip_typeref(function->base.datatype);
+       type_t *type = skip_typeref(function->base.type);
        assert(is_type_pointer(type));
        pointer_type_t *pointer_type = &type->pointer;
        type_t         *points_to    = skip_typeref(pointer_type->points_to);
@@ -1268,7 +1408,7 @@ static ir_node *call_expression_to_firm(const call_expression_t *call)
                ++n_parameters;
        }
 
-       dbg_info *dbgi  = get_dbg_info(&call->expression.source_position);
+       dbg_info *dbgi  = get_dbg_info(&call->base.source_position);
 
        ir_type *ir_method_type  = get_ir_type((type_t*) function_type);
        ir_type *new_method_type = NULL;
@@ -1276,8 +1416,9 @@ static ir_node *call_expression_to_firm(const call_expression_t *call)
                /* we need to construct a new method type matching the call
                 * arguments... */
                int n_res       = get_method_n_ress(ir_method_type);
-               new_method_type = new_type_method(unique_ident("calltype"),
-                                                 n_parameters, n_res);
+               dbg_info *dbgi  = get_dbg_info(&call->base.source_position);
+               new_method_type = new_d_type_method(unique_ident("calltype"),
+                                                 n_parameters, n_res, dbgi);
                set_method_calling_convention(new_method_type,
                               get_method_calling_convention(ir_method_type));
                set_method_additional_properties(new_method_type,
@@ -1300,7 +1441,7 @@ static ir_node *call_expression_to_firm(const call_expression_t *call)
 
                in[n] = arg_node;
                if(new_method_type != NULL) {
-                       ir_type *irtype = get_ir_type(expression->base.datatype);
+                       ir_type *irtype = get_ir_type(expression->base.type);
                        set_method_param_type(new_method_type, n, irtype);
                }
 
@@ -1347,11 +1488,13 @@ static void assign_value(dbg_info *dbgi, ir_node *addr, type_t *type,
 {
        value = do_strict_conv(dbgi, value);
 
-       ir_node  *memory = get_store();
+       ir_node *memory = get_store();
 
        if(is_type_scalar(type)) {
                ir_node  *store     = new_d_Store(dbgi, memory, addr, value);
                ir_node  *store_mem = new_d_Proj(dbgi, store, mode_M, pn_Store_M);
+               if(type->base.qualifiers & TYPE_QUALIFIER_VOLATILE)
+                       set_Store_volatility(store, volatility_is_volatile);
                set_store(store_mem);
        } else {
                ir_type *irtype    = get_ir_type(type);
@@ -1361,6 +1504,76 @@ static void assign_value(dbg_info *dbgi, ir_node *addr, type_t *type,
        }
 }
 
+static tarval *create_bitfield_mask(ir_mode *mode, int offset, int size)
+{
+       tarval *all_one   = get_mode_all_one(mode);
+       int     mode_size = get_mode_size_bits(mode);
+
+       assert(offset >= 0 && size >= 0);
+       assert(offset + size <= mode_size);
+       if(size == mode_size) {
+               return all_one;
+       }
+
+       long    shiftr    = get_mode_size_bits(mode) - size;
+       long    shiftl    = offset;
+       tarval *tv_shiftr = new_tarval_from_long(shiftr, mode_uint);
+       tarval *tv_shiftl = new_tarval_from_long(shiftl, mode_uint);
+       tarval *mask0     = tarval_shr(all_one, tv_shiftr);
+       tarval *mask1     = tarval_shl(mask0, tv_shiftl);
+
+       return mask1;
+}
+
+static void bitfield_store_to_firm(const unary_expression_t *expression,
+                                   ir_node *value)
+{
+       expression_t *select = expression->value;
+       assert(select->kind == EXPR_SELECT);
+       type_t       *type   = select->base.type;
+       assert(type->kind == TYPE_BITFIELD);
+       ir_mode      *mode   = get_ir_mode(type->bitfield.base);
+       ir_node      *addr   = expression_to_addr(select);
+
+       assert(get_irn_mode(value) == mode);
+
+       dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
+
+       /* kill upper bits of value and shift to right position */
+       ir_entity *entity       = select->select.compound_entry->v.entity;
+       int        bitoffset    = get_entity_offset_bits_remainder(entity);
+       ir_type   *entity_type  = get_entity_type(entity);
+       int        bitsize      = get_mode_size_bits(get_type_mode(entity_type));
+
+       tarval  *mask            = create_bitfield_mask(mode, 0, bitsize);
+       ir_node *mask_node       = new_d_Const(dbgi, mode, mask);
+       ir_node *value_masked    = new_d_And(dbgi, value, mask_node, mode);
+       tarval  *shiftl          = new_tarval_from_long(bitoffset, mode_uint);
+       ir_node *shiftcount      = new_d_Const(dbgi, mode_uint, shiftl);
+       ir_node *value_maskshift = new_d_Shl(dbgi, value_masked, shiftcount, mode);
+
+       /* load current value */
+       ir_node  *mem             = get_store();
+       ir_node  *load            = new_d_Load(dbgi, mem, addr, mode);
+       ir_node  *load_mem        = new_d_Proj(dbgi, load, mode_M, pn_Load_M);
+       ir_node  *load_res        = new_d_Proj(dbgi, load, mode, pn_Load_res);
+       tarval   *shift_mask      = create_bitfield_mask(mode, bitoffset, bitsize);
+       tarval   *inv_mask        = tarval_not(shift_mask);
+       ir_node  *inv_mask_node   = new_d_Const(dbgi, mode, inv_mask);
+       ir_node  *load_res_masked = new_d_And(dbgi, load_res, inv_mask_node, mode);
+
+       /* construct new value and store */
+       ir_node *new_val   = new_d_Or(dbgi, load_res_masked, value_maskshift, mode);
+       ir_node *store     = new_d_Store(dbgi, load_mem, addr, new_val);
+       ir_node *store_mem = new_d_Proj(dbgi, store, mode_M, pn_Store_M);
+       set_store(store_mem);
+
+       if(type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) {
+               set_Load_volatility(load, volatility_is_volatile);
+               set_Store_volatility(store, volatility_is_volatile);
+       }
+}
+
 static void set_value_for_expression(const expression_t *expression,
                                      ir_node *value)
 {
@@ -1378,8 +1591,13 @@ static void set_value_for_expression(const expression_t *expression,
                }
        }
 
+       if(expression->kind == EXPR_UNARY_BITFIELD_EXTRACT) {
+               bitfield_store_to_firm(&expression->unary, value);
+               return;
+       }
+
        ir_node *addr = expression_to_addr(expression);
-       type_t  *type = skip_typeref(expression->base.datatype);
+       type_t  *type = skip_typeref(expression->base.type);
        assign_value(dbgi, addr, type, value);
 }
 
@@ -1402,8 +1620,8 @@ static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode)
 
 static ir_node *create_incdec(const unary_expression_t *expression)
 {
-       dbg_info     *dbgi  = get_dbg_info(&expression->expression.source_position);
-       type_t       *type  = skip_typeref(expression->expression.datatype);
+       dbg_info     *dbgi  = get_dbg_info(&expression->base.source_position);
+       type_t       *type  = skip_typeref(expression->base.type);
        ir_mode      *mode  = get_ir_mode(type);
        expression_t *value = expression->value;
 
@@ -1412,14 +1630,13 @@ 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));
        }
 
-       switch(expression->expression.kind) {
+       switch(expression->base.kind) {
        case EXPR_UNARY_POSTFIX_INCREMENT: {
                ir_node *new_value = new_d_Add(dbgi, value_node, offset, mode);
                set_value_for_expression(value, new_value);
@@ -1455,12 +1672,13 @@ static bool is_local_variable(expression_t *expression)
        return declaration->declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE;
 }
 
-static pn_Cmp get_pnc(const expression_kind_t kind)
+static pn_Cmp get_pnc(const expression_kind_t kind, type_t *const type)
 {
        switch(kind) {
        case EXPR_BINARY_EQUAL:         return pn_Cmp_Eq;
        case EXPR_BINARY_ISLESSGREATER: return pn_Cmp_Lg;
-       case EXPR_BINARY_NOTEQUAL:      return pn_Cmp_Ne;
+       case EXPR_BINARY_NOTEQUAL:
+               return is_type_float(skip_typeref(type)) ? pn_Cmp_Ne : pn_Cmp_Lg;
        case EXPR_BINARY_ISLESS:
        case EXPR_BINARY_LESS:          return pn_Cmp_Lt;
        case EXPR_BINARY_ISLESSEQUAL:
@@ -1498,7 +1716,7 @@ static ir_node *handle_assume_compare(dbg_info *dbi,
        ir_node       *res = NULL;
        pn_Cmp         cmp_val;
 
-       cmp_val = get_pnc(expression->expression.kind);
+       cmp_val = get_pnc(expression->base.kind, op1->base.type);
 
        if (is_local_variable(op1) && is_local_variable(op2)) {
        var  = op1->reference.declaration;
@@ -1560,17 +1778,61 @@ static ir_node *handle_assume(dbg_info *dbi, const expression_t *expression) {
        }
 }
 
+static ir_node *bitfield_extract_to_firm(const unary_expression_t *expression)
+{
+       expression_t *select = expression->value;
+       assert(select->kind == EXPR_SELECT);
+
+       type_t   *type     = select->base.type;
+       assert(type->kind == TYPE_BITFIELD);
+       ir_mode  *mode     = get_ir_mode(type->bitfield.base);
+       dbg_info *dbgi     = get_dbg_info(&expression->base.source_position);
+       ir_node  *addr     = expression_to_addr(select);
+       ir_node  *mem      = get_store();
+       ir_node  *load     = new_d_Load(dbgi, mem, addr, mode);
+       ir_node  *load_mem = new_d_Proj(dbgi, load, mode_M, pn_Load_M);
+       ir_node  *load_res = new_d_Proj(dbgi, load, mode, pn_Load_res);
+
+       load_res           = create_conv(dbgi, load_res, mode_int);
+
+       set_store(load_mem);
+
+       /* kill upper bits */
+       ir_entity *entity       = select->select.compound_entry->v.entity;
+       int        bitoffset    = get_entity_offset_bits_remainder(entity);
+       ir_type   *entity_type  = get_entity_type(entity);
+       int        bitsize      = get_mode_size_bits(get_type_mode(entity_type));
+       long       shift_bitsl  = machine_size - bitoffset - bitsize;
+       assert(shift_bitsl >= 0);
+       tarval    *tvl          = new_tarval_from_long(shift_bitsl, mode_uint);
+       ir_node   *countl       = new_d_Const(dbgi, mode_uint, tvl);
+       ir_node   *shiftl       = new_d_Shl(dbgi, load_res, countl, mode_int);
+
+       long       shift_bitsr  = bitoffset + shift_bitsl;
+       assert(shift_bitsr <= (long) machine_size);
+       tarval    *tvr          = new_tarval_from_long(shift_bitsr, mode_uint);
+       ir_node   *countr       = new_d_Const(dbgi, mode_uint, tvr);
+       ir_node   *shiftr;
+       if(mode_is_signed(mode)) {
+               shiftr = new_d_Shrs(dbgi, shiftl, countr, mode_int);
+       } else {
+               shiftr = new_d_Shr(dbgi, shiftl, countr, mode_int);
+       }
+
+       return create_conv(dbgi, shiftr, mode);
+}
+
 static ir_node *unary_expression_to_firm(const unary_expression_t *expression)
 {
-       dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
-       type_t   *type = skip_typeref(expression->expression.datatype);
+       dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
+       type_t   *type = skip_typeref(expression->base.type);
 
-       if(expression->expression.kind == EXPR_UNARY_TAKE_ADDRESS)
+       if(expression->base.kind == EXPR_UNARY_TAKE_ADDRESS)
                return expression_to_addr(expression->value);
 
        const expression_t *value = expression->value;
 
-       switch(expression->expression.kind) {
+       switch(expression->base.kind) {
        case EXPR_UNARY_NEGATE: {
                ir_node *value_node = expression_to_firm(value);
                ir_mode *mode = get_ir_mode(type);
@@ -1597,10 +1859,9 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression)
        }
        case EXPR_UNARY_DEREFERENCE: {
                ir_node *value_node = expression_to_firm(value);
-               type_t  *value_type = skip_typeref(value->base.datatype);
-               ir_type *irtype     = get_ir_type(value_type);
-               assert(is_Pointer_type(irtype));
-               ir_type *points_to  = get_pointer_points_to_type(irtype);
+               type_t  *value_type = skip_typeref(value->base.type);
+               assert(is_type_pointer(value_type));
+               type_t  *points_to  = value_type->pointer.points_to;
                return deref_address(points_to, value_node, dbgi);
        }
        case EXPR_UNARY_POSTFIX_INCREMENT:
@@ -1610,21 +1871,33 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression)
                return create_incdec(expression);
        case EXPR_UNARY_CAST: {
                ir_node *value_node = expression_to_firm(value);
-               ir_mode *mode = get_ir_mode(type);
-               ir_node *node = create_conv(dbgi, value_node, mode);
-               node = do_strict_conv(dbgi, node);
-               return node;
+               if(is_type_scalar(type)) {
+                       ir_mode *mode = get_ir_mode(type);
+                       ir_node *node = create_conv(dbgi, value_node, mode);
+                       node = do_strict_conv(dbgi, node);
+                       return node;
+               } else {
+                       /* make sure firm type is constructed */
+                       (void) get_ir_type(type);
+                       return value_node;
+               }
        }
        case EXPR_UNARY_CAST_IMPLICIT: {
                ir_node *value_node = expression_to_firm(value);
-               ir_mode *mode = get_ir_mode(type);
-               return create_conv(dbgi, value_node, mode);
+               if(is_type_scalar(type)) {
+                       ir_mode *mode = get_ir_mode(type);
+                       return create_conv(dbgi, value_node, mode);
+               } else {
+                       return value_node;
+               }
        }
        case EXPR_UNARY_ASSUME:
                if(firm_opt.confirm)
                        return handle_assume(dbgi, value);
                else
                        return NULL;
+       case EXPR_UNARY_BITFIELD_EXTRACT:
+               return bitfield_extract_to_firm(expression);
 
        default:
                break;
@@ -1632,25 +1905,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->expression.source_position);
-       type_t   *type = expression->expression.datatype;
-       ir_mode  *mode = get_ir_mode(type);
-
-       if(is_constant_expression(expression->left)) {
-               long val = fold_constant(expression->left);
-               expression_kind_t ekind = expression->expression.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();
@@ -1662,8 +1920,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);
 
@@ -1678,16 +1935,38 @@ 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);
 
 static ir_node *create_arithmetic_binop(const binary_expression_t *expression,
                                         create_arithmetic_func func)
 {
-       dbg_info *dbgi  = get_dbg_info(&expression->expression.source_position);
+       dbg_info *dbgi  = get_dbg_info(&expression->base.source_position);
        ir_node  *left  = expression_to_firm(expression->left);
        ir_node  *right = expression_to_firm(expression->right);
-       type_t   *type  = expression->right->base.datatype;
+       type_t   *type  = expression->right->base.type;
        /* be careful with the modes, because in arithmetic assign nodes only
         * the right operand has the mode of the arithmetic already */
        ir_mode  *mode  = get_ir_mode(type);
@@ -1705,7 +1984,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) {
@@ -1722,8 +2001,8 @@ static ir_node *pointer_arithmetic(ir_node  *const pointer,
 static ir_node *create_arithmetic_assign_binop(
                const binary_expression_t *expression, create_arithmetic_func func)
 {
-       dbg_info *const dbgi = get_dbg_info(&expression->expression.source_position);
-       type_t   *const type = skip_typeref(expression->expression.datatype);
+       dbg_info *const dbgi = get_dbg_info(&expression->base.source_position);
+       type_t   *const type = skip_typeref(expression->base.type);
        ir_node  *value;
 
        if (is_type_pointer(type)) {
@@ -1743,15 +2022,15 @@ static ir_node *create_arithmetic_assign_binop(
 
 static ir_node *create_add(const binary_expression_t *expression)
 {
-       dbg_info *dbgi  = get_dbg_info(&expression->expression.source_position);
+       dbg_info *dbgi  = get_dbg_info(&expression->base.source_position);
        ir_node  *left  = expression_to_firm(expression->left);
        ir_node  *right = expression_to_firm(expression->right);
-       type_t   *type  = expression->expression.datatype;
+       type_t   *type  = expression->base.type;
 
        expression_t *expr_left  = expression->left;
        expression_t *expr_right = expression->right;
-       type_t       *type_left  = skip_typeref(expr_left->base.datatype);
-       type_t       *type_right = skip_typeref(expr_right->base.datatype);
+       type_t       *type_left  = skip_typeref(expr_left->base.type);
+       type_t       *type_right = skip_typeref(expr_right->base.type);
 
        if(is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) {
                ir_mode *const mode = get_ir_mode(type);
@@ -1768,27 +2047,28 @@ static ir_node *create_add(const binary_expression_t *expression)
 
 static ir_node *create_sub(const binary_expression_t *expression)
 {
-       dbg_info *const dbgi  = get_dbg_info(&expression->expression.source_position);
+       dbg_info *const dbgi  = get_dbg_info(&expression->base.source_position);
        expression_t *const expr_left  = expression->left;
        expression_t *const expr_right = expression->right;
        ir_node      *const left       = expression_to_firm(expr_left);
        ir_node      *const right      = expression_to_firm(expr_right);
-       type_t       *const type       = expression->expression.datatype;
-       type_t       *const type_left  = skip_typeref(expr_left->base.datatype);
-       type_t       *const type_right = skip_typeref(expr_right->base.datatype);
+       type_t       *const type       = expression->base.type;
+       type_t       *const type_left  = skip_typeref(expr_left->base.type);
+       type_t       *const type_right = skip_typeref(expr_right->base.type);
 
        if (is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) {
                ir_mode *const mode = get_ir_mode(type);
                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);
        }
 
@@ -1798,10 +2078,10 @@ static ir_node *create_sub(const binary_expression_t *expression)
 
 static ir_node *create_shift(const binary_expression_t *expression)
 {
-       dbg_info *dbgi  = get_dbg_info(&expression->expression.source_position);
+       dbg_info *dbgi  = get_dbg_info(&expression->base.source_position);
        ir_node  *left  = expression_to_firm(expression->left);
        ir_node  *right = expression_to_firm(expression->right);
-       type_t   *type  = expression->expression.datatype;
+       type_t   *type  = expression->base.type;
        ir_mode  *mode  = get_ir_mode(type);
 
        /* firm always wants the shift count to be unsigned */
@@ -1809,7 +2089,7 @@ static ir_node *create_shift(const binary_expression_t *expression)
 
        ir_node *res;
 
-       switch(expression->expression.kind) {
+       switch(expression->base.kind) {
        case EXPR_BINARY_SHIFTLEFT_ASSIGN:
        case EXPR_BINARY_SHIFTLEFT:
                res = new_d_Shl(dbgi, left, right, mode);
@@ -1817,7 +2097,7 @@ static ir_node *create_shift(const binary_expression_t *expression)
        case EXPR_BINARY_SHIFTRIGHT_ASSIGN:
        case EXPR_BINARY_SHIFTRIGHT: {
                 expression_t *expr_left = expression->left;
-                type_t       *type_left = skip_typeref(expr_left->base.datatype);
+                type_t       *type_left = skip_typeref(expr_left->base.type);
 
                 if(is_type_signed(type_left)) {
                        res = new_d_Shrs(dbgi, left, right, mode);
@@ -1836,19 +2116,19 @@ static ir_node *create_shift(const binary_expression_t *expression)
 
 static ir_node *create_divmod(const binary_expression_t *expression)
 {
-       dbg_info *dbgi  = get_dbg_info(&expression->expression.source_position);
+       dbg_info *dbgi  = get_dbg_info(&expression->base.source_position);
        ir_node  *left  = expression_to_firm(expression->left);
        ir_node  *right = expression_to_firm(expression->right);
        ir_node  *pin   = new_Pin(new_NoMem());
        /* be careful with the modes, because in arithmetic assign nodes only
         * the right operand has the mode of the arithmetic already */
-       type_t   *type  = expression->right->base.datatype;
+       type_t   *type  = expression->right->base.type;
        ir_mode  *mode  = get_ir_mode(type);
        left            = create_conv(dbgi, left, mode);
        ir_node  *op;
        ir_node  *res;
 
-       switch (expression->expression.kind) {
+       switch (expression->base.kind) {
        case EXPR_BINARY_DIV:
        case EXPR_BINARY_DIV_ASSIGN:
                if(mode_is_float(mode)) {
@@ -1877,8 +2157,8 @@ static ir_node *create_arithmetic_assign_divmod(
                const binary_expression_t *expression)
 {
        ir_node  *      value = create_divmod(expression);
-       dbg_info *const dbgi  = get_dbg_info(&expression->expression.source_position);
-       type_t   *const type  = expression->expression.datatype;
+       dbg_info *const dbgi  = get_dbg_info(&expression->base.source_position);
+       type_t   *const type  = expression->base.type;
        ir_mode  *const mode  = get_ir_mode(type);
 
        assert(type->kind != TYPE_POINTER);
@@ -1893,8 +2173,8 @@ static ir_node *create_arithmetic_assign_shift(
                const binary_expression_t *expression)
 {
        ir_node  *      value = create_shift(expression);
-       dbg_info *const dbgi  = get_dbg_info(&expression->expression.source_position);
-       type_t   *const type  = expression->expression.datatype;
+       dbg_info *const dbgi  = get_dbg_info(&expression->base.source_position);
+       type_t   *const type  = expression->base.type;
        ir_mode  *const mode  = get_ir_mode(type);
 
        value = create_conv(dbgi, value, mode);
@@ -1905,7 +2185,7 @@ static ir_node *create_arithmetic_assign_shift(
 
 static ir_node *binary_expression_to_firm(const binary_expression_t *expression)
 {
-       expression_kind_t kind = expression->expression.kind;
+       expression_kind_t kind = expression->base.kind;
 
        switch(kind) {
        case EXPR_BINARY_EQUAL:
@@ -1920,11 +2200,11 @@ static ir_node *binary_expression_to_firm(const binary_expression_t *expression)
        case EXPR_BINARY_ISLESSEQUAL:
        case EXPR_BINARY_ISLESSGREATER:
        case EXPR_BINARY_ISUNORDERED: {
-               dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
+               dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
                ir_node *left  = expression_to_firm(expression->left);
                ir_node *right = expression_to_firm(expression->right);
                ir_node *cmp   = new_d_Cmp(dbgi, left, right);
-               long     pnc   = get_pnc(kind);
+               long     pnc   = get_pnc(kind, expression->left->base.type);
                ir_node *proj  = new_d_Proj(dbgi, cmp, mode_b, pnc);
                return proj;
        }
@@ -1964,6 +2244,7 @@ static ir_node *binary_expression_to_firm(const binary_expression_t *expression)
                return create_arithmetic_assign_binop(expression, new_d_Sub);
        case EXPR_BINARY_MUL_ASSIGN:
                return create_arithmetic_assign_binop(expression, new_d_Mul);
+       case EXPR_BINARY_MOD_ASSIGN:
        case EXPR_BINARY_DIV_ASSIGN:
                return create_arithmetic_assign_divmod(expression);
        case EXPR_BINARY_BITWISE_AND_ASSIGN:
@@ -1984,17 +2265,16 @@ static ir_node *binary_expression_to_firm(const binary_expression_t *expression)
 
 static ir_node *array_access_addr(const array_access_expression_t *expression)
 {
-       dbg_info *dbgi      = get_dbg_info(&expression->expression.source_position);
+       dbg_info *dbgi      = get_dbg_info(&expression->base.source_position);
        ir_node  *base_addr = expression_to_firm(expression->array_ref);
        ir_node  *offset    = expression_to_firm(expression->index);
        offset              = create_conv(dbgi, offset, mode_uint);
 
-       type_t *ref_type = skip_typeref(expression->array_ref->base.datatype);
+       type_t *ref_type = skip_typeref(expression->array_ref->base.type);
        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);
@@ -2005,41 +2285,152 @@ static ir_node *array_access_addr(const array_access_expression_t *expression)
 static ir_node *array_access_to_firm(
                const array_access_expression_t *expression)
 {
-       dbg_info *dbgi   = get_dbg_info(&expression->expression.source_position);
+       dbg_info *dbgi   = get_dbg_info(&expression->base.source_position);
        ir_node  *addr   = array_access_addr(expression);
        type_t   *type   = revert_automatic_type_conversion(
                        (const expression_t*) expression);
        type             = skip_typeref(type);
-       ir_type  *irtype = get_ir_type(type);
 
-       return deref_address(irtype, addr, dbgi);
+       return deref_address(type, addr, dbgi);
+}
+
+static long get_offsetof_offset(const offsetof_expression_t *expression)
+{
+       type_t *orig_type = expression->type;
+       long    offset    = 0;
+
+       designator_t *designator = expression->designator;
+       for( ; designator != NULL; designator = designator->next) {
+               type_t *type = skip_typeref(orig_type);
+               /* be sure the type is constructed */
+               (void) get_ir_type(type);
+
+               if(designator->symbol != NULL) {
+                       assert(is_type_compound(type));
+                       symbol_t *symbol = designator->symbol;
+
+                       declaration_t *declaration = type->compound.declaration;
+                       declaration_t *iter        = declaration->scope.declarations;
+                       for( ; iter != NULL; iter = iter->next) {
+                               if(iter->symbol == symbol) {
+                                       break;
+                               }
+                       }
+                       assert(iter != NULL);
+
+                       assert(iter->declaration_kind == DECLARATION_KIND_COMPOUND_MEMBER);
+                       offset += get_entity_offset(iter->v.entity);
+
+                       orig_type = iter->type;
+               } else {
+                       expression_t *array_index = designator->array_index;
+                       assert(designator->array_index != NULL);
+                       assert(is_type_array(type));
+                       assert(is_type_valid(array_index->base.type));
+
+                       long index         = fold_constant(array_index);
+                       ir_type *arr_type  = get_ir_type(type);
+                       ir_type *elem_type = get_array_element_type(arr_type);
+                       long     elem_size = get_type_size_bytes(elem_type);
+
+                       offset += index * elem_size;
+
+                       orig_type = type->array.element_type;
+               }
+       }
+
+       return offset;
+}
+
+static ir_node *offsetof_to_firm(const offsetof_expression_t *expression)
+{
+       ir_mode  *mode   = get_ir_mode(expression->base.type);
+       long      offset = get_offsetof_offset(expression);
+       tarval   *tv     = new_tarval_from_long(offset, mode);
+       dbg_info *dbgi   = get_dbg_info(&expression->base.source_position);
+
+       return new_d_Const(dbgi, mode, tv);
+}
+
+static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi,
+                                     ir_entity *entity, type_t *type);
+
+static ir_node *compound_literal_to_firm(
+               const compound_literal_expression_t *expression)
+{
+       type_t *type = expression->type;
+
+       /* create an entity on the stack */
+       ir_type *frame_type = get_irg_frame_type(current_ir_graph);
+
+       ident     *const id     = unique_ident("CompLit");
+       ir_type   *const irtype = get_ir_type(type);
+       dbg_info  *const dbgi   = get_dbg_info(&expression->base.source_position);
+       ir_entity *const entity = new_d_entity(frame_type, id, irtype, dbgi);
+       set_entity_ld_ident(entity, id);
+
+       set_entity_variability(entity, variability_uninitialized);
+
+       /* 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);
+       return sel;
 }
 
-static ir_node *sizeof_to_firm(const sizeof_expression_t *expression)
+/**
+ * Transform a sizeof expression into Firm code.
+ */
+static ir_node *sizeof_to_firm(const typeprop_expression_t *expression)
 {
        type_t *type = expression->type;
        if(type == NULL) {
-               type = expression->size_expression->base.datatype;
+               type = expression->tp_expression->base.type;
                assert(type != NULL);
        }
 
-       ir_mode *const mode = get_ir_mode(expression->expression.datatype);
-       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);
 }
 
-static ir_node *alignof_to_firm(const alignof_expression_t *expression)
+/**
+ * Transform an alignof expression into Firm code.
+ */
+static ir_node *alignof_to_firm(const typeprop_expression_t *expression)
 {
-       type_t *const  type = expression->type;
-       ir_mode *const mode = get_ir_mode(expression->expression.datatype);
+       type_t *type = expression->type;
+       if(type == NULL) {
+               /* beware: if expression is a variable reference, return the
+                  alignment of the variable. */
+               const expression_t *tp_expression = expression->tp_expression;
+               const declaration_t *declaration = expr_is_variable(tp_expression);
+               if (declaration != NULL) {
+                       /* TODO: get the alignment of this variable. */
+               }
+               type = tp_expression->base.type;
+               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_align);
 }
 
-static long fold_constant(const expression_t *expression)
+static void init_ir_types(void);
+long fold_constant(const expression_t *expression)
 {
+       init_ir_types();
+
        assert(is_constant_expression(expression));
 
        ir_graph *old_current_ir_graph = current_ir_graph;
@@ -2064,7 +2455,7 @@ static long fold_constant(const expression_t *expression)
 
 static ir_node *conditional_to_firm(const conditional_expression_t *expression)
 {
-       dbg_info *const dbgi = get_dbg_info(&expression->expression.source_position);
+       dbg_info *const dbgi = get_dbg_info(&expression->base.source_position);
 
        /* first try to fold a constant condition */
        if(is_constant_expression(expression->condition)) {
@@ -2116,7 +2507,7 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression)
 
 static ir_node *select_addr(const select_expression_t *expression)
 {
-       dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
+       dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
 
        ir_node *compound_addr = expression_to_firm(expression->compound);
 
@@ -2133,14 +2524,13 @@ static ir_node *select_addr(const select_expression_t *expression)
 
 static ir_node *select_to_firm(const select_expression_t *expression)
 {
-       dbg_info *dbgi   = get_dbg_info(&expression->expression.source_position);
+       dbg_info *dbgi   = get_dbg_info(&expression->base.source_position);
        ir_node  *addr   = select_addr(expression);
        type_t   *type   = revert_automatic_type_conversion(
                        (const expression_t*) expression);
        type             = skip_typeref(type);
-       ir_type  *irtype = get_ir_type(type);
 
-       return deref_address(irtype, addr, dbgi);
+       return deref_address(type, addr, dbgi);
 }
 
 /* Values returned by __builtin_classify_type. */
@@ -2170,23 +2560,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.datatype;
+       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->atype) {
+                       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 */
@@ -2201,63 +2591,80 @@ 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().");
 
-       dbg_info *const dbgi = get_dbg_info(&expr->expression.source_position);
+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);
        return new_d_Const(dbgi, mode, tv);
 }
 
 static ir_node *function_name_to_firm(
-               const string_literal_expression_t *const expr)
+               const funcname_expression_t *const expr)
 {
-       if (current_function_name == NULL) {
-               const source_position_t *const src_pos =
-                       &expr->expression.source_position;
-               const char *const name = current_function_decl->symbol->string;
-               current_function_name = string_to_firm(src_pos, "__func__", name);
+       switch(expr->kind) {
+       case FUNCNAME_FUNCTION:
+       case FUNCNAME_PRETTY_FUNCTION:
+       case FUNCNAME_FUNCDNAME:
+               if (current_function_name == NULL) {
+                       const source_position_t *const src_pos = &expr->base.source_position;
+                       const char *const name = current_function_decl->symbol->string;
+                       const string_t string = { name, strlen(name) + 1 };
+                       current_function_name = string_to_firm(src_pos, "__func__", &string);
+               }
+               return current_function_name;
+       case FUNCNAME_FUNCSIG:
+               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;
        }
-
-       return current_function_name;
+       panic("Unsupported function name");
 }
 
 static ir_node *statement_expression_to_firm(const statement_expression_t *expr)
@@ -2275,14 +2682,12 @@ static ir_node *va_start_expression_to_firm(
        int        const n           = get_method_n_params(method_type) - 1;
        ir_entity *const parm_ent    = get_method_value_param_ent(method_type, n);
        ir_node   *const arg_base    = get_irg_value_param_base(current_ir_graph);
-       dbg_info  *const dbgi        =
-               get_dbg_info(&expr->expression.source_position);
+       dbg_info  *const dbgi        = get_dbg_info(&expr->base.source_position);
        ir_node   *const no_mem      = new_NoMem();
        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);
 
@@ -2291,14 +2696,13 @@ static ir_node *va_start_expression_to_firm(
 
 static ir_node *va_arg_expression_to_firm(const va_arg_expression_t *const expr)
 {
-       ir_type  *const irtype = get_ir_type(expr->expression.datatype);
+       type_t   *const type   = expr->base.type;
        ir_node  *const ap     = expression_to_firm(expr->ap);
-       dbg_info *const dbgi   = get_dbg_info(&expr->expression.source_position);
-       ir_node  *const res    = deref_address(irtype, ap, dbgi);
+       dbg_info *const dbgi   = get_dbg_info(&expr->base.source_position);
+       ir_node  *const res    = deref_address(type, ap, dbgi);
 
-       size_t    const parm_size = get_type_size(expr->expression.datatype);
-       ir_node  *const cnst      = new_Const_long(mode_uint, parm_size);
-       ir_node  *const add       = new_d_Add(dbgi, ap, cnst, mode_P_data);
+       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);
 
        return res;
@@ -2306,7 +2710,7 @@ static ir_node *va_arg_expression_to_firm(const va_arg_expression_t *const expr)
 
 static ir_node *dereference_addr(const unary_expression_t *const expression)
 {
-       assert(expression->expression.kind == EXPR_UNARY_DEREFERENCE);
+       assert(expression->base.kind == EXPR_UNARY_DEREFERENCE);
        return expression_to_firm(expression->value);
 }
 
@@ -2330,9 +2734,10 @@ static ir_node *expression_to_addr(const expression_t *expression)
        panic("trying to get address of non-lvalue");
 }
 
-static ir_node *builtin_constant_to_firm(const builtin_constant_expression_t *expression)
+static ir_node *builtin_constant_to_firm(
+               const builtin_constant_expression_t *expression)
 {
-       ir_mode *mode = get_ir_mode(expression->expression.datatype);
+       ir_mode *mode = get_ir_mode(expression->base.type);
        long     v;
 
        if (is_constant_expression(expression->value)) {
@@ -2343,7 +2748,8 @@ static ir_node *builtin_constant_to_firm(const builtin_constant_expression_t *ex
        return new_Const_long(mode, v);
 }
 
-static ir_node *builtin_prefetch_to_firm(const builtin_prefetch_expression_t *expression)
+static ir_node *builtin_prefetch_to_firm(
+               const builtin_prefetch_expression_t *expression)
 {
        ir_node *adr = expression_to_firm(expression->adr);
        /* no Firm support for prefetch yet */
@@ -2354,6 +2760,10 @@ static ir_node *builtin_prefetch_to_firm(const builtin_prefetch_expression_t *ex
 static ir_node *_expression_to_firm(const expression_t *expression)
 {
        switch(expression->kind) {
+       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:
@@ -2371,31 +2781,33 @@ static ir_node *_expression_to_firm(const expression_t *expression)
        case EXPR_ARRAY_ACCESS:
                return array_access_to_firm(&expression->array_access);
        case EXPR_SIZEOF:
-               return sizeof_to_firm(&expression->sizeofe);
+               return sizeof_to_firm(&expression->typeprop);
        case EXPR_ALIGNOF:
-               return alignof_to_firm(&expression->alignofe);
+               return alignof_to_firm(&expression->typeprop);
        case EXPR_CONDITIONAL:
                return conditional_to_firm(&expression->conditional);
        case EXPR_SELECT:
                return select_to_firm(&expression->select);
        case EXPR_CLASSIFY_TYPE:
                return classify_type_to_firm(&expression->classify_type);
-       case EXPR_FUNCTION:
-       case EXPR_PRETTY_FUNCTION:
-               return function_name_to_firm(&expression->string);
+       case EXPR_FUNCNAME:
+               return function_name_to_firm(&expression->funcname);
        case EXPR_STATEMENT:
                return statement_expression_to_firm(&expression->statement);
        case EXPR_VA_START:
                return va_start_expression_to_firm(&expression->va_starte);
        case EXPR_VA_ARG:
                return va_arg_expression_to_firm(&expression->va_arge);
-       case EXPR_OFFSETOF:
        case EXPR_BUILTIN_SYMBOL:
                panic("unimplemented expression found");
        case EXPR_BUILTIN_CONSTANT_P:
                return builtin_constant_to_firm(&expression->builtin_constant);
        case EXPR_BUILTIN_PREFETCH:
                return builtin_prefetch_to_firm(&expression->builtin_prefetch);
+       case EXPR_OFFSETOF:
+               return offsetof_to_firm(&expression->offsetofe);
+       case EXPR_COMPOUND_LITERAL:
+               return compound_literal_to_firm(&expression->compound_literal);
 
        case EXPR_UNKNOWN:
        case EXPR_INVALID:
@@ -2409,8 +2821,18 @@ static ir_node *expression_to_firm(const expression_t *expression)
        ir_node *res = _expression_to_firm(expression);
 
        if(res != NULL && get_irn_mode(res) == mode_b) {
-               ir_mode *mode = get_ir_mode(expression->base.datatype);
-               res           = create_conv(NULL, res, mode);
+               ir_mode *mode = get_ir_mode(expression->base.type);
+               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;
@@ -2503,7 +2925,8 @@ static void create_declaration_entity(declaration_t *declaration,
                                       ir_type *parent_type)
 {
        ident     *const id     = new_id_from_str(declaration->symbol->string);
-       ir_type   *const irtype = get_ir_type(declaration->type);
+       type_t    *const type   = skip_typeref(declaration->type);
+       ir_type   *const irtype = get_ir_type(type);
        dbg_info  *const dbgi   = get_dbg_info(&declaration->source_position);
        ir_entity *const entity = new_d_entity(parent_type, id, irtype, dbgi);
        set_entity_ld_ident(entity, id);
@@ -2515,260 +2938,524 @@ static void create_declaration_entity(declaration_t *declaration,
                set_entity_allocation(entity, allocation_automatic);
        else if(declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE)
                set_entity_allocation(entity, allocation_static);
-       /* TODO: visibility? */
+
+       if(type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) {
+               set_entity_volatility(entity, volatility_is_volatile);
+       }
 }
 
-typedef struct compound_graph_path_entry_t compound_graph_path_entry_t;
 
-enum compound_graph_entry_type_t {
-       COMPOUND_GRAPH_ENTRY_ARRAY,
-       COMPOUND_GRAPH_ENTRY_COMPOUND
+typedef struct type_path_entry_t type_path_entry_t;
+struct type_path_entry_t {
+       type_t           *type;
+       ir_initializer_t *initializer;
+       size_t            index;
+       declaration_t    *compound_entry;
 };
 
-struct compound_graph_path_entry_t {
-       int type;
-       union {
-               ir_entity *entity;
-               int        array_index;
-       } v;
-       compound_graph_path_entry_t *prev;
+typedef struct type_path_t type_path_t;
+struct type_path_t {
+       type_path_entry_t *path;
+       type_t            *top_type;
+       bool               invalid;
 };
 
-static void create_initializer_object(initializer_t *initializer, type_t *type,
-               ir_entity *entity, compound_graph_path_entry_t *entry, int len);
-
-static compound_graph_path *create_compound_path(ir_type *type,
-               compound_graph_path_entry_t *entry, int len)
+static __attribute__((unused)) void debug_print_type_path(const type_path_t *path)
 {
-       compound_graph_path *path = new_compound_graph_path(type, len);
+       size_t len = ARR_LEN(path->path);
+
+       for(size_t i = 0; i < len; ++i) {
+               const type_path_entry_t *entry = & path->path[i];
 
-       int i = len - 1;
-       for( ; entry != NULL; entry = entry->prev, --i) {
-               assert(i >= 0);
-               if(entry->type == COMPOUND_GRAPH_ENTRY_COMPOUND) {
-                       set_compound_graph_path_node(path, i, entry->v.entity);
+               type_t *type = skip_typeref(entry->type);
+               if(is_type_compound(type)) {
+                       fprintf(stderr, ".%s", entry->compound_entry->symbol->string);
+               } else if(is_type_array(type)) {
+                       fprintf(stderr, "[%zd]", entry->index);
                } else {
-                       assert(entry->type == COMPOUND_GRAPH_ENTRY_ARRAY);
-                       set_compound_graph_path_array_index(path, i, entry->v.array_index);
+                       fprintf(stderr, "-INVALID-");
                }
        }
-       assert(i == -1);
+       fprintf(stderr, "  (");
+       print_type(path->top_type);
+       fprintf(stderr, ")");
+}
 
-       return path;
+static type_path_entry_t *get_type_path_top(const type_path_t *path)
+{
+       size_t len = ARR_LEN(path->path);
+       assert(len > 0);
+       return & path->path[len-1];
 }
 
-static void create_initializer_value(initializer_value_t *initializer,
-                                     ir_entity *entity,
-                                     compound_graph_path_entry_t *entry,
-                                     int len)
+static type_path_entry_t *append_to_type_path(type_path_t *path)
 {
-       ir_node             *node = expression_to_firm(initializer->value);
-       ir_type             *type = get_entity_type(entity);
-       compound_graph_path *path = create_compound_path(type, entry, len);
-       add_compound_ent_value_w_path(entity, node, path);
+       size_t len = ARR_LEN(path->path);
+       ARR_RESIZE(type_path_entry_t, path->path, len+1);
+
+       type_path_entry_t *result = & path->path[len];
+       memset(result, 0, sizeof(result[0]));
+       return result;
 }
 
-static void create_initializer_compound(initializer_list_t *initializer,
-                                        compound_type_t *type,
-                                        ir_entity *entity,
-                                        compound_graph_path_entry_t *last_entry,
-                                        int len)
+static size_t get_compound_size(const compound_type_t *type)
 {
-       declaration_t *compound_declaration = type->declaration;
+       declaration_t *declaration = type->declaration;
+       declaration_t *member      = declaration->scope.declarations;
+       size_t         size        = 0;
+       for( ; member != NULL; member = member->next) {
+               ++size;
+       }
+       /* TODO: cache results? */
 
-       declaration_t *compound_entry = compound_declaration->context.declarations;
+       return size;
+}
 
-       compound_graph_path_entry_t entry;
-       entry.type = COMPOUND_GRAPH_ENTRY_COMPOUND;
-       entry.prev = last_entry;
-       ++len;
+static ir_initializer_t *get_initializer_entry(type_path_t *path)
+{
+       type_t *orig_top_type = path->top_type;
+       type_t *top_type      = skip_typeref(orig_top_type);
 
-       size_t i = 0;
-       for( ; compound_entry != NULL; compound_entry = compound_entry->next) {
-               if(compound_entry->symbol == NULL)
-                       continue;
-               if(compound_entry->namespc != NAMESPACE_NORMAL)
-                       continue;
+       assert(is_type_compound(top_type) || is_type_array(top_type));
 
-               if(i >= initializer->len)
-                       break;
+       if(ARR_LEN(path->path) == 0) {
+               return NULL;
+       } else {
+               type_path_entry_t *top         = get_type_path_top(path);
+               ir_initializer_t  *initializer = top->initializer;
+               return get_initializer_compound_value(initializer, top->index);
+       }
+}
 
-               entry.v.entity = compound_entry->v.entity;
+static void descend_into_subtype(type_path_t *path)
+{
+       type_t *orig_top_type = path->top_type;
+       type_t *top_type      = skip_typeref(orig_top_type);
 
-               initializer_t *sub_initializer = initializer->initializers[i];
+       assert(is_type_compound(top_type) || is_type_array(top_type));
 
-               assert(compound_entry != NULL);
-               assert(compound_entry->declaration_kind
-                               == DECLARATION_KIND_COMPOUND_MEMBER);
+       ir_initializer_t *initializer = get_initializer_entry(path);
 
-               if(sub_initializer->kind == INITIALIZER_VALUE) {
-                       create_initializer_value(&sub_initializer->value,
-                                                entity, &entry, len);
+       type_path_entry_t *top = append_to_type_path(path);
+       top->type              = top_type;
+
+       size_t len;
+
+       if(is_type_compound(top_type)) {
+               declaration_t *declaration = top_type->compound.declaration;
+               declaration_t *entry       = declaration->scope.declarations;
+
+               top->compound_entry = entry;
+               top->index          = 0;
+               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);
+
+               top->index     = 0;
+               path->top_type = top_type->array.element_type;
+               len            = top_type->array.size;
+       }
+       if(initializer == NULL
+                       || get_initializer_kind(initializer) == IR_INITIALIZER_NULL) {
+               initializer = create_initializer_compound(len);
+               /* we have to set the entry at the 2nd latest path entry... */
+               size_t path_len = ARR_LEN(path->path);
+               assert(path_len >= 1);
+               if(path_len > 1) {
+                       type_path_entry_t *entry        = & path->path[path_len-2];
+                       ir_initializer_t  *tinitializer = entry->initializer;
+                       set_initializer_compound_value(tinitializer, entry->index,
+                                                      initializer);
+               }
+       }
+       top->initializer = initializer;
+}
+
+static void ascend_from_subtype(type_path_t *path)
+{
+       type_path_entry_t *top = get_type_path_top(path);
+
+       path->top_type = top->type;
+
+       size_t len = ARR_LEN(path->path);
+       ARR_RESIZE(type_path_entry_t, path->path, len-1);
+}
+
+static void walk_designator(type_path_t *path, const designator_t *designator)
+{
+       /* designators start at current object type */
+       ARR_RESIZE(type_path_entry_t, path->path, 1);
+
+       for( ; designator != NULL; designator = designator->next) {
+               type_path_entry_t *top         = get_type_path_top(path);
+               type_t            *orig_type   = top->type;
+               type_t            *type        = skip_typeref(orig_type);
+
+               if(designator->symbol != NULL) {
+                       assert(is_type_compound(type));
+                       size_t    index  = 0;
+                       symbol_t *symbol = designator->symbol;
+
+                       declaration_t *declaration = type->compound.declaration;
+                       declaration_t *iter        = declaration->scope.declarations;
+                       for( ; iter != NULL; iter = iter->next, ++index) {
+                               if(iter->symbol == symbol) {
+                                       break;
+                               }
+                       }
+                       assert(iter != NULL);
+
+                       top->type           = orig_type;
+                       top->compound_entry = iter;
+                       top->index          = index;
+                       orig_type           = iter->type;
                } else {
-                       type_t *entry_type = skip_typeref(compound_entry->type);
-                       create_initializer_object(sub_initializer, entry_type, entity,
-                                                 &entry, len);
+                       expression_t *array_index = designator->array_index;
+                       assert(designator->array_index != NULL);
+                       assert(is_type_array(type));
+                       assert(is_type_valid(array_index->base.type));
+
+                       long index = fold_constant(array_index);
+                       assert(index >= 0);
+#ifndef NDEBUG
+                       if(type->array.size_constant == 1) {
+                               long array_size = type->array.size;
+                               assert(index < array_size);
+                       }
+#endif
+
+                       top->type  = orig_type;
+                       top->index = (size_t) index;
+                       orig_type  = type->array.element_type;
                }
+               path->top_type = orig_type;
 
-               ++i;
+               if(designator->next != NULL) {
+                       descend_into_subtype(path);
+               }
        }
+
+       path->invalid  = false;
 }
 
-static void create_initializer_array(initializer_list_t *initializer,
-                                     array_type_t *type, ir_entity *entity,
-                                     compound_graph_path_entry_t *last_entry,
-                                     int len)
+static void advance_current_object(type_path_t *path)
 {
-       type_t *element_type = type->element_type;
-       element_type         = skip_typeref(element_type);
+       if(path->invalid) {
+               /* TODO: handle this... */
+               panic("invalid initializer in ast2firm (excessive elements)");
+               return;
+       }
 
-       compound_graph_path_entry_t entry;
-       entry.type = COMPOUND_GRAPH_ENTRY_ARRAY;
-       entry.prev = last_entry;
-       ++len;
+       type_path_entry_t *top = get_type_path_top(path);
 
-       size_t i;
-       for(i = 0; i < initializer->len; ++i) {
-               entry.v.array_index = i;
+       type_t *type = skip_typeref(top->type);
+       if(is_type_union(type)) {
+               top->compound_entry = NULL;
+       } else if(is_type_struct(type)) {
+               declaration_t *entry = top->compound_entry;
 
-               initializer_t *sub_initializer = initializer->initializers[i];
+               top->index++;
+               entry               = entry->next;
+               top->compound_entry = entry;
+               if(entry != NULL) {
+                       path->top_type = entry->type;
+                       return;
+               }
+       } else {
+               assert(is_type_array(type));
 
-               if(sub_initializer->kind == INITIALIZER_VALUE) {
-                       create_initializer_value(&sub_initializer->value,
-                                                entity, &entry, len);
-               } else {
-                       create_initializer_object(sub_initializer, element_type, entity,
-                                                 &entry, len);
+               top->index++;
+               if(!type->array.size_constant || top->index < type->array.size) {
+                       return;
                }
        }
 
-#if 0
-       /* TODO: initialize rest... */
-       if(type->size_expression != NULL) {
-               size_t array_len = fold_constant(type->size_expression);
-               for( ; i < array_len; ++i) {
+       /* we're past the last member of the current sub-aggregate, try if we
+        * can ascend in the type hierarchy and continue with another subobject */
+       size_t len = ARR_LEN(path->path);
+
+       if(len > 1) {
+               ascend_from_subtype(path);
+               advance_current_object(path);
+       } else {
+               path->invalid = true;
+       }
+}
 
+
+static ir_initializer_t *create_ir_initializer(
+               const initializer_t *initializer, type_t *type);
+
+static ir_initializer_t *create_ir_initializer_value(
+               const initializer_value_t *initializer)
+{
+       ir_node *value = expression_to_firm(initializer->value);
+       return create_initializer_const(value);
+}
+
+static ir_initializer_t *create_ir_initializer_list(
+               const initializer_list_t *initializer, type_t *type)
+{
+       type_path_t path;
+       memset(&path, 0, sizeof(path));
+       path.top_type = type;
+       path.path     = NEW_ARR_F(type_path_entry_t, 0);
+
+       descend_into_subtype(&path);
+
+       for(size_t i = 0; i < initializer->len; ++i) {
+               const initializer_t *sub_initializer = initializer->initializers[i];
+
+               if(sub_initializer->kind == INITIALIZER_DESIGNATOR) {
+                       walk_designator(&path, sub_initializer->designator.designator);
+                       continue;
+               }
+
+               if(sub_initializer->kind == INITIALIZER_VALUE) {
+                       /* we might have to descend into types until we're at a scalar
+                        * type */
+                       while(true) {
+                               type_t *orig_top_type = path.top_type;
+                               type_t *top_type      = skip_typeref(orig_top_type);
+
+                               if(is_type_scalar(top_type))
+                                       break;
+                               descend_into_subtype(&path);
+                       }
                }
+
+               ir_initializer_t *sub_irinitializer
+                       = create_ir_initializer(sub_initializer, path.top_type);
+
+               size_t path_len = ARR_LEN(path.path);
+               assert(path_len >= 1);
+               type_path_entry_t *entry        = & path.path[path_len-1];
+               ir_initializer_t  *tinitializer = entry->initializer;
+               set_initializer_compound_value(tinitializer, entry->index,
+                                              sub_irinitializer);
+
+               advance_current_object(&path);
        }
-#endif
+
+       assert(ARR_LEN(path.path) >= 1);
+       ir_initializer_t *result = path.path[0].initializer;
+       DEL_ARR_F(path.path);
+
+       return result;
 }
 
-static void create_initializer_string(initializer_string_t *initializer,
-                                      array_type_t *type, ir_entity *entity,
-                                      compound_graph_path_entry_t *last_entry,
-                                      int len)
+static ir_initializer_t *create_ir_initializer_string(
+               const initializer_string_t *initializer, type_t *type)
 {
-       type_t *element_type = type->element_type;
-       element_type         = skip_typeref(element_type);
+       type = skip_typeref(type);
 
-       compound_graph_path_entry_t entry;
-       entry.type = COMPOUND_GRAPH_ENTRY_ARRAY;
-       entry.prev = last_entry;
-       ++len;
+       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);
 
-       ir_type    *irtype  = get_entity_type(entity);
-       size_t      arr_len = get_array_type_size(type);
-       const char *p       = initializer->string;
-       size_t      i       = 0;
-       for(i = 0; i < arr_len; ++i, ++p) {
-               entry.v.array_index = i;
+       const char *string = initializer->string.begin;
+       ir_mode    *mode   = get_type_mode(ir_type_const_char);
 
-               ir_node             *node = new_Const_long(mode_Bs, *p);
-               compound_graph_path *path = create_compound_path(irtype, &entry, len);
-               add_compound_ent_value_w_path(entity, node, path);
+       for(size_t i = 0; i < len; ++i) {
+               char c = 0;
+               if(i < string_len)
+                       c = string[i];
 
-               if(*p == '\0')
-                       break;
+               tarval           *tv = new_tarval_from_long(string[i], mode);
+               ir_initializer_t *char_initializer = create_initializer_tarval(tv);
+
+               set_initializer_compound_value(irinitializer, i, char_initializer);
+       }
+
+       return irinitializer;
+}
+
+static ir_initializer_t *create_ir_initializer_wide_string(
+               const initializer_wide_string_t *initializer, type_t *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 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);
+
+               set_initializer_compound_value(irinitializer, i, char_initializer);
        }
+
+       return irinitializer;
 }
 
-static void create_initializer_wide_string(
-       const initializer_wide_string_t *const initializer, array_type_t *const type,
-       ir_entity *const entity, compound_graph_path_entry_t *const last_entry,
-       int len)
+static ir_initializer_t *create_ir_initializer(
+               const initializer_t *initializer, type_t *type)
 {
-       type_t *element_type = type->element_type;
-       element_type         = skip_typeref(element_type);
+       switch(initializer->kind) {
+               case INITIALIZER_STRING:
+                       return create_ir_initializer_string(&initializer->string, type);
+
+               case INITIALIZER_WIDE_STRING:
+                       return create_ir_initializer_wide_string(&initializer->wide_string,
+                                                                type);
 
-       compound_graph_path_entry_t entry;
-       entry.type = COMPOUND_GRAPH_ENTRY_ARRAY;
-       entry.prev = last_entry;
-       ++len;
+               case INITIALIZER_LIST:
+                       return create_ir_initializer_list(&initializer->list, type);
 
-       ir_type           *const irtype  = get_entity_type(entity);
-       const size_t             arr_len = get_array_type_size(type);
-       const wchar_rep_t *      p       = initializer->string.begin;
-       const wchar_rep_t *const end     = p + initializer->string.size;
-       for (size_t i = 0; i < arr_len && p != end; ++i, ++p) {
-               entry.v.array_index = i;
+               case INITIALIZER_VALUE:
+                       return create_ir_initializer_value(&initializer->value);
 
-               ir_node             *node = new_Const_long(mode_int, *p);
-               compound_graph_path *path = create_compound_path(irtype, &entry, len);
-               add_compound_ent_value_w_path(entity, node, path);
+               case INITIALIZER_DESIGNATOR:
+                       panic("unexpected designator initializer found");
        }
+       panic("unknown initializer");
 }
 
-static void create_initializer_object(initializer_t *initializer, type_t *type,
-               ir_entity *entity, compound_graph_path_entry_t *entry, int len)
+static void create_dynamic_initializer_sub(ir_initializer_t *initializer,
+               ir_type *type, dbg_info *dbgi, ir_node *base_addr)
 {
-       if(is_type_array(type)) {
-               array_type_t *array_type = &type->array;
+       switch(get_initializer_kind(initializer)) {
+       case IR_INITIALIZER_NULL: {
+               /* TODO: implement this for compound types... */
+               assert(type != NULL);
 
-               switch (initializer->kind) {
-                       case INITIALIZER_STRING: {
-                               initializer_string_t *const string = &initializer->string;
-                               create_initializer_string(string, array_type, entity, entry, len);
-                               return;
-                       }
+               ir_mode *mode = get_type_mode(type);
+               tarval  *zero = get_mode_null(mode);
+               ir_node *cnst = new_d_Const(dbgi, mode, zero);
 
-                       case INITIALIZER_WIDE_STRING: {
-                               initializer_wide_string_t *const string = &initializer->wide_string;
-                               create_initializer_wide_string(string, array_type, entity, entry, len);
-                               return;
-                       }
+               /* 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);
 
-                       case INITIALIZER_LIST: {
-                               initializer_list_t *const list = &initializer->list;
-                               create_initializer_array(list, array_type, entity, entry, len);
-                               return;
-                       }
+               /* 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);
 
-                       case INITIALIZER_VALUE:
-                               break;
+               /* 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);
                }
-               panic("Unhandled initializer");
-       } else {
-               assert(initializer->kind == INITIALIZER_LIST);
-               initializer_list_t *list = &initializer->list;
 
-               assert(is_type_compound(type));
-               compound_type_t *compound_type = &type->compound;
-               create_initializer_compound(list, compound_type, entity, entry, len);
+               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_initializer_local_variable_entity(declaration_t *declaration)
+static void create_dynamic_initializer(ir_initializer_t *initializer,
+               dbg_info *dbgi, ir_entity *entity)
 {
-       initializer_t *initializer = declaration->init.initializer;
-       dbg_info      *dbgi        = get_dbg_info(&declaration->source_position);
-       ir_entity     *entity      = declaration->v.entity;
-       ir_node       *memory      = get_store();
-       ir_node       *nomem       = new_NoMem();
-       ir_node       *frame       = get_irg_frame(current_ir_graph);
-       ir_node       *addr        = new_d_simpleSel(dbgi, nomem, frame, 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)
+{
+       ir_node *memory = get_store();
+       ir_node *nomem  = new_NoMem();
+       ir_node *frame  = get_irg_frame(current_ir_graph);
+       ir_node *addr   = new_d_simpleSel(dbgi, nomem, frame, entity);
 
        if(initializer->kind == INITIALIZER_VALUE) {
                initializer_value_t *initializer_value = &initializer->value;
 
                ir_node *value = expression_to_firm(initializer_value->value);
-               type_t  *type  = skip_typeref(declaration->type);
+               type = skip_typeref(type);
                assign_value(dbgi, addr, type, value);
                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(declaration->type);
+       ir_type   *const irtype      = get_ir_type(type);
        ir_type   *const global_type = get_glob_type();
        ir_entity *const init_entity = new_d_entity(global_type, id, irtype, dbgi);
        set_entity_ld_ident(init_entity, id);
@@ -2777,23 +3464,25 @@ static void create_initializer_local_variable_entity(declaration_t *declaration)
        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();
-
-       type_t *const type = skip_typeref(declaration->type);
-       create_initializer_object(initializer, type, init_entity, NULL, 0);
-
-       assert(current_ir_graph == get_const_code_irg());
-       current_ir_graph = old_current_ir_graph;
+       set_entity_initializer(init_entity, irinitializer);
 
-       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);
 }
 
-static void create_initializer(declaration_t *declaration)
+static void create_initializer_local_variable_entity(declaration_t *declaration)
+{
+       initializer_t *initializer = declaration->init.initializer;
+       dbg_info      *dbgi        = get_dbg_info(&declaration->source_position);
+       ir_entity     *entity      = declaration->v.entity;
+       type_t        *type        = declaration->type;
+       create_local_initializer(initializer, dbgi, entity, type);
+}
+
+static void create_declaration_initializer(declaration_t *declaration)
 {
        initializer_t *initializer = declaration->init.initializer;
        if(initializer == NULL)
@@ -2825,14 +3514,44 @@ static void create_initializer(declaration_t *declaration)
                assert(declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE_ENTITY
                                || declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE);
 
-               ir_entity *entity = declaration->v.entity;
-               set_entity_variability(entity, variability_initialized);
+               ir_entity        *entity        = declaration->v.entity;
+               ir_initializer_t *irinitializer
+                       = create_ir_initializer(initializer, declaration->type);
 
-               type_t *type = skip_typeref(declaration->type);
-               create_initializer_object(initializer, type, entity, NULL, 0);
+               set_entity_variability(entity, variability_initialized);
+               set_entity_initializer(entity, irinitializer);
        }
 }
 
+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.
+ */
 static void create_local_variable(declaration_t *declaration)
 {
        assert(declaration->declaration_kind == DECLARATION_KIND_UNKNOWN);
@@ -2840,7 +3559,13 @@ 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;
+       } else if(type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) {
                needs_entity = true;
        }
 
@@ -2852,10 +3577,11 @@ static void create_local_variable(declaration_t *declaration)
        } else {
                declaration->declaration_kind = DECLARATION_KIND_LOCAL_VARIABLE;
                declaration->v.value_number   = next_value_number_function;
+               set_irg_loc_description(current_ir_graph, next_value_number_function, declaration);
                ++next_value_number_function;
        }
 
-       create_initializer(declaration);
+       create_declaration_initializer(declaration);
 }
 
 static void create_local_static_variable(declaration_t *declaration)
@@ -2870,6 +3596,10 @@ static void create_local_static_variable(declaration_t *declaration)
        ir_entity *const entity      = new_d_entity(global_type, id, irtype, dbgi);
        set_entity_ld_ident(entity, id);
 
+       if(type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) {
+               set_entity_volatility(entity, volatility_is_volatile);
+       }
+
        declaration->declaration_kind = DECLARATION_KIND_GLOBAL_VARIABLE;
        declaration->v.entity         = entity;
        set_entity_variability(entity, variability_uninitialized);
@@ -2879,7 +3609,7 @@ static void create_local_static_variable(declaration_t *declaration)
        ir_graph *const old_current_ir_graph = current_ir_graph;
        current_ir_graph = get_const_code_irg();
 
-       create_initializer(declaration);
+       create_declaration_initializer(declaration);
 
        assert(current_ir_graph == get_const_code_irg());
        current_ir_graph = old_current_ir_graph;
@@ -2892,17 +3622,17 @@ static void return_statement_to_firm(return_statement_t *statement)
        if(get_cur_block() == NULL)
                return;
 
-       ir_type *func_irtype = get_ir_type(current_function_decl->type);
+       dbg_info *dbgi        = get_dbg_info(&statement->base.source_position);
+       ir_type  *func_irtype = get_ir_type(current_function_decl->type);
 
-       dbg_info *dbgi  = get_dbg_info(&statement->statement.source_position);
 
        ir_node *in[1];
        int      in_len;
        if(get_method_n_ress(func_irtype) > 0) {
                ir_type *res_type = get_method_res_type(func_irtype, 0);
 
-               if(statement->return_value != NULL) {
-                       ir_node *node = expression_to_firm(statement->return_value);
+               if(statement->value != NULL) {
+                       ir_node *node = expression_to_firm(statement->value);
                        node  = do_strict_conv(dbgi, node);
                        in[0] = node;
                } else {
@@ -2917,8 +3647,8 @@ static void return_statement_to_firm(return_statement_t *statement)
                in_len = 1;
        } else {
                /* build return_value for its side effects */
-               if(statement->return_value != NULL) {
-                       expression_to_firm(statement->return_value);
+               if(statement->value != NULL) {
+                       expression_to_firm(statement->value);
                }
                in_len = 0;
        }
@@ -2945,7 +3675,7 @@ static ir_node *compound_statement_to_firm(compound_statement_t *compound)
        ir_node     *result    = NULL;
        statement_t *statement = compound->statements;
        for( ; statement != NULL; statement = statement->base.next) {
-               //context2firm(&statement->context);
+               //context2firm(&statement->scope);
 
                if(statement->base.next == NULL
                                && statement->kind == STATEMENT_EXPRESSION) {
@@ -2959,27 +3689,89 @@ static ir_node *compound_statement_to_firm(compound_statement_t *compound)
        return result;
 }
 
+static void create_global_variable(declaration_t *declaration)
+{
+       ir_visibility  vis;
+       ir_type       *var_type;
+       switch ((storage_class_tag_t)declaration->storage_class) {
+               case STORAGE_CLASS_STATIC:
+                       vis = visibility_local;
+                       goto global_var;
+
+               case STORAGE_CLASS_EXTERN:
+                       vis = visibility_external_allocated;
+                       goto global_var;
+
+               case STORAGE_CLASS_NONE:
+                       vis = visibility_external_visible;
+                       goto global_var;
+
+               case STORAGE_CLASS_THREAD:
+                       vis = visibility_external_visible;
+                       goto tls_var;
+
+               case STORAGE_CLASS_THREAD_EXTERN:
+                       vis = visibility_external_allocated;
+                       goto tls_var;
+
+               case STORAGE_CLASS_THREAD_STATIC:
+                       vis = visibility_local;
+                       goto tls_var;
+
+tls_var:
+                       var_type = get_tls_type();
+                       goto create_var;
+
+global_var:
+                       var_type = get_glob_type();
+                       goto create_var;
+
+create_var:
+                       create_declaration_entity(declaration,
+                                                 DECLARATION_KIND_GLOBAL_VARIABLE,
+                                                 var_type);
+                       set_entity_visibility(declaration->v.entity, vis);
+
+                       return;
+
+               case STORAGE_CLASS_TYPEDEF:
+               case STORAGE_CLASS_AUTO:
+               case STORAGE_CLASS_REGISTER:
+               case STORAGE_CLASS_ENUM_ENTRY:
+                       break;
+       }
+       panic("Invalid storage class for global variable");
+}
+
 static void create_local_declaration(declaration_t *declaration)
 {
+       if(declaration->symbol == NULL)
+               return;
+
        type_t *type = skip_typeref(declaration->type);
 
        switch ((storage_class_tag_t) declaration->storage_class) {
        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:
-               panic("extern declaration in local block found");
+               create_global_variable(declaration);
+               create_declaration_initializer(declaration);
+               return;
        case STORAGE_CLASS_NONE:
        case STORAGE_CLASS_AUTO:
        case STORAGE_CLASS_REGISTER:
                if(is_type_function(type)) {
-                       panic("nested functions not supported yet");
+                       if(declaration->init.statement != NULL) {
+                               panic("nested functions not supported yet");
+                       } else {
+                               get_function_entity(declaration);
+                       }
                } else {
                        create_local_variable(declaration);
                }
                return;
+       case STORAGE_CLASS_ENUM_ENTRY:
        case STORAGE_CLASS_TYPEDEF:
        case STORAGE_CLASS_THREAD:
        case STORAGE_CLASS_THREAD_EXTERN:
@@ -2994,7 +3786,9 @@ static void declaration_statement_to_firm(declaration_statement_t *statement)
        declaration_t *declaration = statement->declarations_begin;
        declaration_t *end         = statement->declarations_end->next;
        for( ; declaration != end; declaration = declaration->next) {
-               create_local_variable(declaration);
+               if(declaration->namespc != NAMESPACE_NORMAL)
+                       continue;
+               create_local_declaration(declaration);
        }
 }
 
@@ -3162,7 +3956,7 @@ static void for_statement_to_firm(for_statement_t *statement)
                }
 
                /* create declarations */
-               declaration_t *declaration = statement->context.declarations;
+               declaration_t *declaration = statement->scope.declarations;
                for( ; declaration != NULL; declaration = declaration->next) {
                        create_local_declaration(declaration);
                }
@@ -3247,7 +4041,7 @@ static void create_jump_statement(const statement_t *statement,
 
 static void switch_statement_to_firm(const switch_statement_t *statement)
 {
-       dbg_info *dbgi = get_dbg_info(&statement->statement.source_position);
+       dbg_info *dbgi = get_dbg_info(&statement->base.source_position);
 
        ir_node *expression  = expression_to_firm(statement->expression);
        ir_node *cond        = new_d_Cond(dbgi, expression);
@@ -3261,7 +4055,9 @@ static void switch_statement_to_firm(const switch_statement_t *statement)
        current_switch_cond                  = cond;
        break_label                          = break_block;
 
-       statement_to_firm(statement->body);
+       if (statement->body != NULL) {
+               statement_to_firm(statement->body);
+       }
 
        if(get_cur_block() != NULL) {
                ir_node *jmp = new_Jmp();
@@ -3287,36 +4083,49 @@ static void switch_statement_to_firm(const switch_statement_t *statement)
 
 static void case_label_to_firm(const case_label_statement_t *statement)
 {
-       dbg_info *dbgi = get_dbg_info(&statement->statement.source_position);
+       dbg_info *dbgi = get_dbg_info(&statement->base.source_position);
 
        ir_node *const fallthrough = (get_cur_block() == NULL ? NULL : new_Jmp());
 
        /* let's create a node and hope firm constant folding creates a Const
         * node... */
        ir_node *proj;
-       set_cur_block(get_nodes_block(current_switch_cond));
-       if(statement->expression) {
-               long pn = fold_constant(statement->expression);
-               if(pn == MAGIC_DEFAULT_PN_NUMBER) {
-                       /* oops someone detected our cheating... */
-                       panic("magic default pn used");
-               }
-               proj = new_d_Proj(dbgi, current_switch_cond, mode_X, pn);
+       ir_node *old_block = get_nodes_block(current_switch_cond);
+       ir_node *block     = new_immBlock();
+
+       set_cur_block(old_block);
+       if(statement->expression != NULL) {
+               long start_pn = fold_constant(statement->expression);
+               long end_pn = start_pn;
+               if (statement->end_range != NULL) {
+                       end_pn = fold_constant(statement->end_range);
+               }
+               assert(start_pn <= end_pn);
+               /* create jumps for all cases in the given range */
+               for (long pn = start_pn; pn <= end_pn; ++pn) {
+                       if(pn == MAGIC_DEFAULT_PN_NUMBER) {
+                               /* oops someone detected our cheating... */
+                               panic("magic default pn used");
+                       }
+                       proj = new_d_Proj(dbgi, current_switch_cond, mode_X, pn);
+                       add_immBlock_pred(block, proj);
+               }
        } else {
                saw_default_label = true;
                proj = new_d_defaultProj(dbgi, current_switch_cond,
                                         MAGIC_DEFAULT_PN_NUMBER);
+
+               add_immBlock_pred(block, proj);
        }
 
-       ir_node *block = new_immBlock();
        if (fallthrough != NULL) {
                add_immBlock_pred(block, fallthrough);
        }
-       add_immBlock_pred(block, proj);
        mature_immBlock(block);
+       set_cur_block(block);
 
-       if(statement->label_statement != NULL) {
-               statement_to_firm(statement->label_statement);
+       if(statement->statement != NULL) {
+               statement_to_firm(statement->statement);
        }
 }
 
@@ -3353,8 +4162,8 @@ static void label_to_firm(const label_statement_t *statement)
        set_cur_block(block);
        keep_alive(block);
 
-       if(statement->label_statement != NULL) {
-               statement_to_firm(statement->label_statement);
+       if(statement->statement != NULL) {
+               statement_to_firm(statement->statement);
        }
 }
 
@@ -3377,9 +4186,11 @@ typedef enum modifier_t {
        ASM_MODIFIER_EARLYCLOBBER = 1 << 3,
 } modifier_t;
 
-#if 0
 static void asm_statement_to_firm(const asm_statement_t *statement)
 {
+       (void) statement;
+       fprintf(stderr, "WARNING asm not implemented yet!\n");
+#if 0
        bool needs_memory = false;
 
        size_t         n_clobbers = 0;
@@ -3461,15 +4272,18 @@ static void asm_statement_to_firm(const asm_statement_t *statement)
 
                }
        }
-
-}
 #endif
+}
 
 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;
@@ -3513,9 +4327,8 @@ static void statement_to_firm(statement_t *statement)
                goto_to_firm(&statement->gotos);
                return;
        case STATEMENT_ASM:
-               //asm_statement_to_firm(&statement->asms);
-               //return;
-               break;
+               asm_statement_to_firm(&statement->asms);
+               return;
        }
        panic("Statement not implemented\n");
 }
@@ -3527,17 +4340,11 @@ static int count_local_declarations(const declaration_t *      decl,
 {
        int count = 0;
        for (; decl != end; decl = decl->next) {
+               if(decl->namespc != NAMESPACE_NORMAL)
+                       continue;
                const type_t *type = skip_typeref(decl->type);
-               switch (type->kind) {
-                       case TYPE_ATOMIC:
-                       case TYPE_ENUM:
-                       case TYPE_POINTER:
-                               if (!decl->address_taken)
-                                       ++count;
-                               break;
-
-                       default: break;
-               }
+               if (!decl->address_taken && is_type_scalar(type))
+                       ++count;
                const initializer_t *initializer = decl->init.initializer;
                /* FIXME: should walk initializer hierarchies... */
                if(initializer != NULL && initializer->kind == INITIALIZER_VALUE) {
@@ -3548,10 +4355,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 {
@@ -3561,8 +4370,71 @@ static int count_decls_in_expression(const expression_t *expression) {
        }
        EXPR_UNARY_CASES
                return count_decls_in_expression(expression->unary.value);
+       case EXPR_CALL: {
+               call_argument_t *argument = expression->call.arguments;
+               for( ; argument != NULL; argument = argument->next) {
+                       count += count_decls_in_expression(argument->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_FUNCNAME:
+       case EXPR_BUILTIN_SYMBOL:
+       case EXPR_VA_START:
+       case EXPR_VA_ARG:
                break;
        }
 
@@ -3578,6 +4450,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,
@@ -3609,7 +4484,9 @@ static int count_decls_in_stmts(const statement_t *stmt)
 
                        case STATEMENT_LABEL: {
                                const label_statement_t *const label_stmt = &stmt->label;
-                               count += count_decls_in_stmts(label_stmt->label_statement);
+                               if(label_stmt->statement != NULL) {
+                                       count += count_decls_in_stmts(label_stmt->statement);
+                               }
                                break;
                        }
 
@@ -3629,7 +4506,7 @@ static int count_decls_in_stmts(const statement_t *stmt)
 
                        case STATEMENT_FOR: {
                                const for_statement_t *const for_stmt = &stmt->fors;
-                               count += count_local_declarations(for_stmt->context.declarations, NULL);
+                               count += count_local_declarations(for_stmt->scope.declarations, NULL);
                                count += count_decls_in_expression(for_stmt->initialisation);
                                count += count_decls_in_expression(for_stmt->condition);
                                count += count_decls_in_expression(for_stmt->step);
@@ -3640,7 +4517,9 @@ static int count_decls_in_stmts(const statement_t *stmt)
                        case STATEMENT_CASE_LABEL: {
                                const case_label_statement_t *label = &stmt->case_label;
                                count += count_decls_in_expression(label->expression);
-                               count += count_decls_in_stmts(label->label_statement);
+                               if(label->statement != NULL) {
+                                       count += count_decls_in_stmts(label->statement);
+                               }
                                break;
                        }
 
@@ -3661,7 +4540,7 @@ static int count_decls_in_stmts(const statement_t *stmt)
 
                        case STATEMENT_RETURN: {
                                const return_statement_t *ret_stmt = &stmt->returns;
-                               count += count_decls_in_expression(ret_stmt->return_value);
+                               count += count_decls_in_expression(ret_stmt->value);
                                break;
                        }
                }
@@ -3674,7 +4553,7 @@ static int get_function_n_local_vars(declaration_t *declaration)
        int count = 0;
 
        /* count parameters */
-       count += count_local_declarations(declaration->context.declarations, NULL);
+       count += count_local_declarations(declaration->scope.declarations, NULL);
 
        /* count local variables declared in body */
        count += count_decls_in_stmts(declaration->init.statement);
@@ -3690,7 +4569,7 @@ static void initialize_function_parameters(declaration_t *declaration)
        ir_type         *function_irtype = get_ir_type(declaration->type);
 
        int            n         = 0;
-       declaration_t *parameter = declaration->context.declarations;
+       declaration_t *parameter = declaration->scope.declarations;
        for( ; parameter != NULL; parameter = parameter->next, ++n) {
                assert(parameter->declaration_kind == DECLARATION_KIND_UNKNOWN);
                type_t *type = skip_typeref(parameter->type);
@@ -3718,6 +4597,7 @@ static void initialize_function_parameters(declaration_t *declaration)
 
                parameter->declaration_kind = DECLARATION_KIND_LOCAL_VARIABLE;
                parameter->v.value_number   = next_value_number_function;
+               set_irg_loc_description(current_ir_graph, next_value_number_function, parameter);
                ++next_value_number_function;
 
                set_value(parameter->v.value_number, proj);
@@ -3768,6 +4648,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);
@@ -3855,71 +4736,14 @@ 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);
 }
 
-static void create_global_variable(declaration_t *declaration)
-{
-       ir_visibility  vis;
-       ir_type       *var_type;
-       switch ((storage_class_tag_t)declaration->storage_class) {
-               case STORAGE_CLASS_STATIC:
-                       vis = visibility_local;
-                       goto global_var;
-
-               case STORAGE_CLASS_EXTERN:
-                       vis = visibility_external_allocated;
-                       goto global_var;
-
-               case STORAGE_CLASS_NONE:
-                       vis = visibility_external_visible;
-                       goto global_var;
-
-               case STORAGE_CLASS_THREAD:
-                       vis = visibility_external_visible;
-                       goto tls_var;
-
-               case STORAGE_CLASS_THREAD_EXTERN:
-                       vis = visibility_external_allocated;
-                       goto tls_var;
-
-               case STORAGE_CLASS_THREAD_STATIC:
-                       vis = visibility_local;
-                       goto tls_var;
-
-tls_var:
-                       var_type = get_tls_type();
-                       goto create_var;
-
-global_var:
-                       var_type = get_glob_type();
-                       goto create_var;
-
-create_var:
-                       create_declaration_entity(declaration,
-                                                 DECLARATION_KIND_GLOBAL_VARIABLE,
-                                                 var_type);
-                       set_entity_visibility(declaration->v.entity, vis);
-
-                       current_ir_graph = get_const_code_irg();
-                       create_initializer(declaration);
-                       return;
-
-               case STORAGE_CLASS_TYPEDEF:
-               case STORAGE_CLASS_AUTO:
-               case STORAGE_CLASS_REGISTER:
-               case STORAGE_CLASS_ENUM_ENTRY:
-                       break;
-       }
-       panic("Invalid storage class for global variable");
-}
-
-static void context_to_firm(context_t *context)
+static void scope_to_firm(scope_t *scope)
 {
        /* first pass: create declarations */
-       declaration_t *declaration = context->declarations;
+       declaration_t *declaration = scope->declarations;
        for( ; declaration != NULL; declaration = declaration->next) {
                if(declaration->namespc != NAMESPACE_NORMAL)
                        continue;
@@ -3937,8 +4761,8 @@ static void context_to_firm(context_t *context)
                }
        }
 
-       /* second pass: create code */
-       declaration = context->declarations;
+       /* second pass: create code/initializers */
+       declaration = scope->declarations;
        for( ; declaration != NULL; declaration = declaration->next) {
                if(declaration->namespc != NAMESPACE_NORMAL)
                        continue;
@@ -3949,10 +4773,14 @@ static void context_to_firm(context_t *context)
                        continue;
 
                type_t *type = declaration->type;
-               if(type->kind != TYPE_FUNCTION)
-                       continue;
-
-               create_function(declaration);
+               if(type->kind == TYPE_FUNCTION) {
+                       create_function(declaration);
+               } else {
+                       assert(declaration->declaration_kind
+                                       == DECLARATION_KIND_GLOBAL_VARIABLE);
+                       current_ir_graph = get_const_code_irg();
+                       create_declaration_initializer(declaration);
+               }
        }
 }
 
@@ -3967,13 +4795,13 @@ void init_ast2firm(void)
        }
 }
 
-void exit_ast2firm(void)
+static void init_ir_types(void)
 {
-       obstack_free(&asm_obst, NULL);
-}
+       static int ir_types_initialized = 0;
+       if(ir_types_initialized)
+               return;
+       ir_types_initialized = 1;
 
-void translation_unit_to_firm(translation_unit_t *unit)
-{
        type_const_char = make_atomic_type(ATOMIC_TYPE_CHAR, TYPE_QUALIFIER_CONST);
        type_void       = make_atomic_type(ATOMIC_TYPE_VOID, TYPE_QUALIFIER_NONE);
        type_int        = make_atomic_type(ATOMIC_TYPE_INT,  TYPE_QUALIFIER_NONE);
@@ -3985,11 +4813,21 @@ void translation_unit_to_firm(translation_unit_t *unit)
                                                       type in firm */
 
        type_void->base.firm_type = ir_type_void;
+}
 
+void exit_ast2firm(void)
+{
+       obstack_free(&asm_obst, NULL);
+}
+
+void translation_unit_to_firm(translation_unit_t *unit)
+{
        /* just to be sure */
        continue_label      = NULL;
        break_label         = NULL;
        current_switch_cond = NULL;
 
-       context_to_firm(&unit->context);
+       init_ir_types();
+
+       scope_to_firm(&unit->scope);
 }