long double alignment is 4, implement wide character constant parsing, add another...
[cparser] / ast2firm.c
index 8e3b3ac..e081b1d 100644 (file)
 #include "token_t.h"
 #include "type_t.h"
 #include "ast_t.h"
+#include "parser.h"
 
 #define MAGIC_DEFAULT_PN_NUMBER            (long) -314159265
 
 static ir_type *ir_type_const_char;
+static ir_type *ir_type_wchar_t;
 static ir_type *ir_type_void;
 static ir_type *ir_type_int;
-static ir_type *ir_type_void_ptr;
 
 static type_t *type_const_char;
 static type_t *type_void;
@@ -32,8 +33,14 @@ static int       next_value_number_function;
 static ir_node  *continue_label;
 static ir_node  *break_label;
 static ir_node  *current_switch_cond;
+static bool      saw_default_label;
 static ir_node **imature_blocks;
 
+static const declaration_t *current_function_decl;
+static ir_node             *current_function_name;
+
+static struct obstack asm_obst;
+
 typedef enum declaration_type_t {
        DECLARATION_TYPE_UNKNOWN,
        DECLARATION_TYPE_FUNCTION,
@@ -42,6 +49,7 @@ typedef enum declaration_type_t {
        DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY,
        DECLARATION_TYPE_COMPOUND_MEMBER,
        DECLARATION_TYPE_LABEL_BLOCK,
+       DECLARATION_TYPE_ENUM_ENTRY
 } declaration_type_t;
 
 static ir_type *get_ir_type(type_t *type);
@@ -69,7 +77,7 @@ unsigned dbg_snprint(char *buf, unsigned len, const dbg_info *dbg)
                                   pos->linenr);
 }
 
-const char *retrieve_dbg(const dbg_info *dbg, unsigned *line)
+const char *dbg_retrieve(const dbg_info *dbg, unsigned *line)
 {
        const source_position_t *pos = (const source_position_t*) dbg;
        if(pos == NULL)
@@ -81,22 +89,12 @@ const char *retrieve_dbg(const dbg_info *dbg, unsigned *line)
 
 void init_ast2firm(void)
 {
-       type_const_char = make_atomic_type(ATOMIC_TYPE_CHAR, TYPE_QUALIFIER_CONST);
-       type_void       = make_atomic_type(ATOMIC_TYPE_VOID, 0);
-       type_int        = make_atomic_type(ATOMIC_TYPE_INT, 0);
-
-       ir_type_int        = get_ir_type(type_int);
-       ir_type_const_char = get_ir_type(type_const_char);
-       ir_type_void       = get_ir_type(type_int); /* we don't have a real void
-                                                      type in firm */
-       ir_type_void_ptr   = new_type_pointer(new_id_from_str("void_ptr"),
-                                             ir_type_void, mode_P_data);
-
-       type_void->firm_type = ir_type_void;
+       obstack_init(&asm_obst);
 }
 
 void exit_ast2firm(void)
 {
+       obstack_free(&asm_obst, NULL);
 }
 
 static unsigned unique_id = 0;
@@ -105,7 +103,7 @@ static ident *unique_ident(const char *tag)
 {
        char buf[256];
 
-       snprintf(buf, sizeof(buf), "%s.%d", tag, unique_id);
+       snprintf(buf, sizeof(buf), "%s.%u", tag, unique_id);
        unique_id++;
        return new_id_from_str(buf);
 }
@@ -122,6 +120,7 @@ static ir_mode *get_atomic_mode(const atomic_type_t* atomic_type)
                return mode_Hs;
        case ATOMIC_TYPE_USHORT:
                return mode_Hu;
+       case ATOMIC_TYPE_BOOL:
        case ATOMIC_TYPE_LONG:
        case ATOMIC_TYPE_INT:
                return mode_Is;
@@ -138,8 +137,6 @@ static ir_mode *get_atomic_mode(const atomic_type_t* atomic_type)
                return mode_D;
        case ATOMIC_TYPE_LONG_DOUBLE:
                return mode_E;
-       case ATOMIC_TYPE_BOOL:
-               return mode_b;
 #ifdef PROVIDE_COMPLEX
        case ATOMIC_TYPE_FLOAT_COMPLEX:
        case ATOMIC_TYPE_DOUBLE_COMPLEX:
@@ -203,13 +200,13 @@ static unsigned get_atomic_type_size(const atomic_type_t *type)
 
 static unsigned get_compound_type_size(compound_type_t *type)
 {
-       ir_type *irtype = get_ir_type(&type->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)
 {
-       ir_type *irtype = get_ir_type(&type->type);
+       ir_type *irtype = get_ir_type((type_t*) type);
        return get_type_size_bytes(irtype);
 }
 
@@ -219,20 +216,21 @@ static unsigned get_type_size(type_t *type)
 
        switch(type->type) {
        case TYPE_ATOMIC:
-               return get_atomic_type_size((const atomic_type_t*) type);
+               return get_atomic_type_size(&type->atomic);
        case TYPE_ENUM:
                return get_mode_size_bytes(mode_Is);
        case TYPE_COMPOUND_UNION:
        case TYPE_COMPOUND_STRUCT:
-               return get_compound_type_size((compound_type_t*) type);
+               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:
                return get_mode_size_bytes(mode_P_data);
        case TYPE_ARRAY:
-               return get_array_type_size((array_type_t*) type);
+               return get_array_type_size(&type->array);
        case TYPE_BUILTIN:
+               return get_type_size(type->builtin.real_type);
        case TYPE_TYPEDEF:
        case TYPE_TYPEOF:
        case TYPE_INVALID:
@@ -264,20 +262,24 @@ static ir_type *create_atomic_type(const atomic_type_t *type)
        ident   *id     = get_mode_ident(mode);
        ir_type *irtype = new_type_primitive(id, mode);
 
+       if(type->atype == ATOMIC_TYPE_LONG_DOUBLE) {
+               set_type_alignment_bytes(irtype, 4);
+       }
+
        return irtype;
 }
 
 static ir_type *create_method_type(const function_type_t *function_type)
 {
-       type_t  *result_type  = function_type->result_type;
+       type_t  *return_type  = function_type->return_type;
 
        ident   *id           = unique_ident("functiontype");
        int      n_parameters = count_parameters(function_type);
-       int      n_results    = result_type == type_void ? 0 : 1;
+       int      n_results    = return_type == type_void ? 0 : 1;
        ir_type *irtype       = new_type_method(id, n_parameters, n_results);
 
-       if(result_type != type_void) {
-               ir_type *restype = get_ir_type(result_type);
+       if(return_type != type_void) {
+               ir_type *restype = get_ir_type(return_type);
                set_method_res_type(irtype, 0, restype);
        }
 
@@ -359,7 +361,7 @@ static ir_type *create_struct_type(compound_type_t *type)
        int offset    = 0;
        declaration_t *entry = type->declaration->context.declarations;
        for( ; entry != NULL; entry = entry->next) {
-               if(entry->namespace != NAMESPACE_NORMAL)
+               if(entry->namespc != NAMESPACE_NORMAL)
                        continue;
 
                ident       *ident         = new_id_from_str(entry->symbol->string);
@@ -367,8 +369,9 @@ static ir_type *create_struct_type(compound_type_t *type)
 
                int entry_size      = get_type_size_bytes(entry_ir_type);
                int entry_alignment = get_type_alignment_bytes(entry_ir_type);
-               int misalign = offset % entry_alignment;
-               offset += misalign;
+               int misalign        = offset % entry_alignment;
+               if (misalign != 0)
+                       offset += entry_alignment - misalign;
 
                ir_entity *entity = new_entity(ir_type, ident, entry_ir_type);
                set_entity_offset(entity, offset);
@@ -412,7 +415,7 @@ static ir_type *create_union_type(compound_type_t *type)
        int size      = 0;
        declaration_t *entry = declaration->context.declarations;
        for( ; entry != NULL; entry = entry->next) {
-               if(entry->namespace != NAMESPACE_NORMAL)
+               if(entry->namespc != NAMESPACE_NORMAL)
                        continue;
 
                ident       *ident         = new_id_from_str(entry->symbol->string);
@@ -445,41 +448,76 @@ static ir_type *create_union_type(compound_type_t *type)
        return ir_type;
 }
 
+static ir_node *expression_to_firm(const expression_t *expression);
+static inline ir_mode *get_ir_mode(type_t *type);
+
+static ir_type *create_enum_type(enum_type_t *const type)
+{
+       type->type.firm_type = ir_type_int;
+
+       ir_mode *const mode    = get_ir_mode((type_t*) type);
+       tarval  *const one     = get_mode_one(mode);
+       tarval  *      tv_next = get_tarval_null(mode);
+
+       declaration_t *declaration = type->declaration->next;
+       for (; declaration != NULL; declaration = declaration->next) {
+               if (declaration->storage_class != STORAGE_CLASS_ENUM_ENTRY)
+                       break;
+
+               declaration->declaration_type = DECLARATION_TYPE_ENUM_ENTRY;
+
+               expression_t *const init = declaration->init.enum_value;
+               if (init != NULL) {
+                       ir_node *const cnst = expression_to_firm(init);
+                       if (!is_Const(cnst)) {
+                               panic("couldn't fold constant");
+                       }
+                       tv_next = get_Const_tarval(cnst);
+               }
+               declaration->v.enum_val = tv_next;
+               tv_next = tarval_add(tv_next, one);
+       }
+
+       return ir_type_int;
+}
+
 static ir_type *get_ir_type(type_t *type)
 {
        assert(type != NULL);
 
        type = skip_typeref(type);
 
-       if(type->firm_type != NULL) {
-               assert(type->firm_type != INVALID_TYPE);
-               return type->firm_type;
+       if(type->base.firm_type != NULL) {
+               assert(type->base.firm_type != INVALID_TYPE);
+               return type->base.firm_type;
        }
 
        ir_type *firm_type = NULL;
        switch(type->type) {
        case TYPE_ATOMIC:
-               firm_type = create_atomic_type((atomic_type_t*) type);
+               firm_type = create_atomic_type(&type->atomic);
                break;
        case TYPE_FUNCTION:
-               firm_type = create_method_type((function_type_t*) type);
+               firm_type = create_method_type(&type->function);
                break;
        case TYPE_POINTER:
-               firm_type = create_pointer_type((pointer_type_t*) type);
+               firm_type = create_pointer_type(&type->pointer);
                break;
        case TYPE_ARRAY:
-               firm_type = create_array_type((array_type_t*) type);
+               firm_type = create_array_type(&type->array);
                break;
        case TYPE_COMPOUND_STRUCT:
-               firm_type = create_struct_type((compound_type_t*) type);
+               firm_type = create_struct_type(&type->compound);
                break;
        case TYPE_COMPOUND_UNION:
-               firm_type = create_union_type((compound_type_t*) type);
+               firm_type = create_union_type(&type->compound);
                break;
        case TYPE_ENUM:
-               firm_type = ir_type_int;
+               firm_type = create_enum_type(&type->enumt);
                break;
        case TYPE_BUILTIN:
+               firm_type = get_ir_type(type->builtin.real_type);
+               break;
        case TYPE_TYPEOF:
        case TYPE_TYPEDEF:
        case TYPE_INVALID:
@@ -488,7 +526,7 @@ static ir_type *get_ir_type(type_t *type)
        if(firm_type == NULL)
                panic("unknown type found");
 
-       type->firm_type = firm_type;
+       type->base.firm_type = firm_type;
        return firm_type;
 }
 
@@ -501,7 +539,7 @@ static inline ir_mode *get_ir_mode(type_t *type)
                return mode_P;
        }
 
-       ir_mode *mode   = get_type_mode(irtype);
+       ir_mode *mode = get_type_mode(irtype);
        assert(mode != NULL);
        return mode;
 }
@@ -519,17 +557,17 @@ static ir_entity* get_function_entity(declaration_t *declaration)
        ir_type  *ir_type_method = get_ir_type(declaration->type);
        assert(is_Method_type(ir_type_method));
 
-       type_t    *type   = declaration->type;
        ir_entity *entity = new_entity(global_type, id, ir_type_method);
        set_entity_ld_ident(entity, id);
-       if(declaration->storage_class & STORAGE_CLASS_STATIC
-                       || type->qualifiers & TYPE_QUALIFIER_INLINE) {
+       if(declaration->storage_class == STORAGE_CLASS_STATIC
+                       || declaration->is_inline) {
                set_entity_visibility(entity, visibility_local);
        } else if(declaration->init.statement != NULL) {
                set_entity_visibility(entity, visibility_external_visible);
        } else {
                set_entity_visibility(entity, visibility_external_allocated);
        }
+       set_entity_allocation(entity, allocation_static);
 
        declaration->declaration_type = DECLARATION_TYPE_FUNCTION;
        declaration->v.entity         = entity;
@@ -537,26 +575,29 @@ static ir_entity* get_function_entity(declaration_t *declaration)
        return entity;
 }
 
-
-
-static ir_node *expression_to_firm(const expression_t *expression);
-static ir_node *expression_to_modeb(const expression_t *expression);
-
 static dbg_info *get_dbg_info(const source_position_t *pos)
 {
        return (dbg_info*) pos;
 }
 
-static ir_node *const_to_firm(const const_t *cnst)
+static ir_node *const_to_firm(const const_expression_t *cnst)
 {
        dbg_info *dbgi = get_dbg_info(&cnst->expression.source_position);
        ir_mode  *mode = get_ir_mode(cnst->expression.datatype);
 
-       tarval   *tv;
+       char    buf[128];
+       tarval *tv;
+       size_t  len;
        if(mode_is_float(mode)) {
                tv = new_tarval_from_double(cnst->v.float_value, mode);
        } else {
-               tv = new_tarval_from_long(cnst->v.int_value, mode);
+               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);
        }
 
        return new_d_Const(dbgi, mode, tv);
@@ -570,29 +611,31 @@ static ir_node *create_symconst(dbg_info *dbgi, ir_entity *entity)
        return new_d_SymConst(dbgi, sym, symconst_addr_ent);
 }
 
-static ir_node *string_literal_to_firm(const string_literal_t* literal)
+static ir_node *string_to_firm(const source_position_t *const src_pos,
+                               const char *const id_prefix,
+                               const char *const string)
 {
-       ir_type   *global_type = get_glob_type();
-       ir_type   *type        = new_type_array(unique_ident("strtype"), 1,
-                                               ir_type_const_char);
+       ir_type *const global_type = get_glob_type();
+       ir_type *const type        = new_type_array(unique_ident("strtype"), 1,
+                                                   ir_type_const_char);
 
-       ident     *id     = unique_ident("Lstr");
-       ir_entity *entity = new_entity(global_type, id, type);
+       ident     *const id     = unique_ident(id_prefix);
+       ir_entity *const entity = new_entity(global_type, id, type);
        set_entity_ld_ident(entity, id);
        set_entity_variability(entity, variability_constant);
+       set_entity_allocation(entity, allocation_static);
 
-       ir_type    *elem_type = ir_type_const_char;
-       ir_mode    *mode      = get_type_mode(elem_type);
+       ir_type *const elem_type = ir_type_const_char;
+       ir_mode *const mode      = get_type_mode(elem_type);
 
-       const char *string = literal->value;
-       size_t      slen   = strlen(string) + 1;
+       const size_t slen = strlen(string) + 1;
 
        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);
 
-       tarval **tvs = xmalloc(slen * sizeof(tvs[0]));
+       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);
        }
@@ -600,50 +643,151 @@ static ir_node *string_literal_to_firm(const string_literal_t* literal)
        set_array_entity_values(entity, tvs, slen);
        free(tvs);
 
-       dbg_info *dbgi = get_dbg_info(&literal->expression.source_position);
+       dbg_info *const dbgi = get_dbg_info(src_pos);
 
        return create_symconst(dbgi, entity);
 }
 
-static ir_node *load_from_expression_addr(type_t *type, ir_node *addr,
-                                          dbg_info *dbgi)
+static ir_node *string_literal_to_firm(
+               const string_literal_expression_t* literal)
 {
-       ir_mode *mode     = get_ir_mode(type);
-       ir_node *memory   = get_store();
-       ir_node *load     = new_d_Load(dbgi, memory, addr, mode);
-       ir_node *load_mem = new_d_Proj(dbgi, load, mode_M, pn_Load_M);
-       ir_node *load_res = new_d_Proj(dbgi, load, mode, pn_Load_res);
-       set_store(load_mem);
+       return string_to_firm(&literal->expression.source_position, "Lstr",
+                             literal->value);
+}
+
+static ir_node *wide_string_literal_to_firm(
+       const wide_string_literal_expression_t* const literal)
+{
+       ir_type *const global_type = get_glob_type();
+       ir_type *const elem_type   = ir_type_wchar_t;
+       ir_type *const type        = new_type_array(unique_ident("strtype"), 1,
+                                                   elem_type);
+
+       ident     *const id     = unique_ident("Lstr");
+       ir_entity *const entity = new_entity(global_type, id, type);
+       set_entity_ld_ident(entity, id);
+       set_entity_variability(entity, variability_constant);
+       set_entity_allocation(entity, allocation_static);
+
+       ir_mode *const mode      = get_type_mode(elem_type);
+
+       const wchar_rep_t *const string = literal->value.begin;
+       const size_t             slen   = literal->value.size;
+
+       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);
 
+       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);
+       }
+
+       set_array_entity_values(entity, tvs, slen);
+       free(tvs);
+
+       dbg_info *const dbgi = get_dbg_info(&literal->expression.source_position);
+
+       return create_symconst(dbgi, entity);
+}
+
+static ir_node *deref_address(ir_type *const irtype, ir_node *const addr,
+                              dbg_info *const dbgi)
+{
+       if(is_compound_type(irtype) || is_Array_type(irtype)) {
+               return addr;
+       }
+
+       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);
+       ir_node *const load_mem = new_d_Proj(dbgi, load, mode_M, pn_Load_M);
+       ir_node *const load_res = new_d_Proj(dbgi, load, mode,   pn_Load_res);
+       set_store(load_mem);
        return load_res;
 }
 
+static ir_node *do_strict_conv(dbg_info *dbgi, ir_node *node)
+{
+       ir_mode *mode = get_irn_mode(node);
+
+       if(!(get_irg_fp_model(current_ir_graph) & fp_explicit_rounding))
+               return node;
+       if(!mode_is_float(mode))
+               return node;
+
+       /* check if there is already a Conv */
+       if (get_irn_op(node) == op_Conv) {
+               /* convert it into a strict Conv */
+               set_Conv_strict(node, 1);
+               return node;
+       }
+
+       /* otherwise create a new one */
+       return new_d_strictConv(dbgi, node, mode);
+}
+
+static ir_node *get_global_var_address(dbg_info *const dbgi,
+                                       const declaration_t *const decl)
+{
+       assert(decl->declaration_type == DECLARATION_TYPE_GLOBAL_VARIABLE);
+
+       ir_entity *const entity = decl->v.entity;
+       switch ((storage_class_tag_t)decl->storage_class) {
+               case STORAGE_CLASS_THREAD:
+               case STORAGE_CLASS_THREAD_EXTERN:
+               case STORAGE_CLASS_THREAD_STATIC: {
+                       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, entity);
+               }
+
+               default:
+                       return create_symconst(dbgi, entity);
+       }
+}
+
 static ir_node *reference_expression_to_firm(const reference_expression_t *ref)
 {
        dbg_info      *dbgi        = get_dbg_info(&ref->expression.source_position);
        declaration_t *declaration = ref->declaration;
        type_t        *type        = skip_typeref(declaration->type);
-       ir_mode       *mode        = get_ir_mode(type);
 
        switch((declaration_type_t) declaration->declaration_type) {
        case DECLARATION_TYPE_UNKNOWN:
-               break;
-       case DECLARATION_TYPE_LOCAL_VARIABLE:
+               if (declaration->storage_class != STORAGE_CLASS_ENUM_ENTRY) {
+                       break;
+               }
+               get_ir_type(type);
+               /* FALLTHROUGH */
+
+       case DECLARATION_TYPE_ENUM_ENTRY: {
+               ir_mode *const mode = get_ir_mode(type);
+               return new_Const(mode, declaration->v.enum_val);
+       }
+
+       case DECLARATION_TYPE_LOCAL_VARIABLE: {
+               ir_mode *mode = get_ir_mode(type);
                return get_value(declaration->v.value_number, mode);
+       }
        case DECLARATION_TYPE_FUNCTION: {
                return create_symconst(dbgi, declaration->v.entity);
        }
        case DECLARATION_TYPE_GLOBAL_VARIABLE: {
-               ir_entity *entity   = declaration->v.entity;
-               ir_node   *symconst = create_symconst(dbgi, entity);
+               ir_node *const addr   = get_global_var_address(dbgi, declaration);
+               ir_type *const irtype = get_entity_type(declaration->v.entity);
+               return deref_address(irtype, addr, dbgi);
+       }
 
-               if(type->type == TYPE_ARRAY) {
-                       return symconst;
-               } else {
-                       return load_from_expression_addr(type, symconst, dbgi);
-               }
+       case DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY: {
+               ir_entity *entity = declaration->v.entity;
+               ir_node   *frame  = get_irg_frame(current_ir_graph);
+               ir_node   *sel    = new_d_simpleSel(dbgi, new_NoMem(), frame, entity);
+               ir_type   *irtype = get_entity_type(entity);
+               return deref_address(irtype, sel, dbgi);
        }
-       case DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY:
+
        case DECLARATION_TYPE_COMPOUND_MEMBER:
        case DECLARATION_TYPE_LABEL_BLOCK:
                panic("not implemented reference type");
@@ -666,11 +810,20 @@ static ir_node *reference_addr(const reference_expression_t *ref)
                return create_symconst(dbgi, declaration->v.entity);
        }
        case DECLARATION_TYPE_GLOBAL_VARIABLE: {
-               ir_entity *entity   = declaration->v.entity;
-               ir_node   *symconst = create_symconst(dbgi, entity);
-               return symconst;
+               ir_node *const addr = get_global_var_address(dbgi, declaration);
+               return addr;
        }
-       case DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY:
+       case DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY: {
+               ir_entity *entity = declaration->v.entity;
+               ir_node   *frame  = get_irg_frame(current_ir_graph);
+               ir_node   *sel    = new_d_simpleSel(dbgi, new_NoMem(), frame, entity);
+
+               return sel;
+       }
+
+       case DECLARATION_TYPE_ENUM_ENTRY:
+               panic("trying to reference enum entry");
+
        case DECLARATION_TYPE_COMPOUND_MEMBER:
        case DECLARATION_TYPE_LABEL_BLOCK:
                panic("not implemented reference type");
@@ -679,15 +832,69 @@ static ir_node *reference_addr(const reference_expression_t *ref)
        panic("reference to declaration with unknown type found");
 }
 
+static ir_node *process_builtin_call(const call_expression_t *call)
+{
+       dbg_info *dbgi = get_dbg_info(&call->expression.source_position);
+
+       assert(call->function->type == EXPR_BUILTIN_SYMBOL);
+       builtin_symbol_expression_t *builtin = &call->function->builtin_symbol;
+
+       type_t *type = skip_typeref(builtin->expression.datatype);
+       assert(is_type_pointer(type));
+
+       type_t   *function_type = skip_typeref(type->pointer.points_to);
+       symbol_t *symbol        = builtin->symbol;
+
+       switch(symbol->ID) {
+       case T___builtin_alloca: {
+               if(call->arguments == NULL || call->arguments->next != NULL) {
+                       panic("invalid number of parameters on __builtin_alloca");
+               }
+               expression_t *argument = call->arguments->expression;
+               ir_node      *size     = expression_to_firm(argument);
+
+               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;
+       }
+       case T___builtin_nan:
+       case T___builtin_nanf:
+       case T___builtin_nand: {
+               /* Ignore string for now... */
+               assert(is_type_function(function_type));
+               ir_mode *mode = get_ir_mode(function_type->function.return_type);
+               tarval  *tv   = get_mode_NAN(mode);
+               ir_node *res  = new_d_Const(dbgi, mode, tv);
+               return res;
+       }
+       case T___builtin_va_end:
+               return NULL;
+       default:
+               panic("Unsupported builtin found\n");
+       }
+}
+
 static ir_node *call_expression_to_firm(const call_expression_t *call)
 {
        assert(get_cur_block() != NULL);
 
-       expression_t  *function = call->function;
-       ir_node       *callee   = expression_to_firm(function);
+       expression_t *function = call->function;
+       if(function->type == EXPR_BUILTIN_SYMBOL) {
+               return process_builtin_call(call);
+       }
+       ir_node *callee = expression_to_firm(function);
 
-       assert(function->datatype->type == TYPE_FUNCTION);
-       function_type_t *function_type = (function_type_t*) function->datatype;
+       type_t *type = skip_typeref(function->base.datatype);
+       assert(is_type_pointer(type));
+       pointer_type_t *pointer_type = &type->pointer;
+       type_t         *points_to    = skip_typeref(pointer_type->points_to);
+       assert(is_type_function(points_to));
+       function_type_t *function_type = &points_to->function;
 
        int              n_parameters = 0;
        call_argument_t *argument     = call->arguments;
@@ -695,6 +902,8 @@ static ir_node *call_expression_to_firm(const call_expression_t *call)
                ++n_parameters;
        }
 
+       dbg_info *dbgi  = get_dbg_info(&call->expression.source_position);
+
        ir_type *ir_method_type  = get_ir_type((type_t*) function_type);
        ir_type *new_method_type = NULL;
        if(function_type->variadic || function_type->unspecified_parameters) {
@@ -721,9 +930,11 @@ static ir_node *call_expression_to_firm(const call_expression_t *call)
                expression_t *expression = argument->expression;
                ir_node      *arg_node   = expression_to_firm(expression);
 
+               arg_node = do_strict_conv(dbgi, arg_node);
+
                in[n] = arg_node;
                if(new_method_type != NULL) {
-                       ir_type *irtype = get_ir_type(expression->datatype);
+                       ir_type *irtype = get_ir_type(expression->base.datatype);
                        set_method_param_type(new_method_type, n, irtype);
                }
 
@@ -734,17 +945,22 @@ static ir_node *call_expression_to_firm(const call_expression_t *call)
        if(new_method_type != NULL)
                ir_method_type = new_method_type;
 
-       dbg_info *dbgi  = get_dbg_info(&call->expression.source_position);
        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);
        set_store(mem);
 
-       type_t  *result_type = function_type->result_type;
+       type_t  *return_type = skip_typeref(function_type->return_type);
        ir_node *result      = NULL;
-       if(result_type != type_void) {
-               ir_mode *mode    = get_ir_mode(result_type);
+
+       if(!is_type_atomic(return_type, ATOMIC_TYPE_VOID)) {
+               ir_mode *mode;
+               if(is_type_scalar(return_type)) {
+                       mode = get_ir_mode(return_type);
+               } else {
+                       mode = mode_P_data;
+               }
                ir_node *resproj = new_d_Proj(dbgi, node, mode_T, pn_Call_T_result);
                result           = new_d_Proj(dbgi, resproj, mode, 0);
        }
@@ -752,11 +968,39 @@ static ir_node *call_expression_to_firm(const call_expression_t *call)
        return result;
 }
 
+static void statement_to_firm(statement_t *statement);
+static ir_node *compound_statement_to_firm(compound_statement_t *compound);
+
 static ir_node *expression_to_addr(const expression_t *expression);
+static void create_condition_evaluation(const expression_t *expression,
+                                        ir_node *true_block,
+                                        ir_node *false_block);
+
+static void assign_value(dbg_info *dbgi, ir_node *addr, type_t *type,
+                         ir_node *value)
+{
+       value = do_strict_conv(dbgi, value);
+
+       ir_node  *memory = get_store();
+
+       if(is_type_scalar(type)) {
+               ir_node  *store     = new_d_Store(dbgi, memory, addr, value);
+               ir_node  *store_mem = new_d_Proj(dbgi, store, mode_M, pn_Store_M);
+               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);
+               set_store(copyb_mem);
+       }
+}
 
 static void set_value_for_expression(const expression_t *expression,
                                      ir_node *value)
 {
+       dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
+       value          = do_strict_conv(dbgi, value);
+
        if(expression->type == EXPR_REFERENCE) {
                reference_expression_t *ref = (reference_expression_t*) expression;
 
@@ -768,20 +1012,16 @@ static void set_value_for_expression(const expression_t *expression,
                }
        }
 
-       dbg_info *dbgi      = get_dbg_info(&expression->source_position);
-       ir_node  *addr      = expression_to_addr(expression);
-       assert(get_irn_mode(value) == get_ir_mode(expression->datatype));
-       ir_node  *memory    = get_store();
-       ir_node  *store     = new_d_Store(dbgi, memory, addr, value);
-       ir_node  *store_mem = new_d_Proj(dbgi, store, mode_M, pn_Store_M);
-       set_store(store_mem);
+       ir_node *addr = expression_to_addr(expression);
+       type_t  *type = skip_typeref(expression->base.datatype);
+       assign_value(dbgi, addr, type, value);
 }
 
 static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode)
 {
        ir_mode *value_mode = get_irn_mode(value);
 
-       if(value_mode == dest_mode)
+       if (value_mode == dest_mode || is_Bad(value))
                return value;
 
        if(dest_mode == mode_b) {
@@ -794,26 +1034,72 @@ static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode)
        return new_d_Conv(dbgi, value, dest_mode);
 }
 
+static ir_node *create_incdec(const unary_expression_t *expression)
+{
+       dbg_info     *dbgi  = get_dbg_info(&expression->expression.source_position);
+       type_t       *type  = skip_typeref(expression->expression.datatype);
+       ir_mode      *mode  = get_ir_mode(type);
+       expression_t *value = expression->value;
+
+       ir_node *value_node = expression_to_firm(value);
+
+       ir_node *offset;
+       if(is_type_pointer(type)) {
+               pointer_type_t *pointer_type = &type->pointer;
+               unsigned        elem_size    = get_type_size(pointer_type->points_to);
+               offset = new_Const_long(mode_Is, elem_size);
+       } else {
+               assert(is_type_arithmetic(type));
+               offset = new_Const(mode, get_mode_one(mode));
+       }
+
+       switch(expression->expression.type) {
+       case EXPR_UNARY_POSTFIX_INCREMENT: {
+               ir_node *new_value = new_d_Add(dbgi, value_node, offset, mode);
+               set_value_for_expression(value, new_value);
+               return value_node;
+       }
+       case EXPR_UNARY_POSTFIX_DECREMENT: {
+               ir_node *new_value = new_d_Sub(dbgi, value_node, offset, mode);
+               set_value_for_expression(value, new_value);
+               return value_node;
+       }
+       case EXPR_UNARY_PREFIX_INCREMENT: {
+               ir_node *new_value = new_d_Add(dbgi, value_node, offset, mode);
+               set_value_for_expression(value, new_value);
+               return new_value;
+       }
+       case EXPR_UNARY_PREFIX_DECREMENT: {
+               ir_node *new_value = new_d_Sub(dbgi, value_node, offset, mode);
+               set_value_for_expression(value, new_value);
+               return new_value;
+       }
+       default:
+               panic("no incdec expr in create_incdec");
+               return NULL;
+       }
+}
+
 static ir_node *unary_expression_to_firm(const unary_expression_t *expression)
 {
        dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
-       type_t   *type = expression->expression.datatype;
+       type_t   *type = skip_typeref(expression->expression.datatype);
        ir_mode  *mode = get_ir_mode(type);
 
-       if(expression->type == UNEXPR_TAKE_ADDRESS)
+       if(expression->expression.type == EXPR_UNARY_TAKE_ADDRESS)
                return expression_to_addr(expression->value);
 
        const expression_t *value      = expression->value;
        ir_node            *value_node = expression_to_firm(value);
 
-       switch(expression->type) {
-       case UNEXPR_NEGATE:
+       switch(expression->expression.type) {
+       case EXPR_UNARY_NEGATE:
                return new_d_Minus(dbgi, value_node, mode);
-       case UNEXPR_PLUS:
+       case EXPR_UNARY_PLUS:
                return value_node;
-       case UNEXPR_BITWISE_NEGATE:
+       case EXPR_UNARY_BITWISE_NEGATE:
                return new_d_Not(dbgi, value_node, mode);
-       case UNEXPR_NOT:
+       case EXPR_UNARY_NOT: {
                if(get_irn_mode(value_node) != mode_b) {
                        value_node = create_conv(dbgi, value_node, mode_b);
                }
@@ -822,51 +1108,49 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression)
                        value_node = create_conv(dbgi, value_node, mode);
                }
                return value_node;
-       case UNEXPR_DEREFERENCE:
-               return load_from_expression_addr(type, value_node, dbgi);
-       case UNEXPR_POSTFIX_INCREMENT: {
-               ir_node *one       = new_Const(mode, get_mode_one(mode));
-               ir_node *new_value = new_d_Add(dbgi, value_node, one, mode);
-               set_value_for_expression(value, new_value);
-               return value_node;
-       }
-       case UNEXPR_POSTFIX_DECREMENT: {
-               ir_node *one       = new_Const(mode, get_mode_one(mode));
-               ir_node *new_value = new_d_Sub(dbgi, value_node, one, mode);
-               set_value_for_expression(value, new_value);
-               return value_node;
-       }
-       case UNEXPR_PREFIX_INCREMENT: {
-               ir_node *one       = new_Const(mode, get_mode_one(mode));
-               ir_node *new_value = new_d_Add(dbgi, value_node, one, mode);
-               set_value_for_expression(value, new_value);
-               return new_value;
-       }
-       case UNEXPR_PREFIX_DECREMENT: {
-               ir_node *one       = new_Const(mode, get_mode_one(mode));
-               ir_node *new_value = new_d_Sub(dbgi, value_node, one, mode);
-               set_value_for_expression(value, new_value);
-               return new_value;
        }
-       case UNEXPR_CAST:
-               return create_conv(dbgi, value_node, mode);
+       case EXPR_UNARY_DEREFERENCE: {
+               type_t  *value_type = skip_typeref(value->base.datatype);
+               ir_type *irtype     = get_ir_type(value_type);
+               assert(is_Pointer_type(irtype));
+               ir_type *points_to  = get_pointer_points_to_type(irtype);
+               return deref_address(points_to, value_node, dbgi);
+       }
+       case EXPR_UNARY_POSTFIX_INCREMENT:
+       case EXPR_UNARY_POSTFIX_DECREMENT:
+       case EXPR_UNARY_PREFIX_INCREMENT:
+       case EXPR_UNARY_PREFIX_DECREMENT:
+               return create_incdec(expression);
+       case EXPR_UNARY_CAST: {
+               ir_node *node = create_conv(dbgi, value_node, get_ir_mode(type));
+               node = do_strict_conv(dbgi, node);
+               return node;
+       }
+       case EXPR_UNARY_CAST_IMPLICIT:
+               return create_conv(dbgi, value_node, get_ir_mode(type));
 
-       case UNEXPR_TAKE_ADDRESS:
-       case UNEXPR_INVALID:
+       default:
                break;
        }
        panic("invalid UNEXPR type found");
 }
 
-static long get_pnc(binary_expression_type_t type)
+static long get_pnc(const expression_type_t type)
 {
        switch(type) {
-       case BINEXPR_EQUAL:        return pn_Cmp_Eq;
-       case BINEXPR_NOTEQUAL:     return pn_Cmp_Lg;
-       case BINEXPR_LESS:         return pn_Cmp_Lt;
-       case BINEXPR_LESSEQUAL:    return pn_Cmp_Le;
-       case BINEXPR_GREATER:      return pn_Cmp_Gt;
-       case BINEXPR_GREATEREQUAL: return pn_Cmp_Ge;
+       case EXPR_BINARY_EQUAL:         return pn_Cmp_Eq;
+       case EXPR_BINARY_ISLESSGREATER: return pn_Cmp_Lg;
+       case EXPR_BINARY_NOTEQUAL:      return pn_Cmp_Ne;
+       case EXPR_BINARY_ISLESS:
+       case EXPR_BINARY_LESS:          return pn_Cmp_Lt;
+       case EXPR_BINARY_ISLESSEQUAL:
+       case EXPR_BINARY_LESSEQUAL:     return pn_Cmp_Le;
+       case EXPR_BINARY_ISGREATER:
+       case EXPR_BINARY_GREATER:       return pn_Cmp_Gt;
+       case EXPR_BINARY_ISGREATEREQUAL:
+       case EXPR_BINARY_GREATEREQUAL:  return pn_Cmp_Ge;
+       case EXPR_BINARY_ISUNORDERED:   return pn_Cmp_Uo;
+
        default:
                break;
        }
@@ -876,48 +1160,32 @@ static long get_pnc(binary_expression_type_t type)
 static ir_node *create_lazy_op(const binary_expression_t *expression)
 {
        dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
+       type_t   *type = expression->expression.datatype;
+       ir_mode  *mode = get_ir_mode(type);
 
-       bool is_or = (expression->type == BINEXPR_LOGICAL_OR);
-       assert(is_or || expression->type == BINEXPR_LOGICAL_AND);
-
-       ir_node  *val1       = expression_to_modeb(expression->left);
-       ir_node  *cond       = new_d_Cond(dbgi, val1);
-       ir_node  *true_proj  = new_d_Proj(dbgi, cond, mode_X, pn_Cond_true);
-       ir_node  *false_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_false);
-
-       ir_node *fallthrough_block = new_immBlock();
-
-       /* the true case */
-       ir_node *calc_val2_block = new_immBlock();
-       if(is_or) {
-               add_immBlock_pred(calc_val2_block, false_proj);
-       } else {
-               add_immBlock_pred(calc_val2_block, true_proj);
-       }
+       ir_node *cur_block = get_cur_block();
 
-       mature_immBlock(calc_val2_block);
+       ir_node *one_block = new_immBlock();
+       ir_node *one       = new_Const(mode, get_mode_one(mode));
+       ir_node *jmp_one   = new_d_Jmp(dbgi);
 
-       ir_node *val2 = expression_to_modeb(expression->right);
-       if(get_cur_block() != NULL) {
-               ir_node *jmp = new_d_Jmp(dbgi);
-               add_immBlock_pred(fallthrough_block, jmp);
-       }
+       ir_node *zero_block = new_immBlock();
+       ir_node *zero       = new_Const(mode, get_mode_null(mode));
+       ir_node *jmp_zero   = new_d_Jmp(dbgi);
 
-       /* fallthrough */
-       ir_node *constb;
-       if(is_or) {
-               constb = new_d_Const(dbgi, mode_b, get_tarval_b_true());
-               add_immBlock_pred(fallthrough_block, true_proj);
-       } else {
-               constb = new_d_Const(dbgi, mode_b, get_tarval_b_false());
-               add_immBlock_pred(fallthrough_block, false_proj);
-       }
-       mature_immBlock(fallthrough_block);
+       set_cur_block(cur_block);
+       create_condition_evaluation((const expression_t*) expression,
+                                   one_block, zero_block);
+       mature_immBlock(one_block);
+       mature_immBlock(zero_block);
 
-       set_cur_block(fallthrough_block);
+       ir_node *common_block = new_immBlock();
+       add_immBlock_pred(common_block, jmp_one);
+       add_immBlock_pred(common_block, jmp_zero);
+       mature_immBlock(common_block);
 
-       ir_node *in[2] = { val2, constb };
-       ir_node *val   = new_d_Phi(dbgi, 2, in, mode_b);
+       ir_node *in[2] = { one, zero };
+       ir_node *val   = new_d_Phi(dbgi, 2, in, mode);
 
        return val;
 }
@@ -931,9 +1199,9 @@ static ir_node *create_arithmetic_binop(const binary_expression_t *expression,
        dbg_info *dbgi  = get_dbg_info(&expression->expression.source_position);
        ir_node  *left  = expression_to_firm(expression->left);
        ir_node  *right = expression_to_firm(expression->right);
-       type_t   *type  = expression->right->datatype;
-       /* be careful with the modes, because in asithmetic assign nodes only
-        * the right operand has the mode of the arithmetic alread */
+       type_t   *type  = expression->right->base.datatype;
+       /* be careful with the modes, because in arithmetic assign nodes only
+        * the right operand has the mode of the arithmetic already */
        ir_mode  *mode  = get_ir_mode(type);
        left            = create_conv(dbgi, left, mode);
        ir_node  *res   = func(dbgi, left, right, mode);
@@ -941,16 +1209,44 @@ static ir_node *create_arithmetic_binop(const binary_expression_t *expression,
        return res;
 }
 
+static ir_node *pointer_arithmetic(ir_node  *const pointer,
+                                   ir_node  *      integer,
+                                   type_t   *const type,
+                                   dbg_info *const dbgi,
+                                   const create_arithmetic_func func)
+{
+       pointer_type_t *const pointer_type = (pointer_type_t*)type;
+       type_t         *const points_to    = pointer_type->points_to;
+       const unsigned        elem_size    = get_type_size(points_to);
+
+       assert(elem_size >= 1);
+       if (elem_size > 1) {
+               integer             = create_conv(dbgi, integer, mode_Is);
+               ir_node *const cnst = new_Const_long(mode_Is, (long)elem_size);
+               ir_node *const mul  = new_d_Mul(dbgi, integer, cnst, mode_Is);
+               integer = mul;
+       }
+
+       ir_mode *const mode = get_ir_mode(type);
+       return func(dbgi, pointer, integer, mode);
+}
+
 static ir_node *create_arithmetic_assign_binop(
                const binary_expression_t *expression, create_arithmetic_func func)
 {
-       dbg_info *dbgi  = get_dbg_info(&expression->expression.source_position);
-       ir_node  *value = create_arithmetic_binop(expression, func);
-       type_t   *type  = expression->expression.datatype;
-       ir_mode  *mode  = get_ir_mode(type);
+       dbg_info *const dbgi = get_dbg_info(&expression->expression.source_position);
+       type_t   *const type = skip_typeref(expression->expression.datatype);
+       ir_node  *value;
 
-       assert(type->type != TYPE_POINTER);
+       if (is_type_pointer(type)) {
+               ir_node        *const pointer = expression_to_firm(expression->left);
+               ir_node        *      integer = expression_to_firm(expression->right);
+               value = pointer_arithmetic(pointer, integer, type, dbgi, func);
+       } else {
+               value = create_arithmetic_binop(expression, func);
+       }
 
+       ir_mode  *const mode = get_ir_mode(type);
        value = create_conv(dbgi, value, mode);
        set_value_for_expression(expression->left, value);
 
@@ -963,48 +1259,56 @@ static ir_node *create_add(const binary_expression_t *expression)
        ir_node  *left  = expression_to_firm(expression->left);
        ir_node  *right = expression_to_firm(expression->right);
        type_t   *type  = expression->expression.datatype;
-       ir_mode  *mode  = get_ir_mode(type);
 
        expression_t *expr_left  = expression->left;
        expression_t *expr_right = expression->right;
-       type_t       *type_left  = skip_typeref(expr_left->datatype);
-       type_t       *type_right = skip_typeref(expr_right->datatype);
+       type_t       *type_left  = skip_typeref(expr_left->base.datatype);
+       type_t       *type_right = skip_typeref(expr_right->base.datatype);
 
        if(is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) {
+               ir_mode *const mode = get_ir_mode(type);
                return new_d_Add(dbgi, left, right, mode);
        }
 
-       ir_node        *pointer;
-       ir_node        *integer;
-       pointer_type_t *pointer_type;
-       if(type_left->type == TYPE_POINTER) {
-               pointer      = left;
-               integer      = right;
-               pointer_type = (pointer_type_t*) type_left;
+       if (is_type_pointer(type_left)) {
+               return pointer_arithmetic(left, right, type, dbgi, new_d_Add);
        } else {
-               assert(type_right->type == TYPE_POINTER);
-               pointer      = right;
-               integer      = left;
-               pointer_type = (pointer_type_t*) type_right;
+               assert(is_type_pointer(type_right));
+               return pointer_arithmetic(right, left, type, dbgi, new_d_Add);
        }
+}
 
-       type_t   *points_to = pointer_type->points_to;
-       unsigned  elem_size = get_type_size(points_to);
-
-       assert(elem_size >= 1);
-       if(elem_size > 1) {
-               integer       = create_conv(dbgi, integer, mode_Is);
-               ir_node *cnst = new_Const_long(mode_Is, (int) elem_size);
-               ir_node *mul  = new_d_Mul(dbgi, integer, cnst, mode_Is);
-               integer = mul;
+static ir_node *create_sub(const binary_expression_t *expression)
+{
+       dbg_info *const dbgi  = get_dbg_info(&expression->expression.source_position);
+       expression_t *const expr_left  = expression->left;
+       expression_t *const expr_right = expression->right;
+       ir_node      *const left       = expression_to_firm(expr_left);
+       ir_node      *const right      = expression_to_firm(expr_right);
+       type_t       *const type       = expression->expression.datatype;
+       type_t       *const type_left  = skip_typeref(expr_left->base.datatype);
+       type_t       *const type_right = skip_typeref(expr_right->base.datatype);
+
+       if (is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) {
+               ir_mode *const mode = get_ir_mode(type);
+               return new_d_Sub(dbgi, left, right, mode);
+       } else if (is_type_pointer(type_left) && is_type_pointer(type_right)) {
+               const pointer_type_t *const ptr_type = &type_left->pointer;
+               const unsigned elem_size             = get_type_size(ptr_type->points_to);
+               ir_mode *const mode   = get_ir_mode(type);
+               ir_node *const sub    = new_d_Sub(dbgi, left, right, mode);
+               ir_node *const cnst   = new_Const_long(mode_Is, (long)elem_size);
+               ir_node *const no_mem = new_NoMem();
+               ir_node *const div    = new_d_Div(dbgi, no_mem, sub, cnst, mode,
+                                                 op_pin_state_floats);
+               return new_d_Proj(dbgi, div, mode, pn_Div_res);
        }
 
-       ir_node *res = new_d_Add(dbgi, pointer, integer, mode);
-
-       return res;
+       assert(is_type_pointer(type_left));
+       return pointer_arithmetic(left, right, type_left, dbgi, new_d_Sub);
 }
 
-static ir_node *create_sub(const binary_expression_t *expression)
+static ir_node *create_shift(const binary_expression_t *expression)
 {
        dbg_info *dbgi  = get_dbg_info(&expression->expression.source_position);
        ir_node  *left  = expression_to_firm(expression->left);
@@ -1012,49 +1316,53 @@ static ir_node *create_sub(const binary_expression_t *expression)
        type_t   *type  = expression->expression.datatype;
        ir_mode  *mode  = get_ir_mode(type);
 
-       expression_t *expr_left  = expression->left;
-       expression_t *expr_right = expression->right;
-       type_t       *type_left  = skip_typeref(expr_left->datatype);
-       type_t       *type_right = skip_typeref(expr_right->datatype);
-
-       if((is_type_arithmetic(type_left) && is_type_arithmetic(type_right))
-                       || (type_left->type == TYPE_POINTER
-                               && type_right->type == TYPE_POINTER)) {
-               return new_d_Sub(dbgi, left, right, mode);
-       }
-
-       assert(type_right->type == TYPE_POINTER);
-       ir_node        *pointer      = left;
-       ir_node        *integer      = right;
-       pointer_type_t *pointer_type = (pointer_type_t*) type_right;
+       /* firm always wants the shift count to be unsigned */
+       right = create_conv(dbgi, right, mode_Iu);
 
-       type_t   *points_to = pointer_type->points_to;
-       unsigned  elem_size = get_type_size(points_to);
+       ir_node *res;
 
-       assert(elem_size >= 1);
-       if(elem_size > 1) {
-               ir_node *cnst = new_Const_long(mode_Iu, elem_size);
-               ir_node *mul  = new_d_Mul(dbgi, integer, cnst, mode_Iu);
-               integer = mul;
+       switch(expression->expression.type) {
+       case EXPR_BINARY_SHIFTLEFT_ASSIGN:
+       case EXPR_BINARY_SHIFTLEFT:
+               res = new_d_Shl(dbgi, left, right, mode);
+               break;
+       case EXPR_BINARY_SHIFTRIGHT_ASSIGN:
+       case EXPR_BINARY_SHIFTRIGHT: {
+                expression_t *expr_left = expression->left;
+                type_t       *type_left = skip_typeref(expr_left->base.datatype);
+
+                if(is_type_signed(type_left)) {
+                       res = new_d_Shrs(dbgi, left, right, mode);
+                } else {
+                        res = new_d_Shr(dbgi, left, right, mode);
+                }
+                break;
+       }
+       default:
+               panic("create shift op called for non-shift op");
        }
-
-       ir_node *res = new_d_Sub(dbgi, pointer, integer, mode);
 
        return res;
 }
 
+
 static ir_node *create_divmod(const binary_expression_t *expression)
 {
        dbg_info *dbgi  = get_dbg_info(&expression->expression.source_position);
        ir_node  *left  = expression_to_firm(expression->left);
        ir_node  *right = expression_to_firm(expression->right);
        ir_node  *pin   = new_Pin(new_NoMem());
-       type_t   *type  = expression->expression.datatype;
+       /* be careful with the modes, because in arithmetic assign nodes only
+        * the right operand has the mode of the arithmetic already */
+       type_t   *type  = expression->right->base.datatype;
        ir_mode  *mode  = get_ir_mode(type);
+       left            = create_conv(dbgi, left, mode);
        ir_node  *op;
        ir_node  *res;
 
-       if(expression->type == BINEXPR_DIV) {
+       switch (expression->expression.type) {
+       case EXPR_BINARY_DIV:
+       case EXPR_BINARY_DIV_ASSIGN:
                if(mode_is_float(mode)) {
                        op  = new_d_Quot(dbgi, pin, left, right, mode, op_pin_state_floats);
                        res = new_d_Proj(dbgi, op, mode, pn_Quot_res);
@@ -1062,28 +1370,68 @@ static ir_node *create_divmod(const binary_expression_t *expression)
                        op  = new_d_Div(dbgi, pin, left, right, mode, op_pin_state_floats);
                        res = new_d_Proj(dbgi, op, mode, pn_Div_res);
                }
-       } else {
-               assert(expression->type == BINEXPR_MOD);
+               break;
+
+       case EXPR_BINARY_MOD:
+       case EXPR_BINARY_MOD_ASSIGN:
                assert(!mode_is_float(mode));
                op  = new_d_Mod(dbgi, pin, left, right, mode, op_pin_state_floats);
                res = new_d_Proj(dbgi, op, mode, pn_Mod_res);
+               break;
+
+       default: panic("unexpected binary expression type in create_divmod()");
        }
 
        return res;
 }
 
+static ir_node *create_arithmetic_assign_divmod(
+               const binary_expression_t *expression)
+{
+       ir_node  *      value = create_divmod(expression);
+       dbg_info *const dbgi  = get_dbg_info(&expression->expression.source_position);
+       type_t   *const type  = expression->expression.datatype;
+       ir_mode  *const mode  = get_ir_mode(type);
+
+       assert(type->type != TYPE_POINTER);
+
+       value = create_conv(dbgi, value, mode);
+       set_value_for_expression(expression->left, value);
+
+       return value;
+}
+
+static ir_node *create_arithmetic_assign_shift(
+               const binary_expression_t *expression)
+{
+       ir_node  *      value = create_shift(expression);
+       dbg_info *const dbgi  = get_dbg_info(&expression->expression.source_position);
+       type_t   *const type  = expression->expression.datatype;
+       ir_mode  *const mode  = get_ir_mode(type);
+
+       value = create_conv(dbgi, value, mode);
+       set_value_for_expression(expression->left, value);
 
+       return value;
+}
 
 static ir_node *binary_expression_to_firm(const binary_expression_t *expression)
 {
-       binary_expression_type_t type = expression->type;
+       expression_type_t type = expression->expression.type;
+
        switch(type) {
-       case BINEXPR_EQUAL:
-       case BINEXPR_NOTEQUAL:
-       case BINEXPR_LESS:
-       case BINEXPR_LESSEQUAL:
-       case BINEXPR_GREATER:
-       case BINEXPR_GREATEREQUAL: {
+       case EXPR_BINARY_EQUAL:
+       case EXPR_BINARY_NOTEQUAL:
+       case EXPR_BINARY_LESS:
+       case EXPR_BINARY_LESSEQUAL:
+       case EXPR_BINARY_GREATER:
+       case EXPR_BINARY_GREATEREQUAL:
+       case EXPR_BINARY_ISGREATER:
+       case EXPR_BINARY_ISGREATEREQUAL:
+       case EXPR_BINARY_ISLESS:
+       case EXPR_BINARY_ISLESSEQUAL:
+       case EXPR_BINARY_ISLESSGREATER:
+       case EXPR_BINARY_ISUNORDERED: {
                dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
                ir_node *left  = expression_to_firm(expression->left);
                ir_node *right = expression_to_firm(expression->right);
@@ -1092,52 +1440,53 @@ static ir_node *binary_expression_to_firm(const binary_expression_t *expression)
                ir_node *proj  = new_d_Proj(dbgi, cmp, mode_b, pnc);
                return proj;
        }
-       case BINEXPR_ASSIGN: {
+       case EXPR_BINARY_ASSIGN: {
                ir_node *right = expression_to_firm(expression->right);
                set_value_for_expression(expression->left, right);
+
                return right;
        }
-       case BINEXPR_ADD:
+       case EXPR_BINARY_ADD:
                return create_add(expression);
-       case BINEXPR_SUB:
+       case EXPR_BINARY_SUB:
                return create_sub(expression);
-       case BINEXPR_MUL:
+       case EXPR_BINARY_MUL:
                return create_arithmetic_binop(expression, new_d_Mul);
-       case BINEXPR_BITWISE_AND:
+       case EXPR_BINARY_BITWISE_AND:
                return create_arithmetic_binop(expression, new_d_And);
-       case BINEXPR_BITWISE_OR:
+       case EXPR_BINARY_BITWISE_OR:
                return create_arithmetic_binop(expression, new_d_Or);
-       case BINEXPR_BITWISE_XOR:
+       case EXPR_BINARY_BITWISE_XOR:
                return create_arithmetic_binop(expression, new_d_Eor);
-       case BINEXPR_SHIFTLEFT:
-               return create_arithmetic_binop(expression, new_d_Shl);
-       case BINEXPR_SHIFTRIGHT:
-               return create_arithmetic_binop(expression, new_d_Shr);
-       case BINEXPR_DIV:
-       case BINEXPR_MOD:
+       case EXPR_BINARY_SHIFTLEFT:
+       case EXPR_BINARY_SHIFTRIGHT:
+               return create_shift(expression);
+       case EXPR_BINARY_DIV:
+       case EXPR_BINARY_MOD:
                return create_divmod(expression);
-       case BINEXPR_LOGICAL_AND:
-       case BINEXPR_LOGICAL_OR:
+       case EXPR_BINARY_LOGICAL_AND:
+       case EXPR_BINARY_LOGICAL_OR:
                return create_lazy_op(expression);
-       case BINEXPR_COMMA:
+       case EXPR_BINARY_COMMA:
                expression_to_firm(expression->left);
                return expression_to_firm(expression->right);
-       case BINEXPR_ADD_ASSIGN:
+       case EXPR_BINARY_ADD_ASSIGN:
                return create_arithmetic_assign_binop(expression, new_d_Add);
-       case BINEXPR_SUB_ASSIGN:
+       case EXPR_BINARY_SUB_ASSIGN:
                return create_arithmetic_assign_binop(expression, new_d_Sub);
-       case BINEXPR_MUL_ASSIGN:
+       case EXPR_BINARY_MUL_ASSIGN:
                return create_arithmetic_assign_binop(expression, new_d_Mul);
-       case BINEXPR_BITWISE_AND_ASSIGN:
+       case EXPR_BINARY_DIV_ASSIGN:
+               return create_arithmetic_assign_divmod(expression);
+       case EXPR_BINARY_BITWISE_AND_ASSIGN:
                return create_arithmetic_assign_binop(expression, new_d_And);
-       case BINEXPR_BITWISE_OR_ASSIGN:
+       case EXPR_BINARY_BITWISE_OR_ASSIGN:
                return create_arithmetic_assign_binop(expression, new_d_Or);
-       case BINEXPR_BITWISE_XOR_ASSIGN:
+       case EXPR_BINARY_BITWISE_XOR_ASSIGN:
                return create_arithmetic_assign_binop(expression, new_d_Eor);
-       case BINEXPR_SHIFTLEFT_ASSIGN:
-               return create_arithmetic_assign_binop(expression, new_d_Shl);
-       case BINEXPR_SHIFTRIGHT_ASSIGN:
-               return create_arithmetic_assign_binop(expression, new_d_Shr);
+       case EXPR_BINARY_SHIFTLEFT_ASSIGN:
+       case EXPR_BINARY_SHIFTRIGHT_ASSIGN:
+               return create_arithmetic_assign_shift(expression);
        default:
                panic("TODO binexpr type");
        }
@@ -1145,13 +1494,16 @@ static ir_node *binary_expression_to_firm(const binary_expression_t *expression)
 
 static ir_node *array_access_addr(const array_access_expression_t *expression)
 {
-       dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
+       dbg_info *dbgi      = get_dbg_info(&expression->expression.source_position);
+       ir_node  *base_addr = expression_to_firm(expression->array_ref);
+       ir_node  *offset    = expression_to_firm(expression->index);
+       offset              = create_conv(dbgi, offset, mode_Iu);
 
-       ir_node *base_addr = expression_to_firm(expression->array_ref);
-       ir_node *offset    = expression_to_firm(expression->index);
-       offset             = create_conv(dbgi, offset, mode_Iu);
+       type_t *ref_type = skip_typeref(expression->array_ref->base.datatype);
+       assert(is_type_pointer(ref_type));
+       pointer_type_t *pointer_type = (pointer_type_t*) ref_type;
 
-       unsigned elem_size       = get_type_size(expression->expression.datatype);
+       unsigned elem_size       = get_type_size(pointer_type->points_to);
        ir_node *elem_size_const = new_Const_long(mode_Iu, elem_size);
        ir_node *real_offset     = new_d_Mul(dbgi, offset, elem_size_const,
                                             mode_Iu);
@@ -1163,18 +1515,21 @@ static ir_node *array_access_addr(const array_access_expression_t *expression)
 static ir_node *array_access_to_firm(
                const array_access_expression_t *expression)
 {
-       dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
-       ir_node  *addr = array_access_addr(expression);
-       type_t   *type = expression->expression.datatype;
+       dbg_info *dbgi   = get_dbg_info(&expression->expression.source_position);
+       ir_node  *addr   = array_access_addr(expression);
+       type_t   *type   = revert_automatic_type_conversion(
+                       (const expression_t*) expression);
+       type             = skip_typeref(type);
+       ir_type  *irtype = get_ir_type(type);
 
-       return load_from_expression_addr(type, addr, dbgi);
+       return deref_address(irtype, addr, dbgi);
 }
 
 static ir_node *sizeof_to_firm(const sizeof_expression_t *expression)
 {
        type_t *type = expression->type;
        if(type == NULL) {
-               type = expression->size_expression->datatype;
+               type = expression->size_expression->base.datatype;
                assert(type != NULL);
        }
 
@@ -1185,37 +1540,83 @@ static ir_node *sizeof_to_firm(const sizeof_expression_t *expression)
        return size_node;
 }
 
-static ir_node *conditional_to_firm(const conditional_expression_t *expression)
+static tarval *try_fold_constant(const expression_t *expression)
 {
-       dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
+       ir_graph *old_current_ir_graph = current_ir_graph;
+       if(current_ir_graph == NULL) {
+               current_ir_graph = get_const_code_irg();
+       }
 
-       ir_node *condition  = expression_to_modeb(expression->condition);
-       ir_node *cond       = new_d_Cond(dbgi, condition);
-       ir_node *true_proj  = new_d_Proj(dbgi, cond, mode_X, pn_Cond_true);
-       ir_node *false_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_false);
+       ir_node *cnst = expression_to_firm(expression);
+       current_ir_graph = old_current_ir_graph;
 
-       /* create the true block */
-       ir_node *true_block = new_immBlock();
-       add_immBlock_pred(true_block, true_proj);
-       mature_immBlock(true_block);
+       if(!is_Const(cnst)) {
+               return NULL;
+       }
+
+       tarval *tv = get_Const_tarval(cnst);
+       if(!tarval_is_long(tv)) {
+               return NULL;
+       }
+
+       return tv;
+}
+
+static long fold_constant(const expression_t *expression)
+{
+       tarval *tv = try_fold_constant(expression);
+       if(tv == NULL) {
+               panic("couldn't fold constantl");
+       }
+
+       return get_tarval_long(tv);
+}
+
+static ir_node *conditional_to_firm(const conditional_expression_t *expression)
+{
+       dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
+
+       /* first try to fold a constant condition */
+       tarval *tv = try_fold_constant(expression->condition);
+       if(tv != NULL) {
+               long val = get_tarval_long(tv);
+               if(val) {
+                       return expression_to_firm(expression->true_expression);
+               } else {
+                       return expression_to_firm(expression->false_expression);
+               }
+       }
+
+       ir_node *cur_block   = get_cur_block();
+
+       /* create the true block */
+       ir_node *true_block  = new_immBlock();
 
        ir_node *true_val = expression_to_firm(expression->true_expression);
        ir_node *true_jmp = new_Jmp();
 
        /* create the false block */
        ir_node *false_block = new_immBlock();
-       add_immBlock_pred(false_block, false_proj);
-       mature_immBlock(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);
+       create_condition_evaluation(expression->condition, true_block, false_block);
+       mature_immBlock(true_block);
+       mature_immBlock(false_block);
+
        /* create the common block */
        ir_node *common_block = new_immBlock();
        add_immBlock_pred(common_block, true_jmp);
        add_immBlock_pred(common_block, false_jmp);
        mature_immBlock(common_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);
@@ -1224,13 +1625,216 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression)
        return val;
 }
 
+static ir_node *select_addr(const select_expression_t *expression)
+{
+       dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
+
+       ir_node *compound_addr = expression_to_firm(expression->compound);
+
+       declaration_t *entry = expression->compound_entry;
+       assert(entry->declaration_type == DECLARATION_TYPE_COMPOUND_MEMBER);
+       ir_entity     *entity = entry->v.entity;
+
+       assert(entity != NULL);
+
+       ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), compound_addr, entity);
+
+       return sel;
+}
+
+static ir_node *select_to_firm(const select_expression_t *expression)
+{
+       dbg_info *dbgi   = get_dbg_info(&expression->expression.source_position);
+       ir_node  *addr   = select_addr(expression);
+       type_t   *type   = revert_automatic_type_conversion(
+                       (const expression_t*) expression);
+       type             = skip_typeref(type);
+       ir_type  *irtype = get_ir_type(type);
+
+       return deref_address(irtype, addr, dbgi);
+}
+
+/* Values returned by __builtin_classify_type. */
+typedef enum gcc_type_class
+{
+       no_type_class = -1,
+       void_type_class,
+       integer_type_class,
+       char_type_class,
+       enumeral_type_class,
+       boolean_type_class,
+       pointer_type_class,
+       reference_type_class,
+       offset_type_class,
+       real_type_class,
+       complex_type_class,
+       function_type_class,
+       method_type_class,
+       record_type_class,
+       union_type_class,
+       array_type_class,
+       string_type_class,
+       set_type_class,
+       file_type_class,
+       lang_type_class
+} gcc_type_class;
+
+static ir_node *classify_type_to_firm(const classify_type_expression_t *const expr)
+{
+       const type_t *const type = expr->type_expression->base.datatype;
+
+       gcc_type_class tc;
+       switch (type->type)
+       {
+               case TYPE_ATOMIC: {
+                       const atomic_type_t *const atomic_type = &type->atomic;
+                       switch (atomic_type->atype) {
+                               // should not be reached
+                               case ATOMIC_TYPE_INVALID:
+                                       tc = no_type_class;
+                                       break;
+
+                               // gcc cannot do that
+                               case ATOMIC_TYPE_VOID:
+                                       tc = void_type_class;
+                                       break;
+
+                               case ATOMIC_TYPE_CHAR:      // gcc handles this as integer
+                               case ATOMIC_TYPE_SCHAR:     // gcc handles this as integer
+                               case ATOMIC_TYPE_UCHAR:     // gcc handles this as integer
+                               case ATOMIC_TYPE_SHORT:
+                               case ATOMIC_TYPE_USHORT:
+                               case ATOMIC_TYPE_INT:
+                               case ATOMIC_TYPE_UINT:
+                               case ATOMIC_TYPE_LONG:
+                               case ATOMIC_TYPE_ULONG:
+                               case ATOMIC_TYPE_LONGLONG:
+                               case ATOMIC_TYPE_ULONGLONG:
+                               case ATOMIC_TYPE_BOOL:      // gcc handles this as integer
+                                       tc = integer_type_class;
+                                       break;
+
+                               case ATOMIC_TYPE_FLOAT:
+                               case ATOMIC_TYPE_DOUBLE:
+                               case ATOMIC_TYPE_LONG_DOUBLE:
+                                       tc = real_type_class;
+                                       break;
+
+#ifdef PROVIDE_COMPLEX
+                               case ATOMIC_TYPE_FLOAT_COMPLEX:
+                               case ATOMIC_TYPE_DOUBLE_COMPLEX:
+                               case ATOMIC_TYPE_LONG_DOUBLE_COMPLEX:
+                                       tc = complex_type_class;
+                                       break;
+                               case ATOMIC_TYPE_FLOAT_IMAGINARY:
+                               case ATOMIC_TYPE_DOUBLE_IMAGINARY:
+                               case ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY:
+                                       tc = complex_type_class;
+                                       break;
+#endif
+
+                               default:
+                                       panic("Unimplemented case in classify_type_to_firm().");
+                       }
+                       break;
+               }
+
+               case TYPE_ARRAY:           // gcc handles this as pointer
+               case TYPE_FUNCTION:        // gcc handles this as pointer
+               case TYPE_POINTER:         tc = pointer_type_class; break;
+               case TYPE_COMPOUND_STRUCT: tc = record_type_class;  break;
+               case TYPE_COMPOUND_UNION:  tc = union_type_class;   break;
+
+               // gcc handles this as integer
+               case TYPE_ENUM:            tc = integer_type_class; break;
+
+               default:
+                       panic("Unimplemented case in classify_type_to_firm().");
+       }
+
+       dbg_info *const dbgi = get_dbg_info(&expr->expression.source_position);
+       ir_mode  *const mode = mode_Is;
+       tarval   *const tv   = new_tarval_from_long(tc, mode);
+       return new_d_Const(dbgi, mode, tv);
+}
+
+static ir_node *function_name_to_firm(
+               const string_literal_expression_t *const expr)
+{
+       if (current_function_name == NULL) {
+               const source_position_t *const src_pos =
+                       &expr->expression.source_position;
+               const char *const name = current_function_decl->symbol->string;
+               current_function_name = string_to_firm(src_pos, "__func__", name);
+       }
+
+       return current_function_name;
+}
+
+static ir_node *statement_expression_to_firm(const statement_expression_t *expr)
+{
+       statement_t *statement = expr->statement;
+
+       assert(statement->type == STATEMENT_COMPOUND);
+       return compound_statement_to_firm((compound_statement_t*) statement);
+}
+
+static ir_node *va_start_expression_to_firm(
+       const va_start_expression_t *const expr)
+{
+       ir_type   *const method_type = get_ir_type(current_function_decl->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);
+       dbg_info  *const dbgi        =
+               get_dbg_info(&expr->expression.source_position);
+       ir_node   *const no_mem      = new_NoMem();
+       ir_node   *const arg_sel     =
+               new_d_simpleSel(dbgi, no_mem, arg_base, parm_ent);
+
+       size_t     const parm_size   = get_type_size(expr->parameter->type);
+       ir_node   *const cnst        = new_Const_long(mode_Iu, parm_size);
+       ir_node   *const add         = new_d_Add(dbgi, arg_sel, cnst, mode_P_data);
+       set_value_for_expression(expr->ap, add);
+
+       return NULL;
+}
+
+static ir_node *va_arg_expression_to_firm(const va_arg_expression_t *const expr)
+{
+       ir_type  *const irtype = get_ir_type(expr->expression.datatype);
+       ir_node  *const ap     = expression_to_firm(expr->ap);
+       dbg_info *const dbgi   = get_dbg_info(&expr->expression.source_position);
+       ir_node  *const res    = deref_address(irtype, ap, dbgi);
+
+       size_t     const parm_size   = get_type_size(expr->expression.datatype);
+       ir_node   *const cnst        = new_Const_long(mode_Iu, parm_size);
+       ir_node   *const add         = new_d_Add(dbgi, ap, cnst, mode_P_data);
+       set_value_for_expression(expr->ap, add);
+
+       return res;
+}
+
+static ir_node *dereference_addr(const unary_expression_t *const expression)
+{
+       assert(expression->expression.type == EXPR_UNARY_DEREFERENCE);
+       return expression_to_firm(expression->value);
+}
+
 static ir_node *expression_to_addr(const expression_t *expression)
 {
        switch(expression->type) {
        case EXPR_REFERENCE:
-               return reference_addr((const reference_expression_t*) expression);
+               return reference_addr(&expression->reference);
        case EXPR_ARRAY_ACCESS:
-               return array_access_addr((const array_access_expression_t*) expression);
+               return array_access_addr(&expression->array_access);
+       case EXPR_SELECT:
+               return select_addr(&expression->select);
+       case EXPR_CALL:
+               return call_expression_to_firm(&expression->call);
+       case EXPR_UNARY_DEREFERENCE: {
+               return dereference_addr(&expression->unary);
+       }
        default:
                break;
        }
@@ -1241,41 +1845,58 @@ static ir_node *_expression_to_firm(const expression_t *expression)
 {
        switch(expression->type) {
        case EXPR_CONST:
-               return const_to_firm((const const_t*) expression);
+               return const_to_firm(&expression->conste);
        case EXPR_STRING_LITERAL:
-               return string_literal_to_firm((const string_literal_t*) expression);
+               return string_literal_to_firm(&expression->string);
+       case EXPR_WIDE_STRING_LITERAL:
+               return wide_string_literal_to_firm(&expression->wide_string);
        case EXPR_REFERENCE:
-               return reference_expression_to_firm(
-                               (const reference_expression_t*) expression);
+               return reference_expression_to_firm(&expression->reference);
        case EXPR_CALL:
-               return call_expression_to_firm((const call_expression_t*) expression);
-       case EXPR_UNARY:
-               return unary_expression_to_firm((const unary_expression_t*) expression);
-       case EXPR_BINARY:
-               return binary_expression_to_firm(
-                               (const binary_expression_t*) expression);
+               return call_expression_to_firm(&expression->call);
+       EXPR_UNARY_CASES
+               return unary_expression_to_firm(&expression->unary);
+       EXPR_BINARY_CASES
+               return binary_expression_to_firm(&expression->binary);
        case EXPR_ARRAY_ACCESS:
-               return array_access_to_firm(
-                               (const array_access_expression_t*) expression);
+               return array_access_to_firm(&expression->array_access);
        case EXPR_SIZEOF:
-               return sizeof_to_firm((const sizeof_expression_t*) expression);
+               return sizeof_to_firm(&expression->sizeofe);
        case EXPR_CONDITIONAL:
-               return conditional_to_firm((const conditional_expression_t*)expression);
-       default:
+               return conditional_to_firm(&expression->conditional);
+       case EXPR_SELECT:
+               return select_to_firm(&expression->select);
+       case EXPR_CLASSIFY_TYPE:
+               return classify_type_to_firm(&expression->classify_type);
+       case EXPR_FUNCTION:
+       case EXPR_PRETTY_FUNCTION:
+               return function_name_to_firm(&expression->string);
+       case EXPR_STATEMENT:
+               return statement_expression_to_firm(&expression->statement);
+       case EXPR_VA_START:
+               return va_start_expression_to_firm(&expression->va_starte);
+       case EXPR_VA_ARG:
+               return va_arg_expression_to_firm(&expression->va_arge);
+       case EXPR_OFFSETOF:
+       case EXPR_BUILTIN_SYMBOL:
+               panic("unimplemented expression found");
+
+       case EXPR_UNKNOWN:
+       case EXPR_INVALID:
                break;
        }
-       panic("unsupported expression found");
+       panic("invalid expression found");
 }
 
 static ir_node *expression_to_firm(const expression_t *expression)
 {
-       ir_node *res  = _expression_to_firm(expression);
+       ir_node *res = _expression_to_firm(expression);
 
-       if(expression->datatype == type_void)
-               return NULL;
+       if(res != NULL && get_irn_mode(res) == mode_b) {
+               ir_mode *mode = get_ir_mode(expression->base.datatype);
+               res           = create_conv(NULL, res, mode);
+       }
 
-       ir_mode *mode = get_ir_mode(expression->datatype);
-       res           = create_conv(NULL, res, mode);
        return res;
 }
 
@@ -1287,76 +1908,588 @@ static ir_node *expression_to_modeb(const expression_t *expression)
        return res;
 }
 
-static void statement_to_firm(statement_t *statement);
+/**
+ * create a short-circuit expression evaluation that tries to construct
+ * efficient control flow structures for &&, || and ! expressions
+ */
+static void create_condition_evaluation(const expression_t *expression,
+                                        ir_node *true_block,
+                                        ir_node *false_block)
+{
+       switch(expression->type) {
+       case EXPR_UNARY_NOT: {
+               const unary_expression_t *unary_expression = &expression->unary;
+               create_condition_evaluation(unary_expression->value, false_block,
+                                           true_block);
+               return;
+       }
+       case EXPR_BINARY_LOGICAL_AND: {
+               const binary_expression_t *binary_expression = &expression->binary;
+
+               ir_node *cur_block   = get_cur_block();
+               ir_node *extra_block = new_immBlock();
+               set_cur_block(cur_block);
+               create_condition_evaluation(binary_expression->left, extra_block,
+                                           false_block);
+               mature_immBlock(extra_block);
+               set_cur_block(extra_block);
+               create_condition_evaluation(binary_expression->right, true_block,
+                                           false_block);
+               return;
+       }
+       case EXPR_BINARY_LOGICAL_OR: {
+               const binary_expression_t *binary_expression = &expression->binary;
+
+               ir_node *cur_block   = get_cur_block();
+               ir_node *extra_block = new_immBlock();
+               set_cur_block(cur_block);
+               create_condition_evaluation(binary_expression->left, true_block,
+                                           extra_block);
+               mature_immBlock(extra_block);
+               set_cur_block(extra_block);
+               create_condition_evaluation(binary_expression->right, true_block,
+                                           false_block);
+               return;
+       }
+       default:
+               break;
+       }
+
+       dbg_info *dbgi       = get_dbg_info(&expression->base.source_position);
+       ir_node  *condition  = expression_to_modeb(expression);
+       ir_node  *cond       = new_d_Cond(dbgi, condition);
+       ir_node  *true_proj  = new_d_Proj(dbgi, cond, mode_X, pn_Cond_true);
+       ir_node  *false_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_false);
+
+       add_immBlock_pred(true_block, true_proj);
+       add_immBlock_pred(false_block, false_proj);
+
+       set_cur_block(NULL);
+}
+
+
+
+static void create_declaration_entity(declaration_t *declaration,
+                                      declaration_type_t declaration_type,
+                                      ir_type *parent_type)
+{
+       ident     *id     = new_id_from_str(declaration->symbol->string);
+       ir_type   *irtype = get_ir_type(declaration->type);
+       ir_entity *entity = new_entity(parent_type, id, irtype);
+       set_entity_ld_ident(entity, id);
+
+       declaration->declaration_type = (unsigned char) declaration_type;
+       declaration->v.entity         = entity;
+       set_entity_variability(entity, variability_uninitialized);
+       if(parent_type == get_tls_type())
+               set_entity_allocation(entity, allocation_automatic);
+       else if(declaration_type == DECLARATION_TYPE_GLOBAL_VARIABLE)
+               set_entity_allocation(entity, allocation_static);
+       /* TODO: visibility? */
+}
+
+typedef struct compound_graph_path_entry_t compound_graph_path_entry_t;
+
+enum compound_graph_entry_type_t {
+       COMPOUND_GRAPH_ENTRY_ARRAY,
+       COMPOUND_GRAPH_ENTRY_COMPOUND
+};
+
+struct compound_graph_path_entry_t {
+       int type;
+       union {
+               ir_entity *entity;
+               int        array_index;
+       } v;
+       compound_graph_path_entry_t *prev;
+};
+
+static void create_initializer_object(initializer_t *initializer, type_t *type,
+               ir_entity *entity, compound_graph_path_entry_t *entry, int len);
+
+static compound_graph_path *create_compound_path(ir_type *type,
+               compound_graph_path_entry_t *entry, int len)
+{
+       compound_graph_path *path = new_compound_graph_path(type, len);
+
+       int i = len - 1;
+       for( ; entry != NULL; entry = entry->prev, --i) {
+               assert(i >= 0);
+               if(entry->type == COMPOUND_GRAPH_ENTRY_COMPOUND) {
+                       set_compound_graph_path_node(path, i, entry->v.entity);
+               } else {
+                       assert(entry->type == COMPOUND_GRAPH_ENTRY_ARRAY);
+                       set_compound_graph_path_array_index(path, i, entry->v.array_index);
+               }
+       }
+       assert(i == -1);
+
+       return path;
+}
+
+static void create_initializer_value(initializer_value_t *initializer,
+                                     ir_entity *entity,
+                                     compound_graph_path_entry_t *entry,
+                                     int len)
+{
+       ir_node             *node = expression_to_firm(initializer->value);
+       ir_type             *type = get_entity_type(entity);
+       compound_graph_path *path = create_compound_path(type, entry, len);
+       add_compound_ent_value_w_path(entity, node, path);
+}
+
+static void create_initializer_compound(initializer_list_t *initializer,
+                                        compound_type_t *type,
+                                        ir_entity *entity,
+                                        compound_graph_path_entry_t *last_entry,
+                                        int len)
+{
+       declaration_t *compound_declaration = type->declaration;
+
+       declaration_t *compound_entry = compound_declaration->context.declarations;
+
+       compound_graph_path_entry_t entry;
+       entry.type = COMPOUND_GRAPH_ENTRY_COMPOUND;
+       entry.prev = last_entry;
+       ++len;
+
+       size_t i = 0;
+       for( ; compound_entry != NULL; compound_entry = compound_entry->next) {
+               if(compound_entry->symbol == NULL)
+                       continue;
+               if(compound_entry->namespc != NAMESPACE_NORMAL)
+                       continue;
+
+               if(i >= initializer->len)
+                       break;
+
+               entry.v.entity = compound_entry->v.entity;
+
+               initializer_t *sub_initializer = initializer->initializers[i];
+
+               assert(compound_entry != NULL);
+               assert(compound_entry->declaration_type
+                               == DECLARATION_TYPE_COMPOUND_MEMBER);
+
+               if(sub_initializer->type == INITIALIZER_VALUE) {
+                       create_initializer_value(&sub_initializer->value,
+                                                entity, &entry, len);
+               } else {
+                       type_t *entry_type = skip_typeref(compound_entry->type);
+                       create_initializer_object(sub_initializer, entry_type, entity,
+                                                 &entry, len);
+               }
+
+               ++i;
+       }
+}
+
+static void create_initializer_array(initializer_list_t *initializer,
+                                     array_type_t *type, ir_entity *entity,
+                                     compound_graph_path_entry_t *last_entry,
+                                     int len)
+{
+       type_t *element_type = type->element_type;
+       element_type         = skip_typeref(element_type);
+
+       compound_graph_path_entry_t entry;
+       entry.type = COMPOUND_GRAPH_ENTRY_ARRAY;
+       entry.prev = last_entry;
+       ++len;
+
+       size_t i;
+       for(i = 0; i < initializer->len; ++i) {
+               entry.v.array_index = i;
+
+               initializer_t *sub_initializer = initializer->initializers[i];
+
+               if(sub_initializer->type == INITIALIZER_VALUE) {
+                       create_initializer_value(&sub_initializer->value,
+                                                entity, &entry, len);
+               } else {
+                       create_initializer_object(sub_initializer, element_type, entity,
+                                                 &entry, len);
+               }
+       }
+
+#if 0
+       /* TODO: initialize rest... */
+       if(type->size_expression != NULL) {
+               size_t array_len = fold_constant(type->size_expression);
+               for( ; i < array_len; ++i) {
+
+               }
+       }
+#endif
+}
+
+static void create_initializer_string(initializer_string_t *initializer,
+                                      array_type_t *type, ir_entity *entity,
+                                      compound_graph_path_entry_t *last_entry,
+                                      int len)
+{
+       type_t *element_type = type->element_type;
+       element_type         = skip_typeref(element_type);
+
+       compound_graph_path_entry_t entry;
+       entry.type = COMPOUND_GRAPH_ENTRY_ARRAY;
+       entry.prev = last_entry;
+       ++len;
+
+       ir_type    *irtype  = get_entity_type(entity);
+       size_t      arr_len = get_array_type_size(type);
+       const char *p       = initializer->string;
+       size_t      i       = 0;
+       for(i = 0; i < arr_len; ++i, ++p) {
+               entry.v.array_index = i;
+
+               ir_node             *node = new_Const_long(mode_Bs, *p);
+               compound_graph_path *path = create_compound_path(irtype, &entry, len);
+               add_compound_ent_value_w_path(entity, node, path);
+
+               if(*p == '\0')
+                       break;
+       }
+}
+
+static void create_initializer_wide_string(
+       const initializer_wide_string_t *const initializer, array_type_t *const type,
+       ir_entity *const entity, compound_graph_path_entry_t *const last_entry,
+       int len)
+{
+       type_t *element_type = type->element_type;
+       element_type         = skip_typeref(element_type);
+
+       compound_graph_path_entry_t entry;
+       entry.type = COMPOUND_GRAPH_ENTRY_ARRAY;
+       entry.prev = last_entry;
+       ++len;
+
+       ir_type           *const irtype  = get_entity_type(entity);
+       const size_t             arr_len = get_array_type_size(type);
+       const wchar_rep_t *      p       = initializer->string.begin;
+       const wchar_rep_t *const end     = p + initializer->string.size;
+       for (size_t i = 0; i < arr_len && p != end; ++i, ++p) {
+               entry.v.array_index = i;
+
+               ir_node             *node = new_Const_long(mode_Is, *p);
+               compound_graph_path *path = create_compound_path(irtype, &entry, len);
+               add_compound_ent_value_w_path(entity, node, path);
+       }
+}
+
+static void create_initializer_object(initializer_t *initializer, type_t *type,
+               ir_entity *entity, compound_graph_path_entry_t *entry, int len)
+{
+       if(is_type_array(type)) {
+               array_type_t *array_type = &type->array;
+
+               switch (initializer->type) {
+                       case INITIALIZER_STRING: {
+                               initializer_string_t *const string = &initializer->string;
+                               create_initializer_string(string, array_type, entity, entry, len);
+                               return;
+                       }
+
+                       case INITIALIZER_WIDE_STRING: {
+                               initializer_wide_string_t *const string = &initializer->wide_string;
+                               create_initializer_wide_string(string, array_type, entity, entry, len);
+                               return;
+                       }
+
+                       case INITIALIZER_LIST: {
+                               initializer_list_t *const list = &initializer->list;
+                               create_initializer_array(list, array_type, entity, entry, len);
+                               return;
+                       }
+
+                       case INITIALIZER_VALUE:
+                               break;
+               }
+               panic("Unhandled initializer");
+       } else {
+               assert(initializer->type == INITIALIZER_LIST);
+               initializer_list_t *list = &initializer->list;
+
+               assert(is_type_compound(type));
+               compound_type_t *compound_type = &type->compound;
+               create_initializer_compound(list, compound_type, entity, entry, len);
+       }
+}
+
+static void create_initializer_local_variable_entity(declaration_t *declaration)
+{
+       initializer_t *initializer = declaration->init.initializer;
+       dbg_info      *dbgi        = get_dbg_info(&declaration->source_position);
+       ir_entity     *entity      = declaration->v.entity;
+       ir_node       *memory      = get_store();
+       ir_node       *nomem       = new_NoMem();
+       ir_node       *frame       = get_irg_frame(current_ir_graph);
+       ir_node       *addr        = new_d_simpleSel(dbgi, nomem, frame, entity);
+
+       if(initializer->type == INITIALIZER_VALUE) {
+               initializer_value_t *initializer_value = &initializer->value;
+
+               ir_node *value = expression_to_firm(initializer_value->value);
+               type_t  *type  = skip_typeref(declaration->type);
+               assign_value(dbgi, addr, type, value);
+               return;
+       }
+
+       /* create a "template" entity which is copied to the entity on the stack */
+       ident     *id          = unique_ident("initializer");
+       ir_type   *irtype      = get_ir_type(declaration->type);
+       ir_type   *global_type = get_glob_type();
+       ir_entity *init_entity = new_entity(global_type, id, irtype);
+       set_entity_ld_ident(init_entity, id);
+
+       set_entity_variability(init_entity, variability_initialized);
+       set_entity_visibility(init_entity, visibility_local);
+       set_entity_allocation(init_entity, allocation_static);
+
+       ir_graph *old_current_ir_graph = current_ir_graph;
+       current_ir_graph = get_const_code_irg();
+
+       type_t *type = skip_typeref(declaration->type);
+       create_initializer_object(initializer, type, init_entity, NULL, 0);
+
+       assert(current_ir_graph == get_const_code_irg());
+       current_ir_graph = old_current_ir_graph;
+
+       ir_node *src_addr  = create_symconst(dbgi, init_entity);
+       ir_node *copyb     = new_d_CopyB(dbgi, memory, addr, src_addr, irtype);
+
+       ir_node *copyb_mem = new_Proj(copyb, mode_M, pn_CopyB_M_regular);
+       set_store(copyb_mem);
+}
+
+static void create_initializer(declaration_t *declaration)
+{
+       initializer_t *initializer = declaration->init.initializer;
+       if(initializer == NULL)
+               return;
+
+       declaration_type_t declaration_type
+               = (declaration_type_t) declaration->declaration_type;
+       if(declaration_type == DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY) {
+               create_initializer_local_variable_entity(declaration);
+               return;
+       }
+
+       if(initializer->type == INITIALIZER_VALUE) {
+               initializer_value_t *initializer_value = &initializer->value;
+
+               ir_node *value = expression_to_firm(initializer_value->value);
+
+               if(declaration_type == DECLARATION_TYPE_LOCAL_VARIABLE) {
+                       set_value(declaration->v.value_number, value);
+               } else {
+                       assert(declaration_type == DECLARATION_TYPE_GLOBAL_VARIABLE);
+
+                       ir_entity *entity = declaration->v.entity;
+
+                       set_entity_variability(entity, variability_initialized);
+                       set_atomic_ent_value(entity, value);
+               }
+       } else {
+               assert(declaration_type == DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY
+                               || declaration_type == DECLARATION_TYPE_GLOBAL_VARIABLE);
+
+               ir_entity *entity = declaration->v.entity;
+               set_entity_variability(entity, variability_initialized);
+
+               type_t *type = skip_typeref(declaration->type);
+               create_initializer_object(initializer, type, entity, NULL, 0);
+       }
+}
+
+static void create_local_variable(declaration_t *declaration)
+{
+       assert(declaration->declaration_type == DECLARATION_TYPE_UNKNOWN);
+
+       bool needs_entity = declaration->address_taken;
+       type_t *type = skip_typeref(declaration->type);
+
+       if(is_type_array(type) || is_type_compound(type)) {
+               needs_entity = true;
+       }
+
+       if(needs_entity) {
+               ir_type *frame_type = get_irg_frame_type(current_ir_graph);
+               create_declaration_entity(declaration,
+                                         DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY,
+                                         frame_type);
+       } else {
+               declaration->declaration_type = DECLARATION_TYPE_LOCAL_VARIABLE;
+               declaration->v.value_number   = next_value_number_function;
+               ++next_value_number_function;
+       }
+
+       create_initializer(declaration);
+}
+
+static void create_local_static_variable(declaration_t *declaration)
+{
+       assert(declaration->declaration_type == DECLARATION_TYPE_UNKNOWN);
+
+       type_t    *type        = skip_typeref(declaration->type);
+       ir_type   *global_type = get_glob_type();
+       ident     *id          = unique_ident(declaration->symbol->string);
+       ir_type   *irtype      = get_ir_type(type);
+       ir_entity *entity      = new_entity(global_type, id, irtype);
+       set_entity_ld_ident(entity, id);
+
+       declaration->declaration_type = DECLARATION_TYPE_GLOBAL_VARIABLE;
+       declaration->v.entity         = entity;
+       set_entity_variability(entity, variability_uninitialized);
+       set_entity_visibility(entity, visibility_local);
+       set_entity_allocation(entity, allocation_static);
+
+       ir_graph *old_current_ir_graph = current_ir_graph;
+       current_ir_graph = get_const_code_irg();
+
+       create_initializer(declaration);
+
+       assert(current_ir_graph == get_const_code_irg());
+       current_ir_graph = old_current_ir_graph;
+}
+
+
 
 static void return_statement_to_firm(return_statement_t *statement)
 {
        if(get_cur_block() == NULL)
                return;
 
-       dbg_info *dbgi = get_dbg_info(&statement->statement.source_position);
-       ir_node  *ret;
+       ir_type *func_irtype = get_ir_type(current_function_decl->type);
 
-       if(statement->return_value != NULL) {
-               ir_node *retval = expression_to_firm(statement->return_value);
-               ir_node *in[1];
+       dbg_info *dbgi  = get_dbg_info(&statement->statement.source_position);
 
-               in[0] = retval;
-               ret   = new_d_Return(dbgi, get_store(), 1, in);
+       ir_node *in[1];
+       int      in_len;
+       if(get_method_n_ress(func_irtype) > 0) {
+               ir_type *res_type = get_method_res_type(func_irtype, 0);
+
+               if(statement->return_value != NULL) {
+                       ir_node *node = expression_to_firm(statement->return_value);
+                       node  = do_strict_conv(dbgi, node);
+                       in[0] = node;
+               } else {
+                       ir_mode *mode;
+                       if(is_compound_type(res_type)) {
+                               mode = mode_P_data;
+                       } else {
+                               mode = get_type_mode(res_type);
+                       }
+                       in[0] = new_Unknown(mode);
+               }
+               in_len = 1;
        } else {
-               ret   = new_d_Return(dbgi, get_store(), 0, NULL);
+               /* build return_value for its side effects */
+               if(statement->return_value != NULL) {
+                       expression_to_firm(statement->return_value);
+               }
+               in_len = 0;
        }
+
+       ir_node  *store = get_store();
+       ir_node  *ret   = new_d_Return(dbgi, store, in_len, in);
+
        ir_node *end_block = get_irg_end_block(current_ir_graph);
        add_immBlock_pred(end_block, ret);
 
        set_cur_block(NULL);
 }
 
-static void compound_statement_to_firm(compound_statement_t *compound)
+static ir_node *expression_statement_to_firm(expression_statement_t *statement)
+{
+       if(get_cur_block() == NULL)
+               return NULL;
+
+       return expression_to_firm(statement->expression);
+}
+
+static ir_node *compound_statement_to_firm(compound_statement_t *compound)
 {
+       ir_node     *result    = NULL;
        statement_t *statement = compound->statements;
-       for( ; statement != NULL; statement = statement->next) {
+       for( ; statement != NULL; statement = statement->base.next) {
                //context2firm(&statement->context);
+
+               if(statement->base.next == NULL
+                               && statement->type == STATEMENT_EXPRESSION) {
+                       result = expression_statement_to_firm(
+                                       (expression_statement_t*) statement);
+                       break;
+               }
                statement_to_firm(statement);
        }
+
+       return result;
 }
 
-static void expression_statement_to_firm(expression_statement_t *statement)
+static void create_local_declaration(declaration_t *declaration)
 {
-       if(get_cur_block() == NULL)
+       type_t *type = skip_typeref(declaration->type);
+
+       switch ((storage_class_tag_t) declaration->storage_class) {
+       case STORAGE_CLASS_STATIC:
+               create_local_static_variable(declaration);
                return;
+       case STORAGE_CLASS_ENUM_ENTRY:
+               panic("enum entry declaration in local block found");
+       case STORAGE_CLASS_EXTERN:
+               panic("extern declaration in local block found");
+       case STORAGE_CLASS_NONE:
+       case STORAGE_CLASS_AUTO:
+       case STORAGE_CLASS_REGISTER:
+               if(is_type_function(type)) {
+                       panic("nested functions not supported yet");
+               } else {
+                       create_local_variable(declaration);
+               }
+               return;
+       case STORAGE_CLASS_TYPEDEF:
+       case STORAGE_CLASS_THREAD:
+       case STORAGE_CLASS_THREAD_EXTERN:
+       case STORAGE_CLASS_THREAD_STATIC:
+               return;
+       }
+       panic("invalid storage class found");
+}
 
-       expression_to_firm(statement->expression);
+static void declaration_statement_to_firm(declaration_statement_t *statement)
+{
+       declaration_t *declaration = statement->declarations_begin;
+       declaration_t *end         = statement->declarations_end->next;
+       for( ; declaration != end; declaration = declaration->next) {
+               create_local_variable(declaration);
+       }
 }
 
 static void if_statement_to_firm(if_statement_t *statement)
 {
-       dbg_info *dbgi      = get_dbg_info(&statement->statement.source_position);
-       ir_node  *condition = expression_to_modeb(statement->condition);
-
-       /* make sure we have a mode_b condition */
-       ir_node *cond       = new_d_Cond(dbgi, condition);
-       ir_node *true_proj  = new_d_Proj(dbgi, cond, mode_X, pn_Cond_true);
-       ir_node *false_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_false);
+       ir_node *cur_block = get_cur_block();
 
        ir_node *fallthrough_block = new_immBlock();
 
        /* the true (blocks) */
-       ir_node *true_block = new_immBlock();
-       add_immBlock_pred(true_block, true_proj);
-       mature_immBlock(true_block);
-
-       statement_to_firm(statement->true_statement);
-       if(get_cur_block() != NULL) {
-               ir_node *jmp = new_Jmp();
-               add_immBlock_pred(fallthrough_block, jmp);
+       ir_node *true_block;
+       if (statement->true_statement != NULL) {
+               true_block = new_immBlock();
+               statement_to_firm(statement->true_statement);
+               if(get_cur_block() != NULL) {
+                       ir_node *jmp = new_Jmp();
+                       add_immBlock_pred(fallthrough_block, jmp);
+               }
+       } else {
+               true_block = fallthrough_block;
        }
 
        /* the false (blocks) */
+       ir_node *false_block;
        if(statement->false_statement != NULL) {
-               ir_node *false_block = new_immBlock();
-               add_immBlock_pred(false_block, false_proj);
-               mature_immBlock(false_block);
+               false_block = new_immBlock();
 
                statement_to_firm(statement->false_statement);
                if(get_cur_block() != NULL) {
@@ -1364,7 +2497,19 @@ static void if_statement_to_firm(if_statement_t *statement)
                        add_immBlock_pred(fallthrough_block, jmp);
                }
        } else {
-               add_immBlock_pred(fallthrough_block, false_proj);
+               false_block = fallthrough_block;
+       }
+
+       /* create the condition */
+       if(cur_block != NULL) {
+               set_cur_block(cur_block);
+               create_condition_evaluation(statement->condition, true_block,
+                                           false_block);
+       }
+
+       mature_immBlock(true_block);
+       if(false_block != fallthrough_block) {
+               mature_immBlock(false_block);
        }
        mature_immBlock(fallthrough_block);
 
@@ -1373,8 +2518,6 @@ static void if_statement_to_firm(if_statement_t *statement)
 
 static void while_statement_to_firm(while_statement_t *statement)
 {
-       dbg_info *dbgi = get_dbg_info(&statement->statement.source_position);
-
        ir_node *jmp = NULL;
        if(get_cur_block() != NULL) {
                jmp = new_Jmp();
@@ -1386,48 +2529,46 @@ static void while_statement_to_firm(while_statement_t *statement)
                add_immBlock_pred(header_block, jmp);
        }
 
-       /* create the condition */
-       ir_node *condition  = expression_to_modeb(statement->condition);
-       ir_node *cond       = new_d_Cond(dbgi, condition);
-       ir_node *true_proj  = new_d_Proj(dbgi, cond, mode_X, pn_Cond_true);
-       ir_node *false_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_false);
-
        /* the false block */
        ir_node *false_block = new_immBlock();
-       add_immBlock_pred(false_block, false_proj);
 
        /* the loop body */
-       ir_node *body_block = new_immBlock();
-       add_immBlock_pred(body_block, true_proj);
-       mature_immBlock(body_block);
-
-       ir_node *old_continue_label = continue_label;
-       ir_node *old_break_label    = break_label;
-       continue_label              = header_block;
-       break_label                 = false_block;
+       ir_node *body_block;
+       if (statement->body != NULL) {
+               ir_node *old_continue_label = continue_label;
+               ir_node *old_break_label    = break_label;
+               continue_label              = header_block;
+               break_label                 = false_block;
 
-       statement_to_firm(statement->body);
+               body_block = new_immBlock();
+               statement_to_firm(statement->body);
 
-       assert(continue_label == header_block);
-       assert(break_label    == false_block);
-       continue_label = old_continue_label;
-       break_label    = old_break_label;
+               assert(continue_label == header_block);
+               assert(break_label    == false_block);
+               continue_label = old_continue_label;
+               break_label    = old_break_label;
 
-       if(get_cur_block() != NULL) {
-               ir_node *jmp = new_Jmp();
-               add_immBlock_pred(header_block, jmp);
+               if(get_cur_block() != NULL) {
+                       jmp = new_Jmp();
+                       add_immBlock_pred(header_block, jmp);
+               }
+       } else {
+               body_block = header_block;
        }
 
-       mature_immBlock(header_block);
+       /* create the condition */
+       set_cur_block(header_block);
+
+       create_condition_evaluation(statement->condition, body_block, false_block);
+       mature_immBlock(body_block);
        mature_immBlock(false_block);
+       mature_immBlock(header_block);
 
        set_cur_block(false_block);
 }
 
 static void do_while_statement_to_firm(do_while_statement_t *statement)
 {
-       dbg_info *dbgi = get_dbg_info(&statement->statement.source_position);
-
        ir_node *jmp = NULL;
        if(get_cur_block() != NULL) {
                jmp = new_Jmp();
@@ -1445,22 +2586,25 @@ static void do_while_statement_to_firm(do_while_statement_t *statement)
                add_immBlock_pred(body_block, jmp);
        }
 
-       ir_node *old_continue_label = continue_label;
-       ir_node *old_break_label    = break_label;
-       continue_label              = header_block;
-       break_label                 = false_block;
+       if (statement->body != NULL) {
+               ir_node *old_continue_label = continue_label;
+               ir_node *old_break_label    = break_label;
+               continue_label              = header_block;
+               break_label                 = false_block;
 
-       statement_to_firm(statement->body);
+               statement_to_firm(statement->body);
 
-       assert(continue_label == header_block);
-       assert(break_label    == false_block);
-       continue_label = old_continue_label;
-       break_label    = old_break_label;
+               assert(continue_label == header_block);
+               assert(break_label    == false_block);
+               continue_label = old_continue_label;
+               break_label    = old_break_label;
 
-       if(get_cur_block() == NULL) {
-               mature_immBlock(header_block);
-               mature_immBlock(body_block);
-               return;
+               if (get_cur_block() == NULL) {
+                       mature_immBlock(header_block);
+                       mature_immBlock(body_block);
+                       mature_immBlock(false_block);
+                       return;
+               }
        }
 
        ir_node *body_jmp = new_Jmp();
@@ -1468,38 +2612,40 @@ static void do_while_statement_to_firm(do_while_statement_t *statement)
        mature_immBlock(header_block);
 
        /* create the condition */
-       ir_node *condition  = expression_to_modeb(statement->condition);
-       ir_node *cond       = new_d_Cond(dbgi, condition);
-       ir_node *true_proj  = new_d_Proj(dbgi, cond, mode_X, pn_Cond_true);
-       ir_node *false_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_false);
+       set_cur_block(header_block);
 
-       add_immBlock_pred(body_block, true_proj);
+       create_condition_evaluation(statement->condition, body_block, false_block);
        mature_immBlock(body_block);
-
-       add_immBlock_pred(false_block, false_proj);
        mature_immBlock(false_block);
+       mature_immBlock(header_block);
 
        set_cur_block(false_block);
 }
 
 static void for_statement_to_firm(for_statement_t *statement)
 {
-       dbg_info *const dbgi = get_dbg_info(&statement->statement.source_position);
-
        ir_node *jmp = NULL;
        if (get_cur_block() != NULL) {
                if(statement->initialisation != NULL) {
                        expression_to_firm(statement->initialisation);
                }
+
+               /* create declarations */
+               declaration_t *declaration = statement->context.declarations;
+               for( ; declaration != NULL; declaration = declaration->next) {
+                       create_local_declaration(declaration);
+               }
+
                jmp = new_Jmp();
        }
 
+
        /* create the step block */
        ir_node *const step_block = new_immBlock();
        if (statement->step != NULL) {
                expression_to_firm(statement->step);
        }
-       ir_node *const step_jmp   = new_Jmp();
+       ir_node *const step_jmp = new_Jmp();
 
        /* create the header block */
        ir_node *const header_block = new_immBlock();
@@ -1508,149 +2654,60 @@ static void for_statement_to_firm(for_statement_t *statement)
        }
        add_immBlock_pred(header_block, step_jmp);
 
-       /* create the condition */
-       ir_node *true_proj;
-       ir_node *false_proj;
-       if (statement->condition != NULL) {
-               ir_node *const condition  = expression_to_modeb(statement->condition);
-               ir_node *const cond       = new_d_Cond(dbgi, condition);
-               true_proj  = new_d_Proj(dbgi, cond, mode_X, pn_Cond_true);
-               false_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_false);
-       } else {
-               keep_alive(header_block);
-               true_proj  = new_Jmp();
-               false_proj = NULL;
-       }
-
        /* the false block */
        ir_node *const false_block = new_immBlock();
-       if (false_proj != NULL) {
-               add_immBlock_pred(false_block, false_proj);
-       }
 
        /* the loop body */
-       ir_node *const body_block = new_immBlock();
-       add_immBlock_pred(body_block, true_proj);
-       mature_immBlock(body_block);
-
-       ir_node *const old_continue_label = continue_label;
-       ir_node *const old_break_label    = break_label;
-       continue_label = step_block;
-       break_label    = false_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;
-
-       if (get_cur_block() != NULL) {
-               ir_node *const jmp = new_Jmp();
-               add_immBlock_pred(step_block, jmp);
-       }
-
-       mature_immBlock(step_block);
-       mature_immBlock(header_block);
-       mature_immBlock(false_block);
-
-       set_cur_block(false_block);
-}
-
-static void create_declaration_entity(declaration_t *declaration,
-                                      declaration_type_t declaration_type,
-                                      ir_type *parent_type)
-{
-       ident     *id     = new_id_from_str(declaration->symbol->string);
-       ir_type   *irtype = get_ir_type(declaration->type);
-       ir_entity *entity = new_entity(parent_type, id, irtype);
-       set_entity_ld_ident(entity, id);
-
-       declaration->declaration_type = declaration_type;
-       declaration->v.entity         = entity;
-       set_entity_variability(entity, variability_uninitialized);
-       /* TODO: visibility? */
-}
-
-static void create_initializer(declaration_t *declaration)
-{
-       initializer_t *initializer = declaration->init.initializer;
-       if(initializer == NULL)
-               return;
-
-       if(initializer->type == INITIALIZER_VALUE) {
-               assert(initializer->designator == NULL);
-               assert(initializer->next == NULL);
-               ir_node *init_node = expression_to_firm(initializer->v.value);
-
-               if(declaration->declaration_type == DECLARATION_TYPE_LOCAL_VARIABLE) {
-                       set_value(declaration->v.value_number, init_node);
-               } else {
-                       ir_entity *entity = declaration->v.entity;
-
-                       set_entity_variability(entity, variability_initialized);
-                       set_atomic_ent_value(entity, init_node);
+       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();
+               statement_to_firm(statement->body);
+
+               assert(continue_label == step_block);
+               assert(break_label    == false_block);
+               continue_label = old_continue_label;
+               break_label    = old_break_label;
+
+               if (get_cur_block() != NULL) {
+                       jmp = new_Jmp();
+                       add_immBlock_pred(step_block, jmp);
                }
        } else {
-               assert(initializer->type == INITIALIZER_LIST);
-               panic("list initializer not supported yet");
+               body_block = step_block;
        }
-}
-
-static void create_local_variable(declaration_t *declaration)
-{
-       bool needs_entity = declaration->address_taken;
-
-       assert(declaration->declaration_type == DECLARATION_TYPE_UNKNOWN);
 
-       if(needs_entity) {
-               ir_type *frame_type = get_irg_frame_type(current_ir_graph);
-               create_declaration_entity(declaration,
-                                         DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY,
-                                         frame_type);
+       /* create the condition */
+       set_cur_block(header_block);
+       if (statement->condition != NULL) {
+               create_condition_evaluation(statement->condition, body_block,
+                                           false_block);
        } else {
-               declaration->declaration_type = DECLARATION_TYPE_LOCAL_VARIABLE;
-               declaration->v.value_number   = next_value_number_function;
-               ++next_value_number_function;
+               keep_alive(header_block);
+               jmp = new_Jmp();
+               add_immBlock_pred(body_block, jmp);
        }
 
-       create_initializer(declaration);
-}
-
-static void declaration_statement_to_firm(declaration_statement_t *statement)
-{
-       declaration_t *declaration = statement->declarations_begin;
-       declaration_t *end         = statement->declarations_end->next;
-       for( ; declaration != end; declaration = declaration->next) {
-               type_t *type = declaration->type;
+       mature_immBlock(body_block);
+       mature_immBlock(false_block);
+       mature_immBlock(step_block);
+       mature_immBlock(header_block);
+       mature_immBlock(false_block);
 
-               switch(declaration->storage_class) {
-               case STORAGE_CLASS_TYPEDEF:
-                       continue;
-               case STORAGE_CLASS_STATIC:
-                       panic("static local vars not implemented yet");
-               case STORAGE_CLASS_ENUM_ENTRY:
-                       panic("enum entry declaration in local block found");
-               case STORAGE_CLASS_EXTERN:
-                       panic("extern declaration in local block found");
-               case STORAGE_CLASS_NONE:
-               case STORAGE_CLASS_AUTO:
-               case STORAGE_CLASS_REGISTER:
-                       if(type->type == TYPE_FUNCTION) {
-                               panic("nested functions not supported yet");
-                       } else {
-                               create_local_variable(declaration);
-                       }
-                       continue;
-               }
-               panic("invalid storage class found");
-       }
+       set_cur_block(false_block);
 }
 
 static void create_jump_statement(const statement_t *statement,
                                   ir_node *target_block)
 {
-       dbg_info *dbgi = get_dbg_info(&statement->source_position);
+       if(get_cur_block() == NULL)
+               return;
+
+       dbg_info *dbgi = get_dbg_info(&statement->base.source_position);
        ir_node  *jump = new_d_Jmp(dbgi);
        add_immBlock_pred(target_block, jump);
 
@@ -1667,10 +2724,11 @@ static void switch_statement_to_firm(const switch_statement_t *statement)
 
        set_cur_block(NULL);
 
-       ir_node *old_switch_cond = current_switch_cond;
-       ir_node *old_break_label = break_label;
-       current_switch_cond      = cond;
-       break_label              = break_block;
+       ir_node *const old_switch_cond       = current_switch_cond;
+       ir_node *const old_break_label       = break_label;
+       const bool     old_saw_default_label = saw_default_label;
+       current_switch_cond                  = cond;
+       break_label                          = break_block;
 
        statement_to_firm(statement->body);
 
@@ -1679,39 +2737,29 @@ static void switch_statement_to_firm(const switch_statement_t *statement)
                add_immBlock_pred(break_block, jmp);
        }
 
+       if (!saw_default_label) {
+               set_cur_block(get_nodes_block(cond));
+               ir_node *const proj = new_d_defaultProj(dbgi, cond,
+                                                       MAGIC_DEFAULT_PN_NUMBER);
+               add_immBlock_pred(break_block, proj);
+       }
+
        assert(current_switch_cond == cond);
        assert(break_label         == break_block);
        current_switch_cond = old_switch_cond;
        break_label         = old_break_label;
+       saw_default_label   = old_saw_default_label;
 
        mature_immBlock(break_block);
        set_cur_block(break_block);
 }
 
-static long fold_constant(const expression_t *expression)
-{
-       ir_graph *old_current_ir_graph = current_ir_graph;
-       current_ir_graph = get_const_code_irg();
-
-       ir_node *cnst = expression_to_firm(expression);
-       if(!is_Const(cnst)) {
-               panic("couldn't fold constantl");
-       }
-       tarval *tv = get_Const_tarval(cnst);
-       if(!tarval_is_long(tv)) {
-               panic("folded constant not an integer");
-       }
-
-       long res = get_tarval_long(tv);
-
-       current_ir_graph = old_current_ir_graph;
-       return res;
-}
-
 static void case_label_to_firm(const case_label_statement_t *statement)
 {
        dbg_info *dbgi = get_dbg_info(&statement->statement.source_position);
 
+       ir_node *const fallthrough = (get_cur_block() == NULL ? NULL : new_Jmp());
+
        /* let's create a node and hope firm constant folding creates a Const
         * node... */
        ir_node *proj;
@@ -1724,18 +2772,24 @@ static void case_label_to_firm(const case_label_statement_t *statement)
                }
                proj = new_d_Proj(dbgi, current_switch_cond, mode_X, pn);
        } else {
+               saw_default_label = true;
                proj = new_d_defaultProj(dbgi, current_switch_cond,
                                         MAGIC_DEFAULT_PN_NUMBER);
        }
 
        ir_node *block = new_immBlock();
+       if (fallthrough != NULL) {
+               add_immBlock_pred(block, fallthrough);
+       }
        add_immBlock_pred(block, proj);
        mature_immBlock(block);
+
+       statement_to_firm(statement->label_statement);
 }
 
 static ir_node *get_label_block(declaration_t *label)
 {
-       assert(label->namespace == NAMESPACE_LABEL);
+       assert(label->namespc == NAMESPACE_LABEL);
 
        if(label->declaration_type == DECLARATION_TYPE_LABEL_BLOCK) {
                return label->v.block;
@@ -1749,7 +2803,7 @@ static ir_node *get_label_block(declaration_t *label)
        label->declaration_type = DECLARATION_TYPE_LABEL_BLOCK;
        label->v.block          = block;
 
-       ARR_APP1(imature_blocks, block);
+       ARR_APP1(ir_node *, imature_blocks, block);
 
        return block;
 }
@@ -1781,29 +2835,126 @@ static void goto_to_firm(const goto_statement_t *statement)
        set_cur_block(NULL);
 }
 
+typedef enum modifier_t {
+       ASM_MODIFIER_WRITE_ONLY   = 1 << 0,
+       ASM_MODIFIER_READ_WRITE   = 1 << 1,
+       ASM_MODIFIER_COMMUTATIVE  = 1 << 2,
+       ASM_MODIFIER_EARLYCLOBBER = 1 << 3,
+} modifier_t;
+
+#if 0
+static void asm_statement_to_firm(const asm_statement_t *statement)
+{
+       bool needs_memory = false;
+
+       size_t         n_clobbers = 0;
+       asm_clobber_t *clobber    = statement->clobbers;
+       for( ; clobber != NULL; clobber = clobber->next) {
+               if(strcmp(clobber->clobber, "memory") == 0) {
+                       needs_memory = true;
+                       continue;
+               }
+
+               ident *id = new_id_from_str(clobber->clobber);
+               obstack_ptr_grow(&asm_obst, id);
+               ++n_clobbers;
+       }
+       assert(obstack_object_size(&asm_obst) == n_clobbers * sizeof(ident*));
+       ident **clobbers = NULL;
+       if(n_clobbers > 0) {
+               clobbers = obstack_finish(&asm_obst);
+       }
+
+       /* find and count input and output constraints */
+       asm_constraint_t *constraint = statement->inputs;
+       for( ; constraint != NULL; constraint = constraint->next) {
+               int  modifiers      = 0;
+               bool supports_memop = false;
+               for(const char *c = constraint->constraints; *c != 0; ++c) {
+                       /* TODO: improve error messages */
+                       switch(*c) {
+                       case '?':
+                       case '!':
+                               panic("multiple alternative assembler constraints not "
+                                     "supported");
+                       case 'm':
+                       case 'o':
+                       case 'V':
+                       case '<':
+                       case '>':
+                       case 'X':
+                               supports_memop = true;
+                               obstack_1grow(&asm_obst, *c);
+                               break;
+                       case '=':
+                               if(modifiers & ASM_MODIFIER_READ_WRITE)
+                                       panic("inconsistent register constraints");
+                               modifiers |= ASM_MODIFIER_WRITE_ONLY;
+                               break;
+                       case '+':
+                               if(modifiers & ASM_MODIFIER_WRITE_ONLY)
+                                       panic("inconsistent register constraints");
+                               modifiers |= ASM_MODIFIER_READ_WRITE;
+                               break;
+                       case '&':
+                               modifiers |= ASM_MODIFIER_EARLYCLOBBER;
+                               panic("early clobber assembler constraint not supported yet");
+                               break;
+                       case '%':
+                               modifiers |= ASM_MODIFIER_COMMUTATIVE;
+                               panic("commutative assembler constraint not supported yet");
+                               break;
+                       case '#':
+                               /* skip register preferences stuff... */
+                               while(*c != 0 && *c != ',')
+                                       ++c;
+                               break;
+                       case '*':
+                               /* skip register preferences stuff... */
+                               ++c;
+                               break;
+                       default:
+                               obstack_1grow(&asm_obst, *c);
+                               break;
+                       }
+               }
+               obstack_1grow(&asm_obst, '\0');
+               const char *constraint_string = obstack_finish(&asm_obst);
+
+               needs_memory |= supports_memop;
+               if(supports_memop) {
+
+               }
+       }
+
+}
+#endif
+
 static void statement_to_firm(statement_t *statement)
 {
        switch(statement->type) {
+       case STATEMENT_INVALID:
+               panic("invalid statement found");
        case STATEMENT_COMPOUND:
-               compound_statement_to_firm((compound_statement_t*) statement);
+               compound_statement_to_firm(&statement->compound);
                return;
        case STATEMENT_RETURN:
-               return_statement_to_firm((return_statement_t*) statement);
+               return_statement_to_firm(&statement->returns);
                return;
        case STATEMENT_EXPRESSION:
-               expression_statement_to_firm((expression_statement_t*) statement);
+               expression_statement_to_firm(&statement->expression);
                return;
        case STATEMENT_IF:
-               if_statement_to_firm((if_statement_t*) statement);
+               if_statement_to_firm(&statement->ifs);
                return;
        case STATEMENT_WHILE:
-               while_statement_to_firm((while_statement_t*) statement);
+               while_statement_to_firm(&statement->whiles);
                return;
        case STATEMENT_DO_WHILE:
-               do_while_statement_to_firm((do_while_statement_t*) statement);
+               do_while_statement_to_firm(&statement->do_while);
                return;
        case STATEMENT_DECLARATION:
-               declaration_statement_to_firm((declaration_statement_t*) statement);
+               declaration_statement_to_firm(&statement->declaration);
                return;
        case STATEMENT_BREAK:
                create_jump_statement(statement, break_label);
@@ -1812,52 +2963,175 @@ static void statement_to_firm(statement_t *statement)
                create_jump_statement(statement, continue_label);
                return;
        case STATEMENT_SWITCH:
-               switch_statement_to_firm((switch_statement_t*) statement);
+               switch_statement_to_firm(&statement->switchs);
                return;
        case STATEMENT_CASE_LABEL:
-               case_label_to_firm((case_label_statement_t*) statement);
+               case_label_to_firm(&statement->case_label);
                return;
        case STATEMENT_FOR:
-               for_statement_to_firm((for_statement_t*) statement);
+               for_statement_to_firm(&statement->fors);
                return;
        case STATEMENT_LABEL:
-               label_to_firm((label_statement_t*) statement);
+               label_to_firm(&statement->label);
                return;
        case STATEMENT_GOTO:
-               goto_to_firm((goto_statement_t*) statement);
+               goto_to_firm(&statement->gotos);
                return;
-       default:
+       case STATEMENT_ASM:
+               //asm_statement_to_firm(&statement->asms);
+               //return;
                break;
        }
        panic("Statement not implemented\n");
 }
 
+static int count_local_declarations(const declaration_t *      decl,
+                                    const declaration_t *const end)
+{
+       int count = 0;
+       for (; decl != end; decl = decl->next) {
+               const type_t *type = skip_typeref(decl->type);
+               switch (type->type) {
+                       case TYPE_ATOMIC:
+                       case TYPE_ENUM:
+                       case TYPE_POINTER:
+                               if (!decl->address_taken)
+                                       ++count;
+                               break;
+
+                       default: break;
+               }
+       }
+       return count;
+}
+
+static int count_decls_in_stmts(const statement_t *stmt)
+{
+       int count = 0;
+       for (; stmt != NULL; stmt = stmt->base.next) {
+               switch (stmt->type) {
+                       case STATEMENT_DECLARATION: {
+                               const declaration_statement_t *const decl_stmt =
+                                       (const declaration_statement_t*)stmt;
+                               count += count_local_declarations(decl_stmt->declarations_begin,
+                                                                 decl_stmt->declarations_end->next);
+                               break;
+                       }
+
+                       case STATEMENT_COMPOUND: {
+                               const compound_statement_t *const comp =
+                                       (const compound_statement_t*)stmt;
+                               count += count_decls_in_stmts(comp->statements);
+                               break;
+                       }
+
+                       case STATEMENT_IF: {
+                               const if_statement_t *const if_stmt = (const if_statement_t*)stmt;
+                               count += count_decls_in_stmts(if_stmt->true_statement);
+                               count += count_decls_in_stmts(if_stmt->false_statement);
+                               break;
+                       }
+
+                       case STATEMENT_SWITCH: {
+                               const switch_statement_t *const switch_stmt =
+                                       (const switch_statement_t*)stmt;
+                               count += count_decls_in_stmts(switch_stmt->body);
+                               break;
+                       }
+
+                       case STATEMENT_LABEL: {
+                               const label_statement_t *const label_stmt =
+                                       (const label_statement_t*)stmt;
+                               count += count_decls_in_stmts(label_stmt->label_statement);
+                               break;
+                       }
+
+                       case STATEMENT_WHILE: {
+                               const while_statement_t *const while_stmt =
+                                       (const while_statement_t*)stmt;
+                               count += count_decls_in_stmts(while_stmt->body);
+                               break;
+                       }
+
+                       case STATEMENT_DO_WHILE: {
+                               const do_while_statement_t *const do_while_stmt =
+                                       (const do_while_statement_t*)stmt;
+                               count += count_decls_in_stmts(do_while_stmt->body);
+                               break;
+                       }
+
+                       case STATEMENT_FOR: {
+                               const for_statement_t *const for_stmt =
+                                       (const for_statement_t*)stmt;
+                               /* TODO initialisation */
+                               count += count_decls_in_stmts(for_stmt->body);
+                               break;
+                       }
+
+                       case STATEMENT_ASM:
+                       case STATEMENT_BREAK:
+                       case STATEMENT_CASE_LABEL:
+                       case STATEMENT_CONTINUE:
+                       case STATEMENT_EXPRESSION:
+                       case STATEMENT_GOTO:
+                       case STATEMENT_INVALID:
+                       case STATEMENT_RETURN:
+                               break;
+               }
+       }
+       return count;
+}
+
 static int get_function_n_local_vars(declaration_t *declaration)
 {
-       (void) declaration;
-       /* TODO */
-       return 30;
+       int count = 0;
+
+       /* count parameters */
+       count += count_local_declarations(declaration->context.declarations, NULL);
+
+       /* count local variables declared in body */
+       count += count_decls_in_stmts(declaration->init.statement);
+
+       /* TODO FIXME: Matze: I'm lazy don't want to scan all expressions
+        * for expression statements... */
+       count += 10;
+
+       return count;
 }
 
 static void initialize_function_parameters(declaration_t *declaration)
 {
-       ir_graph *irg         = current_ir_graph;
-       ir_node  *args        = get_irg_args(irg);
-       ir_node  *start_block = get_irg_start_block(irg);
+       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(declaration->type);
 
        int            n         = 0;
        declaration_t *parameter = declaration->context.declarations;
-       for( ; parameter != NULL; parameter = parameter->next) {
+       for( ; parameter != NULL; parameter = parameter->next, ++n) {
                assert(parameter->declaration_type == DECLARATION_TYPE_UNKNOWN);
+               type_t *type = skip_typeref(parameter->type);
 
-               if(parameter->address_taken) {
-                       panic("address take from parameter not implemented yet");
+               bool needs_entity = parameter->address_taken;
+               assert(!is_type_array(type));
+               if(is_type_compound(type)) {
+                       needs_entity = true;
+               }
+
+               if(needs_entity) {
+                       ir_entity *entity = get_method_value_param_ent(function_irtype, n);
+                       ident     *id     = new_id_from_str(parameter->symbol->string);
+                       set_entity_ident(entity, id);
+
+                       parameter->declaration_type
+                               = DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY;
+                       parameter->v.entity = entity;
+                       continue;
                }
 
                ir_mode *mode = get_ir_mode(parameter->type);
                long     pn   = n;
                ir_node *proj = new_r_Proj(irg, start_block, args, mode, pn);
-               ++n;
 
                parameter->declaration_type = DECLARATION_TYPE_LOCAL_VARIABLE;
                parameter->v.value_number   = next_value_number_function;
@@ -1869,16 +3143,19 @@ static void initialize_function_parameters(declaration_t *declaration)
 
 static void create_function(declaration_t *declaration)
 {
-       ir_entity *entity = get_function_entity(declaration);
+       ir_entity *function_entity = get_function_entity(declaration);
 
        if(declaration->init.statement == NULL)
                return;
 
+       current_function_decl = declaration;
+       current_function_name = NULL;
+
        assert(imature_blocks == NULL);
        imature_blocks = NEW_ARR_F(ir_node*, 0);
 
        int       n_local_vars = get_function_n_local_vars(declaration);
-       ir_graph *irg          = new_ir_graph(entity, n_local_vars);
+       ir_graph *irg          = new_ir_graph(function_entity, n_local_vars);
        ir_node  *first_block  = get_cur_block();
 
        next_value_number_function = 0;
@@ -1890,15 +3167,24 @@ static void create_function(declaration_t *declaration)
 
        /* do we have a return statement yet? */
        if(get_cur_block() != NULL) {
-               assert(declaration->type->type == TYPE_FUNCTION);
-               const function_type_t* const func_type
-                       = (const function_type_t*) declaration->type;
+               type_t *type = skip_typeref(declaration->type);
+               assert(is_type_function(type));
+               const function_type_t *func_type   = &type->function;
+               const type_t          *return_type
+                       = skip_typeref(func_type->return_type);
+
                ir_node *ret;
-               if (func_type->result_type == type_void) {
+               if (is_type_atomic(return_type, ATOMIC_TYPE_VOID)) {
                        ret = new_Return(get_store(), 0, NULL);
                } else {
-                       ir_mode *const mode = get_ir_mode(func_type->result_type);
-                       ir_node *      in[1];
+                       ir_mode *mode;
+                       if(is_type_scalar(return_type)) {
+                               mode = get_ir_mode(func_type->return_type);
+                       } else {
+                               mode = mode_P_data;
+                       }
+
+                       ir_node *in[1];
                        // ยง5.1.2.2.3 main implicitly returns 0
                        if (strcmp(declaration->symbol->string, "main") == 0) {
                                in[0] = new_Const(mode, get_mode_null(mode));
@@ -1936,7 +3222,9 @@ static void create_function(declaration_t *declaration)
                int misalign = 0;
                if(align > 0) {
                        misalign  = offset % align;
-                       offset   += misalign;
+                       if(misalign > 0) {
+                               offset += align - misalign;
+                       }
                }
 
                set_entity_offset(entity, offset);
@@ -1951,27 +3239,65 @@ static void create_function(declaration_t *declaration)
 
 static void create_global_variable(declaration_t *declaration)
 {
-       ir_type   *global_type = get_glob_type();
-       create_declaration_entity(declaration, DECLARATION_TYPE_GLOBAL_VARIABLE,
-                                 global_type);
+       ir_visibility  vis;
+       ir_type       *var_type;
+       switch ((storage_class_tag_t)declaration->storage_class) {
+               case STORAGE_CLASS_STATIC:
+                       vis = visibility_local;
+                       goto global_var;
 
-       ir_entity *entity = declaration->v.entity;
-       if(declaration->storage_class == STORAGE_CLASS_STATIC) {
-               set_entity_visibility(entity, visibility_local);
-       } else if(declaration->storage_class == STORAGE_CLASS_EXTERN) {
-               set_entity_visibility(entity, visibility_external_allocated);
-       } else {
-               set_entity_visibility(entity, visibility_external_visible);
+               case STORAGE_CLASS_EXTERN:
+                       vis = visibility_external_allocated;
+                       goto global_var;
+
+               case STORAGE_CLASS_NONE:
+                       vis = visibility_external_visible;
+                       goto global_var;
+
+               case STORAGE_CLASS_THREAD:
+                       vis = visibility_external_visible;
+                       goto tls_var;
+
+               case STORAGE_CLASS_THREAD_EXTERN:
+                       vis = visibility_external_allocated;
+                       goto tls_var;
+
+               case STORAGE_CLASS_THREAD_STATIC:
+                       vis = visibility_local;
+                       goto tls_var;
+
+tls_var:
+                       var_type = get_tls_type();
+                       goto create_var;
+
+global_var:
+                       var_type = get_glob_type();
+                       goto create_var;
+
+create_var:
+                       create_declaration_entity(declaration, DECLARATION_TYPE_GLOBAL_VARIABLE,
+                                                 var_type);
+                       set_entity_visibility(declaration->v.entity, vis);
+
+                       current_ir_graph = get_const_code_irg();
+                       create_initializer(declaration);
+                       return;
+
+               case STORAGE_CLASS_TYPEDEF:
+               case STORAGE_CLASS_AUTO:
+               case STORAGE_CLASS_REGISTER:
+               case STORAGE_CLASS_ENUM_ENTRY:
+                       break;
        }
-       current_ir_graph = get_const_code_irg();
-       create_initializer(declaration);
+       panic("Invalid storage class for global variable");
 }
 
 static void context_to_firm(context_t *context)
 {
+       /* first pass: create declarations */
        declaration_t *declaration = context->declarations;
        for( ; declaration != NULL; declaration = declaration->next) {
-               if(declaration->namespace != NAMESPACE_NORMAL)
+               if(declaration->namespc != NAMESPACE_NORMAL)
                        continue;
                if(declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY
                                || declaration->storage_class == STORAGE_CLASS_TYPEDEF)
@@ -1979,19 +3305,46 @@ static void context_to_firm(context_t *context)
                if(declaration->symbol == NULL)
                        continue;
 
-               type_t *type = declaration->type;
-               if(type->type == TYPE_FUNCTION) {
-                       create_function(declaration);
+               type_t *type = skip_typeref(declaration->type);
+               if(is_type_function(type)) {
+                       get_function_entity(declaration);
                } else {
                        create_global_variable(declaration);
                }
        }
+
+       /* second pass: create code */
+       declaration = context->declarations;
+       for( ; declaration != NULL; declaration = declaration->next) {
+               if(declaration->namespc != NAMESPACE_NORMAL)
+                       continue;
+               if(declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY
+                               || declaration->storage_class == STORAGE_CLASS_TYPEDEF)
+                       continue;
+               if(declaration->symbol == NULL)
+                       continue;
+
+               type_t *type = declaration->type;
+               if(type->type != TYPE_FUNCTION)
+                       continue;
+
+               create_function(declaration);
+       }
 }
 
 void translation_unit_to_firm(translation_unit_t *unit)
 {
-       /* remove me later TODO FIXME */
-       (void) get_type_size;
+       type_const_char = make_atomic_type(ATOMIC_TYPE_CHAR, TYPE_QUALIFIER_CONST);
+       type_void       = make_atomic_type(ATOMIC_TYPE_VOID, TYPE_QUALIFIER_NONE);
+       type_int        = make_atomic_type(ATOMIC_TYPE_INT,  TYPE_QUALIFIER_NONE);
+
+       ir_type_int        = get_ir_type(type_int);
+       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_int); /* we don't have a real void
+                                                      type in firm */
+
+       type_void->base.firm_type = ir_type_void;
 
        /* just to be sure */
        continue_label      = NULL;