fix whitespace errors
[cparser] / ast2firm.c
index 020a3d2..50ab325 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * This file is part of cparser.
- * Copyright (C) 2007-2008 Matthias Braun <matze@braunis.de>
+ * Copyright (C) 2007-2009 Matthias Braun <matze@braunis.de>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
 #include "mangle.h"
 #include "walk_statements.h"
 #include "warning.h"
+#include "printer.h"
 #include "entitymap_t.h"
 #include "driver/firm_opt.h"
 #include "driver/firm_cmdline.h"
 
+typedef struct trampoline_region trampoline_region;
+struct trampoline_region {
+       ir_entity        *function;    /**< The function that is called by this trampoline */
+       ir_entity        *region;      /**< created region for the trampoline */
+};
+
+static const backend_params *be_params;
+
+static ir_type *ir_type_char;
 static ir_type *ir_type_const_char;
 static ir_type *ir_type_wchar_t;
 static ir_type *ir_type_void;
@@ -58,6 +68,9 @@ static ir_type *ir_type_int;
 /* architecture specific floating point arithmetic mode (if any) */
 static ir_mode *mode_float_arithmetic;
 
+/* alignment of stack parameters */
+static unsigned stack_param_align;
+
 static int        next_value_number_function;
 static ir_node   *continue_label;
 static ir_node   *break_label;
@@ -67,6 +80,7 @@ static label_t  **all_labels;
 static entity_t **inner_functions;
 static ir_node   *ijmp_list;
 static bool       constant_folding;
+static bool       initializer_use_bitfield_basetype;
 
 extern bool       have_const_functions;
 
@@ -76,6 +90,10 @@ static ir_node            *current_funcsig;
 static switch_statement_t *current_switch;
 static ir_graph           *current_function;
 static translation_unit_t *current_translation_unit;
+static trampoline_region  *current_trampolines;
+static ir_type            *current_outer_frame;
+static ir_type            *current_outer_value_type;
+static ir_node            *current_static_link;
 
 static entitymap_t  entitymap;
 
@@ -106,26 +124,16 @@ static ir_type *get_ir_type_incomplete(type_t *type);
 
 static void enqueue_inner_function(entity_t *entity)
 {
+       if (inner_functions == NULL)
+               inner_functions = NEW_ARR_F(entity_t *, 0);
        ARR_APP1(entity_t*, inner_functions, entity);
 }
 
-static entity_t *next_inner_function(void)
-{
-       int len = ARR_LEN(inner_functions);
-       if (len == 0)
-               return NULL;
-
-       entity_t *entity = inner_functions[len-1];
-       ARR_SHRINKLEN(inner_functions, len-1);
-
-       return entity;
-}
-
-ir_node *uninitialized_local_var(ir_graph *irg, ir_mode *mode, int pos)
+static ir_node *uninitialized_local_var(ir_graph *irg, ir_mode *mode, int pos)
 {
        const entity_t *entity = get_irg_loc_description(irg, pos);
 
-       if (entity != NULL) {
+       if (entity != NULL && warning.uninitialized) {
                warningf(&entity->base.source_position,
                         "%s '%#T' might be used uninitialized",
                         get_entity_kind_name(entity->kind),
@@ -134,16 +142,7 @@ ir_node *uninitialized_local_var(ir_graph *irg, ir_mode *mode, int pos)
        return new_r_Unknown(irg, mode);
 }
 
-unsigned dbg_snprint(char *buf, unsigned len, const dbg_info *dbg)
-{
-       const source_position_t *pos = (const source_position_t*) dbg;
-       if (pos == NULL)
-               return 0;
-       return (unsigned) snprintf(buf, len, "%s:%u", pos->input_name,
-                                  pos->linenr);
-}
-
-const char *dbg_retrieve(const dbg_info *dbg, unsigned *line)
+static const char *dbg_retrieve(const dbg_info *dbg, unsigned *line)
 {
        const source_position_t *pos = (const source_position_t*) dbg;
        if (pos == NULL)
@@ -158,6 +157,21 @@ static dbg_info *get_dbg_info(const source_position_t *pos)
        return (dbg_info*) pos;
 }
 
+static void dbg_print_type_dbg_info(char *buffer, size_t buffer_size,
+                                    const type_dbg_info *dbg)
+{
+       assert(dbg != NULL);
+       print_to_buffer(buffer, buffer_size);
+       const type_t *type = (const type_t*) dbg;
+       print_type(type);
+       finish_print_to_buffer();
+}
+
+static type_dbg_info *get_type_dbg_info_(const type_t *type)
+{
+       return (type_dbg_info*) type;
+}
+
 static ir_mode *atomic_modes[ATOMIC_TYPE_LAST+1];
 
 static ir_mode *mode_int, *mode_uint;
@@ -241,55 +255,6 @@ ir_mode *get_atomic_mode(atomic_type_kind_t kind)
        return atomic_modes[kind];
 }
 
-static unsigned get_compound_type_size(compound_type_t *type)
-{
-       ir_type *irtype = get_ir_type((type_t*) type);
-       return get_type_size_bytes(irtype);
-}
-
-static unsigned get_array_type_size(array_type_t *type)
-{
-       assert(!type->is_vla);
-       ir_type *irtype = get_ir_type((type_t*) type);
-       return get_type_size_bytes(irtype);
-}
-
-static unsigned get_type_size_const(type_t *type)
-{
-       switch(type->kind) {
-       case TYPE_ERROR:
-               panic("error type occurred");
-       case TYPE_ATOMIC:
-               return get_atomic_type_size(type->atomic.akind);
-       case TYPE_COMPLEX:
-               return 2 * get_atomic_type_size(type->complex.akind);
-       case TYPE_IMAGINARY:
-               return get_atomic_type_size(type->imaginary.akind);
-       case TYPE_ENUM:
-               return get_atomic_type_size(type->enumt.akind);
-       case TYPE_COMPOUND_UNION:
-       case TYPE_COMPOUND_STRUCT:
-               return get_compound_type_size(&type->compound);
-       case TYPE_FUNCTION:
-               /* just a pointer to the function */
-               return get_mode_size_bytes(mode_P_code);
-       case TYPE_POINTER:
-       case TYPE_REFERENCE:
-               return get_mode_size_bytes(mode_P_data);
-       case TYPE_ARRAY:
-               return get_array_type_size(&type->array);
-       case TYPE_BUILTIN:
-               return get_type_size_const(type->builtin.real_type);
-       case TYPE_BITFIELD:
-               panic("type size of bitfield request");
-       case TYPE_TYPEDEF:
-       case TYPE_TYPEOF:
-       case TYPE_INVALID:
-               break;
-       }
-       panic("Trying to determine size of invalid type");
-}
-
 static ir_node *get_vla_size(array_type_t *const type)
 {
        ir_node *size_node = type->size_node;
@@ -300,13 +265,16 @@ static ir_node *get_vla_size(array_type_t *const type)
        return size_node;
 }
 
-static ir_node *get_type_size(type_t *type)
+/**
+ * Return a node representing the size of a type.
+ */
+static ir_node *get_type_size_node(type_t *type)
 {
        type = skip_typeref(type);
 
        if (is_type_array(type) && type->array.is_vla) {
                ir_node *size_node = get_vla_size(&type->array);
-               ir_node *elem_size = get_type_size(type->array.element_type);
+               ir_node *elem_size = get_type_size_node(type->array.element_type);
                ir_mode *mode      = get_irn_mode(size_node);
                ir_node *real_size = new_d_Mul(NULL, size_node, elem_size, mode);
                return real_size;
@@ -330,28 +298,15 @@ static unsigned count_parameters(const function_type_t *function_type)
        return count;
 }
 
-static type_t *get_aligned_type(type_t *type, int alignment)
-{
-       if (alignment == 0)
-               return type;
-
-       type = skip_typeref(type);
-       if (alignment > type->base.alignment) {
-               type_t *copy         = duplicate_type(type);
-               copy->base.alignment = alignment;
-               type                 = identify_new_type(copy);
-       }
-       return type;
-}
-
 /**
  * Creates a Firm type for an atomic type
  */
-static ir_type *create_atomic_type(atomic_type_kind_t akind, int alignment)
+static ir_type *create_atomic_type(atomic_type_kind_t akind, const type_t *type)
 {
-       ir_mode            *mode   = atomic_modes[akind];
-       ident              *id     = get_mode_ident(mode);
-       ir_type            *irtype = new_type_primitive(id, mode);
+       ir_mode        *mode      = atomic_modes[akind];
+       type_dbg_info  *dbgi      = get_type_dbg_info_(type);
+       ir_type        *irtype    = new_d_type_primitive(mode, dbgi);
+       il_alignment_t  alignment = get_atomic_type_alignment(akind);
 
        set_type_alignment_bytes(irtype, alignment);
 
@@ -376,26 +331,20 @@ static ir_type *create_complex_type(const complex_type_t *type)
 /**
  * Creates a Firm type for an imaginary type
  */
-static ir_type *create_imaginary_type(const imaginary_type_t *type)
+static ir_type *create_imaginary_type(imaginary_type_t *type)
 {
-       atomic_type_kind_t  kind      = type->akind;
-       ir_mode            *mode      = atomic_modes[kind];
-       ident              *id        = get_mode_ident(mode);
-       ir_type            *irtype    = new_type_primitive(id, mode);
-
-       set_type_alignment_bytes(irtype, type->base.alignment);
-
-       return irtype;
+       return create_atomic_type(type->akind, (const type_t*) type);
 }
 
 /**
  * return type of a parameter (and take transparent union gnu extension into
  * account)
  */
-static type_t *get_parameter_type(type_t *type)
+static type_t *get_parameter_type(type_t *orig_type)
 {
-       type = skip_typeref(type);
-       if (type->base.modifiers & TYPE_MODIFIER_TRANSPARENT_UNION) {
+       type_t *type = skip_typeref(orig_type);
+       if (is_type_union(type)
+                       && get_type_modifiers(orig_type) & DM_TRANSPARENT_UNION) {
                compound_t *compound = type->compound.compound;
                type                 = compound->members.entities->declaration.type;
        }
@@ -403,14 +352,15 @@ static type_t *get_parameter_type(type_t *type)
        return type;
 }
 
-static ir_type *create_method_type(const function_type_t *function_type)
+static ir_type *create_method_type(const function_type_t *function_type, bool for_closure)
 {
-       type_t  *return_type  = skip_typeref(function_type->return_type);
+       type_t        *return_type  = skip_typeref(function_type->return_type);
 
-       ident   *id           = id_unique("functiontype.%u");
-       int      n_parameters = count_parameters(function_type);
-       int      n_results    = return_type == type_void ? 0 : 1;
-       ir_type *irtype       = new_type_method(id, n_parameters, n_results);
+       int            n_parameters = count_parameters(function_type)
+                                      + (for_closure ? 1 : 0);
+       int            n_results    = return_type == type_void ? 0 : 1;
+       type_dbg_info *dbgi         = get_type_dbg_info_((const type_t*) function_type);
+       ir_type       *irtype       = new_d_type_method(n_parameters, n_results, dbgi);
 
        if (return_type != type_void) {
                ir_type *restype = get_ir_type(return_type);
@@ -419,6 +369,11 @@ static ir_type *create_method_type(const function_type_t *function_type)
 
        function_parameter_t *parameter = function_type->parameters;
        int                   n         = 0;
+       if (for_closure) {
+               ir_type *p_irtype = get_ir_type(type_void_ptr);
+               set_method_param_type(irtype, n, p_irtype);
+               ++n;
+       }
        for ( ; parameter != NULL; parameter = parameter->next) {
                type_t  *type     = get_parameter_type(parameter->type);
                ir_type *p_irtype = get_ir_type(type);
@@ -426,9 +381,10 @@ static ir_type *create_method_type(const function_type_t *function_type)
                ++n;
        }
 
-       if (function_type->variadic || function_type->unspecified_parameters) {
+       bool is_variadic = function_type->variadic;
+
+       if (is_variadic)
                set_method_variadicity(irtype, variadicity_variadic);
-       }
 
        unsigned cc = get_method_calling_convention(irtype);
        switch (function_type->calling_convention) {
@@ -439,7 +395,7 @@ is_cdecl:
                break;
 
        case CC_STDCALL:
-               if (function_type->variadic || function_type->unspecified_parameters)
+               if (is_variadic)
                        goto is_cdecl;
 
                /* only non-variadic function can use stdcall, else use cdecl */
@@ -447,7 +403,7 @@ is_cdecl:
                break;
 
        case CC_FASTCALL:
-               if (function_type->variadic || function_type->unspecified_parameters)
+               if (is_variadic)
                        goto is_cdecl;
                /* only non-variadic function can use fastcall, else use cdecl */
                set_method_calling_convention(irtype, SET_FASTCALL(cc));
@@ -458,36 +414,38 @@ is_cdecl:
                break;
        }
 
+       if (for_closure)
+               set_method_calling_convention(irtype, get_method_calling_convention(irtype) | cc_this_call);
+
        return irtype;
 }
 
 static ir_type *create_pointer_type(pointer_type_t *type)
 {
-       type_t   *points_to    = type->points_to;
-       ir_type  *ir_points_to = get_ir_type_incomplete(points_to);
-       ir_type  *ir_type      = new_type_pointer(id_unique("pointer.%u"),
-                                                 ir_points_to, mode_P_data);
+       type_dbg_info *dbgi         = get_type_dbg_info_((const type_t*) type);
+       type_t        *points_to    = type->points_to;
+       ir_type       *ir_points_to = get_ir_type_incomplete(points_to);
+       ir_type       *ir_type      = new_d_type_pointer(ir_points_to, dbgi);
 
        return ir_type;
 }
 
 static ir_type *create_reference_type(reference_type_t *type)
 {
-       type_t  *refers_to    = type->refers_to;
-       ir_type *ir_refers_to = get_ir_type_incomplete(refers_to);
-       ir_type *ir_type      = new_type_pointer(id_unique("reference.%u"),
-                                                ir_refers_to, mode_P_data);
+       type_dbg_info *dbgi         = get_type_dbg_info_((const type_t*) type);
+       type_t        *refers_to    = type->refers_to;
+       ir_type       *ir_refers_to = get_ir_type_incomplete(refers_to);
+       ir_type       *ir_type      = new_d_type_pointer(ir_refers_to, dbgi);
 
        return ir_type;
 }
 
 static ir_type *create_array_type(array_type_t *type)
 {
-       type_t  *element_type    = type->element_type;
-       ir_type *ir_element_type = get_ir_type(element_type);
-
-       ident    *id      = id_unique("array.%u");
-       ir_type  *ir_type = new_type_array(id, 1, ir_element_type);
+       type_dbg_info *dbgi            = get_type_dbg_info_((const type_t*) type);
+       type_t        *element_type    = type->element_type;
+       ir_type       *ir_element_type = get_ir_type(element_type);
+       ir_type       *ir_type         = new_d_type_array(1, ir_element_type, dbgi);
 
        const int align = get_type_alignment_bytes(ir_element_type);
        set_type_alignment_bytes(ir_type, align);
@@ -516,7 +474,8 @@ static ir_type *create_array_type(array_type_t *type)
  * @param size   the size
  */
 static ir_type *get_signed_int_type_for_bit_size(ir_type *base_tp,
-                                                 unsigned size)
+                                                 unsigned size,
+                                                                                                const type_t *type)
 {
        static ir_mode *s_modes[64 + 1] = {NULL, };
        ir_type *res;
@@ -535,11 +494,8 @@ static ir_type *get_signed_int_type_for_bit_size(ir_type *base_tp,
                s_modes[size] = mode;
        }
 
-       char name[32];
-       snprintf(name, sizeof(name), "I%u", size);
-       ident *id = new_id_from_str(name);
-       dbg_info *dbgi = get_dbg_info(&builtin_source_position);
-       res = new_d_type_primitive(id_mangle_u(get_type_ident(base_tp), id), mode, dbgi);
+       type_dbg_info *dbgi = get_type_dbg_info_(type);
+       res                 = new_d_type_primitive(mode, dbgi);
        set_primitive_base_type(res, base_tp);
 
        return res;
@@ -551,7 +507,8 @@ static ir_type *get_signed_int_type_for_bit_size(ir_type *base_tp,
  * @param size   the size
  */
 static ir_type *get_unsigned_int_type_for_bit_size(ir_type *base_tp,
-                                                   unsigned size)
+                                                   unsigned size,
+                                                                                                  const type_t *type)
 {
        static ir_mode *u_modes[64 + 1] = {NULL, };
        ir_type *res;
@@ -570,12 +527,8 @@ static ir_type *get_unsigned_int_type_for_bit_size(ir_type *base_tp,
                u_modes[size] = mode;
        }
 
-       char name[32];
-
-       snprintf(name, sizeof(name), "U%u", size);
-       ident *id = new_id_from_str(name);
-       dbg_info *dbgi = get_dbg_info(&builtin_source_position);
-       res = new_d_type_primitive(id_mangle_u(get_type_ident(base_tp), id), mode, dbgi);
+       type_dbg_info *dbgi = get_type_dbg_info_(type);
+       res = new_d_type_primitive(mode, dbgi);
        set_primitive_base_type(res, base_tp);
 
        return res;
@@ -591,9 +544,11 @@ static ir_type *create_bitfield_type(bitfield_type_t *const type)
 
        assert(!is_type_float(base));
        if (is_type_signed(base)) {
-               return get_signed_int_type_for_bit_size(irbase, size);
+               return get_signed_int_type_for_bit_size(irbase, size,
+                                                       (const type_t*) type);
        } else {
-               return get_unsigned_int_type_for_bit_size(irbase, size);
+               return get_unsigned_int_type_for_bit_size(irbase, size,
+                                                         (const type_t*) type);
        }
 }
 
@@ -606,13 +561,8 @@ enum {
 
 /**
  * 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
- * the anonymous inner struct inside the resulting firm struct)
  */
-static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype,
-                                     size_t *outer_offset, size_t *outer_align,
+static ir_type *create_compound_type(compound_type_t *type,
                                      bool incomplete, bool is_union)
 {
        compound_t *compound = type->compound;
@@ -621,41 +571,37 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype,
                return compound->irtype;
        }
 
-       size_t align_all  = 1;
-       size_t offset     = 0;
-       size_t bit_offset = 0;
-       size_t size       = 0;
-
-       if (irtype == NULL) {
-               symbol_t *symbol = compound->base.symbol;
-               ident    *id;
-               if (symbol != NULL) {
-                       id = new_id_from_str(symbol->string);
-               } else {
-                       if (is_union) {
-                               id = id_unique("__anonymous_union.%u");
-                       } else {
-                               id = id_unique("__anonymous_struct.%u");
-                       }
-               }
-               dbg_info *dbgi = get_dbg_info(&compound->base.source_position);
-
+       symbol_t *symbol = compound->base.symbol;
+       ident    *id;
+       if (symbol != NULL) {
+               id = new_id_from_str(symbol->string);
+       } else {
                if (is_union) {
-                       irtype = new_d_type_union(id, dbgi);
+                       id = id_unique("__anonymous_union.%u");
                } else {
-                       irtype = new_d_type_struct(id, dbgi);
+                       id = id_unique("__anonymous_struct.%u");
                }
+       }
 
-               compound->irtype_complete = false;
-               compound->irtype          = irtype;
+       ir_type *irtype;
+       if (is_union) {
+               irtype = new_type_union(id);
        } else {
-               offset    = *outer_offset;
-               align_all = *outer_align;
+               irtype = new_type_struct(id);
        }
 
+       compound->irtype_complete = false;
+       compound->irtype          = irtype;
+
        if (incomplete)
                return irtype;
 
+       if (is_union) {
+               layout_union_type(type);
+       } else {
+               layout_struct_type(type);
+       }
+
        compound->irtype_complete = true;
 
        entity_t *entry = compound->members.entities;
@@ -663,130 +609,37 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype,
                if (entry->kind != ENTITY_COMPOUND_MEMBER)
                        continue;
 
-               size_t prev_offset = offset;
-
                symbol_t *symbol     = entry->base.symbol;
-               type_t   *entry_type = skip_typeref(entry->declaration.type);
-               entry_type
-                       = get_aligned_type(entry_type, entry->compound_member.alignment);
-               dbg_info *dbgi       = get_dbg_info(&entry->base.source_position);
-
+               type_t   *entry_type = entry->declaration.type;
                ident    *ident;
-               if (symbol != NULL) {
-                       ident = new_id_from_str(symbol->string);
-               } else {
-                       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) {
-                               create_compound_type(&entry_type->compound, irtype, &offset,
-                                                    &align_all, false, COMPOUND_IS_UNION);
-                               goto finished_member;
-                       } else {
-                               assert(entry_type->kind == TYPE_BITFIELD);
-                       }
+               if (symbol == NULL) {
+                       /* anonymous bitfield member, skip */
+                       if (entry_type->kind == TYPE_BITFIELD)
+                               continue;
+                       assert(entry_type->kind == TYPE_COMPOUND_STRUCT
+                                       || entry_type->kind == TYPE_COMPOUND_UNION);
                        ident = id_unique("anon.%u");
-               }
-
-               ir_type *base_irtype;
-               if (entry_type->kind == TYPE_BITFIELD) {
-                       base_irtype = get_ir_type(entry_type->bitfield.base_type);
                } else {
-                       base_irtype = get_ir_type(entry_type);
+                       ident = new_id_from_str(symbol->string);
                }
 
-               size_t entry_alignment = get_type_alignment_bytes(base_irtype);
-               size_t misalign        = offset % entry_alignment;
+               dbg_info *dbgi       = get_dbg_info(&entry->base.source_position);
 
                ir_type   *entry_irtype = get_ir_type(entry_type);
                ir_entity *entity = new_d_entity(irtype, ident, entry_irtype, dbgi);
 
-               size_t base;
-               size_t bits_remainder;
-               if (entry_type->kind == TYPE_BITFIELD) {
-                       size_t size_bits      = entry_type->bitfield.bit_size;
-                       size_t rest_size_bits = (entry_alignment - misalign)*8 - bit_offset;
-
-                       if (size_bits > rest_size_bits) {
-                               /* start a new bucket */
-                               offset     += entry_alignment - misalign;
-                               bit_offset  = 0;
-
-                               base           = offset;
-                               bits_remainder = 0;
-                       } else {
-                               /* put into current bucket */
-                               base           = offset - misalign;
-                               bits_remainder = misalign * 8 + bit_offset;
-                       }
-
-                       offset     += size_bits / 8;
-                       bit_offset  = bit_offset + (size_bits % 8);
-               } else {
-                       size_t entry_size = get_type_size_bytes(base_irtype);
-                       if (misalign > 0 || bit_offset > 0)
-                               offset += entry_alignment - misalign;
-
-                       base           = offset;
-                       bits_remainder = 0;
-                       offset        += entry_size;
-                       bit_offset     = 0;
-               }
-
-               if (entry_alignment > align_all) {
-                       if (entry_alignment % align_all != 0) {
-                               panic("uneven alignments not supported yet");
-                       }
-                       align_all = entry_alignment;
-               }
-
-               set_entity_offset(entity, base);
+               set_entity_offset(entity, entry->compound_member.offset);
                set_entity_offset_bits_remainder(entity,
-                                                (unsigned char) bits_remainder);
-               //add_struct_member(irtype, entity);
-               entry->declaration.kind = DECLARATION_KIND_COMPOUND_MEMBER;
-               assert(entry->compound_member.entity == NULL);
-               entry->compound_member.entity = entity;
-
-finished_member:
-               if (is_union) {
-                       size_t entry_size = offset - prev_offset;
-                       if (entry_size > size) {
-                               size = entry_size;
-                       }
-                       offset     = 0;
-                       bit_offset = 0;
-               }
-       }
+                                                entry->compound_member.bit_offset);
 
-       if (!is_union) {
-               size = offset;
-       }
-
-       size_t misalign = offset % align_all;
-       if (misalign > 0 || bit_offset > 0) {
-               size += align_all - misalign;
+               assert(entry->declaration.kind == DECLARATION_KIND_UNKNOWN);
+               entry->declaration.kind       = DECLARATION_KIND_COMPOUND_MEMBER;
+               entry->compound_member.entity = entity;
        }
 
-       if (outer_offset != NULL) {
-               if (!is_union) {
-                       *outer_offset = offset;
-               } else {
-                       *outer_offset += size;
-               }
-
-               if (align_all > *outer_align) {
-                       if (align_all % *outer_align != 0) {
-                               panic("uneven alignments not supported yet");
-                       }
-                       *outer_align = align_all;
-               }
-       } else {
-               set_type_alignment_bytes(irtype, align_all);
-               set_type_size_bytes(irtype, size);
-               set_type_state(irtype, layout_fixed);
-       }
+       set_type_alignment_bytes(irtype, compound->alignment);
+       set_type_size_bytes(irtype, compound->size);
+       set_type_state(irtype, layout_fixed);
 
        return irtype;
 }
@@ -795,9 +648,9 @@ static ir_type *create_enum_type(enum_type_t *const type)
 {
        type->base.firm_type = ir_type_int;
 
-       ir_mode *const mode    = mode_int;
-       tarval  *const one     = get_mode_one(mode);
-       tarval  *      tv_next = get_tarval_null(mode);
+       ir_mode   *const mode    = mode_int;
+       ir_tarval *const one     = get_mode_one(mode);
+       ir_tarval *      tv_next = get_mode_null(mode);
 
        bool constant_folding_old = constant_folding;
        constant_folding = true;
@@ -822,7 +675,7 @@ static ir_type *create_enum_type(enum_type_t *const type)
 
        constant_folding = constant_folding_old;
 
-       return create_atomic_type(type->akind, type->base.alignment);
+       return create_atomic_type(type->akind, (const type_t*) type);
 }
 
 static ir_type *get_ir_type_incomplete(type_t *type)
@@ -837,11 +690,9 @@ static ir_type *get_ir_type_incomplete(type_t *type)
 
        switch (type->kind) {
        case TYPE_COMPOUND_STRUCT:
-               return create_compound_type(&type->compound, NULL, NULL, NULL,
-                                           true, COMPOUND_IS_STRUCT);
+               return create_compound_type(&type->compound, true, COMPOUND_IS_STRUCT);
        case TYPE_COMPOUND_UNION:
-               return create_compound_type(&type->compound, NULL, NULL, NULL,
-                                           true, COMPOUND_IS_UNION);
+               return create_compound_type(&type->compound, true, COMPOUND_IS_UNION);
        default:
                return get_ir_type(type);
        }
@@ -862,11 +713,10 @@ ir_type *get_ir_type(type_t *type)
        switch (type->kind) {
        case TYPE_ERROR:
                /* Happens while constant folding, when there was an error */
-               return create_atomic_type(ATOMIC_TYPE_VOID, 0);
+               return create_atomic_type(ATOMIC_TYPE_VOID, NULL);
 
        case TYPE_ATOMIC:
-               firm_type = create_atomic_type(type->atomic.akind,
-                                              type->base.alignment);
+               firm_type = create_atomic_type(type->atomic.akind, type);
                break;
        case TYPE_COMPLEX:
                firm_type = create_complex_type(&type->complex);
@@ -875,7 +725,7 @@ ir_type *get_ir_type(type_t *type)
                firm_type = create_imaginary_type(&type->imaginary);
                break;
        case TYPE_FUNCTION:
-               firm_type = create_method_type(&type->function);
+               firm_type = create_method_type(&type->function, false);
                break;
        case TYPE_POINTER:
                firm_type = create_pointer_type(&type->pointer);
@@ -887,12 +737,10 @@ ir_type *get_ir_type(type_t *type)
                firm_type = create_array_type(&type->array);
                break;
        case TYPE_COMPOUND_STRUCT:
-               firm_type = create_compound_type(&type->compound, NULL, NULL, NULL,
-                                                false, COMPOUND_IS_STRUCT);
+               firm_type = create_compound_type(&type->compound, false, COMPOUND_IS_STRUCT);
                break;
        case TYPE_COMPOUND_UNION:
-               firm_type = create_compound_type(&type->compound, NULL, NULL, NULL,
-                                                false, COMPOUND_IS_UNION);
+               firm_type = create_compound_type(&type->compound, false, COMPOUND_IS_UNION);
                break;
        case TYPE_ENUM:
                firm_type = create_enum_type(&type->enumt);
@@ -1016,15 +864,25 @@ static const struct {
        { rts_coshl,      1, "coshl",        1, _C99 },
        { rts_tanhl,      1, "tanhl",        1, _C99 },
 
-       { rts_memcpy,     1, "memcpy",       3, _C89 },  /* HMM, man say its C99 */
-       { rts_memset,     1, "memset",       3, _C89 },  /* HMM, man say its C99 */
        { rts_strcmp,     1, "strcmp",       2, _C89 },
-       { rts_strncmp,    1, "strncmp",      3, _C89 }
+       { rts_strncmp,    1, "strncmp",      3, _C89 },
+       { rts_strcpy,     1, "strcpy",       2, _C89 },
+       { rts_strlen,     1, "strlen",       1, _C89 },
+       { rts_memcpy,     1, "memcpy",       3, _C89 },
+       { rts_mempcpy,    1, "mempcpy",      3, _GNUC },
+       { rts_memmove,    1, "memmove",      3, _C89 },
+       { rts_memset,     1, "memset",       3, _C89 },
+       { rts_memcmp,     1, "memcmp",       3, _C89 },
 };
 
 static ident *rts_idents[lengthof(rts_data)];
 
-static ident* (*create_ld_ident)(entity_t*) = create_name_linux_elf;
+static create_ld_ident_func create_ld_ident = create_name_linux_elf;
+
+void set_create_ld_ident(ident *(*func)(entity_t*))
+{
+       create_ld_ident = func;
+}
 
 /**
  * Handle GNU attributes for entities
@@ -1032,23 +890,25 @@ static ident* (*create_ld_ident)(entity_t*) = create_name_linux_elf;
  * @param ent   the entity
  * @param decl  the routine declaration
  */
-static void handle_gnu_attributes_ent(ir_entity *irentity, entity_t *entity)
+static void handle_decl_modifiers(ir_entity *irentity, entity_t *entity)
 {
        assert(is_declaration(entity));
        decl_modifiers_t modifiers = entity->declaration.modifiers;
-       if (modifiers & DM_PURE) {
-               /* TRUE if the declaration includes the GNU
-                  __attribute__((pure)) specifier. */
-               set_entity_additional_property(irentity, mtp_property_pure);
-       }
-       if (modifiers & DM_CONST) {
-               set_entity_additional_property(irentity, mtp_property_const);
-               have_const_functions = true;
+
+       if (is_method_entity(irentity)) {
+               if (modifiers & DM_PURE) {
+                       set_entity_additional_properties(irentity, mtp_property_pure);
+               }
+               if (modifiers & DM_CONST) {
+                       add_entity_additional_properties(irentity, mtp_property_const);
+                       have_const_functions = true;
+               }
        }
        if (modifiers & DM_USED) {
-               /* TRUE if the declaration includes the GNU
-                  __attribute__((used)) specifier. */
-               set_entity_stickyness(irentity, stickyness_sticky);
+               add_entity_linkage(irentity, IR_LINKAGE_HIDDEN_USER);
+       }
+       if (modifiers & DM_WEAK) {
+               add_entity_linkage(irentity, IR_LINKAGE_WEAK);
        }
 }
 
@@ -1071,13 +931,22 @@ static bool is_main(entity_t *entity)
 /**
  * Creates an entity representing a function.
  *
- * @param declaration  the function declaration
+ * @param entity       the function declaration/definition
+ * @param owner_type   the owner type of this function, NULL
+ *                     for global functions
  */
-static ir_entity *get_function_entity(entity_t *entity)
+static ir_entity *get_function_entity(entity_t *entity, ir_type *owner_type)
 {
        assert(entity->kind == ENTITY_FUNCTION);
-       if (entity->function.entity != NULL) {
-               return entity->function.entity;
+       if (entity->function.irentity != NULL) {
+               return entity->function.irentity;
+       }
+
+       entity_t *original_entity = entity;
+       if (entity->function.btk != bk_none) {
+               entity = get_builtin_replacement(entity);
+               if (entity == NULL)
+                       return NULL;
        }
 
        if (is_main(entity)) {
@@ -1095,57 +964,89 @@ static ir_entity *get_function_entity(entity_t *entity)
        symbol_t *symbol = entity->base.symbol;
        ident    *id     = new_id_from_str(symbol->string);
 
-       ir_type   *global_type    = get_glob_type();
-       ir_type   *ir_type_method = get_ir_type(entity->declaration.type);
-       bool const has_body       = entity->function.statement != NULL;
-
        /* already an entity defined? */
        ir_entity *irentity = entitymap_get(&entitymap, symbol);
+       bool const has_body = entity->function.statement != NULL;
        if (irentity != NULL) {
-               if (get_entity_visibility(irentity) == visibility_external_allocated
+               if (get_entity_visibility(irentity) == ir_visibility_external
                                && has_body) {
-                       set_entity_visibility(irentity, visibility_external_visible);
+                       set_entity_visibility(irentity, ir_visibility_default);
                }
                goto entity_created;
        }
 
+       ir_type *ir_type_method;
+       if (entity->function.need_closure)
+               ir_type_method = create_method_type(&entity->declaration.type->function, true);
+       else
+               ir_type_method = get_ir_type(entity->declaration.type);
+
+       bool nested_function = false;
+       if (owner_type == NULL)
+               owner_type = get_glob_type();
+       else
+               nested_function = true;
+
        dbg_info *const dbgi = get_dbg_info(&entity->base.source_position);
-       irentity             = new_d_entity(global_type, id, ir_type_method, dbgi);
-       set_entity_ld_ident(irentity, create_ld_ident(entity));
-
-       handle_gnu_attributes_ent(irentity, entity);
-
-       /* static inline             => local
-        * extern inline             => local
-        * inline without definition => local
-        * inline with definition    => external_visible */
-       storage_class_tag_t const storage_class
-               = (storage_class_tag_t) entity->declaration.storage_class;
-       bool                const is_inline     = entity->function.is_inline;
-       if (is_inline && storage_class == STORAGE_CLASS_NONE && has_body) {
-               set_entity_visibility(irentity, visibility_external_visible);
-       } else if (storage_class == STORAGE_CLASS_STATIC ||
-                  (is_inline && has_body)) {
-               if (!has_body) {
-                       /* this entity was declared, but is defined nowhere */
-                       set_entity_peculiarity(irentity, peculiarity_description);
+       irentity             = new_d_entity(owner_type, id, ir_type_method, dbgi);
+
+       ident *ld_id;
+       if (nested_function)
+               ld_id = id_unique("inner.%u");
+       else
+               ld_id = create_ld_ident(entity);
+       set_entity_ld_ident(irentity, ld_id);
+
+       handle_decl_modifiers(irentity, entity);
+
+       if (! nested_function) {
+               /* static inline             => local
+                * extern inline             => local
+                * inline without definition => local
+                * inline with definition    => external_visible */
+               storage_class_tag_t const storage_class
+                       = (storage_class_tag_t) entity->declaration.storage_class;
+               bool                const is_inline     = entity->function.is_inline;
+
+               if (is_inline && storage_class == STORAGE_CLASS_NONE && has_body) {
+                   set_entity_visibility(irentity, ir_visibility_default);
+               } else if (storage_class == STORAGE_CLASS_STATIC ||
+                          (is_inline && has_body)) {
+                   set_entity_visibility(irentity, ir_visibility_local);
+               } else if (has_body) {
+                   set_entity_visibility(irentity, ir_visibility_default);
+               } else {
+                   set_entity_visibility(irentity, ir_visibility_external);
                }
-               set_entity_visibility(irentity, visibility_local);
-       } else if (has_body) {
-               set_entity_visibility(irentity, visibility_external_visible);
        } else {
-               set_entity_visibility(irentity, visibility_external_allocated);
+               /* nested functions are always local */
+               set_entity_visibility(irentity, ir_visibility_local);
        }
-       set_entity_allocation(irentity, allocation_static);
 
        /* We should check for file scope here, but as long as we compile C only
           this is not needed. */
-       if (! firm_opt.freestanding) {
+       if (!freestanding && !has_body) {
                /* check for a known runtime function */
                for (size_t i = 0; i < lengthof(rts_data); ++i) {
                        if (id != rts_idents[i])
                                continue;
 
+                       function_type_t *function_type
+                               = &entity->declaration.type->function;
+                       /* rts_entities code can't handle a "wrong" number of parameters */
+                       if (function_type->unspecified_parameters)
+                               continue;
+
+                       /* check number of parameters */
+                       int n_params = count_parameters(function_type);
+                       if (n_params != rts_data[i].n_params)
+                               continue;
+
+                       type_t *return_type = skip_typeref(function_type->return_type);
+                       int     n_res       = return_type != type_void ? 1 : 0;
+                       if (n_res != rts_data[i].n_res)
+                               continue;
+
                        /* ignore those rts functions not necessary needed for current mode */
                        if ((c_mode & rts_data[i].flags) == 0)
                                continue;
@@ -1157,12 +1058,28 @@ static ir_entity *get_function_entity(entity_t *entity)
        entitymap_insert(&entitymap, symbol, irentity);
 
 entity_created:
-       entity->declaration.kind = DECLARATION_KIND_FUNCTION;
-       entity->function.entity  = irentity;
+       original_entity->declaration.kind  = DECLARATION_KIND_FUNCTION;
+       original_entity->function.irentity = irentity;
 
        return irentity;
 }
 
+/**
+ * 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)
+{
+       assert(entity != NULL);
+       union symconst_symbol sym;
+       sym.entity_p = entity;
+       return new_d_SymConst(dbgi, mode, sym, symconst_addr_ent);
+}
+
 static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode)
 {
        ir_mode *value_mode = get_irn_mode(value);
@@ -1172,99 +1089,57 @@ static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode)
 
        if (dest_mode == mode_b) {
                ir_node *zero = new_Const(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;
+               ir_node *cmp  = new_d_Cmp(dbgi, value, zero, ir_relation_less_greater);
+               return cmp;
        }
 
        return new_d_Conv(dbgi, value, dest_mode);
 }
 
-/**
- * Creates a Const node representing a constant.
- */
-static ir_node *const_to_firm(const const_expression_t *cnst)
+static ir_node *create_Const_from_bool(ir_mode *const mode, bool const v)
 {
-       dbg_info *dbgi = get_dbg_info(&cnst->base.source_position);
-       type_t   *type = skip_typeref(cnst->base.type);
-       ir_mode  *mode = get_ir_mode_storage(type);
-
-       char    buf[128];
-       tarval *tv;
-       size_t  len;
-       if (mode_is_float(mode)) {
-               tv = new_tarval_from_double(cnst->v.float_value, mode);
-       } else {
-               if (mode_is_signed(mode)) {
-                       len = snprintf(buf, sizeof(buf), "%lld", cnst->v.int_value);
-               } else {
-                       len = snprintf(buf, sizeof(buf), "%llu",
-                                      (unsigned long long) cnst->v.int_value);
-               }
-               tv = new_tarval_from_str(buf, len, mode);
-       }
-
-       ir_node *res        = new_d_Const(dbgi, tv);
-       ir_mode *mode_arith = get_ir_mode_arithmetic(type);
-       return create_conv(dbgi, res, mode_arith);
+       return new_Const((v ? get_mode_one : get_mode_null)(mode));
 }
 
 /**
- * Creates a Const node representing a character constant.
+ * Creates a SymConst node representing a wide string literal.
+ *
+ * @param literal   the wide string literal
  */
-static ir_node *character_constant_to_firm(const const_expression_t *cnst)
+static ir_node *wide_string_literal_to_firm(
+               const string_literal_expression_t *literal)
 {
-       dbg_info *dbgi = get_dbg_info(&cnst->base.source_position);
-       ir_mode  *mode = get_ir_mode_arithmetic(cnst->base.type);
-
-       long long int v;
-       size_t const  size = cnst->v.character.size;
-       if (size == 1 && char_is_signed) {
-               v = (signed char)cnst->v.character.begin[0];
-       } else {
-               v = 0;
-               for (size_t i = 0; i < size; ++i) {
-                       v = (v << 8) | ((unsigned char)cnst->v.character.begin[i]);
-               }
-       }
-       char    buf[128];
-       size_t  len = snprintf(buf, sizeof(buf), "%lld", v);
-       tarval *tv = new_tarval_from_str(buf, len, mode);
-
-       return new_d_Const(dbgi, tv);
-}
+       ir_type  *const global_type = get_glob_type();
+       ir_type  *const elem_type   = ir_type_wchar_t;
+       dbg_info *const dbgi        = get_dbg_info(&literal->base.source_position);
+       ir_type  *const type        = new_type_array(1, elem_type);
 
-/**
- * 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);
-       ir_mode  *mode = get_ir_mode_arithmetic(cnst->base.type);
+       ident     *const id     = id_unique("str.%u");
+       ir_entity *const entity = new_d_entity(global_type, id, type, dbgi);
+       set_entity_ld_ident(entity, id);
+       set_entity_visibility(entity, ir_visibility_private);
+       add_entity_linkage(entity, IR_LINKAGE_CONSTANT);
 
-       long long int v = cnst->v.wide_character.begin[0];
+       ir_mode      *const mode = get_type_mode(elem_type);
+       const size_t        slen = wstrlen(&literal->value);
 
-       char    buf[128];
-       size_t  len = snprintf(buf, sizeof(buf), "%lld", v);
-       tarval *tv = new_tarval_from_str(buf, len, mode);
+       set_array_lower_bound_int(type, 0, 0);
+       set_array_upper_bound_int(type, 0, slen);
+       set_type_size_bytes(type, slen * get_mode_size_bytes(mode));
+       set_type_state(type, layout_fixed);
 
-       return new_d_Const(dbgi, tv);
-}
+       ir_initializer_t *initializer = create_initializer_compound(slen);
+       const char              *p    = literal->value.begin;
+       for (size_t i = 0; i < slen; ++i) {
+               assert(p < literal->value.begin + literal->value.size);
+               utf32             v   = read_utf8_char(&p);
+               ir_tarval        *tv  = new_tarval_from_long(v, mode);
+               ir_initializer_t *val = create_initializer_tarval(tv);
+               set_initializer_compound_value(initializer, i, val);
+       }
+       set_entity_initializer(entity, initializer);
 
-/**
- * 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)
-{
-       assert(entity != NULL);
-       union symconst_symbol sym;
-       sym.entity_p = entity;
-       return new_d_SymConst(dbgi, mode, sym, symconst_addr_ent);
+       return create_symconst(dbgi, mode_P_data, entity);
 }
 
 /**
@@ -1280,14 +1155,13 @@ static ir_node *string_to_firm(const source_position_t *const src_pos,
 {
        ir_type  *const global_type = get_glob_type();
        dbg_info *const dbgi        = get_dbg_info(src_pos);
-       ir_type  *const type        = new_d_type_array(id_unique("strtype.%u"), 1,
-                                                      ir_type_const_char, dbgi);
+       ir_type  *const type        = new_type_array(1, ir_type_const_char);
 
        ident     *const id     = id_unique(id_prefix);
        ir_entity *const entity = new_d_entity(global_type, id, type, dbgi);
        set_entity_ld_ident(entity, id);
-       set_entity_variability(entity, variability_constant);
-       set_entity_allocation(entity, allocation_static);
+       set_entity_visibility(entity, ir_visibility_private);
+       add_entity_linkage(entity, IR_LINKAGE_CONSTANT);
 
        ir_type *const elem_type = ir_type_const_char;
        ir_mode *const mode      = get_type_mode(elem_type);
@@ -1300,70 +1174,269 @@ static ir_node *string_to_firm(const source_position_t *const src_pos,
        set_type_size_bytes(type, slen);
        set_type_state(type, layout_fixed);
 
-       tarval **const tvs = xmalloc(slen * sizeof(tvs[0]));
+       ir_initializer_t *initializer = create_initializer_compound(slen);
        for (size_t i = 0; i < slen; ++i) {
-               tvs[i] = new_tarval_from_long(string[i], mode);
+               ir_tarval        *tv  = new_tarval_from_long(string[i], mode);
+               ir_initializer_t *val = create_initializer_tarval(tv);
+               set_initializer_compound_value(initializer, i, val);
        }
-
-       set_array_entity_values(entity, tvs, slen);
-       free(tvs);
+       set_entity_initializer(entity, initializer);
 
        return create_symconst(dbgi, mode_P_data, entity);
 }
 
+static bool try_create_integer(literal_expression_t *literal,
+                               type_t *type, unsigned char base)
+{
+       const char *string = literal->value.begin;
+       size_t      size   = literal->value.size;
+
+       assert(type->kind == TYPE_ATOMIC);
+       atomic_type_kind_t akind = type->atomic.akind;
+
+       ir_mode   *mode = atomic_modes[akind];
+       ir_tarval *tv   = new_integer_tarval_from_str(string, size, 1, base, mode);
+       if (tv == tarval_bad)
+               return false;
+
+       literal->base.type    = type;
+       literal->target_value = tv;
+       return true;
+}
+
+static void create_integer_tarval(literal_expression_t *literal)
+{
+       unsigned  us     = 0;
+       unsigned  ls     = 0;
+       symbol_t *suffix = literal->suffix;
+       /* parse suffix */
+       if (suffix != NULL) {
+               for (const char *c = suffix->string; *c != '\0'; ++c) {
+                       if (*c == 'u' || *c == 'U') { ++us; }
+                       if (*c == 'l' || *c == 'L') { ++ls; }
+               }
+       }
+
+       unsigned base;
+       switch (literal->base.kind) {
+               case EXPR_LITERAL_INTEGER_OCTAL:       base =  8; break;
+               case EXPR_LITERAL_INTEGER:             base = 10; break;
+               case EXPR_LITERAL_INTEGER_HEXADECIMAL: base = 16; break;
+               default: panic("invalid literal kind");
+       }
+
+       tarval_int_overflow_mode_t old_mode = tarval_get_integer_overflow_mode();
+
+       /* now try if the constant is small enough for some types */
+       tarval_set_integer_overflow_mode(TV_OVERFLOW_BAD);
+       if (ls < 1) {
+               if (us == 0 && try_create_integer(literal, type_int, base))
+                       goto finished;
+               if ((us == 1 || base != 10)
+                               && try_create_integer(literal, type_unsigned_int, base))
+                       goto finished;
+       }
+       if (ls < 2) {
+               if (us == 0 && try_create_integer(literal, type_long, base))
+                       goto finished;
+               if ((us == 1 || base != 10)
+                               && try_create_integer(literal, type_unsigned_long, base))
+                       goto finished;
+       }
+       /* last try? then we should not report tarval_bad */
+       if (us != 1 && base == 10)
+               tarval_set_integer_overflow_mode(TV_OVERFLOW_WRAP);
+       if (us == 0 && try_create_integer(literal, type_long_long, base))
+               goto finished;
+
+       /* last try */
+       assert(us == 1 || base != 10);
+       tarval_set_integer_overflow_mode(TV_OVERFLOW_WRAP);
+       bool res = try_create_integer(literal, type_unsigned_long_long, base);
+       if (!res)
+               panic("internal error when parsing number literal");
+
+finished:
+       tarval_set_integer_overflow_mode(old_mode);
+}
+
+void determine_literal_type(literal_expression_t *literal)
+{
+       switch (literal->base.kind) {
+       case EXPR_LITERAL_INTEGER:
+       case EXPR_LITERAL_INTEGER_OCTAL:
+       case EXPR_LITERAL_INTEGER_HEXADECIMAL:
+               create_integer_tarval(literal);
+               return;
+       default:
+               break;
+       }
+}
+
 /**
- * Creates a SymConst node representing a string literal.
- *
- * @param literal   the string literal
+ * Creates a Const node representing a constant.
  */
-static ir_node *string_literal_to_firm(
-               const string_literal_expression_t* literal)
+static ir_node *literal_to_firm(const literal_expression_t *literal)
 {
-       return string_to_firm(&literal->base.source_position, "Lstr.%u",
-                             &literal->value);
+       type_t     *type   = skip_typeref(literal->base.type);
+       ir_mode    *mode   = get_ir_mode_storage(type);
+       const char *string = literal->value.begin;
+       size_t      size   = literal->value.size;
+       ir_tarval  *tv;
+
+       switch (literal->base.kind) {
+       case EXPR_LITERAL_WIDE_CHARACTER: {
+               utf32  v = read_utf8_char(&string);
+               char   buf[128];
+               size_t len = snprintf(buf, sizeof(buf), UTF32_PRINTF_FORMAT, v);
+
+               tv = new_tarval_from_str(buf, len, mode);
+               goto make_const;
+       }
+       case EXPR_LITERAL_CHARACTER: {
+               long long int v;
+               if (size == 1 && char_is_signed) {
+                       v = (signed char)string[0];
+               } else {
+                       v = 0;
+                       for (size_t i = 0; i < size; ++i) {
+                               v = (v << 8) | ((unsigned char)string[i]);
+                       }
+               }
+               char   buf[128];
+               size_t len = snprintf(buf, sizeof(buf), "%lld", v);
+
+               tv = new_tarval_from_str(buf, len, mode);
+               goto make_const;
+       }
+       case EXPR_LITERAL_INTEGER:
+       case EXPR_LITERAL_INTEGER_OCTAL:
+       case EXPR_LITERAL_INTEGER_HEXADECIMAL:
+               assert(literal->target_value != NULL);
+               tv = literal->target_value;
+               goto make_const;
+       case EXPR_LITERAL_FLOATINGPOINT:
+               tv = new_tarval_from_str(string, size, mode);
+               goto make_const;
+       case EXPR_LITERAL_FLOATINGPOINT_HEXADECIMAL: {
+               char buffer[size + 2];
+               memcpy(buffer, "0x", 2);
+               memcpy(buffer+2, string, size);
+               tv = new_tarval_from_str(buffer, size+2, mode);
+               goto make_const;
+       }
+       case EXPR_LITERAL_BOOLEAN:
+               if (string[0] == 't') {
+                       tv = get_mode_one(mode);
+               } else {
+                       assert(string[0] == 'f');
+                       tv = get_mode_null(mode);
+               }
+               goto make_const;
+       case EXPR_LITERAL_MS_NOOP:
+               tv = get_mode_null(mode);
+               goto make_const;
+       default:
+               break;
+       }
+       panic("Invalid literal kind found");
+
+make_const: ;
+       dbg_info *dbgi       = get_dbg_info(&literal->base.source_position);
+       ir_node  *res        = new_d_Const(dbgi, tv);
+       ir_mode  *mode_arith = get_ir_mode_arithmetic(type);
+       return create_conv(dbgi, res, mode_arith);
 }
 
-/**
- * Creates a SymConst node representing a wide string literal.
- *
- * @param literal   the wide string literal
+/*
+ * Allocate an area of size bytes aligned at alignment
+ * at a frame type.
  */
-static ir_node *wide_string_literal_to_firm(
-       const wide_string_literal_expression_t* const literal)
+static ir_entity *alloc_trampoline(ir_type *frame_type, int size, unsigned alignment)
 {
-       ir_type *const global_type = get_glob_type();
-       ir_type *const elem_type   = ir_type_wchar_t;
-       dbg_info *const dbgi       = get_dbg_info(&literal->base.source_position);
-       ir_type *const type        = new_d_type_array(id_unique("strtype.%u"), 1,
-                                                   elem_type, dbgi);
+       static unsigned area_cnt = 0;
+       char buf[32];
 
-       ident     *const id     = id_unique("Lstr.%u");
-       ir_entity *const entity = new_d_entity(global_type, id, type, dbgi);
-       set_entity_ld_ident(entity, id);
-       set_entity_variability(entity, variability_constant);
-       set_entity_allocation(entity, allocation_static);
+       ir_type *tp = new_type_array(1, ir_type_char);
+       set_array_bounds_int(tp, 0, 0, size);
+       set_type_alignment_bytes(tp, alignment);
 
-       ir_mode *const mode      = get_type_mode(elem_type);
+       snprintf(buf, sizeof(buf), "trampolin%u", area_cnt++);
+       ident *name = new_id_from_str(buf);
+       ir_entity *area = new_entity(frame_type, name, tp);
 
-       const wchar_rep_t *const string = literal->value.begin;
-       const size_t             slen   = literal->value.size;
+       /* mark this entity as compiler generated */
+       set_entity_compiler_generated(area, 1);
+       return area;
+}
 
-       set_array_lower_bound_int(type, 0, 0);
-       set_array_upper_bound_int(type, 0, slen);
-       set_type_size_bytes(type, slen);
-       set_type_state(type, layout_fixed);
+/**
+ * Return a node representing a trampoline region
+ * for a given function entity.
+ *
+ * @param dbgi    debug info
+ * @param entity  the function entity
+ */
+static ir_node *get_trampoline_region(dbg_info *dbgi, ir_entity *entity)
+{
+       ir_entity *region = NULL;
+       int        i;
 
-       tarval **const tvs = xmalloc(slen * sizeof(tvs[0]));
-       for (size_t i = 0; i < slen; ++i) {
-               tvs[i] = new_tarval_from_long(string[i], mode);
+       if (current_trampolines != NULL) {
+               for (i = ARR_LEN(current_trampolines) - 1; i >= 0; --i) {
+                       if (current_trampolines[i].function == entity) {
+                               region = current_trampolines[i].region;
+                               break;
+                       }
+               }
+       } else {
+               current_trampolines = NEW_ARR_F(trampoline_region, 0);
        }
+       ir_graph *irg = current_ir_graph;
+       if (region == NULL) {
+               /* create a new region */
+               ir_type           *frame_tp = get_irg_frame_type(irg);
+               trampoline_region  reg;
+               reg.function = entity;
 
-       set_array_entity_values(entity, tvs, slen);
-       free(tvs);
+               reg.region   = alloc_trampoline(frame_tp,
+                                               be_params->trampoline_size,
+                                               be_params->trampoline_align);
+               ARR_APP1(trampoline_region, current_trampolines, reg);
+               region = reg.region;
+       }
+       return new_d_simpleSel(dbgi, get_irg_no_mem(irg), get_irg_frame(irg),
+                              region);
+}
 
-       return create_symconst(dbgi, mode_P_data, entity);
+/**
+ * Creates a trampoline for a function represented by an entity.
+ *
+ * @param dbgi    debug info
+ * @param mode    the (reference) mode for the function address
+ * @param entity  the function entity
+ */
+static ir_node *create_trampoline(dbg_info *dbgi, ir_mode *mode,
+                                  ir_entity *entity)
+{
+       assert(entity != NULL);
+       ir_node *in[3];
+       in[0] = get_trampoline_region(dbgi, entity);
+       in[1] = create_symconst(dbgi, mode, entity);
+       in[2] = get_irg_frame(current_ir_graph);
+
+       ir_node *irn = new_d_Builtin(dbgi, get_store(), 3, in, ir_bk_inner_trampoline, get_unknown_type());
+       set_store(new_Proj(irn, mode_M, pn_Builtin_M));
+       return new_Proj(irn, mode, pn_Builtin_1_result);
 }
 
+/**
+ * Dereference an address.
+ *
+ * @param dbgi  debug info
+ * @param type  the type of the dereferenced result (the points_to type)
+ * @param addr  the address to dereference
+ */
 static ir_node *deref_address(dbg_info *const dbgi, type_t *const type,
                                      ir_node *const addr)
 {
@@ -1375,7 +1448,7 @@ static ir_node *deref_address(dbg_info *const dbgi, type_t *const type,
        }
 
        ir_cons_flags  flags    = type->base.qualifiers & TYPE_QUALIFIER_VOLATILE
-                                 ? cons_volatile : 0;
+                                 ? cons_volatile : cons_none;
        ir_mode *const mode     = get_type_mode(irtype);
        ir_node *const memory   = get_store();
        ir_node *const load     = new_d_Load(dbgi, memory, addr, mode, flags);
@@ -1389,7 +1462,10 @@ static ir_node *deref_address(dbg_info *const dbgi, type_t *const type,
 }
 
 /**
- * Creates a strict Conv if neccessary.
+ * Creates a strict Conv (to the node's mode) if necessary.
+ *
+ * @param dbgi  debug info
+ * @param node  the node to strict conv
  */
 static ir_node *do_strict_conv(dbg_info *dbgi, ir_node *node)
 {
@@ -1411,14 +1487,17 @@ static ir_node *do_strict_conv(dbg_info *dbgi, ir_node *node)
        return new_d_strictConv(dbgi, node, mode);
 }
 
+/**
+ * Returns the address of a global variable.
+ *
+ * @param dbgi      debug info
+ * @param variable  the variable
+ */
 static ir_node *get_global_var_address(dbg_info *const dbgi,
-                                       const entity_t *const entity)
+                                       const variable_t *const variable)
 {
-       assert(entity->kind == ENTITY_VARIABLE);
-       assert(entity->declaration.kind == DECLARATION_KIND_GLOBAL_VARIABLE);
-
-       ir_entity *const irentity = entity->variable.v.entity;
-       if (entity->variable.thread_local) {
+       ir_entity *const irentity = variable->v.entity;
+       if (variable->thread_local) {
                ir_node *const no_mem = new_NoMem();
                ir_node *const tls    = get_irg_tls(current_ir_graph);
                return new_d_simpleSel(dbgi, no_mem, tls, irentity);
@@ -1435,11 +1514,11 @@ static ir_node *get_local_frame(ir_entity *const ent)
 {
        ir_graph      *const irg   = current_ir_graph;
        const ir_type *const owner = get_entity_owner(ent);
-       if (owner == get_irg_frame_type(irg)) {
-               return get_irg_frame(irg);
+       if (owner == current_outer_frame || owner == current_outer_value_type) {
+               assert(current_static_link != NULL);
+               return current_static_link;
        } else {
-               assert(owner == get_method_value_param_type(get_entity_type(get_irg_entity(irg))));
-               return get_irg_value_param_base(irg);
+               return get_irg_frame(irg);
        }
 }
 
@@ -1477,6 +1556,25 @@ static ir_node *reference_expression_to_firm(const reference_expression_t *ref)
        /* make sure the type is constructed */
        (void) get_ir_type(type);
 
+       if (entity->kind == ENTITY_FUNCTION && entity->function.btk != bk_none) {
+               ir_entity *irentity = get_function_entity(entity, NULL);
+               /* for gcc compatibility we have to produce (dummy) addresses for some
+                * builtins which don't have entities */
+               if (irentity == NULL) {
+                       if (warning.other) {
+                               warningf(&ref->base.source_position,
+                                               "taking address of builtin '%Y'",
+                                               ref->entity->base.symbol);
+                       }
+
+                       /* simply create a NULL pointer */
+                       ir_mode  *mode = get_ir_mode_arithmetic(type_void_ptr);
+                       ir_node  *res  = new_Const(get_mode_null(mode));
+
+                       return res;
+               }
+       }
+
        switch ((declaration_kind_t) entity->declaration.kind) {
        case DECLARATION_KIND_UNKNOWN:
                break;
@@ -1493,22 +1591,22 @@ static ir_node *reference_expression_to_firm(const reference_expression_t *ref)
        }
        case DECLARATION_KIND_FUNCTION: {
                ir_mode *const mode = get_ir_mode_storage(type);
-               return create_symconst(dbgi, mode, entity->function.entity);
+               return create_symconst(dbgi, mode, entity->function.irentity);
        }
        case DECLARATION_KIND_INNER_FUNCTION: {
                ir_mode *const mode = get_ir_mode_storage(type);
                if (!entity->function.goto_to_outer && !entity->function.need_closure) {
                        /* inner function not using the closure */
-                       return create_symconst(dbgi, mode, entity->function.entity);
+                       return create_symconst(dbgi, mode, entity->function.irentity);
                } else {
-                       /* TODO: need trampoline here */
-                       panic("Trampoline code not implemented");
-                       return create_symconst(dbgi, mode, entity->function.entity);
+                       /* need trampoline here */
+                       return create_trampoline(dbgi, mode, entity->function.irentity);
                }
        }
        case DECLARATION_KIND_GLOBAL_VARIABLE: {
-               ir_node *const addr = get_global_var_address(dbgi, entity);
-               return deref_address(dbgi, entity->declaration.type, addr);
+               const variable_t *variable = &entity->variable;
+               ir_node *const addr = get_global_var_address(dbgi, variable);
+               return deref_address(dbgi, variable->base.type, addr);
        }
 
        case DECLARATION_KIND_LOCAL_VARIABLE_ENTITY: {
@@ -1549,7 +1647,7 @@ static ir_node *reference_addr(const reference_expression_t *ref)
                 * as an indicator for no real address) */
                return NULL;
        case DECLARATION_KIND_GLOBAL_VARIABLE: {
-               ir_node *const addr = get_global_var_address(dbgi, entity);
+               ir_node *const addr = get_global_var_address(dbgi, &entity->variable);
                return addr;
        }
        case DECLARATION_KIND_LOCAL_VARIABLE_ENTITY: {
@@ -1573,10 +1671,21 @@ static ir_node *reference_addr(const reference_expression_t *ref)
        case DECLARATION_KIND_FUNCTION: {
                type_t  *const type = skip_typeref(entity->declaration.type);
                ir_mode *const mode = get_ir_mode_storage(type);
-               return create_symconst(dbgi, mode, entity->function.entity);
+               return create_symconst(dbgi, mode, entity->function.irentity);
+       }
+
+       case DECLARATION_KIND_INNER_FUNCTION: {
+               type_t  *const type = skip_typeref(entity->declaration.type);
+               ir_mode *const mode = get_ir_mode_storage(type);
+               if (!entity->function.goto_to_outer && !entity->function.need_closure) {
+                       /* inner function not using the closure */
+                       return create_symconst(dbgi, mode, entity->function.irentity);
+               } else {
+                       /* need trampoline here */
+                       return create_trampoline(dbgi, mode, entity->function.irentity);
+               }
        }
 
-       case DECLARATION_KIND_INNER_FUNCTION:
        case DECLARATION_KIND_COMPOUND_MEMBER:
                panic("not implemented reference type");
        }
@@ -1584,6 +1693,72 @@ static ir_node *reference_addr(const reference_expression_t *ref)
        panic("reference to declaration with unknown type found");
 }
 
+/**
+ * Generate an unary builtin.
+ *
+ * @param kind           the builtin kind to generate
+ * @param op             the operand
+ * @param function_type  the function type for the GNU builtin routine
+ * @param db             debug info
+ */
+static ir_node *gen_unary_builtin(ir_builtin_kind kind, expression_t *op, type_t *function_type, dbg_info *db)
+{
+       ir_node *in[1];
+       in[0] = expression_to_firm(op);
+
+       ir_type *tp  = get_ir_type(function_type);
+       ir_type *res = get_method_res_type(tp, 0);
+       ir_node *irn = new_d_Builtin(db, get_irg_no_mem(current_ir_graph), 1, in, kind, tp);
+       set_irn_pinned(irn, op_pin_state_floats);
+       return new_Proj(irn, get_type_mode(res), pn_Builtin_1_result);
+}
+
+/**
+ * Generate a pinned unary builtin.
+ *
+ * @param kind           the builtin kind to generate
+ * @param op             the operand
+ * @param function_type  the function type for the GNU builtin routine
+ * @param db             debug info
+ */
+static ir_node *gen_unary_builtin_pinned(ir_builtin_kind kind, expression_t *op,
+                                         type_t *function_type, dbg_info *db)
+{
+       ir_node *in[1];
+       in[0] = expression_to_firm(op);
+
+       ir_type *tp  = get_ir_type(function_type);
+       ir_type *res = get_method_res_type(tp, 0);
+       ir_node *mem = get_store();
+       ir_node *irn = new_d_Builtin(db, mem, 1, in, kind, tp);
+       set_store(new_Proj(irn, mode_M, pn_Builtin_M));
+       return new_Proj(irn, get_type_mode(res), pn_Builtin_1_result);
+}
+
+/**
+ * Generate an binary-void-return builtin.
+ *
+ * @param kind           the builtin kind to generate
+ * @param op1            the first operand
+ * @param op2            the second operand
+ * @param function_type  the function type for the GNU builtin routine
+ * @param db             debug info
+ */
+static ir_node *gen_binary_builtin_mem(ir_builtin_kind kind, expression_t *op1,
+                                       expression_t *op2, type_t *function_type,
+                                                                          dbg_info *db)
+{
+       ir_node *in[2];
+       in[0] = expression_to_firm(op1);
+       in[1] = expression_to_firm(op2);
+
+       ir_type *tp  = get_ir_type(function_type);
+       ir_node *mem = get_store();
+       ir_node *irn = new_d_Builtin(db, mem, 2, in, kind, tp);
+       set_store(new_Proj(irn, mode_M, pn_Builtin_M));
+       return NULL;
+}
+
 /**
  * Transform calls to builtin functions.
  */
@@ -1591,17 +1766,16 @@ static ir_node *process_builtin_call(const call_expression_t *call)
 {
        dbg_info *dbgi = get_dbg_info(&call->base.source_position);
 
-       assert(call->function->kind == EXPR_BUILTIN_SYMBOL);
-       builtin_symbol_expression_t *builtin = &call->function->builtin_symbol;
+       assert(call->function->kind == EXPR_REFERENCE);
+       reference_expression_t *builtin = &call->function->reference;
 
        type_t *type = skip_typeref(builtin->base.type);
        assert(is_type_pointer(type));
 
-       type_t   *function_type = skip_typeref(type->pointer.points_to);
-       symbol_t *symbol        = builtin->symbol;
+       type_t *function_type = skip_typeref(type->pointer.points_to);
 
-       switch(symbol->ID) {
-       case T___builtin_alloca: {
+       switch (builtin->entity->function.btk) {
+       case bk_gnu_builtin_alloca: {
                if (call->arguments == NULL || call->arguments->next != NULL) {
                        panic("invalid number of parameters on __builtin_alloca");
                }
@@ -1618,35 +1792,166 @@ static ir_node *process_builtin_call(const call_expression_t *call)
                return res;
        }
 
-       case T___builtin_huge_val:
-       case T___builtin_inf:
-       case T___builtin_inff:
-       case T___builtin_infl: {
-               type_t  *type = function_type->function.return_type;
-               ir_mode *mode = get_ir_mode_arithmetic(type);
-               tarval  *tv   = get_mode_infinite(mode);
-               ir_node *res  = new_d_Const(dbgi, tv);
-               return   res;
+       case bk_gnu_builtin_huge_val:
+       case bk_gnu_builtin_huge_valf:
+       case bk_gnu_builtin_huge_vall:
+       case bk_gnu_builtin_inf:
+       case bk_gnu_builtin_inff:
+       case bk_gnu_builtin_infl: {
+               type_t    *type = function_type->function.return_type;
+               ir_mode   *mode = get_ir_mode_arithmetic(type);
+               ir_tarval *tv   = get_mode_infinite(mode);
+               ir_node   *res  = new_d_Const(dbgi, tv);
+               return res;
        }
-       case T___builtin_nan:
-       case T___builtin_nanf:
-       case T___builtin_nanl: {
+       case bk_gnu_builtin_nan:
+       case bk_gnu_builtin_nanf:
+       case bk_gnu_builtin_nanl: {
                /* Ignore string for now... */
                assert(is_type_function(function_type));
-               type_t  *type = function_type->function.return_type;
-               ir_mode *mode = get_ir_mode_arithmetic(type);
-               tarval  *tv   = get_mode_NAN(mode);
-               ir_node *res  = new_d_Const(dbgi, tv);
+               type_t    *type = function_type->function.return_type;
+               ir_mode   *mode = get_ir_mode_arithmetic(type);
+               ir_tarval *tv   = get_mode_NAN(mode);
+               ir_node   *res  = new_d_Const(dbgi, tv);
                return res;
        }
-       case T___builtin_expect: {
+       case bk_gnu_builtin_expect: {
                expression_t *argument = call->arguments->expression;
                return _expression_to_firm(argument);
        }
-       case T___builtin_va_end:
+       case bk_gnu_builtin_va_end:
                /* evaluate the argument of va_end for its side effects */
                _expression_to_firm(call->arguments->expression);
                return NULL;
+       case bk_gnu_builtin_frame_address: {
+               expression_t *const expression = call->arguments->expression;
+               bool val = fold_constant_to_bool(expression);
+               if (!val) {
+                       /* the nice case */
+                       return get_irg_frame(current_ir_graph);
+               } else {
+                       /* get the argument */
+                       ir_node *in[2];
+
+                       in[0] = expression_to_firm(expression);
+                       in[1] = get_irg_frame(current_ir_graph);
+                       ir_type *tp  = get_ir_type(function_type);
+                       ir_node *irn = new_d_Builtin(dbgi, get_irg_no_mem(current_ir_graph), 2, in, ir_bk_frame_address, tp);
+                       return new_Proj(irn, mode_P_data, pn_Builtin_1_result);
+               }
+       }
+       case bk_gnu_builtin_return_address: {
+               expression_t *const expression = call->arguments->expression;
+               ir_node *in[2];
+
+               in[0] = expression_to_firm(expression);
+               in[1] = get_irg_frame(current_ir_graph);
+               ir_type *tp  = get_ir_type(function_type);
+               ir_node *irn = new_d_Builtin(dbgi, get_irg_no_mem(current_ir_graph), 2, in, ir_bk_return_address, tp);
+               return new_Proj(irn, mode_P_data, pn_Builtin_1_result);
+       }
+       case bk_gnu_builtin_ffs:
+                return gen_unary_builtin(ir_bk_ffs,      call->arguments->expression, function_type, dbgi);
+       case bk_gnu_builtin_clz:
+                return gen_unary_builtin(ir_bk_clz,      call->arguments->expression, function_type, dbgi);
+       case bk_gnu_builtin_ctz:
+                return gen_unary_builtin(ir_bk_ctz,      call->arguments->expression, function_type, dbgi);
+       case bk_gnu_builtin_popcount:
+       case bk_ms__popcount:
+                return gen_unary_builtin(ir_bk_popcount, call->arguments->expression, function_type, dbgi);
+       case bk_gnu_builtin_parity:
+                return gen_unary_builtin(ir_bk_parity,   call->arguments->expression, function_type, dbgi);
+       case bk_gnu_builtin_prefetch: {
+               call_argument_t *const args = call->arguments;
+               expression_t *const addr    = args->expression;
+               ir_node *in[3];
+
+               in[0] = _expression_to_firm(addr);
+               if (args->next != NULL) {
+                       expression_t *const rw = args->next->expression;
+
+                       in[1] = _expression_to_firm(rw);
+
+                       if (args->next->next != NULL) {
+                               expression_t *const locality = args->next->next->expression;
+
+                               in[2] = expression_to_firm(locality);
+                       } else {
+                               in[2] = new_Const_long(mode_int, 3);
+                       }
+               } else {
+                       in[1] = new_Const_long(mode_int, 0);
+                       in[2] = new_Const_long(mode_int, 3);
+               }
+               ir_type *tp  = get_ir_type(function_type);
+               ir_node *irn = new_d_Builtin(dbgi, get_store(), 3, in, ir_bk_prefetch, tp);
+               set_store(new_Proj(irn, mode_M, pn_Builtin_M));
+               return NULL;
+       }
+       case bk_gnu_builtin_object_size: {
+               /* determine value of "type" */
+               expression_t *type_expression = call->arguments->next->expression;
+               long          type_val        = fold_constant_to_int(type_expression);
+               type_t       *type            = function_type->function.return_type;
+               ir_mode      *mode            = get_ir_mode_arithmetic(type);
+               /* just produce a "I don't know" result */
+               ir_tarval    *result          = type_val & 2 ? get_mode_null(mode) :
+                                               get_mode_minus_one(mode);
+
+               return new_d_Const(dbgi, result);
+       }
+       case bk_gnu_builtin_trap:
+       case bk_ms__ud2:
+       {
+               ir_type *tp  = get_ir_type(function_type);
+               ir_node *irn = new_d_Builtin(dbgi, get_store(), 0, NULL, ir_bk_trap, tp);
+               set_store(new_Proj(irn, mode_M, pn_Builtin_M));
+               return NULL;
+       }
+       case bk_ms__debugbreak: {
+               ir_type *tp  = get_ir_type(function_type);
+               ir_node *irn = new_d_Builtin(dbgi, get_store(), 0, NULL, ir_bk_debugbreak, tp);
+               set_store(new_Proj(irn, mode_M, pn_Builtin_M));
+               return NULL;
+       }
+       case bk_ms_ReturnAddress: {
+               ir_node *in[2];
+
+               in[0] = new_Const(get_mode_null(mode_int));
+               in[1] = get_irg_frame(current_ir_graph);
+               ir_type *tp  = get_ir_type(function_type);
+               ir_node *irn = new_d_Builtin(dbgi, get_irg_no_mem(current_ir_graph), 2, in, ir_bk_return_address, tp);
+               return new_Proj(irn, mode_P_data, pn_Builtin_1_result);
+       }
+       case bk_ms_rotl:
+       case bk_ms_rotl64: {
+               ir_node *val  = expression_to_firm(call->arguments->expression);
+               ir_node *shf  = expression_to_firm(call->arguments->next->expression);
+               ir_mode *mode = get_irn_mode(val);
+               return new_d_Rotl(dbgi, val, create_conv(dbgi, shf, mode_uint), mode);
+       }
+       case bk_ms_rotr:
+       case bk_ms_rotr64: {
+               ir_node *val  = expression_to_firm(call->arguments->expression);
+               ir_node *shf  = expression_to_firm(call->arguments->next->expression);
+               ir_mode *mode = get_irn_mode(val);
+               ir_node *c    = new_Const_long(mode_uint, get_mode_size_bits(mode));
+               ir_node *sub  = new_d_Sub(dbgi, c, create_conv(dbgi, shf, mode_uint), mode_uint);
+               return new_d_Rotl(dbgi, val, sub, mode);
+       }
+       case bk_ms_byteswap_ushort:
+       case bk_ms_byteswap_ulong:
+       case bk_ms_byteswap_uint64:
+               return gen_unary_builtin(ir_bk_bswap, call->arguments->expression, function_type, dbgi);
+       case bk_ms__inbyte:
+       case bk_ms__inword:
+       case bk_ms__indword:
+               return gen_unary_builtin_pinned(ir_bk_inport, call->arguments->expression, function_type, dbgi);
+       case bk_ms__outbyte:
+       case bk_ms__outword:
+       case bk_ms__outdword:
+               return gen_binary_builtin_mem(ir_bk_outport, call->arguments->expression,
+                       call->arguments->next->expression, function_type, dbgi);
        default:
                panic("unsupported builtin found");
        }
@@ -1659,37 +1964,44 @@ static ir_node *process_builtin_call(const call_expression_t *call)
  * 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)
+static ir_node *call_expression_to_firm(const call_expression_t *const call)
 {
-       dbg_info *dbgi  = get_dbg_info(&call->base.source_position);
+       dbg_info *const dbgi = get_dbg_info(&call->base.source_position);
        assert(get_cur_block() != NULL);
 
        expression_t *function = call->function;
-       if (function->kind == EXPR_BUILTIN_SYMBOL) {
-               return process_builtin_call(call);
-       }
        if (function->kind == EXPR_REFERENCE) {
                const reference_expression_t *ref    = &function->reference;
                entity_t                     *entity = ref->entity;
 
-               if (entity->kind == ENTITY_FUNCTION
-                               && entity->function.entity == rts_entities[rts_alloca]) {
-                       /* handle alloca() call */
-                       expression_t *argument = call->arguments->expression;
-                       ir_node      *size     = expression_to_firm(argument);
-                       ir_mode      *mode     = get_ir_mode_arithmetic(type_size_t);
+               if (entity->kind == ENTITY_FUNCTION) {
+                       ir_entity *irentity = entity->function.irentity;
+                       if (irentity == NULL)
+                               irentity = get_function_entity(entity, NULL);
 
-                       size = create_conv(dbgi, size, mode);
+                       if (irentity == NULL && entity->function.btk != bk_none) {
+                               return process_builtin_call(call);
+                       }
 
-                       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);
+#if 0
+                       if (irentity == rts_entities[rts_alloca]) {
+                               /* handle alloca() call */
+                               expression_t *argument = call->arguments->expression;
+                               ir_node      *size     = expression_to_firm(argument);
+                               ir_mode      *mode     = get_ir_mode_arithmetic(type_size_t);
 
-                       return res;
+                               size = create_conv(dbgi, size, mode);
+
+                               ir_node  *store  = get_store();
+                               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;
+                       }
+#endif
                }
        }
        ir_node *callee = expression_to_firm(function);
@@ -1712,10 +2024,9 @@ static ir_node *call_expression_to_firm(const call_expression_t *call)
 
                /* we need to construct a new method type matching the call
                 * arguments... */
+               type_dbg_info *tdbgi = get_type_dbg_info_((const type_t*) function_type);
                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);
+               new_method_type = new_d_type_method(n_parameters, n_res, tdbgi);
                set_method_calling_convention(new_method_type,
                               get_method_calling_convention(ir_method_type));
                set_method_additional_properties(new_method_type,
@@ -1760,7 +2071,7 @@ static ir_node *call_expression_to_firm(const call_expression_t *call)
        ir_node  *store = get_store();
        ir_node  *node  = new_d_Call(dbgi, store, callee, n_parameters, in,
                                     ir_method_type);
-       ir_node  *mem   = new_d_Proj(dbgi, node, mode_M, pn_Call_M_regular);
+       ir_node  *mem   = new_d_Proj(dbgi, node, mode_M, pn_Call_M);
        set_store(mem);
 
        type_t  *return_type = skip_typeref(function_type->return_type);
@@ -1786,7 +2097,8 @@ static ir_node *call_expression_to_firm(const call_expression_t *call)
                 * nodes into a new and unreachable block. */
                keep_alive(node);
                keep_alive(get_cur_block());
-               new_Block(0, NULL);
+               ir_node *block = new_Block(0, NULL);
+               set_cur_block(block);
        }
 
        return result;
@@ -1813,22 +2125,22 @@ static void assign_value(dbg_info *dbgi, ir_node *addr, type_t *type,
 
        if (is_type_scalar(type)) {
                ir_cons_flags flags = type->base.qualifiers & TYPE_QUALIFIER_VOLATILE
-                                     ? cons_volatile : 0;
+                                     ? cons_volatile : cons_none;
                ir_node  *store     = new_d_Store(dbgi, memory, addr, value, flags);
                ir_node  *store_mem = new_d_Proj(dbgi, store, mode_M, pn_Store_M);
                set_store(store_mem);
        } else {
                ir_type *irtype    = get_ir_type(type);
                ir_node *copyb     = new_d_CopyB(dbgi, memory, addr, value, irtype);
-               ir_node *copyb_mem = new_Proj(copyb, mode_M, pn_CopyB_M_regular);
+               ir_node *copyb_mem = new_Proj(copyb, mode_M, pn_CopyB_M);
                set_store(copyb_mem);
        }
 }
 
-static tarval *create_bitfield_mask(ir_mode *mode, int offset, int size)
+static ir_tarval *create_bitfield_mask(ir_mode *mode, int offset, int size)
 {
-       tarval *all_one   = get_mode_all_one(mode);
-       int     mode_size = get_mode_size_bits(mode);
+       ir_tarval *all_one   = get_mode_all_one(mode);
+       int        mode_size = get_mode_size_bits(mode);
 
        assert(offset >= 0);
        assert(size   >= 0);
@@ -1837,12 +2149,12 @@ static tarval *create_bitfield_mask(ir_mode *mode, int offset, int size)
                return all_one;
        }
 
-       long    shiftr    = get_mode_size_bits(mode) - size;
-       long    shiftl    = offset;
-       tarval *tv_shiftr = new_tarval_from_long(shiftr, mode_uint);
-       tarval *tv_shiftl = new_tarval_from_long(shiftl, mode_uint);
-       tarval *mask0     = tarval_shr(all_one, tv_shiftr);
-       tarval *mask1     = tarval_shl(mask0, tv_shiftl);
+       long       shiftr    = get_mode_size_bits(mode) - size;
+       long       shiftl    = offset;
+       ir_tarval *tv_shiftr = new_tarval_from_long(shiftr, mode_uint);
+       ir_tarval *tv_shiftl = new_tarval_from_long(shiftl, mode_uint);
+       ir_tarval *mask0     = tarval_shr(all_one, tv_shiftr);
+       ir_tarval *mask1     = tarval_shl(mask0, tv_shiftl);
 
        return mask1;
 }
@@ -1861,28 +2173,28 @@ static ir_node *bitfield_store_to_firm(dbg_info *dbgi,
        int      bitoffset    = get_entity_offset_bits_remainder(entity);
        int      bitsize      = get_mode_size_bits(get_type_mode(entity_type));
 
-       tarval  *mask            = create_bitfield_mask(mode, 0, bitsize);
-       ir_node *mask_node       = new_d_Const(dbgi, mask);
-       ir_node *value_masked    = new_d_And(dbgi, value, mask_node, mode);
-       tarval  *shiftl          = new_tarval_from_long(bitoffset, mode_uint);
-       ir_node *shiftcount      = new_d_Const(dbgi, shiftl);
-       ir_node *value_maskshift = new_d_Shl(dbgi, value_masked, shiftcount, mode);
+       ir_tarval *mask            = create_bitfield_mask(mode, 0, bitsize);
+       ir_node   *mask_node       = new_d_Const(dbgi, mask);
+       ir_node   *value_masked    = new_d_And(dbgi, value, mask_node, mode);
+       ir_tarval *shiftl          = new_tarval_from_long(bitoffset, mode_uint);
+       ir_node   *shiftcount      = new_d_Const(dbgi, shiftl);
+       ir_node   *value_maskshift = new_d_Shl(dbgi, value_masked, shiftcount, mode);
 
        /* load current value */
-       ir_node  *mem             = get_store();
-       ir_node  *load            = new_d_Load(dbgi, mem, addr, mode,
-                                       set_volatile ? cons_volatile : 0);
-       ir_node  *load_mem        = new_d_Proj(dbgi, load, mode_M, pn_Load_M);
-       ir_node  *load_res        = new_d_Proj(dbgi, load, mode, pn_Load_res);
-       tarval   *shift_mask      = create_bitfield_mask(mode, bitoffset, bitsize);
-       tarval   *inv_mask        = tarval_not(shift_mask);
-       ir_node  *inv_mask_node   = new_d_Const(dbgi, inv_mask);
-       ir_node  *load_res_masked = new_d_And(dbgi, load_res, inv_mask_node, mode);
+       ir_node   *mem             = get_store();
+       ir_node   *load            = new_d_Load(dbgi, mem, addr, mode,
+                                         set_volatile ? cons_volatile : cons_none);
+       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);
+       ir_tarval *shift_mask      = create_bitfield_mask(mode, bitoffset, bitsize);
+       ir_tarval *inv_mask        = tarval_not(shift_mask);
+       ir_node   *inv_mask_node   = new_d_Const(dbgi, inv_mask);
+       ir_node   *load_res_masked = new_d_And(dbgi, load_res, inv_mask_node, mode);
 
        /* construct new value and store */
        ir_node *new_val   = new_d_Or(dbgi, load_res_masked, value_maskshift, mode);
        ir_node *store     = new_d_Store(dbgi, load_mem, addr, new_val,
-                                        set_volatile ? cons_volatile : 0);
+                                        set_volatile ? cons_volatile : cons_none);
        ir_node *store_mem = new_d_Proj(dbgi, store, mode_M, pn_Store_M);
        set_store(store_mem);
 
@@ -1896,7 +2208,7 @@ static ir_node *bitfield_extract_to_firm(const select_expression_t *expression,
        type_t   *type     = expression->base.type;
        ir_mode  *mode     = get_ir_mode_storage(type);
        ir_node  *mem      = get_store();
-       ir_node  *load     = new_d_Load(dbgi, mem, addr, mode, 0);
+       ir_node  *load     = new_d_Load(dbgi, mem, addr, mode, cons_none);
        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);
 
@@ -1912,13 +2224,13 @@ static ir_node *bitfield_extract_to_firm(const select_expression_t *expression,
        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_tarval *tvl          = new_tarval_from_long(shift_bitsl, mode_uint);
        ir_node   *countl       = new_d_Const(dbgi, 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_tarval *tvr          = new_tarval_from_long(shift_bitsr, mode_uint);
        ir_node   *countr       = new_d_Const(dbgi, tvr);
        ir_node   *shiftr;
        if (mode_is_signed(mode)) {
@@ -2055,7 +2367,7 @@ static ir_node *create_incdec(const unary_expression_t *expression)
        ir_node *offset;
        if (is_type_pointer(type)) {
                pointer_type_t *pointer_type = &type->pointer;
-               offset                       = get_type_size(pointer_type->points_to);
+               offset = get_type_size_node(pointer_type->points_to);
        } else {
                assert(is_type_arithmetic(type));
                offset = new_Const(get_mode_one(mode));
@@ -2101,22 +2413,21 @@ static bool is_local_variable(expression_t *expression)
        return entity->declaration.kind == DECLARATION_KIND_LOCAL_VARIABLE;
 }
 
-static pn_Cmp get_pnc(const expression_kind_t kind, type_t *const type)
+static ir_relation get_relation(const expression_kind_t kind)
 {
        switch(kind) {
-       case EXPR_BINARY_EQUAL:         return pn_Cmp_Eq;
-       case EXPR_BINARY_ISLESSGREATER: return pn_Cmp_Lg;
-       case EXPR_BINARY_NOTEQUAL:
-               return is_type_float(skip_typeref(type)) ? pn_Cmp_Ne : pn_Cmp_Lg;
+       case EXPR_BINARY_EQUAL:         return ir_relation_equal;
+       case EXPR_BINARY_ISLESSGREATER: return ir_relation_less_greater;
+       case EXPR_BINARY_NOTEQUAL:      return ir_relation_unordered_less_greater;
        case EXPR_BINARY_ISLESS:
-       case EXPR_BINARY_LESS:          return pn_Cmp_Lt;
+       case EXPR_BINARY_LESS:          return ir_relation_less;
        case EXPR_BINARY_ISLESSEQUAL:
-       case EXPR_BINARY_LESSEQUAL:     return pn_Cmp_Le;
+       case EXPR_BINARY_LESSEQUAL:     return ir_relation_less_equal;
        case EXPR_BINARY_ISGREATER:
-       case EXPR_BINARY_GREATER:       return pn_Cmp_Gt;
+       case EXPR_BINARY_GREATER:       return ir_relation_greater;
        case EXPR_BINARY_ISGREATEREQUAL:
-       case EXPR_BINARY_GREATEREQUAL:  return pn_Cmp_Ge;
-       case EXPR_BINARY_ISUNORDERED:   return pn_Cmp_Uo;
+       case EXPR_BINARY_GREATEREQUAL:  return ir_relation_greater_equal;
+       case EXPR_BINARY_ISUNORDERED:   return ir_relation_unordered;
 
        default:
                break;
@@ -2142,13 +2453,11 @@ static ir_node *handle_assume_compare(dbg_info *dbi,
        expression_t *op1 = expression->left;
        expression_t *op2 = expression->right;
        entity_t     *var2, *var = NULL;
-       ir_node      *res = NULL;
-       pn_Cmp        cmp_val;
-
-       cmp_val = get_pnc(expression->base.kind, op1->base.type);
+       ir_node      *res      = NULL;
+       ir_relation   relation = get_relation(expression->base.kind);
 
        if (is_local_variable(op1) && is_local_variable(op2)) {
-       var  = op1->reference.entity;
+               var  = op1->reference.entity;
            var2 = op2->reference.entity;
 
                type_t  *const type = skip_typeref(var->declaration.type);
@@ -2157,21 +2466,21 @@ static ir_node *handle_assume_compare(dbg_info *dbi,
                ir_node *const irn1 = get_value(var->variable.v.value_number, mode);
                ir_node *const irn2 = get_value(var2->variable.v.value_number, mode);
 
-               res = new_d_Confirm(dbi, irn2, irn1, get_inversed_pnc(cmp_val));
+               res = new_d_Confirm(dbi, irn2, irn1, get_inversed_relation(relation));
                set_value(var2->variable.v.value_number, res);
 
-               res = new_d_Confirm(dbi, irn1, irn2, cmp_val);
+               res = new_d_Confirm(dbi, irn1, irn2, relation);
                set_value(var->variable.v.value_number, res);
 
                return res;
        }
 
        expression_t *con;
-       if (is_local_variable(op1) && is_constant_expression(op2)) {
+       if (is_local_variable(op1) && is_constant_expression(op2) == EXPR_CLASS_CONSTANT) {
                var = op1->reference.entity;
                con = op2;
-       } else if (is_constant_expression(op1) && is_local_variable(op2)) {
-               cmp_val = get_inversed_pnc(cmp_val);
+       } else if (is_constant_expression(op1) == EXPR_CLASS_CONSTANT && is_local_variable(op2)) {
+               relation = get_inversed_relation(relation);
                var = op2->reference.entity;
                con = op1;
        }
@@ -2181,7 +2490,7 @@ static ir_node *handle_assume_compare(dbg_info *dbi,
                ir_mode *const mode = get_ir_mode_storage(type);
 
                res = get_value(var->variable.v.value_number, mode);
-               res = new_d_Confirm(dbi, res, expression_to_firm(con), cmp_val);
+               res = new_d_Confirm(dbi, res, expression_to_firm(con), relation);
                set_value(var->variable.v.value_number, res);
        }
        return res;
@@ -2208,6 +2517,55 @@ static ir_node *handle_assume(dbg_info *dbi, const expression_t *expression)
        }
 }
 
+static ir_node *create_cast(dbg_info *dbgi, ir_node *value_node,
+                            type_t *from_type, type_t *type)
+{
+       type = skip_typeref(type);
+       if (type == type_void) {
+               /* make sure firm type is constructed */
+               (void) get_ir_type(type);
+               return NULL;
+       }
+       if (!is_type_scalar(type)) {
+               /* make sure firm type is constructed */
+               (void) get_ir_type(type);
+               return value_node;
+       }
+
+       from_type     = skip_typeref(from_type);
+       ir_mode *mode = get_ir_mode_storage(type);
+       /* check for conversion from / to __based types */
+       if (is_type_pointer(type) && is_type_pointer(from_type)) {
+               const variable_t *from_var = from_type->pointer.base_variable;
+               const variable_t *to_var   = type->pointer.base_variable;
+               if (from_var != to_var) {
+                       if (from_var != NULL) {
+                               ir_node *const addr = get_global_var_address(dbgi, from_var);
+                               ir_node *const base = deref_address(dbgi, from_var->base.type, addr);
+                               value_node = new_d_Add(dbgi, value_node, base, get_ir_mode_storage(from_type));
+                       }
+                       if (to_var != NULL) {
+                               ir_node *const addr = get_global_var_address(dbgi, to_var);
+                               ir_node *const base = deref_address(dbgi, to_var->base.type, addr);
+                               value_node = new_d_Sub(dbgi, value_node, base, mode);
+                       }
+               }
+       }
+
+       if (is_type_atomic(type, ATOMIC_TYPE_BOOL)) {
+               /* bool adjustments (we save a mode_Bu, but have to temporarily
+                * convert to mode_b so we only get a 0/1 value */
+               value_node = create_conv(dbgi, value_node, mode_b);
+       }
+
+       ir_mode *mode_arith = get_ir_mode_arithmetic(type);
+       ir_node *node       = create_conv(dbgi, value_node, mode);
+       node                = do_strict_conv(dbgi, node);
+       node                = create_conv(dbgi, node, mode_arith);
+
+       return node;
+}
+
 static ir_node *unary_expression_to_firm(const unary_expression_t *expression)
 {
        dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
@@ -2241,6 +2599,14 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression)
                ir_node *value_node = expression_to_firm(value);
                type_t  *value_type = skip_typeref(value->base.type);
                assert(is_type_pointer(value_type));
+
+               /* check for __based */
+               const variable_t *const base_var = value_type->pointer.base_variable;
+               if (base_var != NULL) {
+                       ir_node *const addr = get_global_var_address(dbgi, base_var);
+                       ir_node *const base = deref_address(dbgi, base_var->base.type, addr);
+                       value_node = new_d_Add(dbgi, value_node, base, get_ir_mode_storage(value_type));
+               }
                type_t  *points_to  = value_type->pointer.points_to;
                return deref_address(dbgi, points_to, value_node);
        }
@@ -2249,38 +2615,14 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression)
        case EXPR_UNARY_PREFIX_INCREMENT:
        case EXPR_UNARY_PREFIX_DECREMENT:
                return create_incdec(expression);
+       case EXPR_UNARY_CAST_IMPLICIT:
        case EXPR_UNARY_CAST: {
                ir_node *value_node = expression_to_firm(value);
-               if (is_type_scalar(type)) {
-                       ir_mode *mode       = get_ir_mode_storage(type);
-                       ir_node *node       = create_conv(dbgi, value_node, mode);
-                       node                = do_strict_conv(dbgi, node);
-                       ir_mode *mode_arith = get_ir_mode_arithmetic(type);
-                       node                = create_conv(dbgi, node, mode_arith);
-                       return node;
-               } else {
-                       /* make sure firm type is constructed */
-                       (void) get_ir_type(type);
-                       return value_node;
-               }
-       }
-       case EXPR_UNARY_CAST_IMPLICIT: {
-               ir_node *value_node = expression_to_firm(value);
-               if (is_type_scalar(type)) {
-                       ir_mode *mode       = get_ir_mode_storage(type);
-                       ir_node *res        = create_conv(dbgi, value_node, mode);
-                       ir_mode *mode_arith = get_ir_mode_arithmetic(type);
-                       res                 = create_conv(dbgi, res, mode_arith);
-                       return res;
-               } else {
-                       return value_node;
-               }
+               type_t  *from_type  = value->base.type;
+               return create_cast(dbgi, value_node, from_type, type);
        }
        case EXPR_UNARY_ASSUME:
-               if (firm_opt.confirm)
-                       return handle_assume(dbgi, value);
-               else
-                       return NULL;
+               return handle_assume(dbgi, value);
 
        default:
                break;
@@ -2294,28 +2636,22 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression)
 static ir_node *produce_condition_result(const expression_t *expression,
                                          ir_mode *mode, dbg_info *dbgi)
 {
-       ir_node *cur_block = get_cur_block();
-
-       ir_node *one_block = new_immBlock();
-       set_cur_block(one_block);
-       ir_node *one       = new_Const(get_mode_one(mode));
-       ir_node *jmp_one   = new_d_Jmp(dbgi);
-
-       ir_node *zero_block = new_immBlock();
-       set_cur_block(zero_block);
-       ir_node *zero       = new_Const(get_mode_null(mode));
-       ir_node *jmp_zero   = new_d_Jmp(dbgi);
-
-       set_cur_block(cur_block);
+       ir_node *const one_block  = new_immBlock();
+       ir_node *const zero_block = new_immBlock();
        create_condition_evaluation(expression, one_block, zero_block);
        mature_immBlock(one_block);
        mature_immBlock(zero_block);
 
-       ir_node *in_cf[2] = { jmp_one, jmp_zero };
-       new_Block(2, in_cf);
+       ir_node *const jmp_one  = new_rd_Jmp(dbgi, one_block);
+       ir_node *const jmp_zero = new_rd_Jmp(dbgi, zero_block);
+       ir_node *const in_cf[2] = { jmp_one, jmp_zero };
+       ir_node *const block    = new_Block(lengthof(in_cf), in_cf);
+       set_cur_block(block);
 
-       ir_node *in[2] = { one, zero };
-       ir_node *val   = new_d_Phi(dbgi, 2, in, mode);
+       ir_node *const one   = new_Const(get_mode_one(mode));
+       ir_node *const zero  = new_Const(get_mode_null(mode));
+       ir_node *const in[2] = { one, zero };
+       ir_node *const val   = new_d_Phi(dbgi, lengthof(in), in, mode);
 
        return val;
 }
@@ -2327,22 +2663,10 @@ static ir_node *adjust_for_pointer_arithmetic(dbg_info *dbgi,
        assert(is_type_pointer(type));
        pointer_type_t *const pointer_type = &type->pointer;
        type_t         *const points_to    = skip_typeref(pointer_type->points_to);
-       unsigned              elem_size    = get_type_size_const(points_to);
-
-       value = create_conv(dbgi, value, mode);
-
-       /* gcc extension: allow arithmetic with void * and function * */
-       if ((elem_size == 0 && is_type_atomic(points_to, ATOMIC_TYPE_VOID)) ||
-           is_type_function(points_to))  {
-               elem_size = 1;
-       }
-
-       assert(elem_size >= 1);
-       if (elem_size == 1)
-               return value;
-
-       ir_node *const cnst = new_Const_long(mode, (long)elem_size);
-       ir_node *const mul  = new_d_Mul(dbgi, value, cnst, mode);
+       ir_node        *      elem_size    = get_type_size_node(points_to);
+       elem_size                          = create_conv(dbgi, elem_size, mode);
+       value                              = create_conv(dbgi, value,     mode);
+       ir_node        *const mul          = new_d_Mul(dbgi, value, elem_size, mode);
        return mul;
 }
 
@@ -2369,7 +2693,7 @@ static ir_node *create_op(dbg_info *dbgi, const binary_expression_t *expression,
                        const pointer_type_t *const ptr_type = &type_left->pointer;
 
                        mode = get_ir_mode_arithmetic(expression->base.type);
-                       ir_node *const elem_size = get_type_size(ptr_type->points_to);
+                       ir_node *const elem_size = get_type_size_node(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();
@@ -2438,15 +2762,9 @@ normal_node:
        case EXPR_BINARY_DIV:
        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);
-               }
+               ir_node *op  = new_d_Div(dbgi, pin, left, right, mode,
+                                        op_pin_state_floats);
+               ir_node *res = new_d_Proj(dbgi, op, mode, pn_Div_res);
                return res;
        }
        case EXPR_BINARY_MOD:
@@ -2469,25 +2787,23 @@ static ir_node *create_lazy_op(const binary_expression_t *expression)
        type_t   *type = skip_typeref(expression->base.type);
        ir_mode  *mode = get_ir_mode_arithmetic(type);
 
-       if (is_constant_expression(expression->left)) {
-               long val = fold_constant(expression->left);
+       if (is_constant_expression(expression->left) == EXPR_CLASS_CONSTANT) {
+               bool val = fold_constant_to_bool(expression->left);
                expression_kind_t ekind = expression->base.kind;
                assert(ekind == EXPR_BINARY_LOGICAL_AND || ekind == EXPR_BINARY_LOGICAL_OR);
                if (ekind == EXPR_BINARY_LOGICAL_AND) {
-                       if (val == 0) {
+                       if (!val) {
                                return new_Const(get_mode_null(mode));
                        }
                } else {
-                       if (val != 0) {
+                       if (val) {
                                return new_Const(get_mode_one(mode));
                        }
                }
 
-               if (is_constant_expression(expression->right)) {
-                       long const valr = fold_constant(expression->right);
-                       return valr != 0 ?
-                               new_Const(get_mode_one(mode)) :
-                               new_Const(get_mode_null(mode));
+               if (is_constant_expression(expression->right) == EXPR_CLASS_CONSTANT) {
+                       bool valr = fold_constant_to_bool(expression->right);
+                       return create_Const_from_bool(mode, valr);
                }
 
                return produce_condition_result(expression->right, mode, dbgi);
@@ -2505,13 +2821,12 @@ static ir_node *create_assign_binop(const binary_expression_t *expression)
        dbg_info *const     dbgi = get_dbg_info(&expression->base.source_position);
        const expression_t *left_expr = expression->left;
        type_t             *type      = skip_typeref(left_expr->base.type);
-       ir_mode            *left_mode = get_ir_mode_storage(type);
        ir_node            *right     = expression_to_firm(expression->right);
        ir_node            *left_addr = expression_to_addr(left_expr);
        ir_node            *left      = get_value_from_lvalue(left_expr, left_addr);
        ir_node            *result    = create_op(dbgi, expression, left, right);
 
-       result = create_conv(dbgi, result, left_mode);
+       result = create_cast(dbgi, result, expression->right->base.type, type);
        result = do_strict_conv(dbgi, result);
 
        result = set_value_for_expression_addr(left_expr, result, left_addr);
@@ -2540,13 +2855,12 @@ static ir_node *binary_expression_to_firm(const binary_expression_t *expression)
        case EXPR_BINARY_ISLESSEQUAL:
        case EXPR_BINARY_ISLESSGREATER:
        case EXPR_BINARY_ISUNORDERED: {
-               dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
-               ir_node *left  = expression_to_firm(expression->left);
-               ir_node *right = expression_to_firm(expression->right);
-               ir_node *cmp   = new_d_Cmp(dbgi, left, right);
-               long     pnc   = get_pnc(kind, expression->left->base.type);
-               ir_node *proj  = new_d_Proj(dbgi, cmp, mode_b, pnc);
-               return proj;
+               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_relation relation = get_relation(kind);
+               ir_node    *cmp      = new_d_Cmp(dbgi, left, right, relation);
+               return cmp;
        }
        case EXPR_BINARY_ASSIGN: {
                ir_node *addr  = expression_to_addr(expression->left);
@@ -2659,7 +2973,7 @@ static long get_offsetof_offset(const offsetof_expression_t *expression)
                        assert(designator->array_index != NULL);
                        assert(is_type_array(type));
 
-                       long index         = fold_constant(array_index);
+                       long index         = fold_constant_to_int(array_index);
                        ir_type *arr_type  = get_ir_type(type);
                        ir_type *elem_type = get_array_element_type(arr_type);
                        long     elem_size = get_type_size_bytes(elem_type);
@@ -2675,10 +2989,10 @@ static long get_offsetof_offset(const offsetof_expression_t *expression)
 
 static ir_node *offsetof_to_firm(const offsetof_expression_t *expression)
 {
-       ir_mode  *mode   = get_ir_mode_arithmetic(expression->base.type);
-       long      offset = get_offsetof_offset(expression);
-       tarval   *tv     = new_tarval_from_long(offset, mode);
-       dbg_info *dbgi   = get_dbg_info(&expression->base.source_position);
+       ir_mode   *mode   = get_ir_mode_arithmetic(expression->base.type);
+       long       offset = get_offsetof_offset(expression);
+       ir_tarval *tv     = new_tarval_from_long(offset, mode);
+       dbg_info  *dbgi   = get_dbg_info(&expression->base.source_position);
 
        return new_d_Const(dbgi, tv);
 }
@@ -2700,14 +3014,12 @@ static ir_node *compound_literal_to_firm(
        ir_entity *const entity = new_d_entity(frame_type, id, irtype, dbgi);
        set_entity_ld_ident(entity, id);
 
-       set_entity_variability(entity, variability_uninitialized);
-
        /* create initialisation code */
        initializer_t *initializer = expression->initializer;
        create_local_initializer(initializer, dbgi, entity, type);
 
        /* create a sel for the compound literal address */
-       ir_node *frame = get_local_frame(entity);
+       ir_node *frame = get_irg_frame(current_ir_graph);
        ir_node *sel   = new_d_simpleSel(dbgi, new_NoMem(), frame, entity);
        return sel;
 }
@@ -2717,20 +3029,19 @@ 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) {
-               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. */
+       type_t *const type = skip_typeref(expression->type);
+       /* Â§6.5.3.4:2 if the type is a VLA, evaluate the expression. */
        if (is_type_array(type) && type->array.is_vla
                        && expression->tp_expression != NULL) {
                expression_to_firm(expression->tp_expression);
        }
+       /* strange gnu extensions: sizeof(function) == 1 */
+       if (is_type_function(type)) {
+               ir_mode *mode = get_ir_mode_storage(type_size_t);
+               return new_Const(get_mode_one(mode));
+       }
 
-       return get_type_size(type);
+       return get_type_size_node(type);
 }
 
 static entity_t *get_expression_entity(const expression_t *expression)
@@ -2741,59 +3052,56 @@ static entity_t *get_expression_entity(const expression_t *expression)
        return expression->reference.entity;
 }
 
+static unsigned get_cparser_entity_alignment(const entity_t *entity)
+{
+       switch(entity->kind) {
+       DECLARATION_KIND_CASES
+               return entity->declaration.alignment;
+       case ENTITY_STRUCT:
+       case ENTITY_UNION:
+               return entity->compound.alignment;
+       case ENTITY_TYPEDEF:
+               return entity->typedefe.alignment;
+       default:
+               break;
+       }
+       return 0;
+}
+
 /**
  * Transform an alignof expression into Firm code.
  */
 static ir_node *alignof_to_firm(const typeprop_expression_t *expression)
 {
-       ir_entity *irentity = NULL;
+       unsigned alignment = 0;
 
        const expression_t *tp_expression = expression->tp_expression;
        if (tp_expression != NULL) {
                entity_t *entity = get_expression_entity(tp_expression);
-               if (entity != NULL && is_declaration(entity)) {
-                       switch (entity->declaration.kind) {
-                       case DECLARATION_KIND_UNKNOWN:
-                               panic("unknown entity reference found");
-                       case DECLARATION_KIND_COMPOUND_MEMBER:
-                               irentity = entity->compound_member.entity;
-                               break;
-                       case DECLARATION_KIND_GLOBAL_VARIABLE:
-                       case DECLARATION_KIND_LOCAL_VARIABLE_ENTITY:
-                               irentity = entity->variable.v.entity;
-                               break;
-                       case DECLARATION_KIND_PARAMETER_ENTITY:
-                               irentity = entity->parameter.v.entity;
-                               break;
-                       case DECLARATION_KIND_FUNCTION:
-                       case DECLARATION_KIND_INNER_FUNCTION:
-                               irentity = entity->function.entity;
-                               break;
-                       case DECLARATION_KIND_PARAMETER:
-                       case DECLARATION_KIND_LOCAL_VARIABLE:
-                       case DECLARATION_KIND_VARIABLE_LENGTH_ARRAY:
-                               break;
+               if (entity != NULL) {
+                       if (entity->kind == ENTITY_FUNCTION) {
+                               /* a gnu-extension */
+                               alignment = 1;
+                       } else {
+                               alignment = get_cparser_entity_alignment(entity);
                        }
                }
        }
 
-       ir_type *irtype;
-       if (irentity != NULL) {
-               irtype = get_entity_type(irentity);
-       } else {
+       if (alignment == 0) {
                type_t *type = expression->type;
-               irtype = get_ir_type(type);
+               alignment = get_type_alignment(type);
        }
 
-       ir_mode *const mode = get_ir_mode_arithmetic(expression->base.type);
-       symconst_symbol sym;
-       sym.type_p = irtype;
-       return new_SymConst(mode, sym, symconst_type_align);
+       dbg_info  *dbgi = get_dbg_info(&expression->base.source_position);
+       ir_mode   *mode = get_ir_mode_arithmetic(expression->base.type);
+       ir_tarval *tv   = new_tarval_from_long(alignment, mode);
+       return new_d_Const(dbgi, tv);
 }
 
 static void init_ir_types(void);
 
-long fold_constant(const expression_t *expression)
+static ir_tarval *fold_constant_to_tarval(const expression_t *expression)
 {
        assert(is_type_valid(skip_typeref(expression->base.type)));
 
@@ -2802,7 +3110,7 @@ long fold_constant(const expression_t *expression)
 
        init_ir_types();
 
-       assert(is_constant_expression(expression));
+       assert(is_constant_expression(expression) == EXPR_CLASS_CONSTANT);
 
        ir_graph *old_current_ir_graph = current_ir_graph;
        current_ir_graph = get_const_code_irg();
@@ -2814,23 +3122,39 @@ long fold_constant(const expression_t *expression)
                panic("couldn't fold constant");
        }
 
-       tarval *tv = get_Const_tarval(cnst);
+       constant_folding = constant_folding_old;
+
+       return get_Const_tarval(cnst);
+}
+
+long fold_constant_to_int(const expression_t *expression)
+{
+       if (expression->kind == EXPR_INVALID)
+               return 0;
+
+       ir_tarval *tv = fold_constant_to_tarval(expression);
        if (!tarval_is_long(tv)) {
                panic("result of constant folding is not integer");
        }
 
-       constant_folding = constant_folding_old;
-
        return get_tarval_long(tv);
 }
 
+bool fold_constant_to_bool(const expression_t *expression)
+{
+       if (expression->kind == EXPR_INVALID)
+               return false;
+       ir_tarval *tv = fold_constant_to_tarval(expression);
+       return !tarval_is_null(tv);
+}
+
 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)) {
-               long val = fold_constant(expression->condition);
+       if (is_constant_expression(expression->condition) == EXPR_CLASS_CONSTANT) {
+               bool val = fold_constant_to_bool(expression->condition);
                if (val) {
                        expression_t *true_expression = expression->true_expression;
                        if (true_expression == NULL)
@@ -2841,50 +3165,47 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression)
                }
        }
 
-       ir_node *cur_block   = get_cur_block();
+       ir_node *const true_block  = new_immBlock();
+       ir_node *const false_block = new_immBlock();
+       ir_node *const cond_expr   = create_condition_evaluation(expression->condition, true_block, false_block);
+       mature_immBlock(true_block);
+       mature_immBlock(false_block);
 
-       /* create the true block */
-       ir_node *true_block  = new_immBlock();
        set_cur_block(true_block);
+       ir_node *true_val;
+       if (expression->true_expression != NULL) {
+               true_val = expression_to_firm(expression->true_expression);
+       } else if (cond_expr != NULL && get_irn_mode(cond_expr) != mode_b) {
+               true_val = cond_expr;
+       } else {
+               /* Condition ended with a short circuit (&&, ||, !) operation or a
+                * comparison.  Generate a "1" as value for the true branch. */
+               true_val = new_Const(get_mode_one(mode_Is));
+       }
+       ir_node *const true_jmp = new_d_Jmp(dbgi);
 
-       ir_node *true_val = expression->true_expression != NULL ?
-               expression_to_firm(expression->true_expression) : NULL;
-       ir_node *true_jmp = new_Jmp();
-
-       /* create the false block */
-       ir_node *false_block = new_immBlock();
        set_cur_block(false_block);
-
-       ir_node *false_val = expression_to_firm(expression->false_expression);
-       ir_node *false_jmp = new_Jmp();
-
-       /* create the condition evaluation */
-       set_cur_block(cur_block);
-       ir_node *const cond_expr = create_condition_evaluation(expression->condition, true_block, false_block);
-       if (expression->true_expression == NULL) {
-               if (cond_expr != NULL) {
-                       true_val = cond_expr;
-               } else {
-                       /* Condition ended with a short circuit (&&, ||, !) operation.
-                        * Generate a "1" as value for the true branch. */
-                       true_val = new_Const(get_mode_one(mode_Is));
-               }
-       }
-       mature_immBlock(true_block);
-       mature_immBlock(false_block);
+       ir_node *const false_val = expression_to_firm(expression->false_expression);
+       ir_node *const false_jmp = new_d_Jmp(dbgi);
 
        /* create the common block */
-       ir_node *in_cf[2] = { true_jmp, false_jmp };
-       new_Block(2, in_cf);
+       ir_node *const in_cf[2] = { true_jmp, false_jmp };
+       ir_node *const block    = new_Block(lengthof(in_cf), in_cf);
+       set_cur_block(block);
 
        /* TODO improve static semantics, so either both or no values are NULL */
        if (true_val == NULL || false_val == NULL)
                return NULL;
 
-       ir_node *in[2] = { true_val, false_val };
-       ir_mode *mode  = get_irn_mode(true_val);
-       assert(get_irn_mode(false_val) == mode);
-       ir_node *val   = new_d_Phi(dbgi, 2, in, mode);
+       ir_node *const in[2] = { true_val, false_val };
+       type_t  *const type  = skip_typeref(expression->base.type);
+       ir_mode *mode;
+       if (is_type_compound(type)) {
+               mode = mode_P;
+       } else {
+               mode = get_ir_mode_arithmetic(type);
+       }
+       ir_node *const val   = new_d_Phi(dbgi, lengthof(in), in, mode);
 
        return val;
 }
@@ -3035,8 +3356,8 @@ static ir_node *classify_type_to_firm(const classify_type_expression_t *const ex
        }
 
 make_const:;
-       dbg_info *const dbgi = get_dbg_info(&expr->base.source_position);
-       tarval   *const tv   = new_tarval_from_long(tc, mode_int);
+       dbg_info  *const dbgi = get_dbg_info(&expr->base.source_position);
+       ir_tarval *const tv   = new_tarval_from_long(tc, mode_int);
        return new_d_Const(dbgi, tv);
 }
 
@@ -3082,14 +3403,20 @@ static ir_node *va_start_expression_to_firm(
        ir_type   *const method_type = get_ir_type(type);
        int        const n           = get_method_n_params(method_type) - 1;
        ir_entity *const parm_ent    = get_method_value_param_ent(method_type, n);
-       ir_node   *const arg_base    = get_irg_value_param_base(current_ir_graph);
+       ir_node   *const frame       = get_irg_frame(current_ir_graph);
        dbg_info  *const dbgi        = get_dbg_info(&expr->base.source_position);
        ir_node   *const no_mem      = new_NoMem();
        ir_node   *const arg_sel     =
-               new_d_simpleSel(dbgi, no_mem, arg_base, parm_ent);
-
-       ir_node   *const cnst        = get_type_size(expr->parameter->base.type);
-       ir_node   *const add         = new_d_Add(dbgi, arg_sel, cnst, mode_P_data);
+               new_d_simpleSel(dbgi, no_mem, frame, parm_ent);
+
+       type_t    *const param_type  = expr->parameter->base.type;
+       ir_node   *const cnst        = get_type_size_node(param_type);
+       ir_mode   *const mode        = get_irn_mode(cnst);
+       ir_node   *const c1          = new_Const_long(mode, stack_param_align - 1);
+       ir_node   *const c2          = new_d_Add(dbgi, cnst, c1, mode);
+       ir_node   *const c3          = new_Const_long(mode, -(long)stack_param_align);
+       ir_node   *const c4          = new_d_And(dbgi, c2, c3, mode);
+       ir_node   *const add         = new_d_Add(dbgi, arg_sel, c4, mode_P_data);
        set_value_for_expression(expr->ap, add);
 
        return NULL;
@@ -3104,14 +3431,29 @@ static ir_node *va_arg_expression_to_firm(const va_arg_expression_t *const expr)
        dbg_info     *const dbgi    = get_dbg_info(&expr->base.source_position);
        ir_node      *const res     = deref_address(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);
+       ir_node      *const cnst    = get_type_size_node(expr->base.type);
+       ir_mode      *const mode    = get_irn_mode(cnst);
+       ir_node      *const c1      = new_Const_long(mode, stack_param_align - 1);
+       ir_node      *const c2      = new_d_Add(dbgi, cnst, c1, mode);
+       ir_node      *const c3      = new_Const_long(mode, -(long)stack_param_align);
+       ir_node      *const c4      = new_d_And(dbgi, c2, c3, mode);
+       ir_node      *const add     = new_d_Add(dbgi, ap, c4, mode_P_data);
 
        set_value_for_expression_addr(ap_expr, add, ap_addr);
 
        return res;
 }
 
+/**
+ * Generate Firm for a va_copy expression.
+ */
+static ir_node *va_copy_expression_to_firm(const va_copy_expression_t *const expr)
+{
+       ir_node *const src = expression_to_firm(expr->src);
+       set_value_for_expression(expr->dst, src);
+       return NULL;
+}
+
 static ir_node *dereference_addr(const unary_expression_t *const expression)
 {
        assert(expression->base.kind == EXPR_UNARY_DEREFERENCE);
@@ -3145,24 +3487,19 @@ static ir_node *expression_to_addr(const expression_t *expression)
 static ir_node *builtin_constant_to_firm(
                const builtin_constant_expression_t *expression)
 {
-       ir_mode *mode = get_ir_mode_arithmetic(expression->base.type);
-       long     v;
-
-       if (is_constant_expression(expression->value)) {
-               v = 1;
-       } else {
-               v = 0;
-       }
-       return new_Const_long(mode, v);
+       ir_mode *const mode = get_ir_mode_arithmetic(expression->base.type);
+       bool     const v    = is_constant_expression(expression->value) == EXPR_CLASS_CONSTANT;
+       return create_Const_from_bool(mode, v);
 }
 
-static ir_node *builtin_prefetch_to_firm(
-               const builtin_prefetch_expression_t *expression)
+static ir_node *builtin_types_compatible_to_firm(
+               const builtin_types_compatible_expression_t *expression)
 {
-       ir_node *adr = expression_to_firm(expression->adr);
-       /* no Firm support for prefetch yet */
-       (void) adr;
-       return NULL;
+       type_t  *const left  = get_unqualified_type(skip_typeref(expression->left));
+       type_t  *const right = get_unqualified_type(skip_typeref(expression->right));
+       bool     const value = types_compatible(left, right);
+       ir_mode *const mode  = get_ir_mode_arithmetic(expression->base.type);
+       return create_Const_from_bool(mode, value);
 }
 
 static ir_node *get_label_block(label_t *label)
@@ -3189,36 +3526,15 @@ static ir_node *get_label_block(label_t *label)
  * Pointer to a label.  This is used for the
  * GNU address-of-label extension.
  */
-static ir_node *label_address_to_firm(
-               const label_address_expression_t *label)
+static ir_node *label_address_to_firm(const label_address_expression_t *label)
 {
-       ir_node    *block = get_label_block(label->label);
-       ir_label_t  nr    = get_Block_label(block);
+       dbg_info  *dbgi   = get_dbg_info(&label->base.source_position);
+       ir_node   *block  = get_label_block(label->label);
+       ir_entity *entity = create_Block_entity(block);
 
-       if (nr == 0) {
-               nr = get_irp_next_label_nr();
-               set_Block_label(block, nr);
-       }
        symconst_symbol value;
-       value.label = nr;
-       return new_SymConst(mode_P_code, value, symconst_label);
-}
-
-static ir_node *builtin_symbol_to_firm(
-               const builtin_symbol_expression_t *expression)
-{
-       /* for gcc compatibility we have to produce (dummy) addresses for some
-        * builtins */
-       if (warning.other) {
-               warningf(&expression->base.source_position,
-                                "taking address of builtin '%Y'", expression->symbol);
-       }
-
-       /* simply create a NULL pointer */
-       ir_mode  *mode = get_ir_mode_arithmetic(type_void_ptr);
-       ir_node  *res  = new_Const_long(mode, 0);
-
-       return res;
+       value.entity_p = entity;
+       return new_d_SymConst(dbgi, mode_P_code, value, symconst_addr_ent);
 }
 
 /**
@@ -3236,16 +3552,13 @@ static ir_node *_expression_to_firm(const expression_t *expression)
 #endif
 
        switch (expression->kind) {
-       case EXPR_CHARACTER_CONSTANT:
-               return character_constant_to_firm(&expression->conste);
-       case EXPR_WIDE_CHARACTER_CONSTANT:
-               return wide_character_constant_to_firm(&expression->conste);
-       case EXPR_CONST:
-               return const_to_firm(&expression->conste);
+       EXPR_LITERAL_CASES
+               return literal_to_firm(&expression->literal);
        case EXPR_STRING_LITERAL:
-               return string_literal_to_firm(&expression->string);
+               return string_to_firm(&expression->base.source_position, "str.%u",
+                                     &expression->literal.value);
        case EXPR_WIDE_STRING_LITERAL:
-               return wide_string_literal_to_firm(&expression->wide_string);
+               return wide_string_literal_to_firm(&expression->string_literal);
        case EXPR_REFERENCE:
                return reference_expression_to_firm(&expression->reference);
        case EXPR_REFERENCE_ENUM_VALUE:
@@ -3276,12 +3589,12 @@ static ir_node *_expression_to_firm(const expression_t *expression)
                return va_start_expression_to_firm(&expression->va_starte);
        case EXPR_VA_ARG:
                return va_arg_expression_to_firm(&expression->va_arge);
-       case EXPR_BUILTIN_SYMBOL:
-               return builtin_symbol_to_firm(&expression->builtin_symbol);
+       case EXPR_VA_COPY:
+               return va_copy_expression_to_firm(&expression->va_copye);
        case EXPR_BUILTIN_CONSTANT_P:
                return builtin_constant_to_firm(&expression->builtin_constant);
-       case EXPR_BUILTIN_PREFETCH:
-               return builtin_prefetch_to_firm(&expression->builtin_prefetch);
+       case EXPR_BUILTIN_TYPES_COMPATIBLE_P:
+               return builtin_types_compatible_to_firm(&expression->builtin_types_compatible);
        case EXPR_OFFSETOF:
                return offsetof_to_firm(&expression->offsetofe);
        case EXPR_COMPOUND_LITERAL:
@@ -3296,15 +3609,20 @@ static ir_node *_expression_to_firm(const expression_t *expression)
        panic("invalid expression found");
 }
 
+/**
+ * Check if a given expression is a GNU __builtin_expect() call.
+ */
 static bool is_builtin_expect(const expression_t *expression)
 {
        if (expression->kind != EXPR_CALL)
                return false;
 
        expression_t *function = expression->call.function;
-       if (function->kind != EXPR_BUILTIN_SYMBOL)
+       if (function->kind != EXPR_REFERENCE)
                return false;
-       if (function->builtin_symbol.symbol->ID != T___builtin_expect)
+       reference_expression_t *ref = &function->reference;
+       if (ref->entity->kind         != ENTITY_FUNCTION ||
+           ref->entity->function.btk != bk_gnu_builtin_expect)
                return false;
 
        return true;
@@ -3350,15 +3668,14 @@ static ir_node *expression_to_firm(const expression_t *expression)
                return res;
        }
 
-       if (is_constant_expression(expression)) {
+       if (is_constant_expression(expression) == EXPR_CLASS_CONSTANT) {
+               bool const constant_folding_old = constant_folding;
+               constant_folding = true;
                ir_node *res  = _expression_to_firm(expression);
+               constant_folding = constant_folding_old;
                ir_mode *mode = get_ir_mode_arithmetic(expression->base.type);
-               assert(is_Const(res));
-               if (is_Const_null(res)) {
-                       return new_Const_long(mode, 0);
-               } else {
-                       return new_Const_long(mode, 1);
-               }
+               assert(is_Const(res));
+               return create_Const_from_bool(mode, !is_Const_null(res));
        }
 
        /* we have to produce a 0/1 from the mode_b expression */
@@ -3420,11 +3737,11 @@ static ir_node *create_condition_evaluation(const expression_t *expression,
        /* set branch prediction info based on __builtin_expect */
        if (is_builtin_expect(expression) && is_Cond(cond)) {
                call_argument_t *argument = expression->call.arguments->next;
-               if (is_constant_expression(argument->expression)) {
-                       long               cnst = fold_constant(argument->expression);
+               if (is_constant_expression(argument->expression) == EXPR_CLASS_CONSTANT) {
+                       bool             cnst = fold_constant_to_bool(argument->expression);
                        cond_jmp_predicate pred;
 
-                       if (cnst == 0) {
+                       if (cnst == false) {
                                pred = COND_JMP_PRED_FALSE;
                        } else {
                                pred = COND_JMP_PRED_TRUE;
@@ -3440,33 +3757,27 @@ static ir_node *create_condition_evaluation(const expression_t *expression,
        return cond_expr;
 }
 
-
 static void create_variable_entity(entity_t *variable,
                                    declaration_kind_t declaration_kind,
                                    ir_type *parent_type)
 {
        assert(variable->kind == ENTITY_VARIABLE);
        type_t    *type = skip_typeref(variable->declaration.type);
-       type            = get_aligned_type(type, variable->variable.alignment);
 
-       ident     *const id       = new_id_from_str(variable->base.symbol->string);
-       ir_type   *const irtype   = get_ir_type(type);
-       dbg_info  *const dbgi     = get_dbg_info(&variable->base.source_position);
+       ident     *const id        = new_id_from_str(variable->base.symbol->string);
+       ir_type   *const irtype    = get_ir_type(type);
+       dbg_info  *const dbgi      = get_dbg_info(&variable->base.source_position);
+       ir_entity *const irentity  = new_d_entity(parent_type, id, irtype, dbgi);
+       unsigned         alignment = variable->declaration.alignment;
 
-       ir_entity *const irentity = new_d_entity(parent_type, id, irtype, dbgi);
+       set_entity_alignment(irentity, alignment);
 
-       handle_gnu_attributes_ent(irentity, variable);
+       handle_decl_modifiers(irentity, variable);
 
        variable->declaration.kind  = (unsigned char) declaration_kind;
        variable->variable.v.entity = irentity;
-       set_entity_variability(irentity, variability_uninitialized);
        set_entity_ld_ident(irentity, create_ld_ident(variable));
 
-       if (parent_type == get_tls_type())
-               set_entity_allocation(irentity, allocation_automatic);
-       else if (declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE)
-               set_entity_allocation(irentity, allocation_static);
-
        if (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) {
                set_entity_volatility(irentity, volatility_is_volatile);
        }
@@ -3638,6 +3949,27 @@ static void walk_designator(type_path_t *path, const designator_t *designator)
                        }
                        assert(iter != NULL);
 
+                       /* revert previous initialisations of other union elements */
+                       if (type->kind == TYPE_COMPOUND_UNION) {
+                               ir_initializer_t *initializer = top->initializer;
+                               if (initializer != NULL
+                                       && get_initializer_kind(initializer) == IR_INITIALIZER_COMPOUND) {
+                                       /* are we writing to a new element? */
+                                       ir_initializer_t *oldi
+                                               = get_initializer_compound_value(initializer, index);
+                                       if (get_initializer_kind(oldi) == IR_INITIALIZER_NULL) {
+                                               /* clear initializer */
+                                               size_t len
+                                                       = get_initializer_compound_n_entries(initializer);
+                                               ir_initializer_t *nulli = get_initializer_null();
+                                               for (size_t i = 0; i < len; ++i) {
+                                                       set_initializer_compound_value(initializer, i,
+                                                                                      nulli);
+                                               }
+                                       }
+                               }
+                       }
+
                        top->type           = orig_type;
                        top->compound_entry = iter;
                        top->index          = index;
@@ -3647,7 +3979,7 @@ static void walk_designator(type_path_t *path, const designator_t *designator)
                        assert(designator->array_index != NULL);
                        assert(is_type_array(type));
 
-                       long index = fold_constant(array_index);
+                       long index = fold_constant_to_int(array_index);
                        assert(index >= 0);
 #ifndef NDEBUG
                        if (type->array.size_constant) {
@@ -3681,6 +4013,7 @@ static void advance_current_object(type_path_t *path)
 
        type_t *type = skip_typeref(top->type);
        if (is_type_union(type)) {
+               /* only the first element is initialized in unions */
                top->compound_entry = NULL;
        } else if (is_type_struct(type)) {
                entity_t *entry = top->compound_entry;
@@ -3704,7 +4037,7 @@ static void advance_current_object(type_path_t *path)
 
        /* we're past the last member of the current sub-aggregate, try if we
         * can ascend in the type hierarchy and continue with another subobject */
-       size_t len = ARR_LEN(path->path);
+       size_t len = ARR_LEN(path->path);
 
        if (len > 1) {
                ascend_from_subtype(path);
@@ -3724,8 +4057,18 @@ static ir_initializer_t *create_ir_initializer_value(
        if (is_type_compound(initializer->value->base.type)) {
                panic("initializer creation for compounds not implemented yet");
        }
-       ir_node *value = expression_to_firm(initializer->value);
-       type_t  *type  = initializer->value->base.type;
+       type_t       *type = initializer->value->base.type;
+       expression_t *expr = initializer->value;
+       if (initializer_use_bitfield_basetype) {
+               type_t *skipped = skip_typeref(type);
+               if (skipped->kind == TYPE_BITFIELD) {
+                       /* remove the bitfield cast... */
+                       assert(expr->kind == EXPR_UNARY_CAST_IMPLICIT);
+                       expr = expr->unary.value;
+                       type = skipped->bitfield.base_type;
+               }
+       }
+       ir_node *value = expression_to_firm(expr);
        ir_mode *mode  = get_ir_mode_storage(type);
        value          = create_conv(NULL, value, mode);
        return create_initializer_const(value);
@@ -3828,7 +4171,7 @@ static ir_initializer_t *create_ir_initializer_string(
                if (i < string_len)
                        c = string[i];
 
-               tarval           *tv = new_tarval_from_long(c, mode);
+               ir_tarval        *tv = new_tarval_from_long(c, mode);
                ir_initializer_t *char_initializer = create_initializer_tarval(tv);
 
                set_initializer_compound_value(irinitializer, i, char_initializer);
@@ -3840,21 +4183,21 @@ static ir_initializer_t *create_ir_initializer_string(
 static ir_initializer_t *create_ir_initializer_wide_string(
                const initializer_wide_string_t *initializer, type_t *type)
 {
-       size_t            string_len    = initializer->string.size;
        assert(type->kind == TYPE_ARRAY);
        assert(type->array.size_constant);
        size_t            len           = type->array.size;
+       size_t            string_len    = wstrlen(&initializer->string);
        ir_initializer_t *irinitializer = create_initializer_compound(len);
 
-       const wchar_rep_t *string = initializer->string.begin;
-       ir_mode           *mode   = get_type_mode(ir_type_wchar_t);
+       const char *p    = initializer->string.begin;
+       ir_mode    *mode = get_type_mode(ir_type_wchar_t);
 
        for (size_t i = 0; i < len; ++i) {
-               wchar_rep_t c = 0;
+               utf32 c = 0;
                if (i < string_len) {
-                       c = string[i];
+                       c = read_utf8_char(&p);
                }
-               tarval *tv = new_tarval_from_long(c, mode);
+               ir_tarval *tv = new_tarval_from_long(c, mode);
                ir_initializer_t *char_initializer = create_initializer_tarval(tv);
 
                set_initializer_compound_value(irinitializer, i, char_initializer);
@@ -3886,63 +4229,70 @@ static ir_initializer_t *create_ir_initializer(
        panic("unknown initializer");
 }
 
-static void create_dynamic_null_initializer(ir_type *type, dbg_info *dbgi,
+/** ANSI C Â§6.7.8:21: If there are fewer initializers [..] than there
+ *  are elements [...] the remainder of the aggregate shall be initialized
+ *  implicitly the same as objects that have static storage duration. */
+static void create_dynamic_null_initializer(ir_entity *entity, dbg_info *dbgi,
                ir_node *base_addr)
 {
-       if (is_atomic_type(type)) {
-               ir_mode *mode = get_type_mode(type);
-               tarval  *zero = get_mode_null(mode);
-               ir_node *cnst = new_d_Const(dbgi, zero);
-
-               /* TODO: bitfields */
-               ir_node *mem    = get_store();
-               ir_node *store  = new_d_Store(dbgi, mem, base_addr, cnst, 0);
-               ir_node *proj_m = new_Proj(store, mode_M, pn_Store_M);
-               set_store(proj_m);
-       } else {
-               assert(is_compound_type(type));
+       /* for unions we must NOT do anything for null initializers */
+       ir_type *owner = get_entity_owner(entity);
+       if (is_Union_type(owner)) {
+               return;
+       }
 
-               int n_members;
-               if (is_Array_type(type)) {
-                       assert(has_array_upper_bound(type, 0));
-                       n_members = get_array_upper_bound_int(type, 0);
-               } else {
-                       n_members = get_compound_n_members(type);
+       ir_type *ent_type = get_entity_type(entity);
+       /* create sub-initializers for a compound type */
+       if (is_compound_type(ent_type)) {
+               unsigned n_members = get_compound_n_members(ent_type);
+               for (unsigned n = 0; n < n_members; ++n) {
+                       ir_entity *member = get_compound_member(ent_type, n);
+                       ir_node   *addr   = new_d_simpleSel(dbgi, new_NoMem(), base_addr,
+                                                               member);
+                       create_dynamic_null_initializer(member, dbgi, addr);
                }
+               return;
+       }
+       if (is_Array_type(ent_type)) {
+               assert(has_array_upper_bound(ent_type, 0));
+               long n = get_array_upper_bound_int(ent_type, 0);
+               for (long i = 0; i < n; ++i) {
+                       ir_tarval *index_tv = new_tarval_from_long(i, mode_uint);
+                       ir_node   *cnst     = new_d_Const(dbgi, index_tv);
+                       ir_node   *in[1]    = { cnst };
+                       ir_entity *arrent   = get_array_element_entity(ent_type);
+                       ir_node   *addr     = new_d_Sel(dbgi, new_NoMem(), base_addr, 1, in,
+                                                       arrent);
+                       create_dynamic_null_initializer(arrent, dbgi, addr);
+               }
+               return;
+       }
 
-               for (int i = 0; i < n_members; ++i) {
-                       ir_node *addr;
-                       ir_type *irtype;
-                       if (is_Array_type(type)) {
-                               ir_entity *entity   = get_array_element_entity(type);
-                               tarval    *index_tv = new_tarval_from_long(i, mode_uint);
-                               ir_node   *cnst     = new_d_Const(dbgi, index_tv);
-                               ir_node   *in[1]    = { cnst };
-                               irtype = get_array_element_type(type);
-                               addr   = new_d_Sel(dbgi, new_NoMem(), base_addr, 1, in, entity);
-                       } else {
-                               ir_entity *member = get_compound_member(type, i);
-
-                               irtype = get_entity_type(member);
-                               addr   = new_d_simpleSel(dbgi, new_NoMem(), base_addr, member);
-                       }
+       ir_mode *value_mode = get_type_mode(ent_type);
+       ir_node *node       = new_Const(get_mode_null(value_mode));
 
-                       create_dynamic_null_initializer(irtype, dbgi, addr);
-               }
+       /* is it a bitfield type? */
+       if (is_Primitive_type(ent_type) &&
+                       get_primitive_base_type(ent_type) != NULL) {
+               bitfield_store_to_firm(dbgi, entity, base_addr, node, false);
+               return;
        }
+
+       ir_node *mem    = get_store();
+       ir_node *store  = new_d_Store(dbgi, mem, base_addr, node, cons_none);
+       ir_node *proj_m = new_Proj(store, mode_M, pn_Store_M);
+       set_store(proj_m);
 }
 
 static void create_dynamic_initializer_sub(ir_initializer_t *initializer,
                ir_entity *entity, ir_type *type, dbg_info *dbgi, ir_node *base_addr)
 {
        switch(get_initializer_kind(initializer)) {
-       case IR_INITIALIZER_NULL: {
-               create_dynamic_null_initializer(type, dbgi, base_addr);
+       case IR_INITIALIZER_NULL:
+               create_dynamic_null_initializer(entity, dbgi, base_addr);
                return;
-       }
        case IR_INITIALIZER_CONST: {
                ir_node *node     = get_initializer_const_value(initializer);
-               ir_mode *mode     = get_irn_mode(node);
                ir_type *ent_type = get_entity_type(entity);
 
                /* is it a bitfield type? */
@@ -3952,18 +4302,17 @@ static void create_dynamic_initializer_sub(ir_initializer_t *initializer,
                        return;
                }
 
-               assert(get_type_mode(type) == mode);
+               assert(get_type_mode(type) == get_irn_mode(node));
                ir_node *mem    = get_store();
-               ir_node *store  = new_d_Store(dbgi, mem, base_addr, node, 0);
+               ir_node *store  = new_d_Store(dbgi, mem, base_addr, node, cons_none);
                ir_node *proj_m = new_Proj(store, mode_M, pn_Store_M);
                set_store(proj_m);
                return;
        }
        case IR_INITIALIZER_TARVAL: {
-               tarval  *tv       = get_initializer_tarval_value(initializer);
-               ir_mode *mode     = get_tarval_mode(tv);
-               ir_node *cnst     = new_d_Const(dbgi, tv);
-               ir_type *ent_type = get_entity_type(entity);
+               ir_tarval *tv       = get_initializer_tarval_value(initializer);
+               ir_node   *cnst     = new_d_Const(dbgi, tv);
+               ir_type   *ent_type = get_entity_type(entity);
 
                /* is it a bitfield type? */
                if (is_Primitive_type(ent_type) &&
@@ -3972,15 +4321,15 @@ static void create_dynamic_initializer_sub(ir_initializer_t *initializer,
                        return;
                }
 
-               assert(get_type_mode(type) == mode);
+               assert(get_type_mode(type) == get_tarval_mode(tv));
                ir_node *mem    = get_store();
-               ir_node *store  = new_d_Store(dbgi, mem, base_addr, cnst, 0);
+               ir_node *store  = new_d_Store(dbgi, mem, base_addr, cnst, cons_none);
                ir_node *proj_m = new_Proj(store, mode_M, pn_Store_M);
                set_store(proj_m);
                return;
        }
        case IR_INITIALIZER_COMPOUND: {
-               assert(is_compound_type(type));
+               assert(is_compound_type(type) || is_Array_type(type));
                int n_members;
                if (is_Array_type(type)) {
                        assert(has_array_upper_bound(type, 0));
@@ -3998,7 +4347,7 @@ static void create_dynamic_initializer_sub(ir_initializer_t *initializer,
                        ir_type   *irtype;
                        ir_entity *sub_entity;
                        if (is_Array_type(type)) {
-                               tarval    *index_tv = new_tarval_from_long(i, mode_uint);
+                               ir_tarval *index_tv = new_tarval_from_long(i, mode_uint);
                                ir_node   *cnst     = new_d_Const(dbgi, index_tv);
                                ir_node   *in[1]    = { cnst };
                                irtype     = get_array_element_type(type);
@@ -4028,7 +4377,7 @@ static void create_dynamic_initializer_sub(ir_initializer_t *initializer,
 static void create_dynamic_initializer(ir_initializer_t *initializer,
                dbg_info *dbgi, ir_entity *entity)
 {
-       ir_node *frame     = get_local_frame(entity);
+       ir_node *frame     = get_irg_frame(current_ir_graph);
        ir_node *base_addr = new_d_simpleSel(dbgi, new_NoMem(), frame, entity);
        ir_type *type      = get_entity_type(entity);
 
@@ -4052,9 +4401,14 @@ static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi,
                return;
        }
 
-       if (!is_constant_initializer(initializer)) {
+       if (is_constant_initializer(initializer) == EXPR_CLASS_VARIABLE) {
+               bool old_initializer_use_bitfield_basetype
+                       = initializer_use_bitfield_basetype;
+               initializer_use_bitfield_basetype = true;
                ir_initializer_t *irinitializer
                        = create_ir_initializer(initializer, type);
+               initializer_use_bitfield_basetype
+                       = old_initializer_use_bitfield_basetype;
 
                create_dynamic_initializer(irinitializer, dbgi, entity);
                return;
@@ -4076,16 +4430,15 @@ static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi,
        ir_entity *const init_entity = new_d_entity(global_type, id, irtype, dbgi);
        set_entity_ld_ident(init_entity, id);
 
-       set_entity_variability(init_entity, variability_initialized);
-       set_entity_visibility(init_entity, visibility_local);
-       set_entity_allocation(init_entity, allocation_static);
+       set_entity_visibility(init_entity, ir_visibility_private);
+       add_entity_linkage(init_entity, IR_LINKAGE_CONSTANT);
 
        set_entity_initializer(init_entity, irinitializer);
 
        ir_node *const src_addr = create_symconst(dbgi, mode_P_data, init_entity);
        ir_node *const copyb    = new_d_CopyB(dbgi, memory, addr, src_addr, irtype);
 
-       ir_node *const copyb_mem = new_Proj(copyb, mode_M, pn_CopyB_M_regular);
+       ir_node *const copyb_mem = new_Proj(copyb, mode_M, pn_CopyB_M);
        set_store(copyb_mem);
 }
 
@@ -4097,7 +4450,6 @@ static void create_initializer_local_variable_entity(entity_t *entity)
        ir_entity     *irentity    = entity->variable.v.entity;
        type_t        *type        = entity->declaration.type;
 
-       type = get_aligned_type(type, entity->variable.alignment);
        create_local_initializer(initializer, dbgi, irentity, type);
 }
 
@@ -4136,10 +4488,9 @@ static void create_variable_initializer(entity_t *entity)
 
                        ir_entity *irentity = entity->variable.v.entity;
 
-                       if (tq & TYPE_QUALIFIER_CONST) {
-                               set_entity_variability(irentity, variability_constant);
-                       } else {
-                               set_entity_variability(irentity, variability_initialized);
+                       if (tq & TYPE_QUALIFIER_CONST
+                                       && get_entity_owner(irentity) != get_tls_type()) {
+                               add_entity_linkage(irentity, IR_LINKAGE_CONSTANT);
                        }
                        set_atomic_ent_value(irentity, value);
                }
@@ -4152,9 +4503,7 @@ static void create_variable_initializer(entity_t *entity)
                        = create_ir_initializer(initializer, type);
 
                if (tq & TYPE_QUALIFIER_CONST) {
-                       set_entity_variability(irentity, variability_constant);
-               } else {
-                       set_entity_variability(irentity, variability_initialized);
+                       add_entity_linkage(irentity, IR_LINKAGE_CONSTANT);
                }
                set_entity_initializer(irentity, irinitializer);
        }
@@ -4183,7 +4532,7 @@ static void allocate_variable_length_array(entity_t *entity)
        ir_type  *el_type   = get_ir_type(type->array.element_type);
 
        /* make sure size_node is calculated */
-       get_type_size(type);
+       get_type_size_node(type);
        ir_node  *elems = type->array.size_node;
        ir_node  *mem   = get_store();
        ir_node  *alloc = new_d_Alloc(dbgi, mem, elems, el_type, stack_alloc);
@@ -4236,19 +4585,16 @@ static void create_local_static_variable(entity_t *entity)
        assert(entity->kind == ENTITY_VARIABLE);
        assert(entity->declaration.kind == DECLARATION_KIND_UNKNOWN);
 
-       type_t    *type = skip_typeref(entity->declaration.type);
-       type            = get_aligned_type(type, entity->variable.alignment);
-
-       ir_type   *const var_type = entity->variable.thread_local ?
+       type_t   *type           = skip_typeref(entity->declaration.type);
+       ir_type  *const var_type = entity->variable.thread_local ?
                get_tls_type() : get_glob_type();
-       ir_type   *const irtype   = get_ir_type(type);
-       dbg_info  *const dbgi     = get_dbg_info(&entity->base.source_position);
+       ir_type  *const irtype   = get_ir_type(type);
+       dbg_info *const dbgi     = get_dbg_info(&entity->base.source_position);
 
        size_t l = strlen(entity->base.symbol->string);
        char   buf[l + sizeof(".%u")];
        snprintf(buf, sizeof(buf), "%s.%%u", entity->base.symbol->string);
-       ident     *const id = id_unique(buf);
-
+       ident     *const id       = id_unique(buf);
        ir_entity *const irentity = new_d_entity(var_type, id, irtype, dbgi);
 
        if (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) {
@@ -4259,10 +4605,7 @@ static void create_local_static_variable(entity_t *entity)
        entity->variable.v.entity = irentity;
 
        set_entity_ld_ident(irentity, id);
-       set_entity_variability(irentity, variability_uninitialized);
-       set_entity_visibility(irentity, visibility_local);
-       set_entity_allocation(irentity, entity->variable.thread_local ?
-               allocation_automatic : allocation_static);
+       set_entity_visibility(irentity, ir_visibility_local);
 
        ir_graph *const old_current_ir_graph = current_ir_graph;
        current_ir_graph = get_const_code_irg();
@@ -4361,22 +4704,36 @@ static ir_node *compound_statement_to_firm(compound_statement_t *compound)
 
 static void create_global_variable(entity_t *entity)
 {
+       ir_linkage    linkage    = IR_LINKAGE_DEFAULT;
+       ir_visibility visibility = ir_visibility_default;
+       ir_entity    *irentity;
        assert(entity->kind == ENTITY_VARIABLE);
 
-       ir_visibility vis;
        switch ((storage_class_tag_t)entity->declaration.storage_class) {
-               case STORAGE_CLASS_STATIC: vis = visibility_local;              break;
-               case STORAGE_CLASS_EXTERN: vis = visibility_external_allocated; break;
-               case STORAGE_CLASS_NONE:   vis = visibility_external_visible;   break;
-
-               default: panic("Invalid storage class for global variable");
+       case STORAGE_CLASS_EXTERN: visibility = ir_visibility_external; break;
+       case STORAGE_CLASS_STATIC: visibility = ir_visibility_local;    break;
+       case STORAGE_CLASS_NONE:
+               visibility = ir_visibility_default;
+               /* uninitialized globals get merged in C */
+               if (entity->variable.initializer == NULL)
+                       linkage |= IR_LINKAGE_MERGE;
+               break;
+       case STORAGE_CLASS_TYPEDEF:
+       case STORAGE_CLASS_AUTO:
+       case STORAGE_CLASS_REGISTER:
+               panic("invalid storage class for global var");
        }
 
-       ir_type *var_type = entity->variable.thread_local ?
-               get_tls_type() : get_glob_type();
-       create_variable_entity(entity,
-                       DECLARATION_KIND_GLOBAL_VARIABLE, var_type);
-       set_entity_visibility(entity->variable.v.entity, vis);
+       ir_type *var_type = get_glob_type();
+       if (entity->variable.thread_local) {
+               var_type = get_tls_type();
+               /* LINKAGE_MERGE not supported by current linkers */
+               linkage &= ~IR_LINKAGE_MERGE;
+       }
+       create_variable_entity(entity, DECLARATION_KIND_GLOBAL_VARIABLE, var_type);
+       irentity = entity->variable.v.entity;
+       add_entity_linkage(irentity, linkage);
+       set_entity_visibility(irentity, visibility);
 }
 
 static void create_local_declaration(entity_t *entity)
@@ -4391,12 +4748,16 @@ static void create_local_declaration(entity_t *entity)
 
        switch ((storage_class_tag_t) entity->declaration.storage_class) {
        case STORAGE_CLASS_STATIC:
-               create_local_static_variable(entity);
+               if (entity->kind == ENTITY_FUNCTION) {
+                       (void)get_function_entity(entity, NULL);
+               } else {
+                       create_local_static_variable(entity);
+               }
                return;
        case STORAGE_CLASS_EXTERN:
                if (entity->kind == ENTITY_FUNCTION) {
                        assert(entity->function.statement == NULL);
-                       get_function_entity(entity);
+                       (void)get_function_entity(entity, NULL);
                } else {
                        create_global_variable(entity);
                        create_variable_initializer(entity);
@@ -4407,11 +4768,12 @@ static void create_local_declaration(entity_t *entity)
        case STORAGE_CLASS_REGISTER:
                if (entity->kind == ENTITY_FUNCTION) {
                        if (entity->function.statement != NULL) {
-                               get_function_entity(entity);
+                               ir_type *owner = get_irg_frame_type(current_ir_graph);
+                               (void)get_function_entity(entity, owner);
                                entity->declaration.kind = DECLARATION_KIND_INNER_FUNCTION;
                                enqueue_inner_function(entity);
                        } else {
-                               get_function_entity(entity);
+                               (void)get_function_entity(entity, NULL);
                        }
                } else {
                        create_local_variable(entity);
@@ -4428,6 +4790,11 @@ static void initialize_local_declaration(entity_t *entity)
        if (entity->base.symbol == NULL)
                return;
 
+       // no need to emit code in dead blocks
+       if (entity->declaration.storage_class != STORAGE_CLASS_STATIC
+                       && get_cur_block() == NULL)
+               return;
+
        switch ((declaration_kind_t) entity->declaration.kind) {
        case DECLARATION_KIND_LOCAL_VARIABLE:
        case DECLARATION_KIND_LOCAL_VARIABLE_ENTITY:
@@ -4456,164 +4823,149 @@ static void initialize_local_declaration(entity_t *entity)
 
 static void declaration_statement_to_firm(declaration_statement_t *statement)
 {
-       entity_t *      entity = statement->declarations_begin;
-       entity_t *const last   = statement->declarations_end;
-       if (entity != NULL) {
-               for ( ;; entity = entity->base.next) {
-                       if (is_declaration(entity)) {
-                               initialize_local_declaration(entity);
-                       } else if (entity->kind == ENTITY_TYPEDEF) {
-                               type_t *const type = skip_typeref(entity->typedefe.type);
-                               if (is_type_array(type) && type->array.is_vla)
-                                       get_vla_size(&type->array);
-                       }
-                       if (entity == last)
-                               break;
+       entity_t *entity = statement->declarations_begin;
+       if (entity == NULL)
+               return;
+
+       entity_t *const last = statement->declarations_end;
+       for ( ;; entity = entity->base.next) {
+               if (is_declaration(entity)) {
+                       initialize_local_declaration(entity);
+               } else if (entity->kind == ENTITY_TYPEDEF) {
+                       /* Â§6.7.7:3  Any array size expressions associated with variable length
+                        * array declarators are evaluated each time the declaration of the
+                        * typedef name is reached in the order of execution. */
+                       type_t *const type = skip_typeref(entity->typedefe.type);
+                       if (is_type_array(type) && type->array.is_vla)
+                               get_vla_size(&type->array);
                }
+               if (entity == last)
+                       break;
        }
 }
 
 static void if_statement_to_firm(if_statement_t *statement)
 {
-       ir_node *cur_block = get_cur_block();
-
-       ir_node *fallthrough_block = NULL;
-
-       /* the true (blocks) */
-       ir_node *true_block = NULL;
-       if (statement->true_statement != NULL) {
-               true_block = new_immBlock();
-               set_cur_block(true_block);
-               statement_to_firm(statement->true_statement);
-               if (get_cur_block() != NULL) {
-                       ir_node *jmp = new_Jmp();
-                       if (fallthrough_block == NULL)
-                               fallthrough_block = new_immBlock();
-                       add_immBlock_pred(fallthrough_block, jmp);
-               }
+       /* Create the condition. */
+       ir_node *true_block  = NULL;
+       ir_node *false_block = NULL;
+       if (get_cur_block() != NULL) {
+               true_block  = new_immBlock();
+               false_block = new_immBlock();
+               create_condition_evaluation(statement->condition, true_block, false_block);
+               mature_immBlock(true_block);
        }
 
-       /* the false (blocks) */
-       ir_node *false_block = NULL;
+       /* Create the false statement.
+        * Handle false before true, so if no false statement is present, then the
+        * empty false block is reused as fallthrough block. */
+       ir_node *fallthrough_block = NULL;
        if (statement->false_statement != NULL) {
-               false_block = new_immBlock();
+               if (false_block != NULL) {
+                       mature_immBlock(false_block);
+               }
                set_cur_block(false_block);
-
                statement_to_firm(statement->false_statement);
                if (get_cur_block() != NULL) {
-                       ir_node *jmp = new_Jmp();
-                       if (fallthrough_block == NULL)
-                               fallthrough_block = new_immBlock();
-                       add_immBlock_pred(fallthrough_block, jmp);
+                       fallthrough_block = new_immBlock();
+                       add_immBlock_pred(fallthrough_block, new_Jmp());
                }
+       } else {
+               fallthrough_block = false_block;
        }
 
-       /* create the condition */
-       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;
+       /* Create the true statement. */
+       set_cur_block(true_block);
+       statement_to_firm(statement->true_statement);
+       if (get_cur_block() != NULL) {
+               if (fallthrough_block == NULL) {
+                       fallthrough_block = new_immBlock();
                }
-
-               set_cur_block(cur_block);
-               create_condition_evaluation(statement->condition, true_block,
-                                           false_block);
+               add_immBlock_pred(fallthrough_block, new_Jmp());
        }
 
-       mature_immBlock(true_block);
-       if (false_block != fallthrough_block && false_block != NULL) {
-               mature_immBlock(false_block);
-       }
+       /* Handle the block after the if-statement. */
        if (fallthrough_block != NULL) {
                mature_immBlock(fallthrough_block);
        }
-
        set_cur_block(fallthrough_block);
 }
 
-static void while_statement_to_firm(while_statement_t *statement)
+/* Create a jump node which jumps into target_block, if the current block is
+ * reachable. */
+static void jump_if_reachable(ir_node *const target_block)
 {
-       ir_node *jmp = NULL;
-       if (get_cur_block() != NULL) {
-               jmp = new_Jmp();
-       }
-
-       /* create the header block */
-       ir_node *header_block = new_immBlock();
-       if (jmp != NULL) {
-               add_immBlock_pred(header_block, jmp);
-       }
-
-       /* the loop body */
-       ir_node *old_continue_label = continue_label;
-       ir_node *old_break_label    = break_label;
-       continue_label              = header_block;
-       break_label                 = NULL;
-
-       ir_node *body_block = new_immBlock();
-       set_cur_block(body_block);
-       statement_to_firm(statement->body);
-       ir_node *false_block = 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);
+               add_immBlock_pred(target_block, new_Jmp());
        }
+}
 
-       /* 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);
+static void while_statement_to_firm(while_statement_t *statement)
+{
+       /* Create the header block */
+       ir_node *const header_block = new_immBlock();
+       jump_if_reachable(header_block);
+
+       /* Create the condition. */
+       ir_node      *      body_block;
+       ir_node      *      false_block;
+       expression_t *const cond = statement->condition;
+       if (is_constant_expression(cond) == EXPR_CLASS_CONSTANT &&
+                       fold_constant_to_bool(cond)) {
+               /* Shortcut for while (true). */
+               body_block  = header_block;
+               false_block = NULL;
 
-               keep_alive(body_block);
-               keep_all_memory(body_block);
-               set_cur_block(body_block);
+               keep_alive(header_block);
+               keep_all_memory(header_block);
        } else {
-               if (false_block == NULL) {
-                       false_block = new_immBlock();
-               }
+               body_block  = new_immBlock();
+               false_block = new_immBlock();
 
-               /* create the condition */
                set_cur_block(header_block);
-
-               create_condition_evaluation(statement->condition, body_block,
-                                           false_block);
+               create_condition_evaluation(cond, body_block, false_block);
+               mature_immBlock(body_block);
        }
 
-       mature_immBlock(body_block);
+       ir_node *const old_continue_label = continue_label;
+       ir_node *const old_break_label    = break_label;
+       continue_label = header_block;
+       break_label    = false_block;
+
+       /* Create the loop body. */
+       set_cur_block(body_block);
+       statement_to_firm(statement->body);
+       jump_if_reachable(header_block);
+
        mature_immBlock(header_block);
+       assert(false_block == NULL || false_block == break_label);
+       false_block = break_label;
        if (false_block != NULL) {
                mature_immBlock(false_block);
        }
-
        set_cur_block(false_block);
+
+       assert(continue_label == header_block);
+       continue_label = old_continue_label;
+       break_label    = old_break_label;
 }
 
-static void do_while_statement_to_firm(do_while_statement_t *statement)
+static ir_node *get_break_label(void)
 {
-       ir_node *jmp = NULL;
-       if (get_cur_block() != NULL) {
-               jmp = new_Jmp();
+       if (break_label == NULL) {
+               break_label = new_immBlock();
        }
+       return break_label;
+}
 
+static void do_while_statement_to_firm(do_while_statement_t *statement)
+{
        /* create the header block */
        ir_node *header_block = new_immBlock();
 
        /* the loop body */
        ir_node *body_block = new_immBlock();
-       if (jmp != NULL) {
-               add_immBlock_pred(body_block, jmp);
-       }
+       jump_if_reachable(body_block);
 
        ir_node *old_continue_label = continue_label;
        ir_node *old_break_label    = break_label;
@@ -4622,28 +4974,20 @@ static void do_while_statement_to_firm(do_while_statement_t *statement)
 
        set_cur_block(body_block);
        statement_to_firm(statement->body);
-       ir_node *false_block = break_label;
+       ir_node *const false_block = get_break_label();
 
        assert(continue_label == header_block);
        continue_label = old_continue_label;
        break_label    = old_break_label;
 
-       if (get_cur_block() != NULL) {
-               ir_node *body_jmp = new_Jmp();
-               add_immBlock_pred(header_block, body_jmp);
-               mature_immBlock(header_block);
-       }
-
-       if (false_block == NULL) {
-               false_block = new_immBlock();
-       }
+       jump_if_reachable(header_block);
 
        /* create the condition */
+       mature_immBlock(header_block);
        set_cur_block(header_block);
 
        create_condition_evaluation(statement->condition, body_block, false_block);
        mature_immBlock(body_block);
-       mature_immBlock(header_block);
        mature_immBlock(false_block);
 
        set_cur_block(false_block);
@@ -4651,8 +4995,6 @@ 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 */
        entity_t *entity = statement->scope.entities;
        for ( ; entity != NULL; entity = entity->base.next) {
@@ -4674,74 +5016,67 @@ static void for_statement_to_firm(for_statement_t *statement)
                if (statement->initialisation != NULL) {
                        expression_to_firm(statement->initialisation);
                }
-
-               jmp = new_Jmp();
        }
 
-
-       /* create the step block */
-       ir_node *const step_block = new_immBlock();
-       set_cur_block(step_block);
-       if (statement->step != NULL) {
-               expression_to_firm(statement->step);
-       }
-       ir_node *const step_jmp = new_Jmp();
-
-       /* create the header block */
+       /* Create the header block */
        ir_node *const header_block = new_immBlock();
-       set_cur_block(header_block);
-       if (jmp != NULL) {
-               add_immBlock_pred(header_block, jmp);
-       }
-       add_immBlock_pred(header_block, step_jmp);
-
-       /* the false block */
-       ir_node *const false_block = new_immBlock();
+       jump_if_reachable(header_block);
 
-       /* the loop body */
+       /* Create the condition. */
        ir_node *body_block;
-       if (statement->body != NULL) {
-               ir_node *const old_continue_label = continue_label;
-               ir_node *const old_break_label    = break_label;
-               continue_label = step_block;
-               break_label    = false_block;
-
-               body_block = new_immBlock();
-               set_cur_block(body_block);
-               statement_to_firm(statement->body);
-
-               assert(continue_label == step_block);
-               assert(break_label    == false_block);
-               continue_label = old_continue_label;
-               break_label    = old_break_label;
+       ir_node *false_block;
+       if (statement->condition != NULL) {
+               body_block  = new_immBlock();
+               false_block = new_immBlock();
 
-               if (get_cur_block() != NULL) {
-                       jmp = new_Jmp();
-                       add_immBlock_pred(step_block, jmp);
-               }
+               set_cur_block(header_block);
+               create_condition_evaluation(statement->condition, body_block, false_block);
+               mature_immBlock(body_block);
        } else {
-               body_block = step_block;
-       }
+               /* for-ever. */
+               body_block  = header_block;
+               false_block = NULL;
 
-       /* create the condition */
-       set_cur_block(header_block);
-       if (statement->condition != NULL) {
-               create_condition_evaluation(statement->condition, body_block,
-                                           false_block);
-       } else {
                keep_alive(header_block);
                keep_all_memory(header_block);
-               jmp = new_Jmp();
-               add_immBlock_pred(body_block, jmp);
        }
 
-       mature_immBlock(body_block);
-       mature_immBlock(false_block);
-       mature_immBlock(step_block);
-       mature_immBlock(header_block);
-       mature_immBlock(false_block);
+       /* Create the step block, if necessary. */
+       ir_node      *      step_block = header_block;
+       expression_t *const step       = statement->step;
+       if (step != NULL) {
+               step_block = new_immBlock();
+       }
+
+       ir_node *const old_continue_label = continue_label;
+       ir_node *const old_break_label    = break_label;
+       continue_label = step_block;
+       break_label    = false_block;
+
+       /* Create the loop body. */
+       set_cur_block(body_block);
+       statement_to_firm(statement->body);
+       jump_if_reachable(step_block);
+
+       /* Create the step code. */
+       if (step != NULL) {
+               mature_immBlock(step_block);
+               set_cur_block(step_block);
+               expression_to_firm(step);
+               jump_if_reachable(header_block);
+       }
 
+       mature_immBlock(header_block);
+       assert(false_block == NULL || false_block == break_label);
+       false_block = break_label;
+       if (false_block != NULL) {
+               mature_immBlock(false_block);
+       }
        set_cur_block(false_block);
+
+       assert(continue_label == step_block);
+       continue_label = old_continue_label;
+       break_label    = old_break_label;
 }
 
 static void create_jump_statement(const statement_t *statement,
@@ -4757,20 +5092,17 @@ static void create_jump_statement(const statement_t *statement,
        set_cur_block(NULL);
 }
 
-static ir_node *get_break_label(void)
-{
-       if (break_label == NULL) {
-               break_label = new_immBlock();
-       }
-       return break_label;
-}
-
 static void switch_statement_to_firm(switch_statement_t *statement)
 {
-       dbg_info *dbgi = get_dbg_info(&statement->base.source_position);
+       ir_node  *first_block = NULL;
+       dbg_info *dbgi        = get_dbg_info(&statement->base.source_position);
+       ir_node  *cond        = NULL;
 
-       ir_node *expression  = expression_to_firm(statement->expression);
-       ir_node *cond        = new_d_Cond(dbgi, expression);
+       if (get_cur_block() != NULL) {
+               ir_node *expression = expression_to_firm(statement->expression);
+               cond                = new_d_Cond(dbgi, expression);
+               first_block         = get_cur_block();
+       }
 
        set_cur_block(NULL);
 
@@ -4784,8 +5116,8 @@ static void switch_statement_to_firm(switch_statement_t *statement)
        current_switch                       = statement;
 
        /* determine a free number for the default label */
-       unsigned long num_cases = 0;
-       long def_nr = 0;
+       unsigned long num_cases       = 0;
+       long          default_proj_nr = 0;
        for (case_label_statement_t *l = statement->first_case; l != NULL; l = l->next) {
                if (l->expression == NULL) {
                        /* default case */
@@ -4793,18 +5125,18 @@ static void switch_statement_to_firm(switch_statement_t *statement)
                }
                if (l->last_case >= l->first_case)
                        num_cases += l->last_case - l->first_case + 1;
-               if (l->last_case > def_nr)
-                       def_nr = l->last_case;
+               if (l->last_case > default_proj_nr)
+                       default_proj_nr = l->last_case;
        }
 
-       if (def_nr == INT_MAX) {
-               /* Bad: an overflow will occurr, we cannot be sure that the
+       if (default_proj_nr == INT_MAX) {
+               /* Bad: an overflow will occur, we cannot be sure that the
                 * maximum + 1 is a free number. Scan the values a second
                 * time to find a free number.
                 */
                unsigned char *bits = xmalloc((num_cases + 7) >> 3);
 
-               memset(bits, 0, (num_cases + 7) >> 3);
+               memset(bits, 0, (num_cases + 7) >> 3);
                for (case_label_statement_t *l = statement->first_case; l != NULL; l = l->next) {
                        if (l->expression == NULL) {
                                /* default case */
@@ -4820,8 +5152,8 @@ static void switch_statement_to_firm(switch_statement_t *statement)
                        }
                }
                /* We look at the first num_cases constants:
-                * Either they are densed, so we took the last (num_cases)
-                * one, or they are non densed, so we will find one free
+                * Either they are dense, so we took the last (num_cases)
+                * one, or they are not dense, so we will find one free
                 * there...
                 */
                unsigned long i;
@@ -4830,25 +5162,23 @@ static void switch_statement_to_firm(switch_statement_t *statement)
                                break;
 
                free(bits);
-               def_nr = i;
+               default_proj_nr = i;
        } else {
-               ++def_nr;
+               ++default_proj_nr;
        }
-       statement->default_proj_nr = def_nr;
-
-       if (statement->body != NULL) {
-               statement_to_firm(statement->body);
+       statement->default_proj_nr = default_proj_nr;
+       /* safety check: cond might already be folded to a Bad */
+       if (cond != NULL && is_Cond(cond)) {
+               set_Cond_default_proj(cond, default_proj_nr);
        }
 
-       if (get_cur_block() != NULL) {
-               ir_node *jmp = new_Jmp();
-               add_immBlock_pred(get_break_label(), jmp);
-       }
+       statement_to_firm(statement->body);
 
-       if (!saw_default_label) {
-               set_cur_block(get_nodes_block(cond));
-               ir_node *const proj = new_d_defaultProj(dbgi, cond,
-                                                       statement->default_proj_nr);
+       jump_if_reachable(get_break_label());
+
+       if (!saw_default_label && first_block != NULL) {
+               set_cur_block(first_block);
+               ir_node *const proj = new_d_Proj(dbgi, cond, mode_X, default_proj_nr);
                add_immBlock_pred(get_break_label(), proj);
        }
 
@@ -4869,58 +5199,46 @@ static void case_label_to_firm(const case_label_statement_t *statement)
        if (statement->is_empty_range)
                return;
 
-       dbg_info *dbgi = get_dbg_info(&statement->base.source_position);
-
-       ir_node *const fallthrough = (get_cur_block() == NULL ? NULL : new_Jmp());
-
-       ir_node *proj;
-       ir_node *block     = new_immBlock();
-
-       set_cur_block(get_nodes_block(current_switch_cond));
-       if (statement->expression != NULL) {
-               long pn     = statement->first_case;
-               long end_pn = statement->last_case;
-               assert(pn <= end_pn);
-               /* create jumps for all cases in the given range */
-               do {
-                       proj = new_d_Proj(dbgi, current_switch_cond, mode_X, pn);
+       ir_node *block = new_immBlock();
+       /* Fallthrough from previous case */
+       jump_if_reachable(block);
+
+       if (current_switch_cond != NULL) {
+               set_cur_block(get_nodes_block(current_switch_cond));
+               dbg_info *const dbgi = get_dbg_info(&statement->base.source_position);
+               if (statement->expression != NULL) {
+                       long pn     = statement->first_case;
+                       long end_pn = statement->last_case;
+                       assert(pn <= end_pn);
+                       /* create jumps for all cases in the given range */
+                       do {
+                               ir_node *const proj = new_d_Proj(dbgi, current_switch_cond, mode_X, pn);
+                               add_immBlock_pred(block, proj);
+                       } while (pn++ < end_pn);
+               } else {
+                       saw_default_label = true;
+                       ir_node *const proj = new_d_Proj(dbgi, current_switch_cond, mode_X,
+                                                        current_switch->default_proj_nr);
                        add_immBlock_pred(block, proj);
-               } while(pn++ < end_pn);
-       } else {
-               saw_default_label = true;
-               proj = new_d_defaultProj(dbgi, current_switch_cond,
-                                        current_switch->default_proj_nr);
-
-               add_immBlock_pred(block, proj);
+               }
        }
 
-       if (fallthrough != NULL) {
-               add_immBlock_pred(block, fallthrough);
-       }
        mature_immBlock(block);
        set_cur_block(block);
 
-       if (statement->statement != NULL) {
-               statement_to_firm(statement->statement);
-       }
+       statement_to_firm(statement->statement);
 }
 
 static void label_to_firm(const label_statement_t *statement)
 {
        ir_node *block = get_label_block(statement->label);
-
-       if (get_cur_block() != NULL) {
-               ir_node *jmp = new_Jmp();
-               add_immBlock_pred(block, jmp);
-       }
+       jump_if_reachable(block);
 
        set_cur_block(block);
        keep_alive(block);
        keep_all_memory(block);
 
-       if (statement->statement != NULL) {
-               statement_to_firm(statement->statement);
-       }
+       statement_to_firm(statement->statement);
 }
 
 static void goto_to_firm(const goto_statement_t *statement)
@@ -5030,7 +5348,7 @@ static void asm_statement_to_firm(const asm_statement_t *statement)
                                char     buf[64];
                                ir_node *value = get_value_from_lvalue(expr, addr);
 
-                               snprintf(buf, sizeof(buf), "%u", pos);
+                               snprintf(buf, sizeof(buf), "%u", (unsigned) out_size);
 
                                ir_asm_constraint constraint;
                                constraint.pos              = pos;
@@ -5170,7 +5488,7 @@ static void asm_statement_to_firm(const asm_statement_t *statement)
 
        /* create output projs & connect them */
        if (needs_memory) {
-               ir_node *projm = new_Proj(node, mode_M, out_size+1);
+               ir_node *projm = new_Proj(node, mode_M, out_size);
                set_store(projm);
        }
 
@@ -5186,13 +5504,13 @@ static void asm_statement_to_firm(const asm_statement_t *statement)
        }
 }
 
-static void    ms_try_statement_to_firm(ms_try_statement_t *statement)
+static void ms_try_statement_to_firm(ms_try_statement_t *statement)
 {
        statement_to_firm(statement->try_statement);
        warningf(&statement->base.source_position, "structured exception handling ignored");
 }
 
-static void    leave_statement_to_firm(leave_statement_t *statement)
+static void leave_statement_to_firm(leave_statement_t *statement)
 {
        errorf(&statement->base.source_position, "__leave not supported yet");
 }
@@ -5272,7 +5590,8 @@ static int count_local_variables(const entity_t *entity,
                                  const entity_t *const last)
 {
        int count = 0;
-       for (; entity != NULL; entity = entity->base.next) {
+       entity_t const *const end = last != NULL ? last->base.next : NULL;
+       for (; entity != end; entity = entity->base.next) {
                type_t *type;
                bool    address_taken;
 
@@ -5288,9 +5607,6 @@ static int count_local_variables(const entity_t *entity,
 
                if (!address_taken && is_type_scalar(type))
                        ++count;
-
-               if (entity == last)
-                       break;
        }
        return count;
 }
@@ -5316,31 +5632,45 @@ static void count_local_variables_in_stmt(statement_t *stmt, void *const env)
        }
 }
 
+/**
+ * Return the number of local (alias free) variables used by a function.
+ */
 static int get_function_n_local_vars(entity_t *entity)
 {
+       const function_t *function = &entity->function;
        int count = 0;
 
        /* count parameters */
-       count += count_local_variables(entity->function.parameters.entities, NULL);
+       count += count_local_variables(function->parameters.entities, NULL);
 
        /* count local variables declared in body */
-       walk_statements(entity->function.statement, count_local_variables_in_stmt,
-                       &count);
+       walk_statements(function->statement, count_local_variables_in_stmt, &count);
        return count;
 }
 
+/**
+ * Build Firm code for the parameters of a function.
+ */
 static void initialize_function_parameters(entity_t *entity)
 {
        assert(entity->kind == ENTITY_FUNCTION);
        ir_graph *irg             = current_ir_graph;
        ir_node  *args            = get_irg_args(irg);
-       ir_node  *start_block     = get_irg_start_block(irg);
        ir_type  *function_irtype = get_ir_type(entity->declaration.type);
+       int      first_param_nr   = 0;
+
+       if (entity->function.need_closure) {
+               /* add an extra parameter for the static link */
+               entity->function.static_link = new_r_Proj(args, mode_P_data, 0);
+               ++first_param_nr;
+       }
 
        int       n         = 0;
        entity_t *parameter = entity->function.parameters.entities;
        for ( ; parameter != NULL; parameter = parameter->base.next, ++n) {
-               assert(parameter->kind == ENTITY_PARAMETER);
+               if (parameter->kind != ENTITY_PARAMETER)
+                       continue;
+
                assert(parameter->declaration.kind == DECLARATION_KIND_UNKNOWN);
                type_t *type = skip_typeref(parameter->declaration.type);
 
@@ -5364,8 +5694,8 @@ static void initialize_function_parameters(entity_t *entity)
                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);
+               long     pn    = n + first_param_nr;
+               ir_node *value = new_r_Proj(args, param_mode, pn);
 
                ir_mode *mode = get_ir_mode_storage(type);
                value = create_conv(NULL, value, mode);
@@ -5387,26 +5717,27 @@ static void initialize_function_parameters(entity_t *entity)
  * @param irg            the IR-graph
  * @param dec_modifiers  additional modifiers
  */
-static void handle_decl_modifier_irg(ir_graph_ptr irg, decl_modifiers_t decl_modifiers)
+static void handle_decl_modifier_irg(ir_graph_ptr irg,
+                                     decl_modifiers_t decl_modifiers)
 {
        if (decl_modifiers & DM_RETURNS_TWICE) {
                /* TRUE if the declaration includes __attribute__((returns_twice)) */
-               set_irg_additional_property(irg, mtp_property_returns_twice);
+               add_irg_additional_properties(irg, mtp_property_returns_twice);
        }
        if (decl_modifiers & DM_NORETURN) {
                /* TRUE if the declaration includes the Microsoft
                   __declspec(noreturn) specifier. */
-               set_irg_additional_property(irg, mtp_property_noreturn);
+               add_irg_additional_properties(irg, mtp_property_noreturn);
        }
        if (decl_modifiers & DM_NOTHROW) {
                /* TRUE if the declaration includes the Microsoft
                   __declspec(nothrow) specifier. */
-               set_irg_additional_property(irg, mtp_property_nothrow);
+               add_irg_additional_properties(irg, mtp_property_nothrow);
        }
        if (decl_modifiers & DM_NAKED) {
                /* TRUE if the declaration includes the Microsoft
                   __declspec(naked) specifier. */
-               set_irg_additional_property(irg, mtp_property_naked);
+               add_irg_additional_properties(irg, mtp_property_naked);
        }
        if (decl_modifiers & DM_FORCEINLINE) {
                /* TRUE if the declaration includes the
@@ -5424,17 +5755,22 @@ static void add_function_pointer(ir_type *segment, ir_entity *method,
                                  const char *unique_template)
 {
        ir_type   *method_type  = get_entity_type(method);
-       ident     *id           = id_unique(unique_template);
-       ir_type   *ptr_type     = new_type_pointer(id, method_type, mode_P_code);
+       ir_type   *ptr_type     = new_type_pointer(method_type);
 
+       /* these entities don't really have a name but firm only allows
+        * "" in ld_ident.
+        * Note that we mustn't give these entities a name since for example
+        * Mach-O doesn't allow them. */
        ident     *ide          = id_unique(unique_template);
        ir_entity *ptr          = new_entity(segment, ide, ptr_type);
        ir_graph  *irg          = get_const_code_irg();
        ir_node   *val          = new_rd_SymConst_addr_ent(NULL, irg, mode_P_code,
-                                                          method, NULL);
+                                                          method);
 
+       set_entity_ld_ident(ptr, new_id_from_chars("", 0));
        set_entity_compiler_generated(ptr, 1);
-       set_entity_variability(ptr, variability_constant);
+       set_entity_visibility(ptr, ir_visibility_private);
+       add_entity_linkage(ptr, IR_LINKAGE_CONSTANT|IR_LINKAGE_HIDDEN_USER);
        set_atomic_ent_value(ptr, val);
 }
 
@@ -5450,16 +5786,25 @@ static void gen_ijmp_branches(ir_node *block)
 }
 
 /**
- * Create code for a function.
+ * Create code for a function and all inner functions.
+ *
+ * @param entity  the function entity
  */
 static void create_function(entity_t *entity)
 {
        assert(entity->kind == ENTITY_FUNCTION);
-       ir_entity *function_entity = get_function_entity(entity);
+       ir_entity *function_entity = get_function_entity(entity, current_outer_frame);
 
        if (entity->function.statement == NULL)
                return;
 
+       if (is_main(entity) && enable_main_collect2_hack) {
+               prepare_main_collect2(entity);
+       }
+
+       inner_functions     = NULL;
+       current_trampolines = NULL;
+
        if (entity->declaration.modifiers & DM_CONSTRUCTOR) {
                ir_type *segment = get_segment_type(IR_SEGMENT_CONSTRUCTORS);
                add_function_pointer(segment, function_entity, "constructor_ptr.%u");
@@ -5479,13 +5824,15 @@ static void create_function(entity_t *entity)
 
        int       n_local_vars = get_function_n_local_vars(entity);
        ir_graph *irg          = new_ir_graph(function_entity, n_local_vars);
+       current_ir_graph = irg;
 
        ir_graph *old_current_function = current_function;
        current_function = irg;
 
        set_irg_fp_model(irg, firm_opt.fp_model);
        tarval_enable_fp_ops(1);
-       set_irn_dbg_info(get_irg_start_block(irg), get_entity_dbg_info(function_entity));
+       set_irn_dbg_info(get_irg_start_block(irg),
+                        get_entity_dbg_info(function_entity));
 
        ir_node *first_block = get_cur_block();
 
@@ -5496,6 +5843,7 @@ static void create_function(entity_t *entity)
 
        next_value_number_function = 0;
        initialize_function_parameters(entity);
+       current_static_link = entity->function.static_link;
 
        statement_to_firm(entity->function.statement);
 
@@ -5585,14 +5933,28 @@ static void create_function(entity_t *entity)
        set_type_size_bytes(frame_type, offset);
        set_type_alignment_bytes(frame_type, align_all);
 
-       irg_vrfy(irg);
+       irg_verify(irg, VERIFY_ENFORCE_SSA);
        current_function = old_current_function;
 
-       /* create inner functions */
-       entity_t *inner;
-       for (inner = next_inner_function(); inner != NULL;
-            inner = next_inner_function()) {
-               create_function(inner);
+       if (current_trampolines != NULL) {
+               DEL_ARR_F(current_trampolines);
+               current_trampolines = NULL;
+       }
+
+       /* create inner functions if any */
+       entity_t **inner = inner_functions;
+       if (inner != NULL) {
+               ir_type *rem_outer_frame      = current_outer_frame;
+               current_outer_frame           = get_irg_frame_type(current_ir_graph);
+               ir_type *rem_outer_value_type = current_outer_value_type;
+               current_outer_value_type      = get_irg_value_param_type(current_ir_graph);
+               for (int i = ARR_LEN(inner) - 1; i >= 0; --i) {
+                       create_function(inner[i]);
+               }
+               DEL_ARR_F(inner);
+
+               current_outer_value_type = rem_outer_value_type;
+               current_outer_frame      = rem_outer_frame;
        }
 }
 
@@ -5605,9 +5967,15 @@ static void scope_to_firm(scope_t *scope)
                        continue;
 
                if (entity->kind == ENTITY_FUNCTION) {
-                       get_function_entity(entity);
+                       if (entity->function.btk != bk_none) {
+                               /* builtins have no representation */
+                               continue;
+                       }
+                       (void)get_function_entity(entity, NULL);
                } else if (entity->kind == ENTITY_VARIABLE) {
                        create_global_variable(entity);
+               } else if (entity->kind == ENTITY_NAMESPACE) {
+                       scope_to_firm(&entity->namespacee.members);
                }
        }
 
@@ -5618,6 +5986,10 @@ static void scope_to_firm(scope_t *scope)
                        continue;
 
                if (entity->kind == ENTITY_FUNCTION) {
+                       if (entity->function.btk != bk_none) {
+                               /* builtins have no representation */
+                               continue;
+                       }
                        create_function(entity);
                } else if (entity->kind == ENTITY_VARIABLE) {
                        assert(entity->declaration.kind
@@ -5633,20 +6005,8 @@ void init_ast2firm(void)
        obstack_init(&asm_obst);
        init_atomic_modes();
 
-       /* OS option must be set to the backend */
-       switch (firm_opt.os_support) {
-       case OS_SUPPORT_MINGW:
-               create_ld_ident = create_name_win32;
-               break;
-       case OS_SUPPORT_LINUX:
-               create_ld_ident = create_name_linux_elf;
-               break;
-       case OS_SUPPORT_MACHO:
-               create_ld_ident = create_name_macho;
-               break;
-       default:
-               panic("unexpected OS support mode");
-       }
+       ir_set_debug_retrieve(dbg_retrieve);
+       ir_set_type_debug_retrieve(dbg_print_type_dbg_info);
 
        /* create idents for all known runtime functions */
        for (size_t i = 0; i < lengthof(rts_data); ++i) {
@@ -5664,12 +6024,15 @@ static void init_ir_types(void)
        ir_types_initialized = 1;
 
        ir_type_int        = get_ir_type(type_int);
+       ir_type_char       = get_ir_type(type_char);
        ir_type_const_char = get_ir_type(type_const_char);
        ir_type_wchar_t    = get_ir_type(type_wchar_t);
        ir_type_void       = get_ir_type(type_void);
 
-       const backend_params *be_params = be_get_backend_param();
+       be_params             = be_get_backend_param();
        mode_float_arithmetic = be_params->mode_float_arithmetic;
+
+       stack_param_align     = be_params->stack_param_align;
 }
 
 void exit_ast2firm(void)
@@ -5697,6 +6060,10 @@ static void global_asm_to_firm(statement_t *s)
 
 void translation_unit_to_firm(translation_unit_t *unit)
 {
+       /* initialize firm arithmetic */
+       tarval_set_integer_overflow_mode(TV_OVERFLOW_WRAP);
+       ir_set_uninitialized_local_variable_func(uninitialized_local_var);
+
        /* just to be sure */
        continue_label           = NULL;
        break_label              = NULL;
@@ -5704,14 +6071,10 @@ void translation_unit_to_firm(translation_unit_t *unit)
        current_translation_unit = unit;
 
        init_ir_types();
-       inner_functions = NEW_ARR_F(entity_t *, 0);
 
        scope_to_firm(&unit->scope);
        global_asm_to_firm(unit->global_asm);
 
-       DEL_ARR_F(inner_functions);
-       inner_functions  = NULL;
-
        current_ir_graph         = NULL;
        current_translation_unit = NULL;
 }