always transmit const source_position_t * instead of source_position_t
[cparser] / ast2firm.c
index 832c30f..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"
 
 #define MAGIC_DEFAULT_PN_NUMBER            (long) -314159265
 
@@ -26,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;
@@ -38,31 +59,32 @@ static ir_node **imature_blocks;
 
 static const declaration_t *current_function_decl;
 static ir_node             *current_function_name;
-
-typedef enum declaration_type_t {
-       DECLARATION_TYPE_UNKNOWN,
-       DECLARATION_TYPE_FUNCTION,
-       DECLARATION_TYPE_GLOBAL_VARIABLE,
-       DECLARATION_TYPE_LOCAL_VARIABLE,
-       DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY,
-       DECLARATION_TYPE_COMPOUND_MEMBER,
-       DECLARATION_TYPE_LABEL_BLOCK,
-       DECLARATION_TYPE_ENUM_ENTRY
-} declaration_type_t;
+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,
+       DECLARATION_KIND_COMPOUND_MEMBER,
+       DECLARATION_KIND_LABEL_BLOCK,
+       DECLARATION_KIND_ENUM_ENTRY
+} declaration_kind_t;
 
 static ir_type *get_ir_type(type_t *type);
+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);
 }
 
@@ -75,7 +97,7 @@ unsigned dbg_snprint(char *buf, unsigned len, const dbg_info *dbg)
                                   pos->linenr);
 }
 
-const char *retrieve_dbg(const dbg_info *dbg, unsigned *line)
+const char *dbg_retrieve(const dbg_info *dbg, unsigned *line)
 {
        const source_position_t *pos = (const source_position_t*) dbg;
        if(pos == NULL)
@@ -85,12 +107,9 @@ const char *retrieve_dbg(const dbg_info *dbg, unsigned *line)
        return pos->input_name;
 }
 
-void init_ast2firm(void)
-{
-}
-
-void exit_ast2firm(void)
+static dbg_info *get_dbg_info(const source_position_t *pos)
 {
+       return (dbg_info*) pos;
 }
 
 static unsigned unique_id = 0;
@@ -104,95 +123,150 @@ static ident *unique_ident(const char *tag)
        return new_id_from_str(buf);
 }
 
-static ir_mode *get_atomic_mode(const atomic_type_t* atomic_type)
+/**
+ * Return the signed integer mode of size bytes.
+ *
+ * @param size   the size
+ */
+static ir_mode *get_smode(unsigned size)
 {
-       switch(atomic_type->atype) {
-       case ATOMIC_TYPE_SCHAR:
-       case ATOMIC_TYPE_CHAR:
-               return mode_Bs;
-       case ATOMIC_TYPE_UCHAR:
-               return mode_Bu;
-       case ATOMIC_TYPE_SHORT:
-               return mode_Hs;
-       case ATOMIC_TYPE_USHORT:
-               return mode_Hu;
-       case ATOMIC_TYPE_LONG:
-       case ATOMIC_TYPE_INT:
-               return mode_Is;
-       case ATOMIC_TYPE_ULONG:
-       case ATOMIC_TYPE_UINT:
-               return mode_Iu;
-       case ATOMIC_TYPE_LONGLONG:
-               return mode_Ls;
-       case ATOMIC_TYPE_ULONGLONG:
-               return mode_Lu;
-       case ATOMIC_TYPE_FLOAT:
-               return mode_F;
-       case ATOMIC_TYPE_DOUBLE:
-               return mode_D;
-       case ATOMIC_TYPE_LONG_DOUBLE:
-               return mode_E;
-       case ATOMIC_TYPE_BOOL:
-               return mode_b;
-#ifdef PROVIDE_COMPLEX
-       case ATOMIC_TYPE_FLOAT_COMPLEX:
-       case ATOMIC_TYPE_DOUBLE_COMPLEX:
-       case ATOMIC_TYPE_LONG_DOUBLE_COMPLEX:
-               panic("complex lowering not implemented yet");
-               break;
-       case ATOMIC_TYPE_FLOAT_IMAGINARY:
-       case ATOMIC_TYPE_DOUBLE_IMAGINARY:
-       case ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY:
-               panic("imaginary lowering not implemented yet");
-               break;
-#endif
-       case ATOMIC_TYPE_VOID:
-               /* firm has no real void... */
-               return mode_Is;
-       case ATOMIC_TYPE_INVALID:
-               break;
+       static ir_mode *s_modes[16 + 1] = {0, };
+       ir_mode *res;
+
+       if (size <= 0 || size > 16)
+               return NULL;
+
+       res = s_modes[size];
+       if (res == NULL) {
+               unsigned bits;
+       char name[32];
+
+       bits = size * 8;
+       snprintf(name, sizeof(name), "i%u", bits);
+       res = new_ir_mode(name, irms_int_number, bits, 1, irma_twos_complement,
+                                       bits <= machine_size ? machine_size : bits );
+
+               s_modes[size] = res;
        }
-       panic("Encountered unknown atomic type");
+       return res;
 }
 
+/**
+ * Return the unsigned integer mode of size bytes.
+ *
+ * @param size  the size
+ */
+static ir_mode *get_umode(unsigned size)
+{
+       static ir_mode *u_modes[16 + 1] = {0, };
+       ir_mode *res;
+
+       if (size <= 0 || size > 16)
+               return NULL;
+
+       res = u_modes[size];
+       if (res == NULL) {
+               unsigned bits;
+               char name[32];
 
-static unsigned get_type_size(type_t *type);
+               bits = size * 8;
+               snprintf(name, sizeof(name), "u%u", bits);
+               res = new_ir_mode(name, irms_int_number, bits, 0, irma_twos_complement,
+                                               bits <= machine_size ? machine_size : bits );
 
-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;
+               u_modes[size] = res;
+       }
+       return res;
+}
 
-       case ATOMIC_TYPE_SHORT:
-       case ATOMIC_TYPE_USHORT:
-               return 2;
+/**
+ * Return the pointer mode of size bytes.
+ *
+ * @param size  the size
+ */
+static ir_mode *get_ptrmode(unsigned size, char *name)
+{
+       static ir_mode *p_modes[16 + 1] = {0, };
+       ir_mode *res;
 
-       case ATOMIC_TYPE_BOOL:
-       case ATOMIC_TYPE_INT:
-       case ATOMIC_TYPE_UINT:
-       case ATOMIC_TYPE_LONG:
-       case ATOMIC_TYPE_ULONG:
-       case ATOMIC_TYPE_FLOAT:
-               return 4;
+       if (size <= 0 || size > 16)
+               return NULL;
 
-       case ATOMIC_TYPE_LONGLONG:
-       case ATOMIC_TYPE_ULONGLONG:
-       case ATOMIC_TYPE_DOUBLE:
-               return 8;
+       res = p_modes[size];
+       if (res == NULL) {
+               unsigned bits;
+               char buf[32];
 
-       case ATOMIC_TYPE_LONG_DOUBLE:
-               return 12;
+               bits = size * 8;
+               if (name == NULL) {
+                       snprintf(buf, sizeof(buf), "p%u", bits);
+                       name = buf;
+               }
+               res = new_ir_mode(name, irms_reference, bits, 0, irma_twos_complement,
+                                               bits <= machine_size ? machine_size : bits);
 
-       case ATOMIC_TYPE_VOID:
-               return 1;
+               p_modes[size] = res;
 
-       case ATOMIC_TYPE_INVALID:
-               break;
+               set_reference_mode_signed_eq(res, get_smode(size));
+               set_reference_mode_unsigned_eq(res, get_umode(size));
        }
-       panic("Trying to determine size of invalid atomic type");
+       return res;
+}
+
+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.
+ */
+static void init_atomic_modes(void) {
+       unsigned int_size   = machine_size < 32 ? 2 : 4;
+       unsigned long_size  = machine_size < 64 ? 4 : 8;
+       unsigned llong_size = machine_size < 32 ? 4 : 8;
+
+       /* firm has no real void... */
+       _atomic_modes[ATOMIC_TYPE_VOID]        = mode_T;
+       _atomic_modes[ATOMIC_TYPE_CHAR]        = char_is_signed ? get_smode(1) : get_umode(1);
+       _atomic_modes[ATOMIC_TYPE_SCHAR]       = get_smode(1);
+       _atomic_modes[ATOMIC_TYPE_UCHAR]       = get_umode(1);
+       _atomic_modes[ATOMIC_TYPE_SHORT]       = get_smode(2);
+       _atomic_modes[ATOMIC_TYPE_USHORT]      = get_umode(2);
+       _atomic_modes[ATOMIC_TYPE_INT]         = get_smode(int_size);
+       _atomic_modes[ATOMIC_TYPE_UINT]        = get_umode(int_size);
+       _atomic_modes[ATOMIC_TYPE_LONG]        = get_smode(long_size);
+       _atomic_modes[ATOMIC_TYPE_ULONG]       = get_umode(long_size);
+       _atomic_modes[ATOMIC_TYPE_LONGLONG]    = get_smode(llong_size);
+       _atomic_modes[ATOMIC_TYPE_ULONGLONG]   = get_umode(llong_size);
+       _atomic_modes[ATOMIC_TYPE_FLOAT]       = mode_F;
+       _atomic_modes[ATOMIC_TYPE_DOUBLE]      = mode_D;
+       _atomic_modes[ATOMIC_TYPE_LONG_DOUBLE] = mode_E;
+       _atomic_modes[ATOMIC_TYPE_BOOL]        = get_umode(int_size);
+
+       _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];
+
+       /* Hmm, pointers should be machine size */
+       set_modeP_data(get_ptrmode(machine_size >> 3, NULL));
+       set_modeP_code(get_ptrmode(machine_size >> 3, NULL));
+
+       mode_int  = _atomic_modes[ATOMIC_TYPE_INT];
+       mode_uint = _atomic_modes[ATOMIC_TYPE_UINT];
+}
+
+static ir_mode *get_atomic_mode(const atomic_type_t* atomic_type)
+{
+       ir_mode *res = NULL;
+       if ((unsigned)atomic_type->akind <= (unsigned)ATOMIC_TYPE_LAST)
+               res = _atomic_modes[(unsigned)atomic_type->akind];
+       if (res == NULL)
+               panic("Encountered unknown atomic type");
+       return res;
 }
 
 static unsigned get_compound_type_size(compound_type_t *type)
@@ -203,19 +277,23 @@ 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->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_Is);
+               return get_mode_size_bytes(mode_int);
        case TYPE_COMPOUND_UNION:
        case TYPE_COMPOUND_STRUCT:
                return get_compound_type_size(&type->compound);
@@ -227,7 +305,9 @@ 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:
        case TYPE_TYPEOF:
        case TYPE_INVALID:
@@ -236,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;
@@ -249,15 +353,21 @@ 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);
+       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);
+       }
 
        return irtype;
 }
@@ -269,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);
@@ -299,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);
@@ -314,113 +426,332 @@ 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;
 }
 
-#define INVALID_TYPE ((ir_type_ptr)-1)
+/**
+ * Return the signed integer type of size bits.
+ *
+ * @param size   the size
+ */
+static ir_type *get_signed_int_type_for_bit_size(ir_type *base_tp,
+                                                 unsigned size)
+{
+       static ir_mode *s_modes[64 + 1] = {NULL, };
+       ir_type *res;
+       ir_mode *mode;
+
+       if (size <= 0 || size > 64)
+               return NULL;
+
+       mode = s_modes[size];
+       if (mode == NULL) {
+               char name[32];
+
+               snprintf(name, sizeof(name), "bf_I%u", size);
+               mode = new_ir_mode(name, irms_int_number, size, 1, irma_twos_complement,
+                                  size <= 32 ? 32 : size );
+               s_modes[size] = mode;
+       }
+
+       char name[32];
+       snprintf(name, sizeof(name), "I%u", size);
+       ident *id = new_id_from_str(name);
+       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;
+}
+
+/**
+ * Return the unsigned integer type of size bits.
+ *
+ * @param size   the size
+ */
+static ir_type *get_unsigned_int_type_for_bit_size(ir_type *base_tp,
+                                                   unsigned size)
+{
+       static ir_mode *u_modes[64 + 1] = {NULL, };
+       ir_type *res;
+       ir_mode *mode;
+
+       if (size <= 0 || size > 64)
+               return NULL;
+
+       mode = u_modes[size];
+       if (mode == NULL) {
+               char name[32];
+
+               snprintf(name, sizeof(name), "bf_U%u", size);
+               mode = new_ir_mode(name, irms_int_number, size, 0, irma_twos_complement,
+                                  size <= 32 ? 32 : size );
+               u_modes[size] = mode;
+       }
+
+       char name[32];
 
-static ir_type *create_struct_type(compound_type_t *type)
+       snprintf(name, sizeof(name), "U%u", size);
+       ident *id = new_id_from_str(name);
+       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;
+}
+
+static ir_type *create_bitfield_type(bitfield_type_t *const type)
 {
-       symbol_t *symbol = type->declaration->symbol;
-       ident    *id;
-       if(symbol != NULL) {
-               id = unique_ident(symbol->string);
+       type_t *base = skip_typeref(type->base);
+       assert(base->kind == TYPE_ATOMIC);
+       ir_type *irbase = get_ir_type(base);
+
+       unsigned size = fold_constant(type->size);
+
+       assert(!is_type_float(base));
+       if(is_type_signed(base)) {
+               return get_signed_int_type_for_bit_size(irbase, size);
        } else {
-               id = unique_ident("__anonymous_struct");
+               return get_unsigned_int_type_for_bit_size(irbase, size);
+       }
+}
+
+#define INVALID_TYPE ((ir_type_ptr)-1)
+
+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)
+{
+       declaration_t *declaration = type->declaration;
+       if(declaration->v.irtype != NULL) {
+               return declaration->v.irtype;
        }
-       ir_type *ir_type = new_type_struct(id);
 
-       type->type.firm_type = ir_type;
+       size_t align_all  = 1;
+       size_t offset     = 0;
+       size_t bit_offset = 0;
+       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;
+       }
 
-       int align_all = 1;
-       int offset    = 0;
-       declaration_t *entry = type->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_ptr  entry_ir_type = get_ir_type(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);
+               } else {
+                       base_irtype = get_ir_type(entry_type);
+               }
 
-               int entry_size      = get_type_size_bytes(entry_ir_type);
-               int entry_alignment = get_type_alignment_bytes(entry_ir_type);
-               int misalign        = offset % entry_alignment;
-               if (misalign != 0)
-                       offset += entry_alignment - misalign;
+               size_t entry_alignment = get_type_alignment_bytes(base_irtype);
+               size_t misalign        = offset % entry_alignment;
 
-               ir_entity *entity = new_entity(ir_type, ident, entry_ir_type);
-               set_entity_offset(entity, offset);
-               add_struct_member(ir_type, entity);
-               entry->declaration_type = DECLARATION_TYPE_COMPOUND_MEMBER;
-               entry->v.entity         = entity;
+               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;
+               if(entry_type->kind == TYPE_BITFIELD) {
+                       size_t size_bits      = fold_constant(entry_type->bitfield.size);
+                       size_t rest_size_bits = (entry_alignment - misalign)*8 - bit_offset;
+
+                       if(size_bits > rest_size_bits) {
+                               /* start a new bucket */
+                               offset     += entry_alignment - misalign;
+                               bit_offset  = 0;
+
+                               base           = offset;
+                               bits_remainder = 0;
+                       } else {
+                               /* put into current bucket */
+                               base           = offset - misalign;
+                               bits_remainder = misalign * 8 + bit_offset;
+                       }
+
+                       offset     += size_bits / 8;
+                       bit_offset  = bit_offset + (size_bits % 8);
+               } else {
+                       size_t entry_size = get_type_size_bytes(base_irtype);
+                       if(misalign > 0 || bit_offset > 0)
+                               offset += entry_alignment - misalign;
+
+                       base           = offset;
+                       bits_remainder = 0;
+                       offset        += entry_size;
+                       bit_offset     = 0;
+               }
 
-               offset += entry_size;
                if(entry_alignment > align_all) {
                        if(entry_alignment % align_all != 0) {
-                               panic("Uneven alignments not supported yet");
+                               panic("uneven alignments not supported yet");
                        }
                        align_all = entry_alignment;
                }
+
+               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;
        }
 
-       int misalign = offset % align_all;
-       offset += misalign;
-       set_type_alignment_bytes(ir_type, align_all);
-       set_type_size_bytes(ir_type, offset);
-       set_type_state(ir_type, layout_fixed);
+       size_t misalign = offset % align_all;
+       if(misalign > 0 || bit_offset > 0) {
+               offset += align_all - misalign;
+       }
 
-       return ir_type;
+       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  *ir_type = new_type_union(id);
 
-       type->type.firm_type = ir_type;
+       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_ptr  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);
 
-               ir_entity *entity = new_entity(ir_type, ident, entry_ir_type);
-               add_union_member(ir_type, entity);
+               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);
                set_entity_offset(entity, 0);
-               entry->declaration_type = DECLARATION_TYPE_COMPOUND_MEMBER;
+               entry->declaration_kind = DECLARATION_KIND_COMPOUND_MEMBER;
+               assert(entry->v.entity == NULL);
                entry->v.entity         = entity;
 
                if(entry_size > size) {
@@ -434,21 +765,35 @@ static ir_type *create_union_type(compound_type_t *type)
                }
        }
 
-       set_type_alignment_bytes(ir_type, align_all);
-       set_type_size_bytes(ir_type, size);
-       set_type_state(ir_type, layout_fixed);
+       if(outer_offset != NULL) {
+               assert(*outer_offset == offset);
 
-       return ir_type;
-}
+               size_t misalign = offset % align_all;
+               if (misalign != 0)
+                       size += align_all - misalign;
+               *outer_offset += size;
 
-static ir_node *expression_to_firm(const expression_t *expression);
-static inline ir_mode *get_ir_mode(type_t *type);
+               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_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);
 
@@ -457,7 +802,7 @@ static ir_type *create_enum_type(enum_type_t *const type)
                if (declaration->storage_class != STORAGE_CLASS_ENUM_ENTRY)
                        break;
 
-               declaration->declaration_type = DECLARATION_TYPE_ENUM_ENTRY;
+               declaration->declaration_kind = DECLARATION_KIND_ENUM_ENTRY;
 
                expression_t *const init = declaration->init.enum_value;
                if (init != NULL) {
@@ -486,7 +831,9 @@ static ir_type *get_ir_type(type_t *type)
        }
 
        ir_type *firm_type = NULL;
-       switch(type->type) {
+       switch(type->kind) {
+       case TYPE_ERROR:
+               panic("error type occured");
        case TYPE_ATOMIC:
                firm_type = create_atomic_type(&type->atomic);
                break;
@@ -500,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);
@@ -511,6 +858,10 @@ static ir_type *get_ir_type(type_t *type)
        case TYPE_BUILTIN:
                firm_type = get_ir_type(type->builtin.real_type);
                break;
+       case TYPE_BITFIELD:
+               firm_type = create_bitfield_type(&type->bitfield);
+               break;
+
        case TYPE_TYPEOF:
        case TYPE_TYPEDEF:
        case TYPE_INVALID:
@@ -529,7 +880,7 @@ static inline ir_mode *get_ir_mode(type_t *type)
 
        /* firm doesn't report a mode for arrays somehow... */
        if(is_Array_type(irtype)) {
-               return mode_P;
+               return mode_P_data;
        }
 
        ir_mode *mode = get_type_mode(irtype);
@@ -537,11 +888,94 @@ static inline ir_mode *get_ir_mode(type_t *type)
        return mode;
 }
 
+static ident *predef_idents[rts_max];
+
+/** Names of the runtime functions. */
+static const struct {
+       int        id;           /**< the rts id */
+       int        n_res;        /**< number of return values */
+       const char *name;        /**< the name of the rts function */
+       int        n_params;     /**< number of parameters */
+       unsigned   flags;        /**< language flags */
+} rts_data[] = {
+       { rts_debugbreak, 0, "__debugbreak", 0, _MS },
+       { rts_abort,      0, "abort",        0, _C89 },
+       { rts_abs,        1, "abs",          1, _C89 },
+       { rts_labs,       1, "labs",         1, _C89 },
+       { rts_llabs,      1, "llabs",        1, _C99 },
+       { rts_imaxabs,    1, "imaxabs",      1, _C99 },
+
+       { rts_fabs,       1, "fabs",         1, _C89 },
+       { rts_sqrt,       1, "sqrt",         1, _C89 },
+       { rts_cbrt,       1, "cbrt",         1, _C99 },
+       { rts_exp,        1, "exp",          1, _C89 },
+       { rts_exp2,       1, "exp2",         1, _C89 },
+       { rts_exp10,      1, "exp10",        1, _GNUC },
+       { rts_log,        1, "log",          1, _C89 },
+       { rts_log2,       1, "log2",         1, _C89 },
+       { rts_log10,      1, "log10",        1, _C89 },
+       { rts_pow,        1, "pow",          2, _C89 },
+       { rts_sin,        1, "sin",          1, _C89 },
+       { rts_cos,        1, "cos",          1, _C89 },
+       { rts_tan,        1, "tan",          1, _C89 },
+       { rts_asin,       1, "asin",         1, _C89 },
+       { rts_acos,       1, "acos",         1, _C89 },
+       { rts_atan,       1, "atan",         1, _C89 },
+       { rts_sinh,       1, "sinh",         1, _C89 },
+       { rts_cosh,       1, "cosh",         1, _C89 },
+       { rts_tanh,       1, "tanh",         1, _C89 },
+
+       { rts_fabsf,      1, "fabsf",        1, _C99 },
+       { rts_sqrtf,      1, "sqrtf",        1, _C99 },
+       { rts_cbrtf,      1, "cbrtf",        1, _C99 },
+       { rts_expf,       1, "expf",         1, _C99 },
+       { rts_exp2f,      1, "exp2f",        1, _C99 },
+       { rts_exp10f,     1, "exp10f",       1, _GNUC },
+       { rts_logf,       1, "logf",         1, _C99 },
+       { rts_log2f,      1, "log2f",        1, _C99 },
+       { rts_log10f,     1, "log10f",       1, _C99 },
+       { rts_powf,       1, "powf",         2, _C99 },
+       { rts_sinf,       1, "sinf",         1, _C99 },
+       { rts_cosf,       1, "cosf",         1, _C99 },
+       { rts_tanf,       1, "tanf",         1, _C99 },
+       { rts_asinf,      1, "asinf",        1, _C99 },
+       { rts_acosf,      1, "acosf",        1, _C99 },
+       { rts_atanf,      1, "atanf",        1, _C99 },
+       { rts_sinhf,      1, "sinhf",        1, _C99 },
+       { rts_coshf,      1, "coshf",        1, _C99 },
+       { rts_tanhf,      1, "tanhf",        1, _C99 },
+
+       { rts_fabsl,      1, "fabsl",        1, _C99 },
+       { rts_sqrtl,      1, "sqrtl",        1, _C99 },
+       { rts_cbrtl,      1, "cbrtl",        1, _C99 },
+       { rts_expl,       1, "expl",         1, _C99 },
+       { rts_exp2l,      1, "exp2l",        1, _C99 },
+       { rts_exp10l,     1, "exp10l",       1, _GNUC },
+       { rts_logl,       1, "logl",         1, _C99 },
+       { rts_log2l,      1, "log2l",        1, _C99 },
+       { rts_log10l,     1, "log10l",       1, _C99 },
+       { rts_powl,       1, "powl",         2, _C99 },
+       { rts_sinl,       1, "sinl",         1, _C99 },
+       { rts_cosl,       1, "cosl",         1, _C99 },
+       { rts_tanl,       1, "tanl",         1, _C99 },
+       { rts_asinl,      1, "asinl",        1, _C99 },
+       { rts_acosl,      1, "acosl",        1, _C99 },
+       { rts_atanl,      1, "atanl",        1, _C99 },
+       { rts_sinhl,      1, "sinhl",        1, _C99 },
+       { rts_coshl,      1, "coshl",        1, _C99 },
+       { rts_tanhl,      1, "tanhl",        1, _C99 },
+
+       { rts_memcpy,     1, "memcpy",       3, _C89 },  /* HMM, man say its C99 */
+       { rts_memset,     1, "memset",       3, _C89 },  /* HMM, man say its C99 */
+       { rts_strcmp,     1, "strcmp",       2, _C89 },
+       { rts_strncmp,    1, "strncmp",      3, _C89 }
+};
+
 static ir_entity* get_function_entity(declaration_t *declaration)
 {
-       if(declaration->declaration_type == DECLARATION_TYPE_FUNCTION)
+       if(declaration->declaration_kind == DECLARATION_KIND_FUNCTION)
                return declaration->v.entity;
-       assert(declaration->declaration_type == DECLARATION_TYPE_UNKNOWN);
+       assert(declaration->declaration_kind == DECLARATION_KIND_UNKNOWN);
 
        symbol_t *symbol = declaration->symbol;
        ident    *id     = new_id_from_str(symbol->string);
@@ -550,7 +984,8 @@ static ir_entity* get_function_entity(declaration_t *declaration)
        ir_type  *ir_type_method = get_ir_type(declaration->type);
        assert(is_Method_type(ir_type_method));
 
-       ir_entity *entity = new_entity(global_type, id, ir_type_method);
+       dbg_info  *const dbgi   = get_dbg_info(&declaration->source_position);
+       ir_entity *const entity = new_d_entity(global_type, id, ir_type_method, dbgi);
        set_entity_ld_ident(entity, id);
        if(declaration->storage_class == STORAGE_CLASS_STATIC
                        || declaration->is_inline) {
@@ -559,23 +994,43 @@ static ir_entity* get_function_entity(declaration_t *declaration)
                set_entity_visibility(entity, visibility_external_visible);
        } else {
                set_entity_visibility(entity, visibility_external_allocated);
+
+               /* We should check for file scope here, but as long as we compile C only
+                  this is not needed. */
+               int    n_params = get_method_n_params(ir_type_method);
+               int    n_res    = get_method_n_ress(ir_type_method);
+               int    i;
+
+               if (n_params == 0 && n_res == 0 && id == predef_idents[rts_abort]) {
+                       /* found abort(), store for later */
+                       //abort_ent = ent;
+                       //abort_tp  = ftype;
+               } else {
+                       if (! firm_opt.freestanding) {
+                               /* check for a known runtime function */
+                               for (i = 0; i < rts_max; ++i) {
+                                       /* ignore those rts functions not necessary needed for current mode */
+                                       if ((c_mode & rts_data[i].flags) == 0)
+                                               continue;
+                                       if (n_params == rts_data[i].n_params && n_res == rts_data[i].n_res &&
+                                               id == predef_idents[rts_data[i].id])
+                                               rts_entities[rts_data[i].id] = entity;
+                               }
+                       }
+               }
        }
+       set_entity_allocation(entity, allocation_static);
 
-       declaration->declaration_type = DECLARATION_TYPE_FUNCTION;
+       declaration->declaration_kind = DECLARATION_KIND_FUNCTION;
        declaration->v.entity         = entity;
 
        return entity;
 }
 
-static dbg_info *get_dbg_info(const source_position_t *pos)
-{
-       return (dbg_info*) pos;
-}
-
 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;
@@ -595,31 +1050,65 @@ static ir_node *const_to_firm(const const_expression_t *cnst)
        return new_d_Const(dbgi, mode, tv);
 }
 
-static ir_node *create_symconst(dbg_info *dbgi, ir_entity *entity)
+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)
 {
        assert(entity != NULL);
        union symconst_symbol sym;
        sym.entity_p = entity;
-       return new_d_SymConst(dbgi, sym, symconst_addr_ent);
+       return new_d_SymConst(dbgi, mode, sym, symconst_addr_ent);
 }
 
 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);
-       ir_entity *const entity = new_entity(global_type, id, type);
+       ir_entity *const entity = new_d_entity(global_type, id, type, dbgi);
        set_entity_ld_ident(entity, id);
        set_entity_variability(entity, variability_constant);
+       set_entity_allocation(entity, allocation_static);
 
        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);
@@ -634,16 +1123,14 @@ static ir_node *string_to_firm(const source_position_t *const src_pos,
        set_array_entity_values(entity, tvs, slen);
        free(tvs);
 
-       dbg_info *const dbgi = get_dbg_info(src_pos);
-
-       return create_symconst(dbgi, entity);
+       return create_symconst(dbgi, mode_P_data, entity);
 }
 
 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(
@@ -651,13 +1138,15 @@ 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");
-       ir_entity *const entity = new_entity(global_type, id, type);
+       ir_entity *const entity = new_d_entity(global_type, id, type, dbgi);
        set_entity_ld_ident(entity, id);
        set_entity_variability(entity, variability_constant);
+       set_entity_allocation(entity, allocation_static);
 
        ir_mode *const mode      = get_type_mode(elem_type);
 
@@ -677,15 +1166,16 @@ static ir_node *wide_string_literal_to_firm(
        set_array_entity_values(entity, tvs, slen);
        free(tvs);
 
-       dbg_info *const dbgi = get_dbg_info(&literal->expression.source_position);
-
-       return create_symconst(dbgi, entity);
+       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;
        }
 
@@ -694,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;
 }
@@ -721,7 +1216,7 @@ static ir_node *do_strict_conv(dbg_info *dbgi, ir_node *node)
 static ir_node *get_global_var_address(dbg_info *const dbgi,
                                        const declaration_t *const decl)
 {
-       assert(decl->declaration_type == DECLARATION_TYPE_GLOBAL_VARIABLE);
+       assert(decl->declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE);
 
        ir_entity *const entity = decl->v.entity;
        switch ((storage_class_tag_t)decl->storage_class) {
@@ -734,52 +1229,68 @@ static ir_node *get_global_var_address(dbg_info *const dbgi,
                }
 
                default:
-                       return create_symconst(dbgi, entity);
+                       return create_symconst(dbgi, mode_P_data, entity);
+       }
+}
+
+/* Returns the correct base address depending on whether it is a parameter or a
+ * normal local variable */
+static ir_node *get_local_frame(ir_entity *const ent)
+{
+       ir_graph      *const irg   = current_ir_graph;
+       const ir_type *const owner = get_entity_owner(ent);
+       if (owner == get_irg_frame_type(irg)) {
+               return get_irg_frame(irg);
+       } else {
+               assert(owner == get_method_value_param_type(get_entity_type(get_irg_entity(irg))));
+               return get_irg_value_param_base(irg);
        }
 }
 
 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);
 
-       switch((declaration_type_t) declaration->declaration_type) {
-       case DECLARATION_TYPE_UNKNOWN:
+       switch((declaration_kind_t) declaration->declaration_kind) {
+       case DECLARATION_KIND_UNKNOWN:
                if (declaration->storage_class != STORAGE_CLASS_ENUM_ENTRY) {
                        break;
                }
                get_ir_type(type);
                /* FALLTHROUGH */
 
-       case DECLARATION_TYPE_ENUM_ENTRY: {
+       case DECLARATION_KIND_ENUM_ENTRY: {
                ir_mode *const mode = get_ir_mode(type);
                return new_Const(mode, declaration->v.enum_val);
        }
 
-       case DECLARATION_TYPE_LOCAL_VARIABLE: {
-               ir_mode *mode = get_ir_mode(type);
+       case DECLARATION_KIND_LOCAL_VARIABLE: {
+               ir_mode *const mode = get_ir_mode(type);
                return get_value(declaration->v.value_number, mode);
        }
-       case DECLARATION_TYPE_FUNCTION: {
-               return create_symconst(dbgi, declaration->v.entity);
+       case DECLARATION_KIND_FUNCTION: {
+               ir_mode *const mode = get_ir_mode(type);
+               return create_symconst(dbgi, mode, declaration->v.entity);
        }
-       case DECLARATION_TYPE_GLOBAL_VARIABLE: {
+       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_TYPE_LOCAL_VARIABLE_ENTITY: {
+       case DECLARATION_KIND_LOCAL_VARIABLE_ENTITY: {
                ir_entity *entity = declaration->v.entity;
-               ir_node   *frame  = get_irg_frame(current_ir_graph);
+               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_TYPE_COMPOUND_MEMBER:
-       case DECLARATION_TYPE_LABEL_BLOCK:
+       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");
        }
 
@@ -788,34 +1299,39 @@ 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_type_t) declaration->declaration_type) {
-       case DECLARATION_TYPE_UNKNOWN:
+       switch((declaration_kind_t) declaration->declaration_kind) {
+       case DECLARATION_KIND_UNKNOWN:
                break;
-       case DECLARATION_TYPE_LOCAL_VARIABLE:
+       case DECLARATION_KIND_LOCAL_VARIABLE:
                panic("local variable without entity has no address");
-       case DECLARATION_TYPE_FUNCTION: {
-               return create_symconst(dbgi, declaration->v.entity);
+       case DECLARATION_KIND_FUNCTION: {
+               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);
        }
-       case DECLARATION_TYPE_GLOBAL_VARIABLE: {
+       case DECLARATION_KIND_GLOBAL_VARIABLE: {
                ir_node *const addr = get_global_var_address(dbgi, declaration);
                return addr;
        }
-       case DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY: {
+       case DECLARATION_KIND_LOCAL_VARIABLE_ENTITY: {
                ir_entity *entity = declaration->v.entity;
-               ir_node   *frame  = get_irg_frame(current_ir_graph);
+               ir_node   *frame  = get_local_frame(entity);
                ir_node   *sel    = new_d_simpleSel(dbgi, new_NoMem(), frame, entity);
 
                return sel;
        }
 
-       case DECLARATION_TYPE_ENUM_ENTRY:
+       case DECLARATION_KIND_VARIABLE_LENGTH_ARRAY:
+               return declaration->v.vla_base;
+
+       case DECLARATION_KIND_ENUM_ENTRY:
                panic("trying to reference enum entry");
 
-       case DECLARATION_TYPE_COMPOUND_MEMBER:
-       case DECLARATION_TYPE_LABEL_BLOCK:
+       case DECLARATION_KIND_COMPOUND_MEMBER:
+       case DECLARATION_KIND_LABEL_BLOCK:
                panic("not implemented reference type");
        }
 
@@ -824,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->type == EXPR_BUILTIN_SYMBOL);
+       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);
@@ -874,12 +1390,12 @@ static ir_node *call_expression_to_firm(const call_expression_t *call)
        assert(get_cur_block() != NULL);
 
        expression_t *function = call->function;
-       if(function->type == EXPR_BUILTIN_SYMBOL) {
+       if(function->kind == EXPR_BUILTIN_SYMBOL) {
                return process_builtin_call(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);
@@ -892,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;
@@ -900,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,
@@ -924,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);
                }
 
@@ -971,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);
@@ -985,25 +1504,100 @@ 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)
 {
        dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
        value          = do_strict_conv(dbgi, value);
 
-       if(expression->type == EXPR_REFERENCE) {
-               reference_expression_t *ref = (reference_expression_t*) expression;
+       if(expression->kind == EXPR_REFERENCE) {
+               const reference_expression_t *ref = &expression->reference;
 
                declaration_t *declaration = ref->declaration;
-               assert(declaration->declaration_type != DECLARATION_TYPE_UNKNOWN);
-               if(declaration->declaration_type == DECLARATION_TYPE_LOCAL_VARIABLE) {
+               assert(declaration->declaration_kind != DECLARATION_KIND_UNKNOWN);
+               if(declaration->declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE) {
                        set_value(declaration->v.value_number, value);
                        return;
                }
        }
 
+       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);
 }
 
@@ -1026,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;
 
@@ -1036,30 +1630,29 @@ 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_Is, 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->type) {
-       case UNEXPR_POSTFIX_INCREMENT: {
+       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);
                return value_node;
        }
-       case UNEXPR_POSTFIX_DECREMENT: {
+       case EXPR_UNARY_POSTFIX_DECREMENT: {
                ir_node *new_value = new_d_Sub(dbgi, value_node, offset, mode);
                set_value_for_expression(value, new_value);
                return value_node;
        }
-       case UNEXPR_PREFIX_INCREMENT: {
+       case EXPR_UNARY_PREFIX_INCREMENT: {
                ir_node *new_value = new_d_Add(dbgi, value_node, offset, mode);
                set_value_for_expression(value, new_value);
                return new_value;
        }
-       case UNEXPR_PREFIX_DECREMENT: {
+       case EXPR_UNARY_PREFIX_DECREMENT: {
                ir_node *new_value = new_d_Sub(dbgi, value_node, offset, mode);
                set_value_for_expression(value, new_value);
                return new_value;
@@ -1070,83 +1663,252 @@ static ir_node *create_incdec(const unary_expression_t *expression)
        }
 }
 
-static ir_node *unary_expression_to_firm(const unary_expression_t *expression)
+static bool is_local_variable(expression_t *expression)
 {
-       dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
-       type_t   *type = skip_typeref(expression->expression.datatype);
-       ir_mode  *mode = get_ir_mode(type);
-
-       if(expression->type == UNEXPR_TAKE_ADDRESS)
-               return expression_to_addr(expression->value);
+       if (expression->kind != EXPR_REFERENCE)
+               return false;
+       reference_expression_t *ref_expr    = &expression->reference;
+       declaration_t          *declaration = ref_expr->declaration;
+       return declaration->declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE;
+}
 
-       const expression_t *value      = expression->value;
-       ir_node            *value_node = expression_to_firm(value);
+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 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:
+       case EXPR_BINARY_LESSEQUAL:     return pn_Cmp_Le;
+       case EXPR_BINARY_ISGREATER:
+       case EXPR_BINARY_GREATER:       return pn_Cmp_Gt;
+       case EXPR_BINARY_ISGREATEREQUAL:
+       case EXPR_BINARY_GREATEREQUAL:  return pn_Cmp_Ge;
+       case EXPR_BINARY_ISUNORDERED:   return pn_Cmp_Uo;
 
-       switch(expression->type) {
-       case UNEXPR_NEGATE:
-               return new_d_Minus(dbgi, value_node, mode);
-       case UNEXPR_PLUS:
-               return value_node;
-       case UNEXPR_BITWISE_NEGATE:
-               return new_d_Not(dbgi, value_node, mode);
-       case UNEXPR_NOT: {
-               if(get_irn_mode(value_node) != mode_b) {
-                       value_node = create_conv(dbgi, value_node, mode_b);
-               }
-               value_node = new_d_Not(dbgi, value_node, mode_b);
-               if(mode != mode_b) {
-                       value_node = create_conv(dbgi, value_node, mode);
-               }
-               return value_node;
+       default:
+               break;
        }
-       case UNEXPR_DEREFERENCE: {
-               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);
-               return deref_address(points_to, value_node, dbgi);
+       panic("trying to get pn_Cmp from non-comparison binexpr type");
+}
+
+/**
+ * Handle the assume optimizer hint: check if a Confirm
+ * node can be created.
+ *
+ * @param dbi    debug info
+ * @param expr   the IL assume expression
+ *
+ * we support here only some simple cases:
+ *  - var rel const
+ *  - const rel val
+ *  - var rel var
+ */
+static ir_node *handle_assume_compare(dbg_info *dbi,
+                                      const binary_expression_t *expression)
+{
+       expression_t  *op1 = expression->left;
+       expression_t  *op2 = expression->right;
+       declaration_t *var2, *var = NULL;
+       ir_node       *res = NULL;
+       pn_Cmp         cmp_val;
+
+       cmp_val = get_pnc(expression->base.kind, op1->base.type);
+
+       if (is_local_variable(op1) && is_local_variable(op2)) {
+       var  = op1->reference.declaration;
+           var2 = op2->reference.declaration;
+
+               type_t  *const type = skip_typeref(var->type);
+               ir_mode *const mode = get_ir_mode(type);
+
+               ir_node *const irn1 = get_value(var->v.value_number, mode);
+               ir_node *const irn2 = get_value(var2->v.value_number, mode);
+
+               res = new_d_Confirm(dbi, irn2, irn1, get_inversed_pnc(cmp_val));
+               set_value(var2->v.value_number, res);
+
+               res = new_d_Confirm(dbi, irn1, irn2, cmp_val);
+               set_value(var->v.value_number, res);
+
+               return res;
        }
-       case UNEXPR_POSTFIX_INCREMENT:
-       case UNEXPR_POSTFIX_DECREMENT:
-       case UNEXPR_PREFIX_INCREMENT:
-       case UNEXPR_PREFIX_DECREMENT:
-               return create_incdec(expression);
-       case UNEXPR_CAST: {
-               ir_node *node = create_conv(dbgi, value_node, get_ir_mode(type));
-               node = do_strict_conv(dbgi, node);
-               return node;
+
+       expression_t *con;
+       if (is_local_variable(op1) && is_constant_expression(op2)) {
+               var = op1->reference.declaration;
+               con = op2;
+       } else if (is_constant_expression(op1) && is_local_variable(op2)) {
+               cmp_val = get_inversed_pnc(cmp_val);
+               var = op2->reference.declaration;
+               con = op1;
        }
-       case UNEXPR_CAST_IMPLICIT:
-               return create_conv(dbgi, value_node, get_ir_mode(type));
 
-       case UNEXPR_TAKE_ADDRESS:
-       case UNEXPR_INVALID:
-               break;
+       if (var != NULL) {
+               type_t  *const type = skip_typeref(var->type);
+               ir_mode *const mode = get_ir_mode(type);
+
+               res = get_value(var->v.value_number, mode);
+               res = new_d_Confirm(dbi, res, expression_to_firm(con), cmp_val);
+               set_value(var->v.value_number, res);
        }
-       panic("invalid UNEXPR type found");
+       return res;
+}
+
+/**
+ * Handle the assume optimizer hint.
+ *
+ * @param dbi    debug info
+ * @param expr   the IL assume expression
+ */
+static ir_node *handle_assume(dbg_info *dbi, const expression_t *expression) {
+       switch(expression->kind) {
+       case EXPR_BINARY_EQUAL:
+       case EXPR_BINARY_NOTEQUAL:
+       case EXPR_BINARY_LESS:
+       case EXPR_BINARY_LESSEQUAL:
+       case EXPR_BINARY_GREATER:
+       case EXPR_BINARY_GREATEREQUAL:
+               return handle_assume_compare(dbi, &expression->binary);
+       default:
+               return NULL;
+       }
+}
+
+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 long get_pnc(binary_expression_type_t type)
+static ir_node *unary_expression_to_firm(const unary_expression_t *expression)
 {
-       switch(type) {
-       case BINEXPR_EQUAL:        return pn_Cmp_Eq;
-       case BINEXPR_NOTEQUAL:     return pn_Cmp_Lg;
-       case BINEXPR_LESS:         return pn_Cmp_Lt;
-       case BINEXPR_LESSEQUAL:    return pn_Cmp_Le;
-       case BINEXPR_GREATER:      return pn_Cmp_Gt;
-       case BINEXPR_GREATEREQUAL: return pn_Cmp_Ge;
+       dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
+       type_t   *type = skip_typeref(expression->base.type);
+
+       if(expression->base.kind == EXPR_UNARY_TAKE_ADDRESS)
+               return expression_to_addr(expression->value);
+
+       const expression_t *value = expression->value;
+
+       switch(expression->base.kind) {
+       case EXPR_UNARY_NEGATE: {
+               ir_node *value_node = expression_to_firm(value);
+               ir_mode *mode = get_ir_mode(type);
+               return new_d_Minus(dbgi, value_node, mode);
+       }
+       case EXPR_UNARY_PLUS:
+               return expression_to_firm(value);
+       case EXPR_UNARY_BITWISE_NEGATE: {
+               ir_node *value_node = expression_to_firm(value);
+               ir_mode *mode = get_ir_mode(type);
+               return new_d_Not(dbgi, value_node, mode);
+       }
+       case EXPR_UNARY_NOT: {
+               ir_node *value_node = expression_to_firm(value);
+               ir_mode *mode = get_ir_mode(type);
+               if(get_irn_mode(value_node) != mode_b) {
+                       value_node = create_conv(dbgi, value_node, mode_b);
+               }
+               value_node = new_d_Not(dbgi, value_node, mode_b);
+               if(mode != mode_b) {
+                       value_node = create_conv(dbgi, value_node, mode);
+               }
+               return value_node;
+       }
+       case EXPR_UNARY_DEREFERENCE: {
+               ir_node *value_node = expression_to_firm(value);
+               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:
+       case EXPR_UNARY_POSTFIX_DECREMENT:
+       case EXPR_UNARY_PREFIX_INCREMENT:
+       case EXPR_UNARY_PREFIX_DECREMENT:
+               return create_incdec(expression);
+       case EXPR_UNARY_CAST: {
+               ir_node *value_node = expression_to_firm(value);
+               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);
+               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;
        }
-       panic("trying to get pn_Cmp from non-comparison binexpr type");
+       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);
-
+       ir_mode *mode      = get_ir_mode(expression->base.type);
        ir_node *cur_block = get_cur_block();
 
        ir_node *one_block = new_immBlock();
@@ -1158,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);
 
@@ -1174,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);
@@ -1199,15 +1982,15 @@ static ir_node *pointer_arithmetic(ir_node  *const pointer,
                                    dbg_info *const dbgi,
                                    const create_arithmetic_func func)
 {
-       pointer_type_t *const pointer_type = (pointer_type_t*)type;
+       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) {
-               integer             = create_conv(dbgi, integer, mode_Is);
-               ir_node *const cnst = new_Const_long(mode_Is, (long)elem_size);
-               ir_node *const mul  = new_d_Mul(dbgi, integer, cnst, mode_Is);
+               integer             = create_conv(dbgi, integer, mode_int);
+               ir_node *const cnst = new_Const_long(mode_int, (long)elem_size);
+               ir_node *const mul  = new_d_Mul(dbgi, integer, cnst, mode_int);
                integer = mul;
        }
 
@@ -1218,19 +2001,19 @@ 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)) {
-               ir_node        *const pointer = expression_to_firm(expression->left);
-               ir_node        *      integer = expression_to_firm(expression->right);
+               ir_node *const pointer = expression_to_firm(expression->left);
+               ir_node *      integer = expression_to_firm(expression->right);
                value = pointer_arithmetic(pointer, integer, type, dbgi, func);
        } else {
                value = create_arithmetic_binop(expression, func);
        }
 
-       ir_mode  *const mode = get_ir_mode(type);
+       ir_mode *const mode = get_ir_mode(type);
        value = create_conv(dbgi, value, mode);
        set_value_for_expression(expression->left, value);
 
@@ -1239,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);
@@ -1264,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_Is, (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);
        }
 
@@ -1294,26 +2078,26 @@ 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 */
-       right = create_conv(dbgi, right, mode_Iu);
+       right = create_conv(dbgi, right, mode_uint);
 
        ir_node *res;
 
-       switch(expression->type) {
-       case BINEXPR_SHIFTLEFT_ASSIGN:
-       case BINEXPR_SHIFTLEFT:
+       switch(expression->base.kind) {
+       case EXPR_BINARY_SHIFTLEFT_ASSIGN:
+       case EXPR_BINARY_SHIFTLEFT:
                res = new_d_Shl(dbgi, left, right, mode);
                break;
-       case BINEXPR_SHIFTRIGHT_ASSIGN:
-       case BINEXPR_SHIFTRIGHT: {
+       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);
@@ -1332,38 +2116,38 @@ 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->type)  {
-               case BINEXPR_DIV:
-               case BINEXPR_DIV_ASSIGN:
-                       if(mode_is_float(mode)) {
-                               op  = new_d_Quot(dbgi, pin, left, right, mode, op_pin_state_floats);
-                               res = new_d_Proj(dbgi, op, mode, pn_Quot_res);
-                       } else {
-                               op  = new_d_Div(dbgi, pin, left, right, mode, op_pin_state_floats);
-                               res = new_d_Proj(dbgi, op, mode, pn_Div_res);
-                       }
-                       break;
+       switch (expression->base.kind) {
+       case EXPR_BINARY_DIV:
+       case EXPR_BINARY_DIV_ASSIGN:
+               if(mode_is_float(mode)) {
+                       op  = new_d_Quot(dbgi, pin, left, right, mode, op_pin_state_floats);
+                       res = new_d_Proj(dbgi, op, mode, pn_Quot_res);
+               } else {
+                       op  = new_d_Div(dbgi, pin, left, right, mode, op_pin_state_floats);
+                       res = new_d_Proj(dbgi, op, mode, pn_Div_res);
+               }
+               break;
 
-               case BINEXPR_MOD:
-               case BINEXPR_MOD_ASSIGN:
-                       assert(!mode_is_float(mode));
-                       op  = new_d_Mod(dbgi, pin, left, right, mode, op_pin_state_floats);
-                       res = new_d_Proj(dbgi, op, mode, pn_Mod_res);
-                       break;
+       case EXPR_BINARY_MOD:
+       case EXPR_BINARY_MOD_ASSIGN:
+               assert(!mode_is_float(mode));
+               op  = new_d_Mod(dbgi, pin, left, right, mode, op_pin_state_floats);
+               res = new_d_Proj(dbgi, op, mode, pn_Mod_res);
+               break;
 
-               default: panic("unexpected binary expression type in create_divmod()");
+       default: panic("unexpected binary expression type in create_divmod()");
        }
 
        return res;
@@ -1373,11 +2157,11 @@ 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->type != TYPE_POINTER);
+       assert(type->kind != TYPE_POINTER);
 
        value = create_conv(dbgi, value, mode);
        set_value_for_expression(expression->left, value);
@@ -1389,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);
@@ -1401,69 +2185,79 @@ static ir_node *create_arithmetic_assign_shift(
 
 static ir_node *binary_expression_to_firm(const binary_expression_t *expression)
 {
-       binary_expression_type_t type = expression->type;
-       switch(type) {
-       case BINEXPR_EQUAL:
-       case BINEXPR_NOTEQUAL:
-       case BINEXPR_LESS:
-       case BINEXPR_LESSEQUAL:
-       case BINEXPR_GREATER:
-       case BINEXPR_GREATEREQUAL: {
-               dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
+       expression_kind_t kind = expression->base.kind;
+
+       switch(kind) {
+       case EXPR_BINARY_EQUAL:
+       case EXPR_BINARY_NOTEQUAL:
+       case EXPR_BINARY_LESS:
+       case EXPR_BINARY_LESSEQUAL:
+       case EXPR_BINARY_GREATER:
+       case EXPR_BINARY_GREATEREQUAL:
+       case EXPR_BINARY_ISGREATER:
+       case EXPR_BINARY_ISGREATEREQUAL:
+       case EXPR_BINARY_ISLESS:
+       case EXPR_BINARY_ISLESSEQUAL:
+       case EXPR_BINARY_ISLESSGREATER:
+       case EXPR_BINARY_ISUNORDERED: {
+               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(type);
+               long     pnc   = get_pnc(kind, expression->left->base.type);
                ir_node *proj  = new_d_Proj(dbgi, cmp, mode_b, pnc);
                return proj;
        }
-       case BINEXPR_ASSIGN: {
+       case EXPR_BINARY_ASSIGN: {
                ir_node *right = expression_to_firm(expression->right);
                set_value_for_expression(expression->left, right);
 
                return right;
        }
-       case BINEXPR_ADD:
+       case EXPR_BINARY_ADD:
                return create_add(expression);
-       case BINEXPR_SUB:
+       case EXPR_BINARY_SUB:
                return create_sub(expression);
-       case BINEXPR_MUL:
+       case EXPR_BINARY_MUL:
                return create_arithmetic_binop(expression, new_d_Mul);
-       case BINEXPR_BITWISE_AND:
+       case EXPR_BINARY_BITWISE_AND:
                return create_arithmetic_binop(expression, new_d_And);
-       case BINEXPR_BITWISE_OR:
+       case EXPR_BINARY_BITWISE_OR:
                return create_arithmetic_binop(expression, new_d_Or);
-       case BINEXPR_BITWISE_XOR:
+       case EXPR_BINARY_BITWISE_XOR:
                return create_arithmetic_binop(expression, new_d_Eor);
-       case BINEXPR_SHIFTLEFT:
-       case BINEXPR_SHIFTRIGHT:
+       case EXPR_BINARY_SHIFTLEFT:
+       case EXPR_BINARY_SHIFTRIGHT:
                return create_shift(expression);
-       case BINEXPR_DIV:
-       case BINEXPR_MOD:
+       case EXPR_BINARY_DIV:
+       case EXPR_BINARY_MOD:
                return create_divmod(expression);
-       case BINEXPR_LOGICAL_AND:
-       case BINEXPR_LOGICAL_OR:
+       case EXPR_BINARY_LOGICAL_AND:
+       case EXPR_BINARY_LOGICAL_OR:
                return create_lazy_op(expression);
-       case BINEXPR_COMMA:
+       case EXPR_BINARY_COMMA:
                expression_to_firm(expression->left);
                return expression_to_firm(expression->right);
-       case BINEXPR_ADD_ASSIGN:
+       case EXPR_BINARY_ADD_ASSIGN:
                return create_arithmetic_assign_binop(expression, new_d_Add);
-       case BINEXPR_SUB_ASSIGN:
+       case EXPR_BINARY_SUB_ASSIGN:
                return create_arithmetic_assign_binop(expression, new_d_Sub);
-       case BINEXPR_MUL_ASSIGN:
+       case EXPR_BINARY_MUL_ASSIGN:
                return create_arithmetic_assign_binop(expression, new_d_Mul);
-       case BINEXPR_DIV_ASSIGN:
+       case EXPR_BINARY_MOD_ASSIGN:
+       case EXPR_BINARY_DIV_ASSIGN:
                return create_arithmetic_assign_divmod(expression);
-       case BINEXPR_BITWISE_AND_ASSIGN:
+       case EXPR_BINARY_BITWISE_AND_ASSIGN:
                return create_arithmetic_assign_binop(expression, new_d_And);
-       case BINEXPR_BITWISE_OR_ASSIGN:
+       case EXPR_BINARY_BITWISE_OR_ASSIGN:
                return create_arithmetic_assign_binop(expression, new_d_Or);
-       case BINEXPR_BITWISE_XOR_ASSIGN:
+       case EXPR_BINARY_BITWISE_XOR_ASSIGN:
                return create_arithmetic_assign_binop(expression, new_d_Eor);
-       case BINEXPR_SHIFTLEFT_ASSIGN:
-       case BINEXPR_SHIFTRIGHT_ASSIGN:
+       case EXPR_BINARY_SHIFTLEFT_ASSIGN:
+       case EXPR_BINARY_SHIFTRIGHT_ASSIGN:
                return create_arithmetic_assign_shift(expression);
+       case EXPR_BINARY_BUILTIN_EXPECT:
+               return expression_to_firm(expression->left);
        default:
                panic("TODO binexpr type");
        }
@@ -1471,20 +2265,19 @@ 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_Iu);
+       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 = (pointer_type_t*) 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_Iu, 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_Iu);
-       ir_node *result          = new_d_Add(dbgi, base_addr, real_offset, mode_P);
+                                            mode_uint);
+       ir_node *result          = new_d_Add(dbgi, base_addr, real_offset, mode_P_data);
 
        return result;
 }
@@ -1492,34 +2285,187 @@ 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;
+}
+
+/**
+ * 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->tp_expression->base.type;
+               assert(type != NULL);
+       }
+
+       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 *sizeof_to_firm(const sizeof_expression_t *expression)
+/**
+ * Transform an alignof expression into Firm code.
+ */
+static ir_node *alignof_to_firm(const typeprop_expression_t *expression)
 {
        type_t *type = expression->type;
        if(type == NULL) {
-               type = expression->size_expression->base.datatype;
+               /* 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  *mode      = get_ir_mode(expression->expression.datatype);
-       unsigned  size      = get_type_size(type);
-       ir_node  *size_node = new_Const_long(mode, size);
+       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 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;
+       if(current_ir_graph == NULL) {
+               current_ir_graph = get_const_code_irg();
+       }
+
+       ir_node *cnst = expression_to_firm(expression);
+       current_ir_graph = old_current_ir_graph;
+
+       if(!is_Const(cnst)) {
+               panic("couldn't fold constant\n");
+       }
+
+       tarval *tv = get_Const_tarval(cnst);
+       if(!tarval_is_long(tv)) {
+               panic("result of constant folding is not integer\n");
+       }
 
-       return size_node;
+       return get_tarval_long(tv);
 }
 
 static ir_node *conditional_to_firm(const conditional_expression_t *expression)
 {
-       dbg_info *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)) {
+               long val = fold_constant(expression->condition);
+               if(val) {
+                       return expression_to_firm(expression->true_expression);
+               } else {
+                       return expression_to_firm(expression->false_expression);
+               }
+       }
 
        ir_node *cur_block   = get_cur_block();
 
@@ -1561,12 +2507,12 @@ 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);
 
        declaration_t *entry = expression->compound_entry;
-       assert(entry->declaration_type == DECLARATION_TYPE_COMPOUND_MEMBER);
+       assert(entry->declaration_kind == DECLARATION_KIND_COMPOUND_MEMBER);
        ir_entity     *entity = entry->v.entity;
 
        assert(entity != NULL);
@@ -1578,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. */
@@ -1615,27 +2560,27 @@ 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->type)
+       switch (type->kind)
        {
                case TYPE_ATOMIC: {
                        const atomic_type_t *const atomic_type = &type->atomic;
-                       switch (atomic_type->atype) {
-                               // should not be reached
+                       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
+                               /* 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
-                               case ATOMIC_TYPE_UCHAR:     // gcc handles this as integer
+                               case ATOMIC_TYPE_CHAR:      /* gcc handles this as integer */
+                               case ATOMIC_TYPE_SCHAR:     /* gcc handles this as integer */
+                               case ATOMIC_TYPE_UCHAR:     /* gcc handles this as integer */
                                case ATOMIC_TYPE_SHORT:
                                case ATOMIC_TYPE_USHORT:
                                case ATOMIC_TYPE_INT:
@@ -1644,73 +2589,90 @@ static ir_node *classify_type_to_firm(const classify_type_expression_t *const ex
                                case ATOMIC_TYPE_ULONG:
                                case ATOMIC_TYPE_LONGLONG:
                                case ATOMIC_TYPE_ULONGLONG:
-                               case ATOMIC_TYPE_BOOL:      // gcc handles this as integer
+                               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_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;
-
-               // gcc handles this as integer
-               case TYPE_ENUM:            tc = integer_type_class; break;
-
-               default:
-                       panic("Unimplemented case 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; 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; 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);
-       ir_mode  *const mode = mode_Is;
+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)
 {
        statement_t *statement = expr->statement;
 
-       assert(statement->type == STATEMENT_COMPOUND);
-       return compound_statement_to_firm((compound_statement_t*) statement);
+       assert(statement->kind == STATEMENT_COMPOUND);
+       return compound_statement_to_firm(&statement->compound);
 }
 
 static ir_node *va_start_expression_to_firm(
@@ -1720,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_Iu, 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);
 
@@ -1736,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_Iu, 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;
@@ -1751,13 +2710,13 @@ 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->type == UNEXPR_DEREFERENCE);
+       assert(expression->base.kind == EXPR_UNARY_DEREFERENCE);
        return expression_to_firm(expression->value);
 }
 
 static ir_node *expression_to_addr(const expression_t *expression)
 {
-       switch(expression->type) {
+       switch(expression->kind) {
        case EXPR_REFERENCE:
                return reference_addr(&expression->reference);
        case EXPR_ARRAY_ACCESS:
@@ -1766,12 +2725,8 @@ static ir_node *expression_to_addr(const expression_t *expression)
                return select_addr(&expression->select);
        case EXPR_CALL:
                return call_expression_to_firm(&expression->call);
-       case EXPR_UNARY: {
-               const unary_expression_t *const unary_expr = &expression->unary;
-               if (unary_expr->type == UNEXPR_DEREFERENCE) {
-                       return dereference_addr(unary_expr);
-               }
-               break;
+       case EXPR_UNARY_DEREFERENCE: {
+               return dereference_addr(&expression->unary);
        }
        default:
                break;
@@ -1779,9 +2734,36 @@ 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)
+{
+       ir_mode *mode = get_ir_mode(expression->base.type);
+       long     v;
+
+       if (is_constant_expression(expression->value)) {
+               v = 1;
+       } else {
+               v = 0;
+       }
+       return new_Const_long(mode, v);
+}
+
+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 */
+       (void) adr;
+       return NULL;
+}
+
 static ir_node *_expression_to_firm(const expression_t *expression)
 {
-       switch(expression->type) {
+       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:
@@ -1792,32 +2774,40 @@ static ir_node *_expression_to_firm(const expression_t *expression)
                return reference_expression_to_firm(&expression->reference);
        case EXPR_CALL:
                return call_expression_to_firm(&expression->call);
-       case EXPR_UNARY:
+       EXPR_UNARY_CASES
                return unary_expression_to_firm(&expression->unary);
-       case EXPR_BINARY:
+       EXPR_BINARY_CASES
                return binary_expression_to_firm(&expression->binary);
        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->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:
@@ -1831,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;
@@ -1854,44 +2854,40 @@ static void create_condition_evaluation(const expression_t *expression,
                                         ir_node *true_block,
                                         ir_node *false_block)
 {
-       switch(expression->type) {
-       case EXPR_UNARY: {
-               unary_expression_t *unary_expression = (unary_expression_t*) expression;
-               if(unary_expression->type == UNEXPR_NOT) {
-                       create_condition_evaluation(unary_expression->value, false_block,
-                                                   true_block);
-                       return;
-               }
-               break;
+       switch(expression->kind) {
+       case EXPR_UNARY_NOT: {
+               const unary_expression_t *unary_expression = &expression->unary;
+               create_condition_evaluation(unary_expression->value, false_block,
+                                           true_block);
+               return;
        }
-       case EXPR_BINARY: {
-               binary_expression_t *binary_expression
-                       = (binary_expression_t*) expression;
-               if(binary_expression->type == BINEXPR_LOGICAL_AND) {
-                       ir_node *cur_block   = get_cur_block();
-                       ir_node *extra_block = new_immBlock();
-                       set_cur_block(cur_block);
-                       create_condition_evaluation(binary_expression->left, extra_block,
-                                                   false_block);
-                       mature_immBlock(extra_block);
-                       set_cur_block(extra_block);
-                       create_condition_evaluation(binary_expression->right, true_block,
-                                                   false_block);
-                       return;
-               }
-               if(binary_expression->type == BINEXPR_LOGICAL_OR) {
-                       ir_node *cur_block   = get_cur_block();
-                       ir_node *extra_block = new_immBlock();
-                       set_cur_block(cur_block);
-                       create_condition_evaluation(binary_expression->left, true_block,
-                                                   extra_block);
-                       mature_immBlock(extra_block);
-                       set_cur_block(extra_block);
-                       create_condition_evaluation(binary_expression->right, true_block,
-                                                   false_block);
-                       return;
-               }
-               break;
+       case EXPR_BINARY_LOGICAL_AND: {
+               const binary_expression_t *binary_expression = &expression->binary;
+
+               ir_node *cur_block   = get_cur_block();
+               ir_node *extra_block = new_immBlock();
+               set_cur_block(cur_block);
+               create_condition_evaluation(binary_expression->left, extra_block,
+                                           false_block);
+               mature_immBlock(extra_block);
+               set_cur_block(extra_block);
+               create_condition_evaluation(binary_expression->right, true_block,
+                                           false_block);
+               return;
+       }
+       case EXPR_BINARY_LOGICAL_OR: {
+               const binary_expression_t *binary_expression = &expression->binary;
+
+               ir_node *cur_block   = get_cur_block();
+               ir_node *extra_block = new_immBlock();
+               set_cur_block(cur_block);
+               create_condition_evaluation(binary_expression->left, true_block,
+                                           extra_block);
+               mature_immBlock(extra_block);
+               set_cur_block(extra_block);
+               create_condition_evaluation(binary_expression->right, true_block,
+                                           false_block);
+               return;
        }
        default:
                break;
@@ -1903,34 +2899,746 @@ static void create_condition_evaluation(const expression_t *expression,
        ir_node  *true_proj  = new_d_Proj(dbgi, cond, mode_X, pn_Cond_true);
        ir_node  *false_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_false);
 
+       /* set branch prediction info based on __builtin_expect */
+       if(expression->kind == EXPR_BINARY_BUILTIN_EXPECT) {
+               long               cnst = fold_constant(expression->binary.right);
+               cond_jmp_predicate pred;
+
+               if(cnst == 0) {
+                       pred = COND_JMP_PRED_FALSE;
+               } else {
+                       pred = COND_JMP_PRED_TRUE;
+               }
+               set_Cond_jmp_pred(cond, pred);
+       }
+
        add_immBlock_pred(true_block, true_proj);
        add_immBlock_pred(false_block, false_proj);
 
        set_cur_block(NULL);
 }
 
-static void return_statement_to_firm(return_statement_t *statement)
+
+
+static void create_declaration_entity(declaration_t *declaration,
+                                      declaration_kind_t declaration_kind,
+                                      ir_type *parent_type)
 {
-       if(get_cur_block() == NULL)
-               return;
+       ident     *const id     = new_id_from_str(declaration->symbol->string);
+       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);
 
-       ir_type *func_irtype = get_ir_type(current_function_decl->type);
+       declaration->declaration_kind = (unsigned char) declaration_kind;
+       declaration->v.entity         = entity;
+       set_entity_variability(entity, variability_uninitialized);
+       if(parent_type == get_tls_type())
+               set_entity_allocation(entity, allocation_automatic);
+       else if(declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE)
+               set_entity_allocation(entity, allocation_static);
 
-       dbg_info *dbgi  = get_dbg_info(&statement->statement.source_position);
+       if(type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) {
+               set_entity_volatility(entity, volatility_is_volatile);
+       }
+}
 
-       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);
-                       node  = do_strict_conv(dbgi, node);
-                       in[0] = node;
+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;
+};
+
+typedef struct type_path_t type_path_t;
+struct type_path_t {
+       type_path_entry_t *path;
+       type_t            *top_type;
+       bool               invalid;
+};
+
+static __attribute__((unused)) void debug_print_type_path(const type_path_t *path)
+{
+       size_t len = ARR_LEN(path->path);
+
+       for(size_t i = 0; i < len; ++i) {
+               const type_path_entry_t *entry = & path->path[i];
+
+               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 {
-                       ir_mode *mode;
-                       if(is_compound_type(res_type)) {
-                               mode = mode_P_data;
+                       fprintf(stderr, "-INVALID-");
+               }
+       }
+       fprintf(stderr, "  (");
+       print_type(path->top_type);
+       fprintf(stderr, ")");
+}
+
+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 type_path_entry_t *append_to_type_path(type_path_t *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 size_t get_compound_size(const compound_type_t *type)
+{
+       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? */
+
+       return size;
+}
+
+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);
+
+       assert(is_type_compound(top_type) || is_type_array(top_type));
+
+       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);
+       }
+}
+
+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);
+
+       assert(is_type_compound(top_type) || is_type_array(top_type));
+
+       ir_initializer_t *initializer = get_initializer_entry(path);
+
+       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 {
+                       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;
+
+               if(designator->next != NULL) {
+                       descend_into_subtype(path);
+               }
+       }
+
+       path->invalid  = false;
+}
+
+static void advance_current_object(type_path_t *path)
+{
+       if(path->invalid) {
+               /* TODO: handle this... */
+               panic("invalid initializer in ast2firm (excessive elements)");
+               return;
+       }
+
+       type_path_entry_t *top = get_type_path_top(path);
+
+       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;
+
+               top->index++;
+               entry               = entry->next;
+               top->compound_entry = entry;
+               if(entry != NULL) {
+                       path->top_type = entry->type;
+                       return;
+               }
+       } else {
+               assert(is_type_array(type));
+
+               top->index++;
+               if(!type->array.size_constant || top->index < type->array.size) {
+                       return;
+               }
+       }
+
+       /* 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);
+       }
+
+       assert(ARR_LEN(path.path) >= 1);
+       ir_initializer_t *result = path.path[0].initializer;
+       DEL_ARR_F(path.path);
+
+       return result;
+}
+
+static ir_initializer_t *create_ir_initializer_string(
+               const initializer_string_t *initializer, type_t *type)
+{
+       type = skip_typeref(type);
+
+       size_t            string_len    = initializer->string.size;
+       assert(type->kind == TYPE_ARRAY && type->array.size_constant);
+       size_t            len           = type->array.size;
+       ir_initializer_t *irinitializer = create_initializer_compound(len);
+
+       const char *string = initializer->string.begin;
+       ir_mode    *mode   = get_type_mode(ir_type_const_char);
+
+       for(size_t i = 0; i < len; ++i) {
+               char c = 0;
+               if(i < string_len)
+                       c = string[i];
+
+               tarval           *tv = new_tarval_from_long(string[i], mode);
+               ir_initializer_t *char_initializer = create_initializer_tarval(tv);
+
+               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 ir_initializer_t *create_ir_initializer(
+               const initializer_t *initializer, type_t *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);
+
+               case INITIALIZER_LIST:
+                       return create_ir_initializer_list(&initializer->list, type);
+
+               case INITIALIZER_VALUE:
+                       return create_ir_initializer_value(&initializer->value);
+
+               case INITIALIZER_DESIGNATOR:
+                       panic("unexpected designator initializer found");
+       }
+       panic("unknown initializer");
+}
+
+static void create_dynamic_initializer_sub(ir_initializer_t *initializer,
+               ir_type *type, dbg_info *dbgi, ir_node *base_addr)
+{
+       switch(get_initializer_kind(initializer)) {
+       case IR_INITIALIZER_NULL: {
+               /* TODO: implement this for compound types... */
+               assert(type != NULL);
+
+               ir_mode *mode = get_type_mode(type);
+               tarval  *zero = get_mode_null(mode);
+               ir_node *cnst = new_d_Const(dbgi, mode, zero);
+
+               /* TODO: bitfields */
+               ir_node *mem    = get_store();
+               ir_node *store  = new_d_Store(dbgi, mem, base_addr, cnst);
+               ir_node *proj_m = new_Proj(store, mode_M, pn_Store_M);
+               set_store(proj_m);
+               return;
+       }
+       case IR_INITIALIZER_CONST: {
+               ir_node *node = get_initializer_const_value(initializer);
+               ir_mode *mode = get_irn_mode(node);
+               assert(get_type_mode(type) == mode);
+
+               /* TODO: bitfields... */
+               ir_node *mem    = get_store();
+               ir_node *store  = new_d_Store(dbgi, mem, base_addr, node);
+               ir_node *proj_m = new_Proj(store, mode_M, pn_Store_M);
+               set_store(proj_m);
+               return;
+       }
+       case IR_INITIALIZER_TARVAL: {
+               tarval  *tv   = get_initializer_tarval_value(initializer);
+               ir_mode *mode = get_tarval_mode(tv);
+               ir_node *cnst = new_d_Const(dbgi, mode, tv);
+               assert(get_type_mode(type) == mode);
+
+               /* TODO: bitfields... */
+               ir_node *mem    = get_store();
+               ir_node *store  = new_d_Store(dbgi, mem, base_addr, cnst);
+               ir_node *proj_m = new_Proj(store, mode_M, pn_Store_M);
+               set_store(proj_m);
+               return;
+       }
+       case IR_INITIALIZER_COMPOUND: {
+               assert(is_compound_type(type));
+               int n_members;
+               if(is_Array_type(type)) {
+                       assert(has_array_upper_bound(type, 0));
+                       n_members = get_array_upper_bound_int(type, 0);
+               } else {
+                       n_members = get_compound_n_members(type);
+               }
+
+               if(get_initializer_compound_n_entries(initializer)
+                               != (unsigned) n_members)
+                       panic("initializer doesn't match compound type");
+
+               for(int i = 0; i < n_members; ++i) {
+                       ir_node *addr;
+                       ir_type *irtype;
+                       if(is_Array_type(type)) {
+                               ir_entity *entity   = get_array_element_entity(type);
+                               tarval    *index_tv = new_tarval_from_long(i, mode_uint);
+                               ir_node   *cnst     = new_d_Const(dbgi, mode_uint, index_tv);
+                               ir_node   *in[1]    = { cnst };
+                               irtype = get_array_element_type(type);
+                               addr   = new_d_Sel(dbgi, new_NoMem(), base_addr, 1, in, entity);
+                       } else {
+                               ir_entity *member = get_compound_member(type, i);
+
+                               irtype = get_entity_type(member);
+                               addr   = new_d_simpleSel(dbgi, new_NoMem(), base_addr, member);
+                       }
+
+                       ir_initializer_t *sub_init
+                               = get_initializer_compound_value(initializer, i);
+
+                       create_dynamic_initializer_sub(sub_init, irtype, dbgi, addr);
+               }
+               return;
+       }
+       }
+
+       panic("invalid IR_INITIALIZER found");
+}
+
+static void create_dynamic_initializer(ir_initializer_t *initializer,
+               dbg_info *dbgi, ir_entity *entity)
+{
+       ir_node *frame     = get_local_frame(entity);
+       ir_node *base_addr = new_d_simpleSel(dbgi, new_NoMem(), frame, entity);
+       ir_type *type      = get_entity_type(entity);
+
+       create_dynamic_initializer_sub(initializer, type, dbgi, base_addr);
+}
+
+static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi,
+                                     ir_entity *entity, type_t *type)
+{
+       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 = 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(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);
+
+       set_entity_variability(init_entity, variability_initialized);
+       set_entity_visibility(init_entity, visibility_local);
+       set_entity_allocation(init_entity, allocation_static);
+
+       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 copyb_mem = new_Proj(copyb, mode_M, pn_CopyB_M_regular);
+       set_store(copyb_mem);
+}
+
+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)
+               return;
+
+       declaration_kind_t declaration_kind
+               = (declaration_kind_t) declaration->declaration_kind;
+       if(declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE_ENTITY) {
+               create_initializer_local_variable_entity(declaration);
+               return;
+       }
+
+       if(initializer->kind == INITIALIZER_VALUE) {
+               initializer_value_t *initializer_value = &initializer->value;
+
+               ir_node *value = expression_to_firm(initializer_value->value);
+
+               if(declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE) {
+                       set_value(declaration->v.value_number, value);
+               } else {
+                       assert(declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE);
+
+                       ir_entity *entity = declaration->v.entity;
+
+                       set_entity_variability(entity, variability_initialized);
+                       set_atomic_ent_value(entity, value);
+               }
+       } else {
+               assert(declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE_ENTITY
+                               || declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE);
+
+               ir_entity        *entity        = declaration->v.entity;
+               ir_initializer_t *irinitializer
+                       = create_ir_initializer(initializer, declaration->type);
+
+               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);
+
+       bool needs_entity = declaration->address_taken;
+       type_t *type = skip_typeref(declaration->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;
+       }
+
+       if(needs_entity) {
+               ir_type *frame_type = get_irg_frame_type(current_ir_graph);
+               create_declaration_entity(declaration,
+                                         DECLARATION_KIND_LOCAL_VARIABLE_ENTITY,
+                                         frame_type);
+       } 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_declaration_initializer(declaration);
+}
+
+static void create_local_static_variable(declaration_t *declaration)
+{
+       assert(declaration->declaration_kind == DECLARATION_KIND_UNKNOWN);
+
+       type_t    *const type        = skip_typeref(declaration->type);
+       ir_type   *const global_type = get_glob_type();
+       ident     *const id          = unique_ident(declaration->symbol->string);
+       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(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);
+       set_entity_visibility(entity, visibility_local);
+       set_entity_allocation(entity, allocation_static);
+
+       ir_graph *const old_current_ir_graph = current_ir_graph;
+       current_ir_graph = get_const_code_irg();
+
+       create_declaration_initializer(declaration);
+
+       assert(current_ir_graph == get_const_code_irg());
+       current_ir_graph = old_current_ir_graph;
+}
+
+
+
+static void return_statement_to_firm(return_statement_t *statement)
+{
+       if(get_cur_block() == NULL)
+               return;
+
+       dbg_info *dbgi        = get_dbg_info(&statement->base.source_position);
+       ir_type  *func_irtype = get_ir_type(current_function_decl->type);
+
+
+       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->value != NULL) {
+                       ir_node *node = expression_to_firm(statement->value);
+                       node  = do_strict_conv(dbgi, node);
+                       in[0] = node;
+               } else {
+                       ir_mode *mode;
+                       if(is_compound_type(res_type)) {
+                               mode = mode_P_data;
                        } else {
                                mode = get_type_mode(res_type);
                        }
@@ -1939,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;
        }
@@ -1964,21 +3672,124 @@ static ir_node *expression_statement_to_firm(expression_statement_t *statement)
 
 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);
+       ir_node     *result    = NULL;
+       statement_t *statement = compound->statements;
+       for( ; statement != NULL; statement = statement->base.next) {
+               //context2firm(&statement->scope);
+
+               if(statement->base.next == NULL
+                               && statement->kind == STATEMENT_EXPRESSION) {
+                       result = expression_statement_to_firm(
+                                       &statement->expression);
+                       break;
+               }
+               statement_to_firm(statement);
+       }
+
+       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;
 
-               if(statement->base.next == NULL
-                               && statement->type == STATEMENT_EXPRESSION) {
-                       result = expression_statement_to_firm(
-                                       (expression_statement_t*) statement);
-                       break;
+       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_EXTERN:
+               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)) {
+                       if(declaration->init.statement != NULL) {
+                               panic("nested functions not supported yet");
+                       } else {
+                               get_function_entity(declaration);
+                       }
+               } else {
+                       create_local_variable(declaration);
                }
-               statement_to_firm(statement);
+               return;
+       case STORAGE_CLASS_ENUM_ENTRY:
+       case STORAGE_CLASS_TYPEDEF:
+       case STORAGE_CLASS_THREAD:
+       case STORAGE_CLASS_THREAD_EXTERN:
+       case STORAGE_CLASS_THREAD_STATIC:
+               return;
        }
+       panic("invalid storage class found");
+}
 
-       return result;
+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) {
+               if(declaration->namespc != NAMESPACE_NORMAL)
+                       continue;
+               create_local_declaration(declaration);
+       }
 }
 
 static void if_statement_to_firm(if_statement_t *statement)
@@ -2143,9 +3954,17 @@ static void for_statement_to_firm(for_statement_t *statement)
                if(statement->initialisation != NULL) {
                        expression_to_firm(statement->initialisation);
                }
+
+               /* create declarations */
+               declaration_t *declaration = statement->scope.declarations;
+               for( ; declaration != NULL; declaration = declaration->next) {
+                       create_local_declaration(declaration);
+               }
+
                jmp = new_Jmp();
        }
 
+
        /* create the step block */
        ir_node *const step_block = new_immBlock();
        if (statement->step != NULL) {
@@ -2172,453 +3991,39 @@ static void for_statement_to_firm(for_statement_t *statement)
                break_label    = false_block;
 
                body_block = new_immBlock();
-               statement_to_firm(statement->body);
-
-               assert(continue_label == step_block);
-               assert(break_label    == false_block);
-               continue_label = old_continue_label;
-               break_label    = old_break_label;
-
-               if (get_cur_block() != NULL) {
-                       jmp = new_Jmp();
-                       add_immBlock_pred(step_block, jmp);
-               }
-       } else {
-               body_block = step_block;
-       }
-
-       /* create the condition */
-       set_cur_block(header_block);
-       if (statement->condition != NULL) {
-               create_condition_evaluation(statement->condition, body_block,
-                                           false_block);
-       } else {
-               keep_alive(header_block);
-               jmp = new_Jmp();
-               add_immBlock_pred(body_block, jmp);
-       }
-
-       mature_immBlock(body_block);
-       mature_immBlock(false_block);
-       mature_immBlock(step_block);
-       mature_immBlock(header_block);
-       mature_immBlock(false_block);
-
-       set_cur_block(false_block);
-}
-
-static void create_declaration_entity(declaration_t *declaration,
-                                      declaration_type_t declaration_type,
-                                      ir_type *parent_type)
-{
-       ident     *id     = new_id_from_str(declaration->symbol->string);
-       ir_type   *irtype = get_ir_type(declaration->type);
-       ir_entity *entity = new_entity(parent_type, id, irtype);
-       set_entity_ld_ident(entity, id);
-
-       declaration->declaration_type = (unsigned char) declaration_type;
-       declaration->v.entity         = entity;
-       set_entity_variability(entity, variability_uninitialized);
-       /* TODO: visibility? */
-}
-
-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
-};
-
-struct compound_graph_path_entry_t {
-       int type;
-       union {
-               ir_entity *entity;
-               int        array_index;
-       } v;
-       compound_graph_path_entry_t *prev;
-};
-
-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)
-{
-       compound_graph_path *path = new_compound_graph_path(type, len);
-
-       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);
-               } else {
-                       assert(entry->type == COMPOUND_GRAPH_ENTRY_ARRAY);
-                       set_compound_graph_path_array_index(path, i, entry->v.array_index);
-               }
-       }
-       assert(i == -1);
-
-       return path;
-}
-
-static void create_initializer_value(initializer_value_t *initializer,
-                                     ir_entity *entity,
-                                     compound_graph_path_entry_t *entry,
-                                     int len)
-{
-       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);
-}
-
-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)
-{
-       declaration_t *compound_declaration = type->declaration;
-
-       declaration_t *compound_entry = compound_declaration->context.declarations;
-
-       compound_graph_path_entry_t entry;
-       entry.type = COMPOUND_GRAPH_ENTRY_COMPOUND;
-       entry.prev = last_entry;
-       ++len;
-
-       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;
-
-               if(i >= initializer->len)
-                       break;
-
-               entry.v.entity = compound_entry->v.entity;
-
-               initializer_t *sub_initializer = initializer->initializers[i];
-
-               assert(compound_entry != NULL);
-               assert(compound_entry->declaration_type
-                               == DECLARATION_TYPE_COMPOUND_MEMBER);
-
-               if(sub_initializer->type == INITIALIZER_VALUE) {
-                       create_initializer_value(&sub_initializer->value,
-                                                entity, &entry, len);
-               } else {
-                       type_t *entry_type = skip_typeref(compound_entry->type);
-                       create_initializer_object(sub_initializer, entry_type, entity,
-                                                 &entry, len);
-               }
-
-               ++i;
-       }
-}
-
-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)
-{
-       type_t *element_type = type->element_type;
-       element_type         = skip_typeref(element_type);
-
-       compound_graph_path_entry_t entry;
-       entry.type = COMPOUND_GRAPH_ENTRY_ARRAY;
-       entry.prev = last_entry;
-       ++len;
-
-       size_t i;
-       for(i = 0; i < initializer->len; ++i) {
-               entry.v.array_index = i;
-
-               initializer_t *sub_initializer = initializer->initializers[i];
-
-               if(sub_initializer->type == INITIALIZER_VALUE) {
-                       create_initializer_value(&sub_initializer->value,
-                                                entity, &entry, len);
-               } else {
-                       create_initializer_object(sub_initializer, element_type, entity,
-                                                 &entry, len);
-               }
-       }
-
-#if 0
-       /* TODO: initialize rest... */
-       if(type->size_expression != NULL) {
-               size_t array_len = fold_constant(type->size_expression);
-               for( ; i < array_len; ++i) {
-
-               }
-       }
-#endif
-}
-
-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)
-{
-       type_t *element_type = type->element_type;
-       element_type         = skip_typeref(element_type);
-
-       compound_graph_path_entry_t entry;
-       entry.type = COMPOUND_GRAPH_ENTRY_ARRAY;
-       entry.prev = last_entry;
-       ++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;
-
-               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);
-
-               if(*p == '\0')
-                       break;
-       }
-}
-
-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)
-{
-       type_t *element_type = type->element_type;
-       element_type         = skip_typeref(element_type);
-
-       compound_graph_path_entry_t entry;
-       entry.type = COMPOUND_GRAPH_ENTRY_ARRAY;
-       entry.prev = last_entry;
-       ++len;
-
-       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;
-
-               ir_node             *node = new_Const_long(mode_Is, *p);
-               compound_graph_path *path = create_compound_path(irtype, &entry, len);
-               add_compound_ent_value_w_path(entity, node, path);
-       }
-}
-
-static void create_initializer_object(initializer_t *initializer, type_t *type,
-               ir_entity *entity, compound_graph_path_entry_t *entry, int len)
-{
-       if(is_type_array(type)) {
-               array_type_t *array_type = &type->array;
-
-               switch (initializer->type) {
-                       case INITIALIZER_STRING: {
-                               initializer_string_t *const string = &initializer->string;
-                               create_initializer_string(string, array_type, entity, entry, len);
-                               return;
-                       }
-
-                       case INITIALIZER_WIDE_STRING: {
-                               initializer_wide_string_t *const string = &initializer->wide_string;
-                               create_initializer_wide_string(string, array_type, entity, entry, len);
-                               return;
-                       }
-
-                       case INITIALIZER_LIST: {
-                               initializer_list_t *const list = &initializer->list;
-                               create_initializer_array(list, array_type, entity, entry, len);
-                               return;
-                       }
-
-                       case INITIALIZER_VALUE:
-                               break;
-               }
-               panic("Unhandled initializer");
-       } else {
-               assert(initializer->type == 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);
-       }
-}
-
-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;
-       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->type == 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);
-               assign_value(dbgi, addr, type, value);
-               return;
-       }
-
-       /* create a "template" entity which is copied to the entity on the stack */
-       ident     *id          = unique_ident("initializer");
-       ir_type   *irtype      = get_ir_type(declaration->type);
-       ir_type   *global_type = get_glob_type();
-       ir_entity *init_entity = new_entity(global_type, id, irtype);
-       set_entity_ld_ident(init_entity, id);
-
-       set_entity_variability(init_entity, variability_initialized);
-       set_entity_visibility(init_entity, visibility_local);
-
-       ir_graph *old_current_ir_graph = current_ir_graph;
-       current_ir_graph = get_const_code_irg();
-
-       type_t *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;
-
-       ir_node *src_addr  = create_symconst(dbgi, init_entity);
-       ir_node *copyb     = new_d_CopyB(dbgi, memory, addr, src_addr, irtype);
-
-       ir_node *copyb_mem = new_Proj(copyb, mode_M, pn_CopyB_M_regular);
-       set_store(copyb_mem);
-}
-
-static void create_initializer(declaration_t *declaration)
-{
-       initializer_t *initializer = declaration->init.initializer;
-       if(initializer == NULL)
-               return;
-
-       declaration_type_t declaration_type
-               = (declaration_type_t) declaration->declaration_type;
-       if(declaration_type == DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY) {
-               create_initializer_local_variable_entity(declaration);
-               return;
-       }
-
-       if(initializer->type == INITIALIZER_VALUE) {
-               initializer_value_t *initializer_value = &initializer->value;
-
-               ir_node *value = expression_to_firm(initializer_value->value);
-
-               if(declaration_type == DECLARATION_TYPE_LOCAL_VARIABLE) {
-                       set_value(declaration->v.value_number, value);
-               } else {
-                       assert(declaration_type == DECLARATION_TYPE_GLOBAL_VARIABLE);
-
-                       ir_entity *entity = declaration->v.entity;
-
-                       set_entity_variability(entity, variability_initialized);
-                       set_atomic_ent_value(entity, value);
-               }
-       } else {
-               assert(declaration_type == DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY
-                               || declaration_type == DECLARATION_TYPE_GLOBAL_VARIABLE);
-
-               ir_entity *entity = declaration->v.entity;
-               set_entity_variability(entity, variability_initialized);
-
-               type_t *type = skip_typeref(declaration->type);
-               create_initializer_object(initializer, type, entity, NULL, 0);
-       }
-}
-
-static void create_local_variable(declaration_t *declaration)
-{
-       assert(declaration->declaration_type == DECLARATION_TYPE_UNKNOWN);
-
-       bool needs_entity = declaration->address_taken;
-       type_t *type = skip_typeref(declaration->type);
-
-       if(is_type_array(type) || is_type_compound(type)) {
-               needs_entity = true;
-       }
-
-       if(needs_entity) {
-               ir_type *frame_type = get_irg_frame_type(current_ir_graph);
-               create_declaration_entity(declaration,
-                                         DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY,
-                                         frame_type);
-       } else {
-               declaration->declaration_type = DECLARATION_TYPE_LOCAL_VARIABLE;
-               declaration->v.value_number   = next_value_number_function;
-               ++next_value_number_function;
-       }
-
-       create_initializer(declaration);
-}
-
-static void create_local_static_variable(declaration_t *declaration)
-{
-       assert(declaration->declaration_type == DECLARATION_TYPE_UNKNOWN);
-
-       type_t    *type        = skip_typeref(declaration->type);
-       ir_type   *global_type = get_glob_type();
-       ident     *id          = unique_ident(declaration->symbol->string);
-       ir_type   *irtype      = get_ir_type(type);
-       ir_entity *entity      = new_entity(global_type, id, irtype);
-       set_entity_ld_ident(entity, id);
-
-       declaration->declaration_type = DECLARATION_TYPE_GLOBAL_VARIABLE;
-       declaration->v.entity         = entity;
-       set_entity_variability(entity, variability_uninitialized);
-       set_entity_visibility(entity, visibility_local);
-
-       ir_graph *old_current_ir_graph = current_ir_graph;
-       current_ir_graph = get_const_code_irg();
-
-       create_initializer(declaration);
-
-       assert(current_ir_graph == get_const_code_irg());
-       current_ir_graph = old_current_ir_graph;
-}
+               statement_to_firm(statement->body);
 
-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) {
-               type_t *type = skip_typeref(declaration->type);
+               assert(continue_label == step_block);
+               assert(break_label    == false_block);
+               continue_label = old_continue_label;
+               break_label    = old_break_label;
 
-               switch ((storage_class_tag_t) declaration->storage_class) {
-               case STORAGE_CLASS_TYPEDEF:
-                       continue;
-               case STORAGE_CLASS_STATIC:
-                       create_local_static_variable(declaration);
-                       continue;
-               case STORAGE_CLASS_ENUM_ENTRY:
-                       panic("enum entry declaration in local block found");
-               case STORAGE_CLASS_EXTERN:
-                       panic("extern declaration in local block found");
-               case STORAGE_CLASS_NONE:
-               case STORAGE_CLASS_AUTO:
-               case STORAGE_CLASS_REGISTER:
-                       if(is_type_function(type)) {
-                               panic("nested functions not supported yet");
-                       } else {
-                               create_local_variable(declaration);
-                       }
-                       continue;
-               case STORAGE_CLASS_THREAD:
-               case STORAGE_CLASS_THREAD_EXTERN:
-               case STORAGE_CLASS_THREAD_STATIC:
-                       break;
+               if (get_cur_block() != NULL) {
+                       jmp = new_Jmp();
+                       add_immBlock_pred(step_block, jmp);
                }
-               panic("invalid storage class found");
+       } else {
+               body_block = step_block;
+       }
+
+       /* create the condition */
+       set_cur_block(header_block);
+       if (statement->condition != NULL) {
+               create_condition_evaluation(statement->condition, body_block,
+                                           false_block);
+       } else {
+               keep_alive(header_block);
+               jmp = new_Jmp();
+               add_immBlock_pred(body_block, jmp);
        }
+
+       mature_immBlock(body_block);
+       mature_immBlock(false_block);
+       mature_immBlock(step_block);
+       mature_immBlock(header_block);
+       mature_immBlock(false_block);
+
+       set_cur_block(false_block);
 }
 
 static void create_jump_statement(const statement_t *statement,
@@ -2636,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);
@@ -2650,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();
@@ -2674,73 +4081,68 @@ static void switch_statement_to_firm(const switch_statement_t *statement)
        set_cur_block(break_block);
 }
 
-static long fold_constant(const expression_t *expression)
-{
-       ir_graph *old_current_ir_graph = current_ir_graph;
-       current_ir_graph = get_const_code_irg();
-
-       ir_node *cnst = expression_to_firm(expression);
-       if(!is_Const(cnst)) {
-               panic("couldn't fold constantl");
-       }
-       tarval *tv = get_Const_tarval(cnst);
-       if(!tarval_is_long(tv)) {
-               panic("folded constant not an integer");
-       }
-
-       long res = get_tarval_long(tv);
-
-       current_ir_graph = old_current_ir_graph;
-       return res;
-}
-
 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);
 
-       statement_to_firm(statement->label_statement);
+       if(statement->statement != NULL) {
+               statement_to_firm(statement->statement);
+       }
 }
 
 static ir_node *get_label_block(declaration_t *label)
 {
        assert(label->namespc == NAMESPACE_LABEL);
 
-       if(label->declaration_type == DECLARATION_TYPE_LABEL_BLOCK) {
+       if(label->declaration_kind == DECLARATION_KIND_LABEL_BLOCK) {
                return label->v.block;
        }
-       assert(label->declaration_type == DECLARATION_TYPE_UNKNOWN);
+       assert(label->declaration_kind == DECLARATION_KIND_UNKNOWN);
 
        ir_node *old_cur_block = get_cur_block();
        ir_node *block         = new_immBlock();
        set_cur_block(old_cur_block);
 
-       label->declaration_type = DECLARATION_TYPE_LABEL_BLOCK;
+       label->declaration_kind = DECLARATION_KIND_LABEL_BLOCK;
        label->v.block          = block;
 
        ARR_APP1(ir_node *, imature_blocks, block);
@@ -2760,7 +4162,9 @@ static void label_to_firm(const label_statement_t *statement)
        set_cur_block(block);
        keep_alive(block);
 
-       statement_to_firm(statement->label_statement);
+       if(statement->statement != NULL) {
+               statement_to_firm(statement->statement);
+       }
 }
 
 static void goto_to_firm(const goto_statement_t *statement)
@@ -2775,11 +4179,111 @@ static void goto_to_firm(const goto_statement_t *statement)
        set_cur_block(NULL);
 }
 
+typedef enum modifier_t {
+       ASM_MODIFIER_WRITE_ONLY   = 1 << 0,
+       ASM_MODIFIER_READ_WRITE   = 1 << 1,
+       ASM_MODIFIER_COMMUTATIVE  = 1 << 2,
+       ASM_MODIFIER_EARLYCLOBBER = 1 << 3,
+} modifier_t;
+
+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;
+       asm_clobber_t *clobber    = statement->clobbers;
+       for( ; clobber != NULL; clobber = clobber->next) {
+               if(strcmp(clobber->clobber, "memory") == 0) {
+                       needs_memory = true;
+                       continue;
+               }
+
+               ident *id = new_id_from_str(clobber->clobber);
+               obstack_ptr_grow(&asm_obst, id);
+               ++n_clobbers;
+       }
+       assert(obstack_object_size(&asm_obst) == n_clobbers * sizeof(ident*));
+       ident **clobbers = NULL;
+       if(n_clobbers > 0) {
+               clobbers = obstack_finish(&asm_obst);
+       }
+
+       /* find and count input and output constraints */
+       asm_constraint_t *constraint = statement->inputs;
+       for( ; constraint != NULL; constraint = constraint->next) {
+               int  modifiers      = 0;
+               bool supports_memop = false;
+               for(const char *c = constraint->constraints; *c != 0; ++c) {
+                       /* TODO: improve error messages */
+                       switch(*c) {
+                       case '?':
+                       case '!':
+                               panic("multiple alternative assembler constraints not "
+                                     "supported");
+                       case 'm':
+                       case 'o':
+                       case 'V':
+                       case '<':
+                       case '>':
+                       case 'X':
+                               supports_memop = true;
+                               obstack_1grow(&asm_obst, *c);
+                               break;
+                       case '=':
+                               if(modifiers & ASM_MODIFIER_READ_WRITE)
+                                       panic("inconsistent register constraints");
+                               modifiers |= ASM_MODIFIER_WRITE_ONLY;
+                               break;
+                       case '+':
+                               if(modifiers & ASM_MODIFIER_WRITE_ONLY)
+                                       panic("inconsistent register constraints");
+                               modifiers |= ASM_MODIFIER_READ_WRITE;
+                               break;
+                       case '&':
+                               modifiers |= ASM_MODIFIER_EARLYCLOBBER;
+                               panic("early clobber assembler constraint not supported yet");
+                               break;
+                       case '%':
+                               modifiers |= ASM_MODIFIER_COMMUTATIVE;
+                               panic("commutative assembler constraint not supported yet");
+                               break;
+                       case '#':
+                               /* skip register preferences stuff... */
+                               while(*c != 0 && *c != ',')
+                                       ++c;
+                               break;
+                       case '*':
+                               /* skip register preferences stuff... */
+                               ++c;
+                               break;
+                       default:
+                               obstack_1grow(&asm_obst, *c);
+                               break;
+                       }
+               }
+               obstack_1grow(&asm_obst, '\0');
+               const char *constraint_string = obstack_finish(&asm_obst);
+
+               needs_memory |= supports_memop;
+               if(supports_memop) {
+
+               }
+       }
+#endif
+}
+
 static void statement_to_firm(statement_t *statement)
 {
-       switch(statement->type) {
+       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;
@@ -2823,39 +4327,134 @@ static void statement_to_firm(statement_t *statement)
                goto_to_firm(&statement->gotos);
                return;
        case STATEMENT_ASM:
-               break;
+               asm_statement_to_firm(&statement->asms);
+               return;
        }
        panic("Statement not implemented\n");
 }
 
+static int count_decls_in_expression(const expression_t *expression);
+
 static int count_local_declarations(const declaration_t *      decl,
                                     const declaration_t *const end)
 {
        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->type) {
-                       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) {
+                       count += count_decls_in_expression(initializer->value.value);
                }
        }
        return count;
 }
 
+static int count_decls_in_expression(const expression_t *expression) {
+       int count = 0;
+
+       if(expression == NULL)
+               return 0;
+
+       switch((expression_kind_t) expression->base.kind) {
+       case EXPR_STATEMENT:
+               return count_decls_in_stmts(expression->statement.statement);
+       EXPR_BINARY_CASES {
+               int count_left  = count_decls_in_expression(expression->binary.left);
+               int count_right = count_decls_in_expression(expression->binary.right);
+               return count_left + count_right;
+       }
+       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;
+       }
+
+       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;
+       }
+
+       /* TODO FIXME: finish/fix that firm patch that allows dynamic value numbers
+        * (or implement all the missing expressions here/implement a walker)
+        */
+
+       return 0;
+}
+
 static int count_decls_in_stmts(const statement_t *stmt)
 {
        int count = 0;
        for (; stmt != NULL; stmt = stmt->base.next) {
-               switch (stmt->type) {
+               switch (stmt->kind) {
+                       case STATEMENT_EMPTY:
+                               break;
+
                        case STATEMENT_DECLARATION: {
-                               const declaration_statement_t *const decl_stmt =
-                                       (const declaration_statement_t*)stmt;
+                               const declaration_statement_t *const decl_stmt = &stmt->declaration;
                                count += count_local_declarations(decl_stmt->declarations_begin,
                                                                  decl_stmt->declarations_end->next);
                                break;
@@ -2863,63 +4462,87 @@ static int count_decls_in_stmts(const statement_t *stmt)
 
                        case STATEMENT_COMPOUND: {
                                const compound_statement_t *const comp =
-                                       (const compound_statement_t*)stmt;
+                                       &stmt->compound;
                                count += count_decls_in_stmts(comp->statements);
                                break;
                        }
 
                        case STATEMENT_IF: {
-                               const if_statement_t *const if_stmt = (const if_statement_t*)stmt;
+                               const if_statement_t *const if_stmt = &stmt->ifs;
+                               count += count_decls_in_expression(if_stmt->condition);
                                count += count_decls_in_stmts(if_stmt->true_statement);
                                count += count_decls_in_stmts(if_stmt->false_statement);
                                break;
                        }
 
                        case STATEMENT_SWITCH: {
-                               const switch_statement_t *const switch_stmt =
-                                       (const switch_statement_t*)stmt;
+                               const switch_statement_t *const switch_stmt = &stmt->switchs;
+                               count += count_decls_in_expression(switch_stmt->expression);
                                count += count_decls_in_stmts(switch_stmt->body);
                                break;
                        }
 
                        case STATEMENT_LABEL: {
-                               const label_statement_t *const label_stmt =
-                                       (const label_statement_t*)stmt;
-                               count += count_decls_in_stmts(label_stmt->label_statement);
+                               const label_statement_t *const label_stmt = &stmt->label;
+                               if(label_stmt->statement != NULL) {
+                                       count += count_decls_in_stmts(label_stmt->statement);
+                               }
                                break;
                        }
 
                        case STATEMENT_WHILE: {
-                               const while_statement_t *const while_stmt =
-                                       (const while_statement_t*)stmt;
+                               const while_statement_t *const while_stmt = &stmt->whiles;
+                               count += count_decls_in_expression(while_stmt->condition);
                                count += count_decls_in_stmts(while_stmt->body);
                                break;
                        }
 
                        case STATEMENT_DO_WHILE: {
-                               const do_while_statement_t *const do_while_stmt =
-                                       (const do_while_statement_t*)stmt;
+                               const do_while_statement_t *const do_while_stmt = &stmt->do_while;
+                               count += count_decls_in_expression(do_while_stmt->condition);
                                count += count_decls_in_stmts(do_while_stmt->body);
                                break;
                        }
 
                        case STATEMENT_FOR: {
-                               const for_statement_t *const for_stmt =
-                                       (const for_statement_t*)stmt;
-                               /* TODO initialisation */
+                               const for_statement_t *const for_stmt = &stmt->fors;
+                               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);
                                count += count_decls_in_stmts(for_stmt->body);
                                break;
                        }
 
+                       case STATEMENT_CASE_LABEL: {
+                               const case_label_statement_t *label = &stmt->case_label;
+                               count += count_decls_in_expression(label->expression);
+                               if(label->statement != NULL) {
+                                       count += count_decls_in_stmts(label->statement);
+                               }
+                               break;
+                       }
+
                        case STATEMENT_ASM:
                        case STATEMENT_BREAK:
-                       case STATEMENT_CASE_LABEL:
                        case STATEMENT_CONTINUE:
-                       case STATEMENT_EXPRESSION:
+                               break;
+
+                       case STATEMENT_EXPRESSION: {
+                               const expression_statement_t *expr_stmt = &stmt->expression;
+                               count += count_decls_in_expression(expr_stmt->expression);
+                               break;
+                       }
+
                        case STATEMENT_GOTO:
                        case STATEMENT_INVALID:
-                       case STATEMENT_RETURN:
                                break;
+
+                       case STATEMENT_RETURN: {
+                               const return_statement_t *ret_stmt = &stmt->returns;
+                               count += count_decls_in_expression(ret_stmt->value);
+                               break;
+                       }
                }
        }
        return count;
@@ -2930,15 +4553,11 @@ 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);
 
-       /* TODO FIXME: Matze: I'm lazy don't want to scan all expressions
-        * for expression statements... */
-       count += 10;
-
        return count;
 }
 
@@ -2950,9 +4569,9 @@ 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_type == DECLARATION_TYPE_UNKNOWN);
+               assert(parameter->declaration_kind == DECLARATION_KIND_UNKNOWN);
                type_t *type = skip_typeref(parameter->type);
 
                bool needs_entity = parameter->address_taken;
@@ -2966,8 +4585,8 @@ static void initialize_function_parameters(declaration_t *declaration)
                        ident     *id     = new_id_from_str(parameter->symbol->string);
                        set_entity_ident(entity, id);
 
-                       parameter->declaration_type
-                               = DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY;
+                       parameter->declaration_kind
+                               = DECLARATION_KIND_LOCAL_VARIABLE_ENTITY;
                        parameter->v.entity = entity;
                        continue;
                }
@@ -2976,14 +4595,50 @@ static void initialize_function_parameters(declaration_t *declaration)
                long     pn   = n;
                ir_node *proj = new_r_Proj(irg, start_block, args, mode, pn);
 
-               parameter->declaration_type = DECLARATION_TYPE_LOCAL_VARIABLE;
+               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);
        }
 }
 
+/**
+ * Handle additional decl modifiers for IR-graphs
+ *
+ * @param irg            the IR-graph
+ * @param dec_modifiers  additional modifiers
+ */
+static void handle_decl_modifier_irg(ir_graph_ptr irg, decl_modifiers_t decl_modifiers)
+{
+       if (decl_modifiers & DM_NORETURN) {
+               /* TRUE if the declaration includes the Microsoft
+                  __declspec(noreturn) specifier. */
+               set_irg_additional_property(irg, mtp_property_noreturn);
+       }
+       if (decl_modifiers & DM_NOTHROW) {
+               /* TRUE if the declaration includes the Microsoft
+                  __declspec(nothrow) specifier. */
+               set_irg_additional_property(irg, mtp_property_nothrow);
+       }
+       if (decl_modifiers & DM_NAKED) {
+               /* TRUE if the declaration includes the Microsoft
+                  __declspec(naked) specifier. */
+               set_irg_additional_property(irg, mtp_property_naked);
+       }
+       if (decl_modifiers & DM_FORCEINLINE) {
+               /* TRUE if the declaration includes the
+                  Microsoft __forceinline specifier. */
+               set_irg_inline_property(irg, irg_inline_forced);
+       }
+       if (decl_modifiers & DM_NOINLINE) {
+               /* TRUE if the declaration includes the Microsoft
+                  __declspec(noinline) specifier. */
+               set_irg_inline_property(irg, irg_inline_forbidden);
+       }
+}
+
 static void create_function(declaration_t *declaration)
 {
        ir_entity *function_entity = get_function_entity(declaration);
@@ -2993,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);
@@ -3001,6 +4657,11 @@ static void create_function(declaration_t *declaration)
        ir_graph *irg          = new_ir_graph(function_entity, n_local_vars);
        ir_node  *first_block  = get_cur_block();
 
+       /* set inline flags */
+       if (declaration->is_inline)
+       set_irg_inline_property(irg, irg_inline_recomended);
+    handle_decl_modifier_irg(irg, declaration->modifiers);
+
        next_value_number_function = 0;
        initialize_function_parameters(declaration);
 
@@ -3028,7 +4689,7 @@ static void create_function(declaration_t *declaration)
                        }
 
                        ir_node *in[1];
-                       // §5.1.2.2.3 main implicitly returns 0
+                       /* §5.1.2.2.3 main implicitly returns 0 */
                        if (strcmp(declaration->symbol->string, "main") == 0) {
                                in[0] = new_Const(mode, get_mode_null(mode));
                        } else {
@@ -3075,70 +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_TYPE_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;
@@ -3156,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;
@@ -3168,15 +4773,35 @@ static void context_to_firm(context_t *context)
                        continue;
 
                type_t *type = declaration->type;
-               if(type->type != TYPE_FUNCTION)
-                       continue;
+               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);
+               }
+       }
+}
+
+void init_ast2firm(void)
+{
+       obstack_init(&asm_obst);
+       init_atomic_modes();
 
-               create_function(declaration);
+       /* create idents for all known runtime functions */
+       for (size_t i = 0; i < sizeof(rts_data) / sizeof(rts_data[0]); ++i) {
+               predef_idents[rts_data[i].id] = new_id_from_str(rts_data[i].name);
        }
 }
 
-void translation_unit_to_firm(translation_unit_t *unit)
+static void init_ir_types(void)
 {
+       static int ir_types_initialized = 0;
+       if(ir_types_initialized)
+               return;
+       ir_types_initialized = 1;
+
        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);
@@ -3188,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);
 }