add space after if, improve while_statement_to_firm
[cparser] / ast2firm.c
index 0d92919..d05e76d 100644 (file)
@@ -38,6 +38,8 @@
 #include "diagnostic.h"
 #include "lang_features.h"
 #include "types.h"
+#include "warning.h"
+#include "entitymap_t.h"
 #include "driver/firm_opt.h"
 #include "driver/firm_cmdline.h"
 
@@ -60,11 +62,14 @@ static ir_node  *break_label;
 static ir_node  *current_switch_cond;
 static bool      saw_default_label;
 static ir_node **imature_blocks;
+static bool constant_folding;
 
 static const declaration_t *current_function_decl;
 static ir_node             *current_function_name;
 static ir_node             *current_funcsig;
 
+static entitymap_t  entitymap;
+
 static struct obstack asm_obst;
 
 typedef enum declaration_kind_t {
@@ -78,7 +83,8 @@ typedef enum declaration_kind_t {
        DECLARATION_KIND_LABEL_BLOCK,
        DECLARATION_KIND_ENUM_ENTRY,
        DECLARATION_KIND_COMPOUND_TYPE_INCOMPLETE,
-       DECLARATION_KIND_COMPOUND_TYPE_COMPLETE
+       DECLARATION_KIND_COMPOUND_TYPE_COMPLETE,
+       DECLARATION_KIND_TYPE
 } declaration_kind_t;
 
 static ir_type *get_ir_type(type_t *type);
@@ -98,7 +104,7 @@ ir_node *uninitialized_local_var(ir_graph *irg, ir_mode *mode, int pos)
 unsigned dbg_snprint(char *buf, unsigned len, const dbg_info *dbg)
 {
        const source_position_t *pos = (const source_position_t*) dbg;
-       if(pos == NULL)
+       if (pos == NULL)
                return 0;
        return (unsigned) snprintf(buf, len, "%s:%u", pos->input_name,
                                   pos->linenr);
@@ -107,9 +113,9 @@ unsigned dbg_snprint(char *buf, unsigned len, const dbg_info *dbg)
 const char *dbg_retrieve(const dbg_info *dbg, unsigned *line)
 {
        const source_position_t *pos = (const source_position_t*) dbg;
-       if(pos == NULL)
+       if (pos == NULL)
                return NULL;
-       if(line != NULL)
+       if (line != NULL)
                *line = pos->linenr;
        return pos->input_name;
 }
@@ -123,23 +129,25 @@ 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 ir_node *expression_to_firm(const expression_t *expression);
 static inline ir_mode *get_ir_mode(type_t *type);
+static void create_local_declaration(declaration_t *declaration);
 
 static ir_mode *init_atomic_ir_mode(atomic_type_kind_t kind)
 {
        unsigned flags = get_atomic_type_flags(kind);
        unsigned size  = get_atomic_type_size(kind);
-       if( (flags & (ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_FLOAT))
+       if ( (flags & (ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_FLOAT))
                        && !(flags & ATOMIC_TYPE_FLAG_COMPLEX)) {
                char            name[64];
-               mode_sort       sort;
+               ir_mode_sort    sort;
                unsigned        bit_size     = size * 8;
                bool            is_signed    = (flags & ATOMIC_TYPE_FLAG_SIGNED) != 0;
-               mode_arithmetic arithmetic;
+               ir_mode_arithmetic arithmetic;
                unsigned        modulo_shift;
 
-               if(flags & ATOMIC_TYPE_FLAG_INTEGER) {
+               if (flags & ATOMIC_TYPE_FLAG_INTEGER) {
                        assert(! (flags & ATOMIC_TYPE_FLAG_FLOAT));
                        snprintf(name, sizeof(name), "i%s%d", is_signed?"":"u", bit_size);
                        sort         = irms_int_number;
@@ -175,10 +183,10 @@ static void init_atomic_modes(void)
 
        /* initialize pointer modes */
        char            name[64];
-       mode_sort       sort         = irms_reference;
+       ir_mode_sort    sort         = irms_reference;
        unsigned        bit_size     = machine_size;
        bool            is_signed    = 0;
-       mode_arithmetic arithmetic   = irma_twos_complement;
+       ir_mode_arithmetic arithmetic   = irma_twos_complement;
        unsigned        modulo_shift
                = bit_size < machine_size ? machine_size : bit_size;
 
@@ -214,7 +222,7 @@ static unsigned get_type_size_const(type_t *type)
 
        switch(type->kind) {
        case TYPE_ERROR:
-               panic("error type occured");
+               panic("error type occurred");
        case TYPE_ATOMIC:
                return get_atomic_type_size(type->atomic.akind);
        case TYPE_COMPLEX:
@@ -249,9 +257,9 @@ static ir_node *get_type_size(type_t *type)
 {
        type = skip_typeref(type);
 
-       if(is_type_array(type) && type->array.is_vla) {
+       if (is_type_array(type) && type->array.is_vla) {
                ir_node *size_node = type->array.size_node;
-               if(size_node == NULL) {
+               if (size_node == NULL) {
                        size_node = expression_to_firm(type->array.size_expression);
                        assert(!is_Const(size_node));
                        type->array.size_node = size_node;
@@ -340,20 +348,20 @@ static ir_type *create_method_type(const function_type_t *function_type)
        dbg_info *dbgi        = get_dbg_info(&function_type->base.source_position);
        ir_type *irtype       = new_d_type_method(id, n_parameters, n_results, dbgi);
 
-       if(return_type != type_void) {
+       if (return_type != type_void) {
                ir_type *restype = get_ir_type(return_type);
                set_method_res_type(irtype, 0, restype);
        }
 
        function_parameter_t *parameter = function_type->parameters;
        int                   n         = 0;
-       for( ; parameter != NULL; parameter = parameter->next) {
+       for ( ; parameter != NULL; parameter = parameter->next) {
                ir_type *p_irtype = get_ir_type(parameter->type);
                set_method_param_type(irtype, n, p_irtype);
                ++n;
        }
 
-       if(function_type->variadic || function_type->unspecified_parameters) {
+       if (function_type->variadic || function_type->unspecified_parameters) {
                set_method_variadicity(irtype, variadicity_variadic);
        }
 
@@ -383,13 +391,13 @@ static ir_type *create_array_type(array_type_t *type)
        const int align = get_type_alignment_bytes(ir_element_type);
        set_type_alignment_bytes(ir_type, align);
 
-       if(type->size_constant) {
+       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);
-               if(elemsize % align > 0) {
+               if (elemsize % align > 0) {
                        elemsize += align - (elemsize % align);
                }
                set_type_size_bytes(ir_type, n_elements * elemsize);
@@ -481,7 +489,7 @@ static ir_type *create_bitfield_type(bitfield_type_t *const type)
        unsigned size = fold_constant(type->size);
 
        assert(!is_type_float(base));
-       if(is_type_signed(base)) {
+       if (is_type_signed(base)) {
                return get_signed_int_type_for_bit_size(irbase, size);
        } else {
                return get_unsigned_int_type_for_bit_size(irbase, size);
@@ -496,7 +504,7 @@ enum {
 };
 
 /**
- * Construct firm type from ast struct tyep.
+ * Construct firm type from ast struct type.
  *
  * As anonymous inner structs get flattened to a single firm type, we might get
  * irtype, outer_offset and out_align passed (they represent the position of
@@ -507,9 +515,9 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype,
                                      bool incomplete, bool is_union)
 {
        declaration_t      *declaration = type->declaration;
-       declaration_kind_t  kind        = declaration->declaration_kind;
+       declaration_kind_t  kind        = (declaration_kind_t)declaration->declaration_kind;
 
-       if(kind == DECLARATION_KIND_COMPOUND_TYPE_COMPLETE
+       if (kind == DECLARATION_KIND_COMPOUND_TYPE_COMPLETE
                        || (kind == DECLARATION_KIND_COMPOUND_TYPE_INCOMPLETE
                                && incomplete))
                return declaration->v.irtype;
@@ -519,10 +527,10 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype,
        size_t bit_offset = 0;
        size_t size       = 0;
 
-       if(irtype == NULL) {
+       if (irtype == NULL) {
                symbol_t *symbol = declaration->symbol;
                ident    *id;
-               if(symbol != NULL) {
+               if (symbol != NULL) {
                        id = new_id_from_str(symbol->string);
                } else {
                        if (is_union) {
@@ -548,14 +556,14 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype,
                align_all = *outer_align;
        }
 
-       if(incomplete)
+       if (incomplete)
                return irtype;
 
        declaration->declaration_kind = DECLARATION_KIND_COMPOUND_TYPE_COMPLETE;
 
        declaration_t *entry = declaration->scope.declarations;
        for( ; entry != NULL; entry = entry->next) {
-               if(entry->namespc != NAMESPACE_NORMAL)
+               if (entry->namespc != NAMESPACE_NORMAL)
                        continue;
 
                size_t prev_offset = offset;
@@ -565,14 +573,14 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype,
                dbg_info *dbgi       = get_dbg_info(&entry->source_position);
 
                ident    *ident;
-               if(symbol != NULL) {
+               if (symbol != NULL) {
                        ident = new_id_from_str(symbol->string);
                } else {
-                       if(entry_type->kind == TYPE_COMPOUND_STRUCT) {
+                       if (entry_type->kind == TYPE_COMPOUND_STRUCT) {
                                create_compound_type(&entry_type->compound, irtype, &offset,
                                                     &align_all, false, COMPOUND_IS_STRUCT);
                                goto finished_member;
-                       } else if(entry_type->kind == TYPE_COMPOUND_UNION) {
+                       } else if (entry_type->kind == TYPE_COMPOUND_UNION) {
                                create_compound_type(&entry_type->compound, irtype, &offset,
                                                     &align_all, false, COMPOUND_IS_UNION);
                                goto finished_member;
@@ -583,7 +591,7 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype,
                }
 
                ir_type *base_irtype;
-               if(entry_type->kind == TYPE_BITFIELD) {
+               if (entry_type->kind == TYPE_BITFIELD) {
                        base_irtype = get_ir_type(entry_type->bitfield.base_type);
                } else {
                        base_irtype = get_ir_type(entry_type);
@@ -597,11 +605,11 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype,
 
                size_t base;
                size_t bits_remainder;
-               if(entry_type->kind == TYPE_BITFIELD) {
+               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) {
+                       if (size_bits > rest_size_bits) {
                                /* start a new bucket */
                                offset     += entry_alignment - misalign;
                                bit_offset  = 0;
@@ -618,7 +626,7 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype,
                        bit_offset  = bit_offset + (size_bits % 8);
                } else {
                        size_t entry_size = get_type_size_bytes(base_irtype);
-                       if(misalign > 0 || bit_offset > 0)
+                       if (misalign > 0 || bit_offset > 0)
                                offset += entry_alignment - misalign;
 
                        base           = offset;
@@ -627,8 +635,8 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype,
                        bit_offset     = 0;
                }
 
-               if(entry_alignment > align_all) {
-                       if(entry_alignment % align_all != 0) {
+               if (entry_alignment > align_all) {
+                       if (entry_alignment % align_all != 0) {
                                panic("uneven alignments not supported yet");
                        }
                        align_all = entry_alignment;
@@ -658,11 +666,11 @@ finished_member:
        }
 
        size_t misalign = offset % align_all;
-       if(misalign > 0 || bit_offset > 0) {
+       if (misalign > 0 || bit_offset > 0) {
                size += align_all - misalign;
        }
 
-       if(outer_offset != NULL) {
+       if (outer_offset != NULL) {
                if (!is_union) {
                        *outer_offset = offset;
                } else {
@@ -670,7 +678,7 @@ finished_member:
                }
 
                if (align_all > *outer_align) {
-                       if(align_all % *outer_align != 0) {
+                       if (align_all % *outer_align != 0) {
                                panic("uneven alignments not supported yet");
                        }
                        *outer_align = align_all;
@@ -692,6 +700,9 @@ static ir_type *create_enum_type(enum_type_t *const type)
        tarval  *const one     = get_mode_one(mode);
        tarval  *      tv_next = get_tarval_null(mode);
 
+       bool constant_folding_old = constant_folding;
+       constant_folding = true;
+
        declaration_t *declaration = type->declaration->next;
        for (; declaration != NULL; declaration = declaration->next) {
                if (declaration->storage_class != STORAGE_CLASS_ENUM_ENTRY)
@@ -711,6 +722,8 @@ static ir_type *create_enum_type(enum_type_t *const type)
                tv_next = tarval_add(tv_next, one);
        }
 
+       constant_folding = constant_folding_old;
+
        return ir_type_int;
 }
 
@@ -793,7 +806,7 @@ static ir_type *get_ir_type(type_t *type)
        case TYPE_INVALID:
                break;
        }
-       if(firm_type == NULL)
+       if (firm_type == NULL)
                panic("unknown type found");
 
        type->base.firm_type = firm_type;
@@ -805,7 +818,7 @@ static inline ir_mode *get_ir_mode(type_t *type)
        ir_type *irtype = get_ir_type(type);
 
        /* firm doesn't report a mode for arrays somehow... */
-       if(is_Array_type(irtype)) {
+       if (is_Array_type(irtype)) {
                return mode_P_data;
        }
 
@@ -814,8 +827,6 @@ 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 */
@@ -826,6 +837,7 @@ static const struct {
 } rts_data[] = {
        { rts_debugbreak, 0, "__debugbreak", 0, _MS },
        { rts_abort,      0, "abort",        0, _C89 },
+       { rts_alloca,     1, "alloca",       1, _ALL },
        { rts_abs,        1, "abs",          1, _C89 },
        { rts_labs,       1, "labs",         1, _C89 },
        { rts_llabs,      1, "llabs",        1, _C99 },
@@ -897,6 +909,8 @@ static const struct {
        { rts_strncmp,    1, "strncmp",      3, _C89 }
 };
 
+static ident *rts_idents[sizeof(rts_data) / sizeof(rts_data[0])];
+
 /**
  * Mangles an entity linker (ld) name for win32 usage.
  *
@@ -952,9 +966,14 @@ typedef ident* (*create_ld_ident_func)(ir_entity *entity,
                                        declaration_t *declaration);
 create_ld_ident_func  create_ld_ident = create_ld_ident_linux_elf;
 
-static ir_entity* get_function_entity(declaration_t *declaration)
+/**
+ * Creates an entity representing a function.
+ *
+ * @param declaration  the function declaration
+ */
+static ir_entity *get_function_entity(declaration_t *declaration)
 {
-       if(declaration->declaration_kind == DECLARATION_KIND_FUNCTION)
+       if (declaration->declaration_kind == DECLARATION_KIND_FUNCTION)
                return declaration->v.entity;
        assert(declaration->declaration_kind == DECLARATION_KIND_UNKNOWN);
 
@@ -965,54 +984,62 @@ 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));
 
-       dbg_info  *const dbgi   = get_dbg_info(&declaration->source_position);
-       ir_entity *const entity = new_d_entity(global_type, id, ir_type_method, dbgi);
+       /* already an entity defined? */
+       ir_entity *entity = entitymap_get(&entitymap, symbol);
+       if (entity != NULL) {
+               if (get_entity_visibility(entity) == visibility_external_allocated
+                               && declaration->init.statement != NULL) {
+                       set_entity_visibility(entity, visibility_external_visible);
+               }
+               goto entity_created;
+       }
+
+       dbg_info *const dbgi = get_dbg_info(&declaration->source_position);
+       entity               = new_d_entity(global_type, id, ir_type_method, dbgi);
        set_entity_ld_ident(entity, create_ld_ident(entity, declaration));
-       if(declaration->storage_class == STORAGE_CLASS_STATIC &&
+       if (declaration->storage_class == STORAGE_CLASS_STATIC &&
                declaration->init.statement == NULL) {
                /* this entity was declared, but never defined */
                set_entity_peculiarity(entity, peculiarity_description);
        }
-       if(declaration->storage_class == STORAGE_CLASS_STATIC
+       if (declaration->storage_class == STORAGE_CLASS_STATIC
                        || declaration->is_inline) {
                set_entity_visibility(entity, visibility_local);
-       } else if(declaration->init.statement != NULL) {
+       } else if (declaration->init.statement != NULL) {
                set_entity_visibility(entity, visibility_external_visible);
        } else {
                set_entity_visibility(entity, visibility_external_allocated);
+       }
+       set_entity_allocation(entity, allocation_static);
 
-               /* 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;
-                               }
-                       }
+       /* We should check for file scope here, but as long as we compile C only
+          this is not needed. */
+       if (! firm_opt.freestanding) {
+               /* check for a known runtime function */
+               for (size_t i = 0; i < sizeof(rts_data) / sizeof(rts_data[0]); ++i) {
+                       if (id != rts_idents[i])
+                               continue;
+
+                       /* ignore those rts functions not necessary needed for current mode */
+                       if ((c_mode & rts_data[i].flags) == 0)
+                               continue;
+                       assert(rts_entities[rts_data[i].id] == NULL);
+                       rts_entities[rts_data[i].id] = entity;
                }
        }
-       set_entity_allocation(entity, allocation_static);
 
+       entitymap_insert(&entitymap, symbol, entity);
+
+entity_created:
        declaration->declaration_kind = DECLARATION_KIND_FUNCTION;
        declaration->v.entity         = entity;
 
        return entity;
 }
 
+/**
+ * Creates a Const node representing a constant.
+ */
 static ir_node *const_to_firm(const const_expression_t *cnst)
 {
        dbg_info *dbgi = get_dbg_info(&cnst->base.source_position);
@@ -1021,10 +1048,10 @@ static ir_node *const_to_firm(const const_expression_t *cnst)
        char    buf[128];
        tarval *tv;
        size_t  len;
-       if(mode_is_float(mode)) {
+       if (mode_is_float(mode)) {
                tv = new_tarval_from_double(cnst->v.float_value, mode);
        } else {
-               if(mode_is_signed(mode)) {
+               if (mode_is_signed(mode)) {
                        len = snprintf(buf, sizeof(buf), "%lld", cnst->v.int_value);
                } else {
                        len = snprintf(buf, sizeof(buf), "%llu",
@@ -1036,6 +1063,9 @@ static ir_node *const_to_firm(const const_expression_t *cnst)
        return new_d_Const(dbgi, mode, tv);
 }
 
+/**
+ * Creates a Const node representing a character constant.
+ */
 static ir_node *character_constant_to_firm(const const_expression_t *cnst)
 {
        dbg_info *dbgi = get_dbg_info(&cnst->base.source_position);
@@ -1056,6 +1086,9 @@ static ir_node *character_constant_to_firm(const const_expression_t *cnst)
        return new_d_Const(dbgi, mode, tv);
 }
 
+/**
+ * Creates a Const node representing a wide character constant.
+ */
 static ir_node *wide_character_constant_to_firm(const const_expression_t *cnst)
 {
        dbg_info *dbgi = get_dbg_info(&cnst->base.source_position);
@@ -1070,6 +1103,13 @@ static ir_node *wide_character_constant_to_firm(const const_expression_t *cnst)
        return new_d_Const(dbgi, mode, tv);
 }
 
+/**
+ * Creates a SymConst for a given entity.
+ *
+ * @param dbgi    debug info
+ * @param mode    the (reference) mode for the SymConst
+ * @param entity  the entity
+ */
 static ir_node *create_symconst(dbg_info *dbgi, ir_mode *mode,
                               ir_entity *entity)
 {
@@ -1079,6 +1119,13 @@ static ir_node *create_symconst(dbg_info *dbgi, ir_mode *mode,
        return new_d_SymConst(dbgi, mode, sym, symconst_addr_ent);
 }
 
+/**
+ * Creates a SymConst node representing a string constant.
+ *
+ * @param src_pos    the source position of the string constant
+ * @param id_prefix  a prefix for the name of the generated string constant
+ * @param value      the value of the string constant
+ */
 static ir_node *string_to_firm(const source_position_t *const src_pos,
                                const char *const id_prefix,
                                const string_t *const value)
@@ -1116,6 +1163,11 @@ static ir_node *string_to_firm(const source_position_t *const src_pos,
        return create_symconst(dbgi, mode_P_data, entity);
 }
 
+/**
+ * Creates a SymConst node representing a string literal.
+ *
+ * @param literal   the string literal
+ */
 static ir_node *string_literal_to_firm(
                const string_literal_expression_t* literal)
 {
@@ -1123,6 +1175,11 @@ static ir_node *string_literal_to_firm(
                              &literal->value);
 }
 
+/**
+ * Creates a SymConst node representing a wide string literal.
+ *
+ * @param literal   the wide string literal
+ */
 static ir_node *wide_string_literal_to_firm(
        const wide_string_literal_expression_t* const literal)
 {
@@ -1159,8 +1216,8 @@ static ir_node *wide_string_literal_to_firm(
        return create_symconst(dbgi, mode_P_data, entity);
 }
 
-static ir_node *deref_address(type_t *const type, ir_node *const addr,
-                              dbg_info *const dbgi)
+static ir_node *deref_address(dbg_info *const dbgi, type_t *const type,
+                                     ir_node *const addr)
 {
        ir_type *irtype = get_ir_type(type);
        if (is_compound_type(irtype)
@@ -1175,7 +1232,7 @@ static ir_node *deref_address(type_t *const type, ir_node *const addr,
        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) {
+       if (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) {
                set_Load_volatility(load, volatility_is_volatile);
        }
 
@@ -1183,17 +1240,20 @@ static ir_node *deref_address(type_t *const type, ir_node *const addr,
        return load_res;
 }
 
+/**
+ * Creates a strict Conv if neccessary.
+ */
 static ir_node *do_strict_conv(dbg_info *dbgi, ir_node *node)
 {
        ir_mode *mode = get_irn_mode(node);
 
-       if(!(get_irg_fp_model(current_ir_graph) & fp_explicit_rounding))
+       if (!(get_irg_fp_model(current_ir_graph) & fp_explicit_rounding))
                return node;
-       if(!mode_is_float(mode))
+       if (!mode_is_float(mode))
                return node;
 
        /* check if there is already a Conv */
-       if (get_irn_op(node) == op_Conv) {
+       if (is_Conv(node)) {
                /* convert it into a strict Conv */
                set_Conv_strict(node, 1);
                return node;
@@ -1223,8 +1283,10 @@ static ir_node *get_global_var_address(dbg_info *const dbgi,
        }
 }
 
-/* Returns the correct base address depending on whether it is a parameter or a
- * normal local variable */
+/**
+ * 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;
@@ -1237,19 +1299,36 @@ static ir_node *get_local_frame(ir_entity *const ent)
        }
 }
 
+static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode)
+{
+       ir_mode *value_mode = get_irn_mode(value);
+
+       if (value_mode == dest_mode || is_Bad(value))
+               return value;
+
+       if (dest_mode == mode_b) {
+               ir_node *zero = new_Const(value_mode, get_mode_null(value_mode));
+               ir_node *cmp  = new_d_Cmp(dbgi, value, zero);
+               ir_node *proj = new_d_Proj(dbgi, cmp, mode_b, pn_Cmp_Lg);
+               return proj;
+       }
+
+       return new_d_Conv(dbgi, value, dest_mode);
+}
+
 static ir_node *reference_expression_to_firm(const reference_expression_t *ref)
 {
        dbg_info      *dbgi        = get_dbg_info(&ref->base.source_position);
        declaration_t *declaration = ref->declaration;
        type_t        *type        = skip_typeref(declaration->type);
 
+       /* make sure the type is constructed */
+       (void) get_ir_type(type);
+
        switch((declaration_kind_t) declaration->declaration_kind) {
+       case DECLARATION_KIND_TYPE:
        case DECLARATION_KIND_UNKNOWN:
-               if (declaration->storage_class != STORAGE_CLASS_ENUM_ENTRY) {
-                       break;
-               }
-               get_ir_type(type);
-               /* FALLTHROUGH */
+               break;
 
        case DECLARATION_KIND_ENUM_ENTRY: {
                ir_mode *const mode = get_ir_mode(type);
@@ -1266,14 +1345,14 @@ static ir_node *reference_expression_to_firm(const reference_expression_t *ref)
        }
        case DECLARATION_KIND_GLOBAL_VARIABLE: {
                ir_node *const addr   = get_global_var_address(dbgi, declaration);
-               return deref_address(declaration->type, addr, dbgi);
+               return deref_address(dbgi, declaration->type, addr);
        }
 
        case DECLARATION_KIND_LOCAL_VARIABLE_ENTITY: {
                ir_entity *entity = declaration->v.entity;
                ir_node   *frame  = get_local_frame(entity);
                ir_node   *sel    = new_d_simpleSel(dbgi, new_NoMem(), frame, entity);
-               return deref_address(declaration->type, sel, dbgi);
+               return deref_address(dbgi, declaration->type, sel);
        }
 
        case DECLARATION_KIND_VARIABLE_LENGTH_ARRAY:
@@ -1295,10 +1374,13 @@ static ir_node *reference_addr(const reference_expression_t *ref)
        declaration_t *declaration = ref->declaration;
 
        switch((declaration_kind_t) declaration->declaration_kind) {
+       case DECLARATION_KIND_TYPE:
        case DECLARATION_KIND_UNKNOWN:
                break;
        case DECLARATION_KIND_LOCAL_VARIABLE:
-               panic("local variable without entity has no address");
+               /* you can store to a local variable (so we don't panic but return NULL
+                * as an indicator for no real address) */
+               return NULL;
        case DECLARATION_KIND_FUNCTION: {
                type_t *const  type = skip_typeref(ref->base.type);
                ir_mode *const mode = get_ir_mode(type);
@@ -1332,6 +1414,9 @@ static ir_node *reference_addr(const reference_expression_t *ref)
        panic("reference to declaration with unknown type found");
 }
 
+/**
+ * Transform calls to builtin functions.
+ */
 static ir_node *process_builtin_call(const call_expression_t *call)
 {
        dbg_info *dbgi = get_dbg_info(&call->base.source_position);
@@ -1347,7 +1432,7 @@ static ir_node *process_builtin_call(const call_expression_t *call)
 
        switch(symbol->ID) {
        case T___builtin_alloca: {
-               if(call->arguments == NULL || call->arguments->next != NULL) {
+               if (call->arguments == NULL || call->arguments->next != NULL) {
                        panic("invalid number of parameters on __builtin_alloca");
                }
                expression_t *argument = call->arguments->expression;
@@ -1362,6 +1447,12 @@ static ir_node *process_builtin_call(const call_expression_t *call)
 
                return res;
        }
+       case T___builtin_huge_val: {
+               ir_mode *mode = get_ir_mode(function_type->function.return_type);
+               tarval  *tv   = get_mode_infinite(mode);
+               ir_node *res  = new_d_Const(dbgi, mode, tv);
+               return   res;
+       }
        case T___builtin_nan:
        case T___builtin_nanf:
        case T___builtin_nand: {
@@ -1379,14 +1470,45 @@ static ir_node *process_builtin_call(const call_expression_t *call)
        }
 }
 
+/**
+ * Transform a call expression.
+ * Handles some special cases, like alloca() calls, which must be resolved BEFORE the inlines runs.
+ * Inlining routines calling alloca() is dangerous, 176.gcc for instance might allocate 2GB instead of
+ * 256 MB if alloca is not handled right...
+ */
 static ir_node *call_expression_to_firm(const call_expression_t *call)
 {
+       dbg_info *dbgi  = get_dbg_info(&call->base.source_position);
        assert(get_cur_block() != NULL);
 
        expression_t *function = call->function;
-       if(function->kind == EXPR_BUILTIN_SYMBOL) {
+       if (function->kind == EXPR_BUILTIN_SYMBOL) {
                return process_builtin_call(call);
        }
+       if (function->kind == EXPR_REFERENCE) {
+               const reference_expression_t *ref = &function->reference;
+               declaration_t *declaration = ref->declaration;
+
+               if ((declaration_kind_t)declaration->declaration_kind == DECLARATION_KIND_FUNCTION) {
+                       if (declaration->v.entity == rts_entities[rts_alloca]) {
+                               /* handle alloca() call */
+                               expression_t *argument = call->arguments->expression;
+                               ir_node      *size     = expression_to_firm(argument);
+
+                               size = create_conv(dbgi, size, get_ir_mode(type_size_t));
+
+                               ir_node *store  = get_store();
+                               dbg_info *dbgi  = get_dbg_info(&call->base.source_position);
+                               ir_node *alloca = new_d_Alloc(dbgi, store, size, firm_unknown_type,
+                                              stack_alloc);
+                               ir_node *proj_m = new_Proj(alloca, mode_M, pn_Alloc_M);
+                               set_store(proj_m);
+                               ir_node *res    = new_Proj(alloca, mode_P_data, pn_Alloc_res);
+
+                               return res;
+                       }
+               }
+       }
        ir_node *callee = expression_to_firm(function);
 
        type_t *type = skip_typeref(function->base.type);
@@ -1396,23 +1518,21 @@ static ir_node *call_expression_to_firm(const call_expression_t *call)
        assert(is_type_function(points_to));
        function_type_t *function_type = &points_to->function;
 
-       int              n_parameters = 0;
-       call_argument_t *argument     = call->arguments;
-       for( ; argument != NULL; argument = argument->next) {
-               ++n_parameters;
-       }
-
-       dbg_info *dbgi  = get_dbg_info(&call->base.source_position);
-
+       int      n_parameters = 0;
        ir_type *ir_method_type  = get_ir_type((type_t*) function_type);
        ir_type *new_method_type = NULL;
-       if(function_type->variadic || function_type->unspecified_parameters) {
+       if (function_type->variadic || function_type->unspecified_parameters) {
+               const call_argument_t *argument = call->arguments;
+               for( ; argument != NULL; argument = argument->next) {
+                       ++n_parameters;
+               }
+
                /* we need to construct a new method type matching the call
                 * arguments... */
                int n_res       = get_method_n_ress(ir_method_type);
                dbg_info *dbgi  = get_dbg_info(&call->base.source_position);
                new_method_type = new_d_type_method(id_unique("calltype.%u"),
-                                                 n_parameters, n_res, dbgi);
+                                                   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,
@@ -1424,29 +1544,30 @@ static ir_node *call_expression_to_firm(const call_expression_t *call)
                        set_method_res_type(new_method_type, i,
                                            get_method_res_type(ir_method_type, i));
                }
+               argument = call->arguments;
+               for(int i = 0; i < n_parameters; ++i, argument = argument->next) {
+                       expression_t *expression = argument->expression;
+                       ir_type      *irtype     = get_ir_type(expression->base.type);
+                       set_method_param_type(new_method_type, i, irtype);
+               }
+               ir_method_type = new_method_type;
+       } else {
+               n_parameters = get_method_n_params(ir_method_type);
        }
+
        ir_node *in[n_parameters];
 
-       argument = call->arguments;
-       int n = 0;
-       for( ; argument != NULL; argument = argument->next) {
+       const call_argument_t *argument = call->arguments;
+       for(int n = 0; n < n_parameters; ++n) {
                expression_t *expression = argument->expression;
                ir_node      *arg_node   = expression_to_firm(expression);
 
                arg_node = do_strict_conv(dbgi, arg_node);
 
                in[n] = arg_node;
-               if(new_method_type != NULL) {
-                       ir_type *irtype = get_ir_type(expression->base.type);
-                       set_method_param_type(new_method_type, n, irtype);
-               }
 
-               n++;
+               argument = argument->next;
        }
-       assert(n == n_parameters);
-
-       if(new_method_type != NULL)
-               ir_method_type = new_method_type;
 
        ir_node  *store = get_store();
        ir_node  *node  = new_d_Call(dbgi, store, callee, n_parameters, in,
@@ -1457,9 +1578,9 @@ static ir_node *call_expression_to_firm(const call_expression_t *call)
        type_t  *return_type = skip_typeref(function_type->return_type);
        ir_node *result      = NULL;
 
-       if(!is_type_atomic(return_type, ATOMIC_TYPE_VOID)) {
+       if (!is_type_atomic(return_type, ATOMIC_TYPE_VOID)) {
                ir_mode *mode;
-               if(is_type_scalar(return_type)) {
+               if (is_type_scalar(return_type)) {
                        mode = get_ir_mode(return_type);
                } else {
                        mode = mode_P_data;
@@ -1486,10 +1607,10 @@ static void assign_value(dbg_info *dbgi, ir_node *addr, type_t *type,
 
        ir_node *memory = get_store();
 
-       if(is_type_scalar(type)) {
+       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)
+               if (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE)
                        set_Store_volatility(store, volatility_is_volatile);
                set_store(store_mem);
        } else {
@@ -1507,7 +1628,7 @@ static tarval *create_bitfield_mask(ir_mode *mode, int offset, int size)
 
        assert(offset >= 0 && size >= 0);
        assert(offset + size <= mode_size);
-       if(size == mode_size) {
+       if (size == mode_size) {
                return all_one;
        }
 
@@ -1521,22 +1642,18 @@ static tarval *create_bitfield_mask(ir_mode *mode, int offset, int size)
        return mask1;
 }
 
-static void bitfield_store_to_firm(const unary_expression_t *expression,
-                                   ir_node *value)
+static void bitfield_store_to_firm(const select_expression_t *expression,
+                                   ir_node *addr, 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_type);
-       ir_node      *addr   = expression_to_addr(select);
+       type_t       *type   = expression->base.type;
+       ir_mode      *mode   = get_ir_mode(type);
 
-       assert(get_irn_mode(value) == mode);
+       assert(get_irn_mode(value) == mode || is_Bad(value));
 
        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;
+       ir_entity *entity       = expression->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));
@@ -1564,67 +1681,135 @@ static void bitfield_store_to_firm(const unary_expression_t *expression,
        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) {
+       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)
+static ir_node *bitfield_extract_to_firm(const select_expression_t *expression,
+               ir_node *addr)
+{
+       dbg_info *dbgi     = get_dbg_info(&expression->base.source_position);
+       type_t   *type     = expression->base.type;
+       ir_mode  *mode     = get_ir_mode(type);
+       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       = expression->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 void set_value_for_expression_addr(const expression_t *expression,
+                                          ir_node *value, ir_node *addr)
 {
        dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
        value          = do_strict_conv(dbgi, value);
 
-       if(expression->kind == EXPR_REFERENCE) {
+       if (expression->kind == EXPR_REFERENCE) {
                const reference_expression_t *ref = &expression->reference;
 
                declaration_t *declaration = ref->declaration;
                assert(declaration->declaration_kind != DECLARATION_KIND_UNKNOWN);
-               if(declaration->declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE) {
+               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;
+       if (addr == NULL)
+               addr = expression_to_addr(expression);
+
+       type_t *type = skip_typeref(expression->base.type);
+
+       if (expression->kind == EXPR_SELECT) {
+               const select_expression_t *select = &expression->select;
+
+               declaration_t *declaration = select->compound_entry;
+               if (declaration->type->kind == TYPE_BITFIELD) {
+                       bitfield_store_to_firm(select, addr, value);
+                       return;
+               }
        }
 
-       ir_node *addr = expression_to_addr(expression);
-       type_t  *type = skip_typeref(expression->base.type);
        assign_value(dbgi, addr, type, value);
 }
 
-static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode)
+static void set_value_for_expression(const expression_t *expression,
+                                     ir_node *value)
 {
-       ir_mode *value_mode = get_irn_mode(value);
+       set_value_for_expression_addr(expression, value, NULL);
+}
 
-       if (value_mode == dest_mode || is_Bad(value))
-               return value;
+static ir_node *get_value_from_lvalue(const expression_t *expression,
+                                      ir_node *addr)
+{
+       if (expression->kind == EXPR_REFERENCE) {
+               const reference_expression_t *ref = &expression->reference;
 
-       if(dest_mode == mode_b) {
-               ir_node *zero = new_Const(value_mode, get_mode_null(value_mode));
-               ir_node *cmp  = new_d_Cmp(dbgi, value, zero);
-               ir_node *proj = new_d_Proj(dbgi, cmp, mode_b, pn_Cmp_Lg);
-               return proj;
+               declaration_t *declaration = ref->declaration;
+               assert(declaration->declaration_kind != DECLARATION_KIND_UNKNOWN);
+               if (declaration->declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE) {
+                       assert(addr == NULL);
+                       ir_mode *mode = get_ir_mode(expression->base.type);
+                       return get_value(declaration->v.value_number, mode);
+               }
        }
 
-       return new_d_Conv(dbgi, value, dest_mode);
+       assert(addr != NULL);
+       dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
+
+       ir_node *value;
+       if (expression->kind == EXPR_SELECT &&
+           expression->select.compound_entry->type->kind == TYPE_BITFIELD){
+               value = bitfield_extract_to_firm(&expression->select, addr);
+       } else {
+               value = deref_address(dbgi, expression->base.type, addr);
+       }
+
+       return value;
 }
 
+
 static ir_node *create_incdec(const unary_expression_t *expression)
 {
-       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;
+       dbg_info *const     dbgi = get_dbg_info(&expression->base.source_position);
+       const expression_t *value_expr = expression->value;
+       ir_node            *addr       = expression_to_addr(value_expr);
+       ir_node            *value      = get_value_from_lvalue(value_expr, addr);
 
-       ir_node *value_node = expression_to_firm(value);
+       type_t  *type = skip_typeref(expression->base.type);
+       ir_mode *mode = get_ir_mode(expression->base.type);
 
        ir_node *offset;
-       if(is_type_pointer(type)) {
+       if (is_type_pointer(type)) {
                pointer_type_t *pointer_type = &type->pointer;
                offset                       = get_type_size(pointer_type->points_to);
        } else {
@@ -1632,31 +1817,32 @@ static ir_node *create_incdec(const unary_expression_t *expression)
                offset = new_Const(mode, get_mode_one(mode));
        }
 
+       ir_node *result;
+       ir_node *store_value;
        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 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 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 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;
-       }
+       case EXPR_UNARY_POSTFIX_INCREMENT:
+               result      = value;
+               store_value = new_d_Add(dbgi, value, offset, mode);
+               break;
+       case EXPR_UNARY_POSTFIX_DECREMENT:
+               result      = value;
+               store_value = new_d_Sub(dbgi, value, offset, mode);
+               break;
+       case EXPR_UNARY_PREFIX_INCREMENT:
+               result      = new_d_Add(dbgi, value, offset, mode);
+               store_value = result;
+               break;
+       case EXPR_UNARY_PREFIX_DECREMENT:
+               result      = new_d_Sub(dbgi, value, offset, mode);
+               store_value = result;
+               break;
        default:
                panic("no incdec expr in create_incdec");
-               return NULL;
        }
+
+       set_value_for_expression_addr(value_expr, store_value, addr);
+
+       return result;
 }
 
 static bool is_local_variable(expression_t *expression)
@@ -1774,56 +1960,12 @@ static ir_node *handle_assume(dbg_info *dbi, const expression_t *expression) {
        }
 }
 
-static ir_node *bitfield_extract_to_firm(const unary_expression_t *expression)
-{
-       expression_t *select = expression->value;
-       assert(select->kind == EXPR_SELECT);
-
-       type_t   *type     = select->base.type;
-       assert(type->kind == TYPE_BITFIELD);
-       ir_mode  *mode     = get_ir_mode(type->bitfield.base_type);
-       dbg_info *dbgi     = get_dbg_info(&expression->base.source_position);
-       ir_node  *addr     = expression_to_addr(select);
-       ir_node  *mem      = get_store();
-       ir_node  *load     = new_d_Load(dbgi, mem, addr, mode);
-       ir_node  *load_mem = new_d_Proj(dbgi, load, mode_M, pn_Load_M);
-       ir_node  *load_res = new_d_Proj(dbgi, load, mode, pn_Load_res);
-
-       load_res           = create_conv(dbgi, load_res, mode_int);
-
-       set_store(load_mem);
-
-       /* kill upper bits */
-       ir_entity *entity       = select->select.compound_entry->v.entity;
-       int        bitoffset    = get_entity_offset_bits_remainder(entity);
-       ir_type   *entity_type  = get_entity_type(entity);
-       int        bitsize      = get_mode_size_bits(get_type_mode(entity_type));
-       long       shift_bitsl  = machine_size - bitoffset - bitsize;
-       assert(shift_bitsl >= 0);
-       tarval    *tvl          = new_tarval_from_long(shift_bitsl, mode_uint);
-       ir_node   *countl       = new_d_Const(dbgi, mode_uint, tvl);
-       ir_node   *shiftl       = new_d_Shl(dbgi, load_res, countl, mode_int);
-
-       long       shift_bitsr  = bitoffset + shift_bitsl;
-       assert(shift_bitsr <= (long) machine_size);
-       tarval    *tvr          = new_tarval_from_long(shift_bitsr, mode_uint);
-       ir_node   *countr       = new_d_Const(dbgi, mode_uint, tvr);
-       ir_node   *shiftr;
-       if(mode_is_signed(mode)) {
-               shiftr = new_d_Shrs(dbgi, shiftl, countr, mode_int);
-       } else {
-               shiftr = new_d_Shr(dbgi, shiftl, countr, mode_int);
-       }
-
-       return create_conv(dbgi, shiftr, mode);
-}
-
 static ir_node *unary_expression_to_firm(const unary_expression_t *expression)
 {
        dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
        type_t   *type = skip_typeref(expression->base.type);
 
-       if(expression->base.kind == EXPR_UNARY_TAKE_ADDRESS)
+       if (expression->base.kind == EXPR_UNARY_TAKE_ADDRESS)
                return expression_to_addr(expression->value);
 
        const expression_t *value = expression->value;
@@ -1842,23 +1984,17 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression)
                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;
+               ir_node *value_node = _expression_to_firm(value);
+               value_node          = create_conv(dbgi, value_node, mode_b);
+               ir_node *res        = new_d_Not(dbgi, value_node, mode_b);
+               return res;
        }
        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);
+               return deref_address(dbgi, points_to, value_node);
        }
        case EXPR_UNARY_POSTFIX_INCREMENT:
        case EXPR_UNARY_POSTFIX_DECREMENT:
@@ -1867,7 +2003,7 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression)
                return create_incdec(expression);
        case EXPR_UNARY_CAST: {
                ir_node *value_node = expression_to_firm(value);
-               if(is_type_scalar(type)) {
+               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);
@@ -1880,7 +2016,7 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression)
        }
        case EXPR_UNARY_CAST_IMPLICIT: {
                ir_node *value_node = expression_to_firm(value);
-               if(is_type_scalar(type)) {
+               if (is_type_scalar(type)) {
                        ir_mode *mode = get_ir_mode(type);
                        return create_conv(dbgi, value_node, mode);
                } else {
@@ -1888,12 +2024,10 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression)
                }
        }
        case EXPR_UNARY_ASSUME:
-               if(firm_opt.confirm)
+               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;
@@ -1901,6 +2035,9 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression)
        panic("invalid UNEXPR type found");
 }
 
+/**
+ * produces a 0/1 depending of the value of a mode_b node
+ */
 static ir_node *produce_condition_result(const expression_t *expression,
                                          dbg_info *dbgi)
 {
@@ -1931,252 +2068,181 @@ static ir_node *produce_condition_result(const 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->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.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);
-       left            = create_conv(dbgi, left, mode);
-       ir_node  *res   = func(dbgi, left, right, mode);
-
-       return res;
-}
-
-static ir_node *pointer_arithmetic(ir_node  *const pointer,
-                                   ir_node  *      integer,
-                                   type_t   *const type,
-                                   dbg_info *const dbgi,
-                                   const create_arithmetic_func func)
+static ir_node *adjust_for_pointer_arithmetic(dbg_info *dbgi,
+               ir_node *value, 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_const(points_to);
 
        assert(elem_size >= 1);
-       if (elem_size > 1) {
-               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;
-       }
-
-       ir_mode *const mode = get_ir_mode(type);
-       return func(dbgi, pointer, integer, mode);
-}
-
-static ir_node *create_arithmetic_assign_binop(
-               const binary_expression_t *expression, create_arithmetic_func func)
-{
-       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);
-               value = pointer_arithmetic(pointer, integer, type, dbgi, func);
-       } else {
-               value = create_arithmetic_binop(expression, func);
-       }
-
-       ir_mode *const mode = get_ir_mode(type);
-       value = create_conv(dbgi, value, mode);
-       set_value_for_expression(expression->left, value);
-
-       return value;
-}
-
-static ir_node *create_add(const binary_expression_t *expression)
-{
-       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->base.type;
-
-       expression_t *expr_left  = expression->left;
-       expression_t *expr_right = expression->right;
-       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);
-               return new_d_Add(dbgi, left, right, mode);
-       }
-
-       if (is_type_pointer(type_left)) {
-               return pointer_arithmetic(left, right, type, dbgi, new_d_Add);
-       } else {
-               assert(is_type_pointer(type_right));
-               return pointer_arithmetic(right, left, type, dbgi, new_d_Add);
-       }
-}
-
-static ir_node *create_sub(const binary_expression_t *expression)
-{
-       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->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;
-
-               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);
-       }
+       if (elem_size == 1)
+               return value;
 
-       assert(is_type_pointer(type_left));
-       return pointer_arithmetic(left, right, type_left, dbgi, new_d_Sub);
+       value = create_conv(dbgi, value, mode_int);
+       ir_node *const cnst = new_Const_long(mode_int, (long)elem_size);
+       ir_node *const mul  = new_d_Mul(dbgi, value, cnst, mode_int);
+       return mul;
 }
 
-static ir_node *create_shift(const binary_expression_t *expression)
+static ir_node *create_op(dbg_info *dbgi, const binary_expression_t *expression,
+                          ir_node *left, ir_node *right)
 {
-       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->base.type;
-       ir_mode  *mode  = get_ir_mode(type);
-
-       /* firm always wants the shift count to be unsigned */
-       right = create_conv(dbgi, right, mode_uint);
+       ir_mode  *mode;
+       type_t   *type_left  = skip_typeref(expression->left->base.type);
+       type_t   *type_right = skip_typeref(expression->right->base.type);
 
-       ir_node *res;
+       expression_kind_t kind = expression->base.kind;
 
-       switch(expression->base.kind) {
-       case EXPR_BINARY_SHIFTLEFT_ASSIGN:
+       switch (kind) {
        case EXPR_BINARY_SHIFTLEFT:
-               res = new_d_Shl(dbgi, left, right, mode);
-               break;
+       case EXPR_BINARY_SHIFTRIGHT:
+       case EXPR_BINARY_SHIFTLEFT_ASSIGN:
        case EXPR_BINARY_SHIFTRIGHT_ASSIGN:
-       case EXPR_BINARY_SHIFTRIGHT: {
-                expression_t *expr_left = expression->left;
-                type_t       *type_left = skip_typeref(expr_left->base.type);
-
-                if(is_type_signed(type_left)) {
-                       res = new_d_Shrs(dbgi, left, right, mode);
-                } else {
-                        res = new_d_Shr(dbgi, left, right, mode);
-                }
-                break;
-       }
-       default:
-               panic("create shift op called for non-shift op");
-       }
+               mode  = get_irn_mode(left);
+               right = create_conv(dbgi, right, mode_uint);
+               break;
 
-       return res;
-}
+       case EXPR_BINARY_SUB:
+               if (is_type_pointer(type_left) && is_type_pointer(type_right)) {
+                       const pointer_type_t *const ptr_type = &type_left->pointer;
+
+                       mode = get_ir_mode(expression->base.type);
+                       ir_node *const elem_size = get_type_size(ptr_type->points_to);
+                       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);
+               }
+               /* fallthrough */
+       case EXPR_BINARY_SUB_ASSIGN:
+               if (is_type_pointer(type_left)) {
+                       right = adjust_for_pointer_arithmetic(dbgi, right, type_left);
+                       mode  = get_ir_mode(type_left);
+                       break;
+               }
+               goto normal_node;
 
+       case EXPR_BINARY_ADD:
+       case EXPR_BINARY_ADD_ASSIGN:
+               if (is_type_pointer(type_left)) {
+                       right = adjust_for_pointer_arithmetic(dbgi, right, type_left);
+                       mode  = get_ir_mode(type_left);
+                       break;
+               } else if (is_type_pointer(type_right)) {
+                       left  = adjust_for_pointer_arithmetic(dbgi, left, type_right);
+                       mode  = get_ir_mode(type_right);
+                       break;
+               }
+               goto normal_node;
 
-static ir_node *create_divmod(const binary_expression_t *expression)
-{
-       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.type;
-       ir_mode  *mode  = get_ir_mode(type);
-       left            = create_conv(dbgi, left, mode);
-       ir_node  *op;
-       ir_node  *res;
+       default:
+normal_node:
+               mode = get_irn_mode(right);
+               left = create_conv(dbgi, left, mode);
+               break;
+       }
 
-       switch (expression->base.kind) {
+       switch (kind) {
+       case EXPR_BINARY_ADD_ASSIGN:
+       case EXPR_BINARY_ADD:
+               return new_d_Add(dbgi, left, right, mode);
+       case EXPR_BINARY_SUB_ASSIGN:
+       case EXPR_BINARY_SUB:
+               return new_d_Sub(dbgi, left, right, mode);
+       case EXPR_BINARY_MUL_ASSIGN:
+       case EXPR_BINARY_MUL:
+               return new_d_Mul(dbgi, left, right, mode);
+       case EXPR_BINARY_BITWISE_AND:
+       case EXPR_BINARY_BITWISE_AND_ASSIGN:
+               return new_d_And(dbgi, left, right, mode);
+       case EXPR_BINARY_BITWISE_OR:
+       case EXPR_BINARY_BITWISE_OR_ASSIGN:
+               return new_d_Or(dbgi, left, right, mode);
+       case EXPR_BINARY_BITWISE_XOR:
+       case EXPR_BINARY_BITWISE_XOR_ASSIGN:
+               return new_d_Eor(dbgi, left, right, mode);
+       case EXPR_BINARY_SHIFTLEFT:
+       case EXPR_BINARY_SHIFTLEFT_ASSIGN:
+               return new_d_Shl(dbgi, left, right, mode);
+       case EXPR_BINARY_SHIFTRIGHT:
+       case EXPR_BINARY_SHIFTRIGHT_ASSIGN:
+               if (mode_is_signed(mode)) {
+                       return new_d_Shrs(dbgi, left, right, mode);
+               } else {
+                       return new_d_Shr(dbgi, left, right, mode);
+               }
        case EXPR_BINARY_DIV:
-       case EXPR_BINARY_DIV_ASSIGN:
-               if(mode_is_float(mode)) {
+       case EXPR_BINARY_DIV_ASSIGN: {
+               ir_node *pin = new_Pin(new_NoMem());
+               ir_node *op;
+               ir_node *res;
+               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;
-
+               return res;
+       }
        case EXPR_BINARY_MOD:
-       case EXPR_BINARY_MOD_ASSIGN:
+       case EXPR_BINARY_MOD_ASSIGN: {
+               ir_node *pin = new_Pin(new_NoMem());
                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()");
+               ir_node *op  = new_d_Mod(dbgi, pin, left, right, mode,
+                                        op_pin_state_floats);
+               ir_node *res = new_d_Proj(dbgi, op, mode, pn_Mod_res);
+               return res;
+       }
+       default:
+               panic("unexpected expression kind");
        }
-
-       return res;
 }
 
-static ir_node *create_arithmetic_assign_divmod(
-               const binary_expression_t *expression)
+static ir_node *create_lazy_op(const binary_expression_t *expression)
 {
-       ir_node  *      value = create_divmod(expression);
-       dbg_info *const dbgi  = get_dbg_info(&expression->base.source_position);
-       type_t   *const type  = expression->base.type;
-       ir_mode  *const mode  = get_ir_mode(type);
-
-       assert(type->kind != TYPE_POINTER);
+       dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
+       type_t   *type = expression->base.type;
+       ir_mode  *mode = get_ir_mode(type);
 
-       value = create_conv(dbgi, value, mode);
-       set_value_for_expression(expression->left, value);
+       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 value;
+       return produce_condition_result((const expression_t*) expression, dbgi);
 }
 
-static ir_node *create_arithmetic_assign_shift(
-               const binary_expression_t *expression)
+typedef ir_node * (*create_arithmetic_func)(dbg_info *dbgi, ir_node *left,
+                                            ir_node *right, ir_mode *mode);
+
+static ir_node *create_assign_binop(const binary_expression_t *expression)
 {
-       ir_node  *      value = create_shift(expression);
-       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);
+       dbg_info *const     dbgi = get_dbg_info(&expression->base.source_position);
+       const expression_t *left_expr = expression->left;
+       ir_mode            *left_mode = get_ir_mode(left_expr->base.type);
+       ir_node            *left_addr = expression_to_addr(left_expr);
+       ir_node            *left      = get_value_from_lvalue(left_expr, left_addr);
+       ir_node            *right     = expression_to_firm(expression->right);
+       ir_node            *result    = create_op(dbgi, expression, left, right);
 
-       value = create_conv(dbgi, value, mode);
-       set_value_for_expression(expression->left, value);
+       result = create_conv(dbgi, result, left_mode);
+       result = do_strict_conv(dbgi, result);
 
-       return value;
+       set_value_for_expression_addr(left_expr, result, left_addr);
+
+       return result;
 }
 
 static ir_node *binary_expression_to_firm(const binary_expression_t *expression)
@@ -2205,55 +2271,49 @@ static ir_node *binary_expression_to_firm(const binary_expression_t *expression)
                return proj;
        }
        case EXPR_BINARY_ASSIGN: {
+               ir_node *addr  = expression_to_addr(expression->left);
                ir_node *right = expression_to_firm(expression->right);
-               set_value_for_expression(expression->left, right);
+               set_value_for_expression_addr(expression->left, right, addr);
 
                return right;
        }
        case EXPR_BINARY_ADD:
-               return create_add(expression);
        case EXPR_BINARY_SUB:
-               return create_sub(expression);
        case EXPR_BINARY_MUL:
-               return create_arithmetic_binop(expression, new_d_Mul);
+       case EXPR_BINARY_DIV:
+       case EXPR_BINARY_MOD:
        case EXPR_BINARY_BITWISE_AND:
-               return create_arithmetic_binop(expression, new_d_And);
        case EXPR_BINARY_BITWISE_OR:
-               return create_arithmetic_binop(expression, new_d_Or);
        case EXPR_BINARY_BITWISE_XOR:
-               return create_arithmetic_binop(expression, new_d_Eor);
        case EXPR_BINARY_SHIFTLEFT:
        case EXPR_BINARY_SHIFTRIGHT:
-               return create_shift(expression);
-       case EXPR_BINARY_DIV:
-       case EXPR_BINARY_MOD:
-               return create_divmod(expression);
+       {
+               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);
+               return create_op(dbgi, expression, left, right);
+       }
        case EXPR_BINARY_LOGICAL_AND:
        case EXPR_BINARY_LOGICAL_OR:
                return create_lazy_op(expression);
        case EXPR_BINARY_COMMA:
-               expression_to_firm(expression->left);
-               return expression_to_firm(expression->right);
+               /* create side effects of left side */
+               (void) expression_to_firm(expression->left);
+               return _expression_to_firm(expression->right);
+
        case EXPR_BINARY_ADD_ASSIGN:
-               return create_arithmetic_assign_binop(expression, new_d_Add);
        case EXPR_BINARY_SUB_ASSIGN:
-               return create_arithmetic_assign_binop(expression, new_d_Sub);
        case EXPR_BINARY_MUL_ASSIGN:
-               return create_arithmetic_assign_binop(expression, new_d_Mul);
        case EXPR_BINARY_MOD_ASSIGN:
        case EXPR_BINARY_DIV_ASSIGN:
-               return create_arithmetic_assign_divmod(expression);
        case EXPR_BINARY_BITWISE_AND_ASSIGN:
-               return create_arithmetic_assign_binop(expression, new_d_And);
        case EXPR_BINARY_BITWISE_OR_ASSIGN:
-               return create_arithmetic_assign_binop(expression, new_d_Or);
        case EXPR_BINARY_BITWISE_XOR_ASSIGN:
-               return create_arithmetic_assign_binop(expression, new_d_Eor);
        case EXPR_BINARY_SHIFTLEFT_ASSIGN:
        case EXPR_BINARY_SHIFTRIGHT_ASSIGN:
-               return create_arithmetic_assign_shift(expression);
+               return create_assign_binop(expression);
        case EXPR_BINARY_BUILTIN_EXPECT:
-               return expression_to_firm(expression->left);
+               return _expression_to_firm(expression->left);
        default:
                panic("TODO binexpr type");
        }
@@ -2264,15 +2324,24 @@ static ir_node *array_access_addr(const array_access_expression_t *expression)
        dbg_info *dbgi      = get_dbg_info(&expression->base.source_position);
        ir_node  *base_addr = expression_to_firm(expression->array_ref);
        ir_node  *offset    = expression_to_firm(expression->index);
-       offset              = create_conv(dbgi, offset, mode_uint);
+
+       type_t  *offset_type = skip_typeref(expression->index->base.type);
+       ir_mode *mode;
+       if (is_type_signed(offset_type)) {
+               mode = get_ir_mode(type_ssize_t);
+       } else {
+               mode = get_ir_mode(type_size_t);
+       }
+       offset = create_conv(dbgi, offset, mode);
 
        type_t *ref_type = skip_typeref(expression->array_ref->base.type);
        assert(is_type_pointer(ref_type));
        pointer_type_t *pointer_type = &ref_type->pointer;
 
        ir_node *elem_size_const = get_type_size(pointer_type->points_to);
+       elem_size_const          = create_conv(dbgi, elem_size_const, mode);
        ir_node *real_offset     = new_d_Mul(dbgi, offset, elem_size_const,
-                                            mode_uint);
+                                            mode);
        ir_node *result          = new_d_Add(dbgi, base_addr, real_offset, mode_P_data);
 
        return result;
@@ -2287,7 +2356,7 @@ static ir_node *array_access_to_firm(
                        (const expression_t*) expression);
        type             = skip_typeref(type);
 
-       return deref_address(type, addr, dbgi);
+       return deref_address(dbgi, type, addr);
 }
 
 static long get_offsetof_offset(const offsetof_expression_t *expression)
@@ -2301,14 +2370,14 @@ static long get_offsetof_offset(const offsetof_expression_t *expression)
                /* be sure the type is constructed */
                (void) get_ir_type(type);
 
-               if(designator->symbol != NULL) {
+               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) {
+                               if (iter->symbol == symbol) {
                                        break;
                                }
                        }
@@ -2383,14 +2452,14 @@ static ir_node *compound_literal_to_firm(
 static ir_node *sizeof_to_firm(const typeprop_expression_t *expression)
 {
        type_t *type = expression->type;
-       if(type == NULL) {
+       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
+       if (is_type_array(type) && type->array.is_vla
                        && expression->tp_expression != NULL) {
                expression_to_firm(expression->tp_expression);
        }
@@ -2404,7 +2473,7 @@ static ir_node *sizeof_to_firm(const typeprop_expression_t *expression)
 static ir_node *alignof_to_firm(const typeprop_expression_t *expression)
 {
        type_t *type = expression->type;
-       if(type == NULL) {
+       if (type == NULL) {
                /* beware: if expression is a variable reference, return the
                   alignment of the variable. */
                const expression_t *tp_expression = expression->tp_expression;
@@ -2425,27 +2494,32 @@ static ir_node *alignof_to_firm(const typeprop_expression_t *expression)
 static void init_ir_types(void);
 long fold_constant(const expression_t *expression)
 {
+       bool constant_folding_old = constant_folding;
+       constant_folding = true;
+
        init_ir_types();
 
        assert(is_constant_expression(expression));
 
        ir_graph *old_current_ir_graph = current_ir_graph;
-       if(current_ir_graph == NULL) {
+       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)) {
+       if (!is_Const(cnst)) {
                panic("couldn't fold constant\n");
        }
 
        tarval *tv = get_Const_tarval(cnst);
-       if(!tarval_is_long(tv)) {
+       if (!tarval_is_long(tv)) {
                panic("result of constant folding is not integer\n");
        }
 
+       constant_folding = constant_folding_old;
+
        return get_tarval_long(tv);
 }
 
@@ -2454,9 +2528,9 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression)
        dbg_info *const dbgi = get_dbg_info(&expression->base.source_position);
 
        /* first try to fold a constant condition */
-       if(is_constant_expression(expression->condition)) {
+       if (is_constant_expression(expression->condition)) {
                long val = fold_constant(expression->condition);
-               if(val) {
+               if (val) {
                        return expression_to_firm(expression->true_expression);
                } else {
                        return expression_to_firm(expression->false_expression);
@@ -2501,6 +2575,9 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression)
        return val;
 }
 
+/**
+ * Returns an IR-node representing the address of a field.
+ */
 static ir_node *select_addr(const select_expression_t *expression)
 {
        dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
@@ -2527,13 +2604,20 @@ 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->base.source_position);
-       ir_node  *addr   = select_addr(expression);
-       type_t   *type   = revert_automatic_type_conversion(
+       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);
+       type           = skip_typeref(type);
 
-       return deref_address(type, addr, dbgi);
+       declaration_t *entry      = expression->compound_entry;
+       type_t        *entry_type = skip_typeref(entry->type);
+
+       if (entry_type->kind == TYPE_BITFIELD) {
+               return bitfield_extract_to_firm(expression, addr);
+       }
+
+       return deref_address(dbgi, type, addr);
 }
 
 /* Values returned by __builtin_classify_type. */
@@ -2690,14 +2774,17 @@ static ir_node *va_start_expression_to_firm(
 
 static ir_node *va_arg_expression_to_firm(const va_arg_expression_t *const expr)
 {
-       type_t   *const type   = expr->base.type;
-       ir_node  *const ap     = expression_to_firm(expr->ap);
-       dbg_info *const dbgi   = get_dbg_info(&expr->base.source_position);
-       ir_node  *const res    = deref_address(type, ap, dbgi);
+       type_t       *const type    = expr->base.type;
+       expression_t *const ap_expr = expr->ap;
+       ir_node      *const ap_addr = expression_to_addr(ap_expr);
+       ir_node      *const ap      = get_value_from_lvalue(ap_expr, ap_addr);
+       dbg_info     *const dbgi    = get_dbg_info(&expr->base.source_position);
+       ir_node      *const res     = deref_address(dbgi, type, ap);
 
-       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);
+       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_addr(ap_expr, add, ap_addr);
 
        return res;
 }
@@ -2708,6 +2795,9 @@ static ir_node *dereference_addr(const unary_expression_t *const expression)
        return expression_to_firm(expression->value);
 }
 
+/**
+ * Returns a IR-node representing an lvalue of the given expression.
+ */
 static ir_node *expression_to_addr(const expression_t *expression)
 {
        switch(expression->kind) {
@@ -2751,8 +2841,20 @@ static ir_node *builtin_prefetch_to_firm(
        return NULL;
 }
 
+/**
+ * creates firm nodes for an expression. The difference between this function
+ * and expression_to_firm is, that this version might produce mode_b nodes
+ * instead of mode_Is.
+ */
 static ir_node *_expression_to_firm(const expression_t *expression)
 {
+#ifndef NDEBUG
+       if (!constant_folding) {
+               assert(!expression->base.transformed);
+               ((expression_t*) expression)->base.transformed = true;
+       }
+#endif
+
        switch(expression->kind) {
        case EXPR_CHARACTER_CONSTANT:
                return character_constant_to_firm(&expression->conste);
@@ -2810,26 +2912,56 @@ static ir_node *_expression_to_firm(const expression_t *expression)
        panic("invalid expression found");
 }
 
+static bool produces_mode_b(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:
+       case EXPR_BINARY_ISGREATER:
+       case EXPR_BINARY_ISGREATEREQUAL:
+       case EXPR_BINARY_ISLESS:
+       case EXPR_BINARY_ISLESSEQUAL:
+       case EXPR_BINARY_ISLESSGREATER:
+       case EXPR_BINARY_ISUNORDERED:
+       case EXPR_UNARY_NOT:
+               return true;
+
+       case EXPR_BINARY_BUILTIN_EXPECT:
+               return produces_mode_b(expression->binary.left);
+       case EXPR_BINARY_COMMA:
+               return produces_mode_b(expression->binary.right);
+
+       default:
+               return false;
+       }
+}
+
 static ir_node *expression_to_firm(const expression_t *expression)
 {
-       ir_node *res = _expression_to_firm(expression);
+       if (!produces_mode_b(expression)) {
+               ir_node *res = _expression_to_firm(expression);
+               assert(res == NULL || get_irn_mode(res) != mode_b);
+               return res;
+       }
 
-       if(res != NULL && get_irn_mode(res) == mode_b) {
+       if (is_constant_expression(expression)) {
+               ir_node *res  = _expression_to_firm(expression);
                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);
-                       }
+               assert(is_Const(res));
+               if (is_Const_null(res)) {
+                       return new_Const_long(mode, 0);
+               } else {
+                       return new_Const_long(mode, 1);
                }
-
-               dbg_info *dbgi        = get_dbg_info(&expression->base.source_position);
-               return produce_condition_result(expression, dbgi);
        }
 
-       return res;
+       /* we have to produce a 0/1 from the mode_b expression */
+       dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
+       return produce_condition_result(expression, dbgi);
 }
 
 static ir_node *expression_to_modeb(const expression_t *expression)
@@ -2894,11 +3026,11 @@ static void create_condition_evaluation(const expression_t *expression,
        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) {
+       if (expression->kind == EXPR_BINARY_BUILTIN_EXPECT) {
                long               cnst = fold_constant(expression->binary.right);
                cond_jmp_predicate pred;
 
-               if(cnst == 0) {
+               if (cnst == 0) {
                        pred = COND_JMP_PRED_FALSE;
                } else {
                        pred = COND_JMP_PRED_TRUE;
@@ -2907,7 +3039,9 @@ static void create_condition_evaluation(const expression_t *expression,
        }
 
        add_immBlock_pred(true_block, true_proj);
-       add_immBlock_pred(false_block, false_proj);
+       if (false_block != NULL) {
+               add_immBlock_pred(false_block, false_proj);
+       }
 
        set_cur_block(NULL);
 }
@@ -2918,8 +3052,13 @@ static void create_declaration_entity(declaration_t *declaration,
                                       declaration_kind_t declaration_kind,
                                       ir_type *parent_type)
 {
-       ident     *const id     = new_id_from_str(declaration->symbol->string);
        type_t    *const type   = skip_typeref(declaration->type);
+       if (is_type_function(type)) {
+               (void) get_function_entity(declaration);
+               return;
+       }
+
+       ident     *const id     = new_id_from_str(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(parent_type, id, irtype, dbgi);
@@ -2928,12 +3067,12 @@ static void create_declaration_entity(declaration_t *declaration,
        declaration->v.entity         = entity;
        set_entity_variability(entity, variability_uninitialized);
        set_entity_ld_ident(entity, create_ld_ident(entity, declaration));
-       if(parent_type == get_tls_type())
+       if (parent_type == get_tls_type())
                set_entity_allocation(entity, allocation_automatic);
-       else if(declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE)
+       else if (declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE)
                set_entity_allocation(entity, allocation_static);
 
-       if(type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) {
+       if (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) {
                set_entity_volatility(entity, volatility_is_volatile);
        }
 }
@@ -2962,9 +3101,9 @@ static __attribute__((unused)) void debug_print_type_path(const type_path_t *pat
                const type_path_entry_t *entry = & path->path[i];
 
                type_t *type = skip_typeref(entry->type);
-               if(is_type_compound(type)) {
+               if (is_type_compound(type)) {
                        fprintf(stderr, ".%s", entry->compound_entry->symbol->string);
-               } else if(is_type_array(type)) {
+               } else if (is_type_array(type)) {
                        fprintf(stderr, "[%zd]", entry->index);
                } else {
                        fprintf(stderr, "-INVALID-");
@@ -3012,7 +3151,7 @@ static ir_initializer_t *get_initializer_entry(type_path_t *path)
 
        assert(is_type_compound(top_type) || is_type_array(top_type));
 
-       if(ARR_LEN(path->path) == 0) {
+       if (ARR_LEN(path->path) == 0) {
                return NULL;
        } else {
                type_path_entry_t *top         = get_type_path_top(path);
@@ -3035,14 +3174,14 @@ static void descend_into_subtype(type_path_t *path)
 
        size_t len;
 
-       if(is_type_compound(top_type)) {
+       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)
+               if (entry != NULL)
                        path->top_type = entry->type;
        } else {
                assert(is_type_array(top_type));
@@ -3052,13 +3191,13 @@ static void descend_into_subtype(type_path_t *path)
                path->top_type = top_type->array.element_type;
                len            = top_type->array.size;
        }
-       if(initializer == NULL
+       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) {
+               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,
@@ -3088,7 +3227,7 @@ static void walk_designator(type_path_t *path, const designator_t *designator)
                type_t            *orig_type   = top->type;
                type_t            *type        = skip_typeref(orig_type);
 
-               if(designator->symbol != NULL) {
+               if (designator->symbol != NULL) {
                        assert(is_type_compound(type));
                        size_t    index  = 0;
                        symbol_t *symbol = designator->symbol;
@@ -3096,7 +3235,7 @@ static void walk_designator(type_path_t *path, const designator_t *designator)
                        declaration_t *declaration = type->compound.declaration;
                        declaration_t *iter        = declaration->scope.declarations;
                        for( ; iter != NULL; iter = iter->next, ++index) {
-                               if(iter->symbol == symbol) {
+                               if (iter->symbol == symbol) {
                                        break;
                                }
                        }
@@ -3115,7 +3254,7 @@ static void walk_designator(type_path_t *path, const designator_t *designator)
                        long index = fold_constant(array_index);
                        assert(index >= 0);
 #ifndef NDEBUG
-                       if(type->array.size_constant == 1) {
+                       if (type->array.size_constant == 1) {
                                long array_size = type->array.size;
                                assert(index < array_size);
                        }
@@ -3127,7 +3266,7 @@ static void walk_designator(type_path_t *path, const designator_t *designator)
                }
                path->top_type = orig_type;
 
-               if(designator->next != NULL) {
+               if (designator->next != NULL) {
                        descend_into_subtype(path);
                }
        }
@@ -3137,7 +3276,7 @@ static void walk_designator(type_path_t *path, const designator_t *designator)
 
 static void advance_current_object(type_path_t *path)
 {
-       if(path->invalid) {
+       if (path->invalid) {
                /* TODO: handle this... */
                panic("invalid initializer in ast2firm (excessive elements)");
                return;
@@ -3146,15 +3285,15 @@ static void advance_current_object(type_path_t *path)
        type_path_entry_t *top = get_type_path_top(path);
 
        type_t *type = skip_typeref(top->type);
-       if(is_type_union(type)) {
+       if (is_type_union(type)) {
                top->compound_entry = NULL;
-       } else if(is_type_struct(type)) {
+       } else if (is_type_struct(type)) {
                declaration_t *entry = top->compound_entry;
 
                top->index++;
                entry               = entry->next;
                top->compound_entry = entry;
-               if(entry != NULL) {
+               if (entry != NULL) {
                        path->top_type = entry->type;
                        return;
                }
@@ -3162,7 +3301,7 @@ static void advance_current_object(type_path_t *path)
                assert(is_type_array(type));
 
                top->index++;
-               if(!type->array.size_constant || top->index < type->array.size) {
+               if (!type->array.size_constant || top->index < type->array.size) {
                        return;
                }
        }
@@ -3171,7 +3310,7 @@ static void advance_current_object(type_path_t *path)
         * can ascend in the type hierarchy and continue with another subobject */
        size_t len = ARR_LEN(path->path);
 
-       if(len > 1) {
+       if (len > 1) {
                ascend_from_subtype(path);
                advance_current_object(path);
        } else {
@@ -3206,19 +3345,19 @@ static ir_initializer_t *create_ir_initializer_list(
        for(size_t i = 0; i < initializer->len; ++i) {
                const initializer_t *sub_initializer = initializer->initializers[i];
 
-               if(sub_initializer->kind == INITIALIZER_DESIGNATOR) {
+               if (sub_initializer->kind == INITIALIZER_DESIGNATOR) {
                        walk_designator(&path, sub_initializer->designator.designator);
                        continue;
                }
 
-               if(sub_initializer->kind == INITIALIZER_VALUE) {
+               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))
+                               if (is_type_scalar(top_type))
                                        break;
                                descend_into_subtype(&path);
                        }
@@ -3259,7 +3398,7 @@ static ir_initializer_t *create_ir_initializer_string(
 
        for(size_t i = 0; i < len; ++i) {
                char c = 0;
-               if(i < string_len)
+               if (i < string_len)
                        c = string[i];
 
                tarval           *tv = new_tarval_from_long(c, mode);
@@ -3284,7 +3423,7 @@ static ir_initializer_t *create_ir_initializer_wide_string(
 
        for(size_t i = 0; i < len; ++i) {
                wchar_rep_t c = 0;
-               if(i < string_len) {
+               if (i < string_len) {
                        c = string[i];
                }
                tarval *tv = new_tarval_from_long(c, mode);
@@ -3336,7 +3475,7 @@ static void create_dynamic_null_initializer(ir_type *type, dbg_info *dbgi,
                assert(is_compound_type(type));
 
                int n_members;
-               if(is_Array_type(type)) {
+               if (is_Array_type(type)) {
                        assert(has_array_upper_bound(type, 0));
                        n_members = get_array_upper_bound_int(type, 0);
                } else {
@@ -3346,7 +3485,7 @@ static void create_dynamic_null_initializer(ir_type *type, dbg_info *dbgi,
                for(int i = 0; i < n_members; ++i) {
                        ir_node *addr;
                        ir_type *irtype;
-                       if(is_Array_type(type)) {
+                       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);
@@ -3401,21 +3540,21 @@ static void create_dynamic_initializer_sub(ir_initializer_t *initializer,
        case IR_INITIALIZER_COMPOUND: {
                assert(is_compound_type(type));
                int n_members;
-               if(is_Array_type(type)) {
+               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)
+               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)) {
+                       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);
@@ -3459,7 +3598,7 @@ static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi,
        ir_node *frame  = get_irg_frame(current_ir_graph);
        ir_node *addr   = new_d_simpleSel(dbgi, nomem, frame, entity);
 
-       if(initializer->kind == INITIALIZER_VALUE) {
+       if (initializer->kind == INITIALIZER_VALUE) {
                initializer_value_t *initializer_value = &initializer->value;
 
                ir_node *value = expression_to_firm(initializer_value->value);
@@ -3468,7 +3607,7 @@ static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi,
                return;
        }
 
-       if(!is_constant_initializer(initializer)) {
+       if (!is_constant_initializer(initializer)) {
                ir_initializer_t *irinitializer
                        = create_ir_initializer(initializer, type);
 
@@ -3517,22 +3656,25 @@ static void create_initializer_local_variable_entity(declaration_t *declaration)
 static void create_declaration_initializer(declaration_t *declaration)
 {
        initializer_t *initializer = declaration->init.initializer;
-       if(initializer == NULL)
+       if (initializer == NULL)
                return;
 
        declaration_kind_t declaration_kind
                = (declaration_kind_t) declaration->declaration_kind;
-       if(declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE_ENTITY) {
+       if (declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE_ENTITY) {
                create_initializer_local_variable_entity(declaration);
                return;
        }
 
-       if(initializer->kind == INITIALIZER_VALUE) {
+       if (initializer->kind == INITIALIZER_VALUE) {
                initializer_value_t *initializer_value = &initializer->value;
+               dbg_info            *dbgi
+                       = get_dbg_info(&declaration->source_position);
 
                ir_node *value = expression_to_firm(initializer_value->value);
+               value = do_strict_conv(dbgi, value);
 
-               if(declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE) {
+               if (declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE) {
                        set_value(declaration->v.value_number, value);
                } else {
                        assert(declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE);
@@ -3592,16 +3734,16 @@ static void create_local_variable(declaration_t *declaration)
        type_t *type = skip_typeref(declaration->type);
 
        /* is it a variable length array? */
-       if(is_type_array(type) && !type->array.size_constant) {
+       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)) {
+       } else if (is_type_array(type) || is_type_compound(type)) {
                needs_entity = true;
-       } else if(type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) {
+       } else if (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) {
                needs_entity = true;
        }
 
-       if(needs_entity) {
+       if (needs_entity) {
                ir_type *frame_type = get_irg_frame_type(current_ir_graph);
                create_declaration_entity(declaration,
                                          DECLARATION_KIND_LOCAL_VARIABLE_ENTITY,
@@ -3612,8 +3754,6 @@ static void create_local_variable(declaration_t *declaration)
                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)
@@ -3622,12 +3762,17 @@ static void create_local_static_variable(declaration_t *declaration)
 
        type_t    *const type        = skip_typeref(declaration->type);
        ir_type   *const global_type = get_glob_type();
-       ident     *const id          = new_id_from_str(declaration->symbol->string);
        ir_type   *const irtype      = get_ir_type(type);
        dbg_info  *const dbgi        = get_dbg_info(&declaration->source_position);
+
+       size_t l = strlen(declaration->symbol->string);
+       char   buf[l + sizeof(".%u")];
+       snprintf(buf, sizeof(buf), "%s.%%u", declaration->symbol->string);
+       ident     *const id = id_unique(buf);
+
        ir_entity *const entity      = new_d_entity(global_type, id, irtype, dbgi);
 
-       if(type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) {
+       if (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) {
                set_entity_volatility(entity, volatility_is_volatile);
        }
 
@@ -3651,7 +3796,7 @@ static void create_local_static_variable(declaration_t *declaration)
 
 static void return_statement_to_firm(return_statement_t *statement)
 {
-       if(get_cur_block() == NULL)
+       if (get_cur_block() == NULL)
                return;
 
        dbg_info *dbgi        = get_dbg_info(&statement->base.source_position);
@@ -3660,16 +3805,16 @@ static void return_statement_to_firm(return_statement_t *statement)
 
        ir_node *in[1];
        int      in_len;
-       if(get_method_n_ress(func_irtype) > 0) {
+       if (get_method_n_ress(func_irtype) > 0) {
                ir_type *res_type = get_method_res_type(func_irtype, 0);
 
-               if(statement->value != NULL) {
+               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)) {
+                       if (is_compound_type(res_type)) {
                                mode = mode_P_data;
                        } else {
                                mode = get_type_mode(res_type);
@@ -3679,7 +3824,7 @@ static void return_statement_to_firm(return_statement_t *statement)
                in_len = 1;
        } else {
                /* build return_value for its side effects */
-               if(statement->value != NULL) {
+               if (statement->value != NULL) {
                        expression_to_firm(statement->value);
                }
                in_len = 0;
@@ -3696,7 +3841,7 @@ static void return_statement_to_firm(return_statement_t *statement)
 
 static ir_node *expression_statement_to_firm(expression_statement_t *statement)
 {
-       if(get_cur_block() == NULL)
+       if (get_cur_block() == NULL)
                return NULL;
 
        return expression_to_firm(statement->expression);
@@ -3704,12 +3849,15 @@ static ir_node *expression_statement_to_firm(expression_statement_t *statement)
 
 static ir_node *compound_statement_to_firm(compound_statement_t *compound)
 {
+       declaration_t *declaration = compound->scope.declarations;
+       for( ; declaration != NULL; declaration = declaration->next) {
+               create_local_declaration(declaration);
+       }
+
        ir_node     *result    = NULL;
        statement_t *statement = compound->statements;
        for( ; statement != NULL; statement = statement->base.next) {
-               //context2firm(&statement->scope);
-
-               if(statement->base.next == NULL
+               if (statement->base.next == NULL
                                && statement->kind == STATEMENT_EXPRESSION) {
                        result = expression_statement_to_firm(
                                        &statement->expression);
@@ -3762,7 +3910,9 @@ create_var:
                        create_declaration_entity(declaration,
                                                  DECLARATION_KIND_GLOBAL_VARIABLE,
                                                  var_type);
-                       set_entity_visibility(declaration->v.entity, vis);
+                       if (!is_type_function(skip_typeref(declaration->type))) {
+                               set_entity_visibility(declaration->v.entity, vis);
+                       }
 
                        return;
 
@@ -3777,8 +3927,13 @@ create_var:
 
 static void create_local_declaration(declaration_t *declaration)
 {
-       if(declaration->symbol == NULL)
+       if (declaration->namespc != NAMESPACE_NORMAL)
+               return;
+       /* construct type */
+       (void) get_ir_type(declaration->type);
+       if (declaration->symbol == NULL) {
                return;
+       }
 
        type_t *type = skip_typeref(declaration->type);
 
@@ -3793,8 +3948,8 @@ static void create_local_declaration(declaration_t *declaration)
        case STORAGE_CLASS_NONE:
        case STORAGE_CLASS_AUTO:
        case STORAGE_CLASS_REGISTER:
-               if(is_type_function(type)) {
-                       if(declaration->init.statement != NULL) {
+               if (is_type_function(type)) {
+                       if (declaration->init.statement != NULL) {
                                panic("nested functions not supported yet");
                        } else {
                                get_function_entity(declaration);
@@ -3804,23 +3959,56 @@ static void create_local_declaration(declaration_t *declaration)
                }
                return;
        case STORAGE_CLASS_ENUM_ENTRY:
+               /* should already be handled */
+               assert(declaration->declaration_kind == DECLARATION_KIND_ENUM_ENTRY);
+               return;
        case STORAGE_CLASS_TYPEDEF:
+               declaration->declaration_kind = DECLARATION_KIND_TYPE;
+               return;
        case STORAGE_CLASS_THREAD:
        case STORAGE_CLASS_THREAD_EXTERN:
        case STORAGE_CLASS_THREAD_STATIC:
-               return;
+               break;
        }
        panic("invalid storage class found");
 }
 
+static void initialize_local_declaration(declaration_t *declaration)
+{
+       if (declaration->symbol == NULL || declaration->namespc != NAMESPACE_NORMAL)
+               return;
+
+       switch ((declaration_kind_t) declaration->declaration_kind) {
+       case DECLARATION_KIND_LOCAL_VARIABLE:
+       case DECLARATION_KIND_LOCAL_VARIABLE_ENTITY:
+               create_declaration_initializer(declaration);
+               return;
+
+       case DECLARATION_KIND_LABEL_BLOCK:
+       case DECLARATION_KIND_COMPOUND_MEMBER:
+       case DECLARATION_KIND_GLOBAL_VARIABLE:
+       case DECLARATION_KIND_VARIABLE_LENGTH_ARRAY:
+       case DECLARATION_KIND_COMPOUND_TYPE_INCOMPLETE:
+       case DECLARATION_KIND_COMPOUND_TYPE_COMPLETE:
+       case DECLARATION_KIND_FUNCTION:
+       case DECLARATION_KIND_TYPE:
+       case DECLARATION_KIND_ENUM_ENTRY:
+               return;
+
+       case DECLARATION_KIND_UNKNOWN:
+               panic("can't initialize unknwon declaration");
+       }
+       panic("invalid declaration kind");
+}
+
 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)
+               if (declaration->namespc != NAMESPACE_NORMAL)
                        continue;
-               create_local_declaration(declaration);
+               initialize_local_declaration(declaration);
        }
 }
 
@@ -3828,47 +4016,58 @@ static void if_statement_to_firm(if_statement_t *statement)
 {
        ir_node *cur_block = get_cur_block();
 
-       ir_node *fallthrough_block = new_immBlock();
+       ir_node *fallthrough_block = NULL;
 
        /* the true (blocks) */
-       ir_node *true_block;
+       ir_node *true_block = NULL;
        if (statement->true_statement != NULL) {
                true_block = new_immBlock();
                statement_to_firm(statement->true_statement);
-               if(get_cur_block() != NULL) {
+               if (get_cur_block() != NULL) {
                        ir_node *jmp = new_Jmp();
+                       if (fallthrough_block == NULL)
+                               fallthrough_block = new_immBlock();
                        add_immBlock_pred(fallthrough_block, jmp);
                }
-       } else {
-               true_block = fallthrough_block;
        }
 
        /* the false (blocks) */
-       ir_node *false_block;
-       if(statement->false_statement != NULL) {
+       ir_node *false_block = NULL;
+       if (statement->false_statement != NULL) {
                false_block = new_immBlock();
 
                statement_to_firm(statement->false_statement);
-               if(get_cur_block() != NULL) {
+               if (get_cur_block() != NULL) {
                        ir_node *jmp = new_Jmp();
+                       if (fallthrough_block == NULL)
+                               fallthrough_block = new_immBlock();
                        add_immBlock_pred(fallthrough_block, jmp);
                }
-       } else {
-               false_block = fallthrough_block;
        }
 
        /* create the condition */
-       if(cur_block != NULL) {
+       if (cur_block != NULL) {
+               if (true_block == NULL || false_block == NULL) {
+                       if (fallthrough_block == NULL)
+                               fallthrough_block = new_immBlock();
+                       if (true_block == NULL)
+                               true_block = fallthrough_block;
+                       if (false_block == NULL)
+                               false_block = fallthrough_block;
+               }
+
                set_cur_block(cur_block);
                create_condition_evaluation(statement->condition, true_block,
                                            false_block);
        }
 
        mature_immBlock(true_block);
-       if(false_block != fallthrough_block) {
+       if (false_block != fallthrough_block) {
                mature_immBlock(false_block);
        }
-       mature_immBlock(fallthrough_block);
+       if (fallthrough_block != NULL) {
+               mature_immBlock(fallthrough_block);
+       }
 
        set_cur_block(fallthrough_block);
 }
@@ -3876,50 +4075,60 @@ static void if_statement_to_firm(if_statement_t *statement)
 static void while_statement_to_firm(while_statement_t *statement)
 {
        ir_node *jmp = NULL;
-       if(get_cur_block() != NULL) {
+       if (get_cur_block() != NULL) {
                jmp = new_Jmp();
        }
 
        /* create the header block */
        ir_node *header_block = new_immBlock();
-       if(jmp != NULL) {
+       if (jmp != NULL) {
                add_immBlock_pred(header_block, jmp);
        }
 
-       /* the false block */
-       ir_node *false_block = new_immBlock();
-
        /* the loop body */
-       ir_node *body_block;
-       if (statement->body != NULL) {
-               ir_node *old_continue_label = continue_label;
-               ir_node *old_break_label    = break_label;
-               continue_label              = header_block;
-               break_label                 = false_block;
+       ir_node *old_continue_label = continue_label;
+       ir_node *old_break_label    = break_label;
+       continue_label              = header_block;
+       break_label                 = NULL;
 
-               body_block = new_immBlock();
-               statement_to_firm(statement->body);
+       ir_node *body_block = new_immBlock();
+       statement_to_firm(statement->body);
+       ir_node *false_block = break_label;
 
-               assert(continue_label == header_block);
-               assert(break_label    == false_block);
-               continue_label = old_continue_label;
-               break_label    = old_break_label;
+       assert(continue_label == header_block);
+       continue_label = old_continue_label;
+       break_label    = old_break_label;
 
-               if(get_cur_block() != NULL) {
-                       jmp = new_Jmp();
-                       add_immBlock_pred(header_block, jmp);
-               }
-       } else {
-               body_block = header_block;
+       if (get_cur_block() != NULL) {
+               jmp = new_Jmp();
+               add_immBlock_pred(header_block, jmp);
        }
 
-       /* create the condition */
-       set_cur_block(header_block);
+       /* shortcut for while(true) */
+       if (is_constant_expression(statement->condition)
+                       && fold_constant(statement->condition) != 0) {
+               set_cur_block(header_block);
+               ir_node *header_jmp = new_Jmp();
+               add_immBlock_pred(body_block, header_jmp);
+
+               keep_alive(body_block);
+       } else {
+               if (false_block == NULL) {
+                       false_block = new_immBlock();
+               }
+
+               /* create the condition */
+               set_cur_block(header_block);
+
+               create_condition_evaluation(statement->condition, body_block,
+                                           false_block);
+       }
 
-       create_condition_evaluation(statement->condition, body_block, false_block);
        mature_immBlock(body_block);
-       mature_immBlock(false_block);
        mature_immBlock(header_block);
+       if (false_block != NULL) {
+               mature_immBlock(false_block);
+       }
 
        set_cur_block(false_block);
 }
@@ -3927,22 +4136,21 @@ static void while_statement_to_firm(while_statement_t *statement)
 static void do_while_statement_to_firm(do_while_statement_t *statement)
 {
        ir_node *jmp = NULL;
-       if(get_cur_block() != NULL) {
+       if (get_cur_block() != NULL) {
                jmp = new_Jmp();
        }
 
        /* create the header block */
        ir_node *header_block = new_immBlock();
 
-       /* the false block */
-       ir_node *false_block = new_immBlock();
-
        /* the loop body */
        ir_node *body_block = new_immBlock();
-       if(jmp != NULL) {
+       if (jmp != NULL) {
                add_immBlock_pred(body_block, jmp);
        }
 
+       ir_node *false_block = NULL;
+
        if (statement->body != NULL) {
                ir_node *old_continue_label = continue_label;
                ir_node *old_break_label    = break_label;
@@ -3950,31 +4158,28 @@ static void do_while_statement_to_firm(do_while_statement_t *statement)
                break_label                 = false_block;
 
                statement_to_firm(statement->body);
+               false_block = break_label;
 
                assert(continue_label == header_block);
-               assert(break_label    == false_block);
                continue_label = old_continue_label;
                break_label    = old_break_label;
-
-               if (get_cur_block() == NULL) {
-                       mature_immBlock(header_block);
-                       mature_immBlock(body_block);
-                       mature_immBlock(false_block);
-                       return;
-               }
        }
 
-       ir_node *body_jmp = new_Jmp();
-       add_immBlock_pred(header_block, body_jmp);
-       mature_immBlock(header_block);
+       if (get_cur_block() != NULL) {
+               ir_node *body_jmp = new_Jmp();
+               add_immBlock_pred(header_block, body_jmp);
+               mature_immBlock(header_block);
+       }
 
        /* create the condition */
        set_cur_block(header_block);
 
        create_condition_evaluation(statement->condition, body_block, false_block);
        mature_immBlock(body_block);
-       mature_immBlock(false_block);
        mature_immBlock(header_block);
+       if (false_block != NULL) {
+               mature_immBlock(false_block);
+       }
 
        set_cur_block(false_block);
 }
@@ -3982,17 +4187,22 @@ static void do_while_statement_to_firm(do_while_statement_t *statement)
 static void for_statement_to_firm(for_statement_t *statement)
 {
        ir_node *jmp = NULL;
+
+       /* create declarations */
+       declaration_t *declaration = statement->scope.declarations;
+       for( ; declaration != NULL; declaration = declaration->next) {
+               create_local_declaration(declaration);
+       }
+       declaration = statement->scope.declarations;
+       for( ; declaration != NULL; declaration = declaration->next) {
+               initialize_local_declaration(declaration);
+       }
+
        if (get_cur_block() != NULL) {
-               if(statement->initialisation != NULL) {
+               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();
        }
 
@@ -4061,7 +4271,7 @@ static void for_statement_to_firm(for_statement_t *statement)
 static void create_jump_statement(const statement_t *statement,
                                   ir_node *target_block)
 {
-       if(get_cur_block() == NULL)
+       if (get_cur_block() == NULL)
                return;
 
        dbg_info *dbgi = get_dbg_info(&statement->base.source_position);
@@ -4071,46 +4281,57 @@ static void create_jump_statement(const statement_t *statement,
        set_cur_block(NULL);
 }
 
+static ir_node *get_break_label(void)
+{
+       if (break_label == NULL) {
+               ir_node *cur_block = get_cur_block();
+               break_label = new_immBlock();
+               set_cur_block(cur_block);
+       }
+       return break_label;
+}
+
 static void switch_statement_to_firm(const switch_statement_t *statement)
 {
        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);
-       ir_node *break_block = new_immBlock();
 
        set_cur_block(NULL);
 
        ir_node *const old_switch_cond       = current_switch_cond;
        ir_node *const old_break_label       = break_label;
        const bool     old_saw_default_label = saw_default_label;
+       saw_default_label                    = false;
        current_switch_cond                  = cond;
-       break_label                          = break_block;
+       break_label                          = NULL;
 
        if (statement->body != NULL) {
                statement_to_firm(statement->body);
        }
 
-       if(get_cur_block() != NULL) {
+       if (get_cur_block() != NULL) {
                ir_node *jmp = new_Jmp();
-               add_immBlock_pred(break_block, jmp);
+               add_immBlock_pred(get_break_label(), jmp);
        }
 
        if (!saw_default_label) {
                set_cur_block(get_nodes_block(cond));
                ir_node *const proj = new_d_defaultProj(dbgi, cond,
                                                        MAGIC_DEFAULT_PN_NUMBER);
-               add_immBlock_pred(break_block, proj);
+               add_immBlock_pred(get_break_label(), proj);
        }
 
+       if (break_label != NULL) {
+               mature_immBlock(break_label);
+       }
+       set_cur_block(break_label);
+
        assert(current_switch_cond == cond);
-       assert(break_label         == break_block);
        current_switch_cond = old_switch_cond;
        break_label         = old_break_label;
        saw_default_label   = old_saw_default_label;
-
-       mature_immBlock(break_block);
-       set_cur_block(break_block);
 }
 
 static void case_label_to_firm(const case_label_statement_t *statement)
@@ -4126,7 +4347,7 @@ static void case_label_to_firm(const case_label_statement_t *statement)
        ir_node *block     = new_immBlock();
 
        set_cur_block(old_block);
-       if(statement->expression != NULL) {
+       if (statement->expression != NULL) {
                long start_pn = fold_constant(statement->expression);
                long end_pn = start_pn;
                if (statement->end_range != NULL) {
@@ -4135,7 +4356,7 @@ static void case_label_to_firm(const case_label_statement_t *statement)
                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) {
+                       if (pn == MAGIC_DEFAULT_PN_NUMBER) {
                                /* oops someone detected our cheating... */
                                panic("magic default pn used");
                        }
@@ -4156,7 +4377,7 @@ static void case_label_to_firm(const case_label_statement_t *statement)
        mature_immBlock(block);
        set_cur_block(block);
 
-       if(statement->statement != NULL) {
+       if (statement->statement != NULL) {
                statement_to_firm(statement->statement);
        }
 }
@@ -4165,7 +4386,7 @@ static ir_node *get_label_block(declaration_t *label)
 {
        assert(label->namespc == NAMESPACE_LABEL);
 
-       if(label->declaration_kind == DECLARATION_KIND_LABEL_BLOCK) {
+       if (label->declaration_kind == DECLARATION_KIND_LABEL_BLOCK) {
                return label->v.block;
        }
        assert(label->declaration_kind == DECLARATION_KIND_UNKNOWN);
@@ -4186,7 +4407,7 @@ static void label_to_firm(const label_statement_t *statement)
 {
        ir_node *block = get_label_block(statement->label);
 
-       if(get_cur_block() != NULL) {
+       if (get_cur_block() != NULL) {
                ir_node *jmp = new_Jmp();
                add_immBlock_pred(block, jmp);
        }
@@ -4194,14 +4415,14 @@ static void label_to_firm(const label_statement_t *statement)
        set_cur_block(block);
        keep_alive(block);
 
-       if(statement->statement != NULL) {
+       if (statement->statement != NULL) {
                statement_to_firm(statement->statement);
        }
 }
 
 static void goto_to_firm(const goto_statement_t *statement)
 {
-       if(get_cur_block() == NULL)
+       if (get_cur_block() == NULL)
                return;
 
        ir_node *block = get_label_block(statement->label);
@@ -4228,7 +4449,7 @@ static void asm_statement_to_firm(const asm_statement_t *statement)
        size_t         n_clobbers = 0;
        asm_clobber_t *clobber    = statement->clobbers;
        for( ; clobber != NULL; clobber = clobber->next) {
-               if(strcmp(clobber->clobber, "memory") == 0) {
+               if (strcmp(clobber->clobber, "memory") == 0) {
                        needs_memory = true;
                        continue;
                }
@@ -4239,7 +4460,7 @@ static void asm_statement_to_firm(const asm_statement_t *statement)
        }
        assert(obstack_object_size(&asm_obst) == n_clobbers * sizeof(ident*));
        ident **clobbers = NULL;
-       if(n_clobbers > 0) {
+       if (n_clobbers > 0) {
                clobbers = obstack_finish(&asm_obst);
        }
 
@@ -4265,12 +4486,12 @@ static void asm_statement_to_firm(const asm_statement_t *statement)
                                obstack_1grow(&asm_obst, *c);
                                break;
                        case '=':
-                               if(modifiers & ASM_MODIFIER_READ_WRITE)
+                               if (modifiers & ASM_MODIFIER_READ_WRITE)
                                        panic("inconsistent register constraints");
                                modifiers |= ASM_MODIFIER_WRITE_ONLY;
                                break;
                        case '+':
-                               if(modifiers & ASM_MODIFIER_WRITE_ONLY)
+                               if (modifiers & ASM_MODIFIER_WRITE_ONLY)
                                        panic("inconsistent register constraints");
                                modifiers |= ASM_MODIFIER_READ_WRITE;
                                break;
@@ -4300,7 +4521,7 @@ static void asm_statement_to_firm(const asm_statement_t *statement)
                const char *constraint_string = obstack_finish(&asm_obst);
 
                needs_memory |= supports_memop;
-               if(supports_memop) {
+               if (supports_memop) {
 
                }
        }
@@ -4316,8 +4537,16 @@ static void      leave_statement_to_firm(leave_statement_t *statement) {
        errorf(&statement->base.source_position, "__leave not supported yet");
 }
 
+/**
+ * Transform a statement.
+ */
 static void statement_to_firm(statement_t *statement)
 {
+#ifndef NDEBUG
+       assert(!statement->base.transformed);
+       statement->base.transformed = true;
+#endif
+
        switch(statement->kind) {
        case STATEMENT_INVALID:
                panic("invalid statement found");
@@ -4347,7 +4576,7 @@ static void statement_to_firm(statement_t *statement)
                declaration_statement_to_firm(&statement->declaration);
                return;
        case STATEMENT_BREAK:
-               create_jump_statement(statement, break_label);
+               create_jump_statement(statement, get_break_label());
                return;
        case STATEMENT_CONTINUE:
                create_jump_statement(statement, continue_label);
@@ -4387,14 +4616,14 @@ static int count_local_declarations(const declaration_t *      decl,
 {
        int count = 0;
        for (; decl != end; decl = decl->next) {
-               if(decl->namespc != NAMESPACE_NORMAL)
+               if (decl->namespc != NAMESPACE_NORMAL)
                        continue;
                const type_t *type = skip_typeref(decl->type);
                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) {
+               if (initializer != NULL && initializer->kind == INITIALIZER_VALUE) {
                        count += count_decls_in_expression(initializer->value.value);
                }
        }
@@ -4404,7 +4633,7 @@ static int count_local_declarations(const declaration_t *      decl,
 static int count_decls_in_expression(const expression_t *expression) {
        int count = 0;
 
-       if(expression == NULL)
+       if (expression == NULL)
                return 0;
 
        switch((expression_kind_t) expression->base.kind) {
@@ -4531,7 +4760,7 @@ static int count_decls_in_stmts(const statement_t *stmt)
 
                        case STATEMENT_LABEL: {
                                const label_statement_t *const label_stmt = &stmt->label;
-                               if(label_stmt->statement != NULL) {
+                               if (label_stmt->statement != NULL) {
                                        count += count_decls_in_stmts(label_stmt->statement);
                                }
                                break;
@@ -4564,7 +4793,7 @@ static int count_decls_in_stmts(const statement_t *stmt)
                        case STATEMENT_CASE_LABEL: {
                                const case_label_statement_t *label = &stmt->case_label;
                                count += count_decls_in_expression(label->expression);
-                               if(label->statement != NULL) {
+                               if (label->statement != NULL) {
                                        count += count_decls_in_stmts(label->statement);
                                }
                                break;
@@ -4595,7 +4824,7 @@ static int count_decls_in_stmts(const statement_t *stmt)
                        case STATEMENT_MS_TRY: {
                                const ms_try_statement_t *const try_stmt = &stmt->ms_try;
                                count += count_decls_in_stmts(try_stmt->try_statement);
-                               if(try_stmt->except_expression != NULL)
+                               if (try_stmt->except_expression != NULL)
                                        count += count_decls_in_expression(try_stmt->except_expression);
                                count += count_decls_in_stmts(try_stmt->final_statement);
                                break;
@@ -4633,11 +4862,11 @@ static void initialize_function_parameters(declaration_t *declaration)
 
                bool needs_entity = parameter->address_taken;
                assert(!is_type_array(type));
-               if(is_type_compound(type)) {
+               if (is_type_compound(type)) {
                        needs_entity = true;
                }
 
-               if(needs_entity) {
+               if (needs_entity) {
                        ir_entity *entity = get_method_value_param_ent(function_irtype, n);
                        ident     *id     = new_id_from_str(parameter->symbol->string);
                        set_entity_ident(entity, id);
@@ -4648,16 +4877,22 @@ static void initialize_function_parameters(declaration_t *declaration)
                        continue;
                }
 
+               ir_type *param_irtype = get_method_param_type(function_irtype, n);
+               ir_mode *param_mode   = get_type_mode(param_irtype);
+
+               long     pn    = n;
+               ir_node *value = new_r_Proj(irg, start_block, args, param_mode, pn);
+
                ir_mode *mode = get_ir_mode(parameter->type);
-               long     pn   = n;
-               ir_node *proj = new_r_Proj(irg, start_block, args, mode, pn);
+               value = create_conv(NULL, value, mode);
+               value = do_strict_conv(NULL, value);
 
                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);
+               set_value(parameter->v.value_number, value);
        }
 }
 
@@ -4696,11 +4931,14 @@ static void handle_decl_modifier_irg(ir_graph_ptr irg, decl_modifiers_t decl_mod
        }
 }
 
+/**
+ * Create code for a function.
+ */
 static void create_function(declaration_t *declaration)
 {
        ir_entity *function_entity = get_function_entity(declaration);
 
-       if(declaration->init.statement == NULL)
+       if (declaration->init.statement == NULL)
                return;
 
        current_function_decl = declaration;
@@ -4732,7 +4970,7 @@ static void create_function(declaration_t *declaration)
        ir_node *end_block = get_irg_end_block(irg);
 
        /* do we have a return statement yet? */
-       if(get_cur_block() != NULL) {
+       if (get_cur_block() != NULL) {
                type_t *type = skip_typeref(declaration->type);
                assert(is_type_function(type));
                const function_type_t *func_type   = &type->function;
@@ -4744,7 +4982,7 @@ static void create_function(declaration_t *declaration)
                        ret = new_Return(get_store(), 0, NULL);
                } else {
                        ir_mode *mode;
-                       if(is_type_scalar(return_type)) {
+                       if (is_type_scalar(return_type)) {
                                mode = get_ir_mode(func_type->return_type);
                        } else {
                                mode = mode_P_data;
@@ -4756,6 +4994,11 @@ static void create_function(declaration_t *declaration)
                                in[0] = new_Const(mode, get_mode_null(mode));
                        } else {
                                in[0] = new_Unknown(mode);
+                               if (warning.return_type) {
+                                       warningf(&declaration->source_position,
+                                               "missing return statement at end of non-void function '%Y'",
+                                               declaration->symbol);
+                               }
                        }
                        ret = new_Return(get_store(), 1, in);
                }
@@ -4783,12 +5026,12 @@ static void create_function(declaration_t *declaration)
                ir_type   *entity_type = get_entity_type(entity);
 
                int align = get_type_alignment_bytes(entity_type);
-               if(align > align_all)
+               if (align > align_all)
                        align_all = align;
                int misalign = 0;
-               if(align > 0) {
+               if (align > 0) {
                        misalign  = offset % align;
-                       if(misalign > 0) {
+                       if (misalign > 0) {
                                offset += align - misalign;
                        }
                }
@@ -4807,16 +5050,16 @@ static void scope_to_firm(scope_t *scope)
        /* first pass: create declarations */
        declaration_t *declaration = scope->declarations;
        for( ; declaration != NULL; declaration = declaration->next) {
-               if(declaration->namespc != NAMESPACE_NORMAL)
+               if (declaration->namespc != NAMESPACE_NORMAL)
                        continue;
-               if(declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY
+               if (declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY
                                || declaration->storage_class == STORAGE_CLASS_TYPEDEF)
                        continue;
-               if(declaration->symbol == NULL)
+               if (declaration->symbol == NULL)
                        continue;
 
                type_t *type = skip_typeref(declaration->type);
-               if(is_type_function(type)) {
+               if (is_type_function(type)) {
                        get_function_entity(declaration);
                } else {
                        create_global_variable(declaration);
@@ -4826,16 +5069,16 @@ static void scope_to_firm(scope_t *scope)
        /* second pass: create code/initializers */
        declaration = scope->declarations;
        for( ; declaration != NULL; declaration = declaration->next) {
-               if(declaration->namespc != NAMESPACE_NORMAL)
+               if (declaration->namespc != NAMESPACE_NORMAL)
                        continue;
-               if(declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY
+               if (declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY
                                || declaration->storage_class == STORAGE_CLASS_TYPEDEF)
                        continue;
-               if(declaration->symbol == NULL)
+               if (declaration->symbol == NULL)
                        continue;
 
                type_t *type = declaration->type;
-               if(type->kind == TYPE_FUNCTION) {
+               if (type->kind == TYPE_FUNCTION) {
                        create_function(declaration);
                } else {
                        assert(declaration->declaration_kind
@@ -4857,7 +5100,7 @@ void init_ast2firm(void)
        /* OS option must be set to the backend */
        const char *s = "ia32-gasmode=linux";
        switch (firm_opt.os_support) {
-       case OS_SUPPORT_WIN32:
+       case OS_SUPPORT_MINGW:
                create_ld_ident = create_ld_ident_win32;
                s = "ia32-gasmode=mingw";
                break;
@@ -4874,14 +5117,16 @@ void init_ast2firm(void)
 
        /* 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);
+               rts_idents[i] = new_id_from_str(rts_data[i].name);
        }
+
+       entitymap_init(&entitymap);
 }
 
 static void init_ir_types(void)
 {
        static int ir_types_initialized = 0;
-       if(ir_types_initialized)
+       if (ir_types_initialized)
                return;
        ir_types_initialized = 1;
 
@@ -4897,6 +5142,7 @@ static void init_ir_types(void)
 
 void exit_ast2firm(void)
 {
+       entitymap_destroy(&entitymap);
        obstack_free(&asm_obst, NULL);
 }