BugFix: expression may be NULL in count_decls_in_expr()
[cparser] / ast2firm.c
index 51f7de6..ec6afd7 100644 (file)
 #include "type_t.h"
 #include "ast_t.h"
 #include "parser.h"
+#include "lang_features.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;
 
@@ -38,6 +40,8 @@ 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,
@@ -50,6 +54,7 @@ typedef enum declaration_type_t {
 } declaration_type_t;
 
 static ir_type *get_ir_type(type_t *type);
+static int count_decls_in_stmts(const statement_t *stmt);
 
 ir_node *uninitialized_local_var(ir_graph *irg, ir_mode *mode, int pos)
 {
@@ -74,7 +79,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)
@@ -84,22 +89,9 @@ const char *retrieve_dbg(const dbg_info *dbg, unsigned *line)
        return pos->input_name;
 }
 
-void init_ast2firm(void)
-{
-       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_void       = get_ir_type(type_int); /* we don't have a real void
-                                                      type in firm */
-
-       type_void->base.firm_type = ir_type_void;
-}
-
-void exit_ast2firm(void)
+static dbg_info *get_dbg_info(const source_position_t *pos)
 {
+       return (dbg_info*) pos;
 }
 
 static unsigned unique_id = 0;
@@ -113,57 +105,149 @@ static ident *unique_ident(const char *tag)
        return new_id_from_str(buf);
 }
 
-static ir_mode *get_atomic_mode(const atomic_type_t* atomic_type)
+/**
+ * Return the signed integer mode of size bytes.
+ *
+ * @param size   the size
+ */
+static ir_mode *get_smode(unsigned size)
 {
-       switch(atomic_type->atype) {
-       case ATOMIC_TYPE_SCHAR:
-       case ATOMIC_TYPE_CHAR:
-               return mode_Bs;
-       case ATOMIC_TYPE_UCHAR:
-               return mode_Bu;
-       case ATOMIC_TYPE_SHORT:
-               return mode_Hs;
-       case ATOMIC_TYPE_USHORT:
-               return mode_Hu;
-       case ATOMIC_TYPE_LONG:
-       case ATOMIC_TYPE_INT:
-               return mode_Is;
-       case ATOMIC_TYPE_ULONG:
-       case ATOMIC_TYPE_UINT:
-               return mode_Iu;
-       case ATOMIC_TYPE_LONGLONG:
-               return mode_Ls;
-       case ATOMIC_TYPE_ULONGLONG:
-               return mode_Lu;
-       case ATOMIC_TYPE_FLOAT:
-               return mode_F;
-       case ATOMIC_TYPE_DOUBLE:
-               return mode_D;
-       case ATOMIC_TYPE_LONG_DOUBLE:
-               return mode_E;
-       case ATOMIC_TYPE_BOOL:
-               return mode_b;
+       static ir_mode *s_modes[16 + 1] = {0, };
+       ir_mode *res;
+
+       if (size <= 0 || size > 16)
+               return NULL;
+
+       res = s_modes[size];
+       if (res == NULL) {
+               unsigned bits;
+       char name[32];
+
+       bits = size * 8;
+       snprintf(name, sizeof(name), "i%u", bits);
+       res = new_ir_mode(name, irms_int_number, bits, 1, irma_twos_complement,
+                                       bits <= machine_size ? machine_size : bits );
+
+               s_modes[size] = res;
+       }
+       return res;
+}
+
+/**
+ * Return the unsigned integer mode of size bytes.
+ *
+ * @param size  the size
+ */
+static ir_mode *get_umode(unsigned size)
+{
+       static ir_mode *u_modes[16 + 1] = {0, };
+       ir_mode *res;
+
+       if (size <= 0 || size > 16)
+               return NULL;
+
+       res = u_modes[size];
+       if (res == NULL) {
+               unsigned bits;
+               char name[32];
+
+               bits = size * 8;
+               snprintf(name, sizeof(name), "u%u", bits);
+               res = new_ir_mode(name, irms_int_number, bits, 0, irma_twos_complement,
+                                               bits <= machine_size ? machine_size : bits );
+
+               u_modes[size] = res;
+       }
+       return res;
+}
+
+/**
+ * Return the pointer mode of size bytes.
+ *
+ * @param size  the size
+ */
+static ir_mode *get_ptrmode(unsigned size, char *name)
+{
+       static ir_mode *p_modes[16 + 1] = {0, };
+       ir_mode *res;
+
+       if (size <= 0 || size > 16)
+               return NULL;
+
+       res = p_modes[size];
+       if (res == NULL) {
+               unsigned bits;
+               char buf[32];
+
+               bits = size * 8;
+               if (name == NULL) {
+                       snprintf(buf, sizeof(buf), "p%u", bits);
+                       name = buf;
+               }
+               res = new_ir_mode(name, irms_reference, bits, 0, irma_twos_complement,
+                                               bits <= machine_size ? machine_size : bits);
+
+               p_modes[size] = res;
+
+               set_reference_mode_signed_eq(res, get_smode(size));
+               set_reference_mode_unsigned_eq(res, get_umode(size));
+       }
+       return res;
+}
+
+static ir_mode *_atomic_modes[ATOMIC_TYPE_LAST];
+
+static ir_mode *mode_int, *mode_uint;
+
+/**
+ * Initialises the atomic modes depending on the machine size.
+ */
+static void init_atomic_modes(void) {
+       unsigned int_size   = machine_size < 32 ? 2 : 4;
+       unsigned long_size  = machine_size < 64 ? 4 : 8;
+       unsigned llong_size = machine_size < 32 ? 4 : 8;
+
+       /* firm has no real void... */
+       _atomic_modes[ATOMIC_TYPE_VOID]        = mode_T;
+       _atomic_modes[ATOMIC_TYPE_CHAR]        = char_is_signed ? get_smode(1) : get_umode(1);
+       _atomic_modes[ATOMIC_TYPE_SCHAR]       = get_smode(1);
+       _atomic_modes[ATOMIC_TYPE_UCHAR]       = get_umode(1);
+       _atomic_modes[ATOMIC_TYPE_SHORT]       = get_smode(2);
+       _atomic_modes[ATOMIC_TYPE_USHORT]      = get_umode(2);
+       _atomic_modes[ATOMIC_TYPE_INT]         = get_smode(int_size);
+       _atomic_modes[ATOMIC_TYPE_UINT]        = get_umode(int_size);
+       _atomic_modes[ATOMIC_TYPE_LONG]        = get_smode(long_size);
+       _atomic_modes[ATOMIC_TYPE_ULONG]       = get_umode(long_size);
+       _atomic_modes[ATOMIC_TYPE_LONGLONG]    = get_smode(llong_size);
+       _atomic_modes[ATOMIC_TYPE_ULONGLONG]   = get_umode(llong_size);
+       _atomic_modes[ATOMIC_TYPE_FLOAT]       = mode_F;
+       _atomic_modes[ATOMIC_TYPE_DOUBLE]      = mode_D;
+       _atomic_modes[ATOMIC_TYPE_LONG_DOUBLE] = mode_E;
+
 #ifdef PROVIDE_COMPLEX
-       case ATOMIC_TYPE_FLOAT_COMPLEX:
-       case ATOMIC_TYPE_DOUBLE_COMPLEX:
-       case ATOMIC_TYPE_LONG_DOUBLE_COMPLEX:
-               panic("complex lowering not implemented yet");
-               break;
-       case ATOMIC_TYPE_FLOAT_IMAGINARY:
-       case ATOMIC_TYPE_DOUBLE_IMAGINARY:
-       case ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY:
-               panic("imaginary lowering not implemented yet");
-               break;
+       _atomic_modes[ATOMIC_TYPE_BOOL]                  = _atomic_modes[ATOMIC_TYPE_INT];
+       _atomic_modes[ATOMIC_TYPE_FLOAT_IMAGINARY]       = _atomic_modes[ATOMIC_TYPE_FLOAT];
+       _atomic_modes[ATOMIC_TYPE_DOUBLE_IMAGINARY]      = _atomic_modes[ATOMIC_TYPE_DOUBLE];
+       _atomic_modes[ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY] = _atomic_modes[ATOMIC_TYPE_LONG_DOUBLE];
 #endif
-       case ATOMIC_TYPE_VOID:
-               /* firm has no real void... */
-               return mode_Is;
-       case ATOMIC_TYPE_INVALID:
-               break;
-       }
-       panic("Encountered unknown atomic type");
+
+       /* Hmm, pointers should be machine size */
+       set_modeP_data(get_ptrmode(machine_size >> 3, NULL));
+       set_modeP_code(get_ptrmode(machine_size >> 3, NULL));
+
+       mode_int  = _atomic_modes[ATOMIC_TYPE_INT];
+       mode_uint = _atomic_modes[ATOMIC_TYPE_UINT];
 }
 
+static ir_mode *get_atomic_mode(const atomic_type_t* atomic_type)
+{
+       ir_mode *res = NULL;
+       if ((unsigned)atomic_type->atype < (unsigned)ATOMIC_TYPE_LAST)
+               res = _atomic_modes[(unsigned)atomic_type->atype];
+       if (res == NULL)
+               panic("Encountered unknown atomic type");
+       return res;
+}
 
 static unsigned get_type_size(type_t *type);
 
@@ -182,13 +266,19 @@ static unsigned get_atomic_type_size(const atomic_type_t *type)
        case ATOMIC_TYPE_BOOL:
        case ATOMIC_TYPE_INT:
        case ATOMIC_TYPE_UINT:
+               return machine_size >> 3;
+
        case ATOMIC_TYPE_LONG:
        case ATOMIC_TYPE_ULONG:
-       case ATOMIC_TYPE_FLOAT:
-               return 4;
+               return machine_size > 16 ? machine_size >> 3 : 4;
 
        case ATOMIC_TYPE_LONGLONG:
        case ATOMIC_TYPE_ULONGLONG:
+               return machine_size > 16 ? 8 : 4;
+
+       case ATOMIC_TYPE_FLOAT:
+               return 4;
+
        case ATOMIC_TYPE_DOUBLE:
                return 8;
 
@@ -199,6 +289,7 @@ static unsigned get_atomic_type_size(const atomic_type_t *type)
                return 1;
 
        case ATOMIC_TYPE_INVALID:
+       case ATOMIC_TYPE_LAST:
                break;
        }
        panic("Trying to determine size of invalid atomic type");
@@ -216,6 +307,7 @@ static unsigned get_array_type_size(array_type_t *type)
        return get_type_size_bytes(irtype);
 }
 
+
 static unsigned get_type_size(type_t *type)
 {
        type = skip_typeref(type);
@@ -224,7 +316,7 @@ static unsigned get_type_size(type_t *type)
        case TYPE_ATOMIC:
                return get_atomic_type_size(&type->atomic);
        case TYPE_ENUM:
-               return get_mode_size_bytes(mode_Is);
+               return get_mode_size_bytes(mode_int);
        case TYPE_COMPOUND_UNION:
        case TYPE_COMPOUND_STRUCT:
                return get_compound_type_size(&type->compound);
@@ -236,6 +328,7 @@ static unsigned get_type_size(type_t *type)
        case TYPE_ARRAY:
                return get_array_type_size(&type->array);
        case TYPE_BUILTIN:
+               return get_type_size(type->builtin.real_type);
        case TYPE_TYPEDEF:
        case TYPE_TYPEOF:
        case TYPE_INVALID:
@@ -267,20 +360,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);
        }
 
@@ -338,6 +435,8 @@ static ir_type *create_array_type(array_type_t *type)
                set_type_size_bytes(ir_type, n_elements * elemsize);
                set_type_alignment_bytes(ir_type, align);
                set_type_state(ir_type, layout_fixed);
+       } else {
+               set_array_lower_bound_int(ir_type, 0, 0);
        }
 
        return ir_type;
@@ -374,7 +473,8 @@ static ir_type *create_struct_type(compound_type_t *type)
                if (misalign != 0)
                        offset += entry_alignment - misalign;
 
-               ir_entity *entity = new_entity(ir_type, ident, entry_ir_type);
+               dbg_info  *const dbgi   = get_dbg_info(&entry->source_position);
+               ir_entity *const entity = new_d_entity(ir_type, ident, entry_ir_type, dbgi);
                set_entity_offset(entity, offset);
                add_struct_member(ir_type, entity);
                entry->declaration_type = DECLARATION_TYPE_COMPOUND_MEMBER;
@@ -425,7 +525,8 @@ static ir_type *create_union_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);
 
-               ir_entity *entity = new_entity(ir_type, ident, entry_ir_type);
+               dbg_info  *const dbgi   = get_dbg_info(&entry->source_position);
+               ir_entity *const entity = new_d_entity(ir_type, ident, entry_ir_type, dbgi);
                add_union_member(ir_type, entity);
                set_entity_offset(entity, 0);
                entry->declaration_type = DECLARATION_TYPE_COMPOUND_MEMBER;
@@ -517,6 +618,8 @@ static ir_type *get_ir_type(type_t *type)
                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:
@@ -535,7 +638,7 @@ static inline ir_mode *get_ir_mode(type_t *type)
 
        /* firm doesn't report a mode for arrays somehow... */
        if(is_Array_type(irtype)) {
-               return mode_P;
+               return mode_P_data;
        }
 
        ir_mode *mode = get_type_mode(irtype);
@@ -556,7 +659,8 @@ static ir_entity* get_function_entity(declaration_t *declaration)
        ir_type  *ir_type_method = get_ir_type(declaration->type);
        assert(is_Method_type(ir_type_method));
 
-       ir_entity *entity = new_entity(global_type, id, ir_type_method);
+       dbg_info  *const dbgi   = get_dbg_info(&declaration->source_position);
+       ir_entity *const entity = new_d_entity(global_type, id, ir_type_method, dbgi);
        set_entity_ld_ident(entity, id);
        if(declaration->storage_class == STORAGE_CLASS_STATIC
                        || declaration->is_inline) {
@@ -566,6 +670,7 @@ static ir_entity* get_function_entity(declaration_t *declaration)
        } else {
                set_entity_visibility(entity, visibility_external_allocated);
        }
+       set_entity_allocation(entity, allocation_static);
 
        declaration->declaration_type = DECLARATION_TYPE_FUNCTION;
        declaration->v.entity         = entity;
@@ -573,11 +678,6 @@ static ir_entity* get_function_entity(declaration_t *declaration)
        return entity;
 }
 
-static dbg_info *get_dbg_info(const source_position_t *pos)
-{
-       return (dbg_info*) pos;
-}
-
 static ir_node *const_to_firm(const const_expression_t *cnst)
 {
        dbg_info *dbgi = get_dbg_info(&cnst->expression.source_position);
@@ -618,9 +718,11 @@ static ir_node *string_to_firm(const source_position_t *const src_pos,
                                                    ir_type_const_char);
 
        ident     *const id     = unique_ident(id_prefix);
-       ir_entity *const entity = new_entity(global_type, id, type);
+       dbg_info  *const dbgi   = get_dbg_info(src_pos);
+       ir_entity *const entity = new_d_entity(global_type, id, type, dbgi);
        set_entity_ld_ident(entity, id);
        set_entity_variability(entity, variability_constant);
+       set_entity_allocation(entity, allocation_static);
 
        ir_type *const elem_type = ir_type_const_char;
        ir_mode *const mode      = get_type_mode(elem_type);
@@ -640,8 +742,6 @@ static ir_node *string_to_firm(const source_position_t *const src_pos,
        set_array_entity_values(entity, tvs, slen);
        free(tvs);
 
-       dbg_info *const dbgi = get_dbg_info(src_pos);
-
        return create_symconst(dbgi, entity);
 }
 
@@ -652,6 +752,42 @@ static ir_node *string_literal_to_firm(
                              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");
+       dbg_info  *const dbgi   = get_dbg_info(&literal->expression.source_position);
+       ir_entity *const entity = new_d_entity(global_type, id, type, dbgi);
+       set_entity_ld_ident(entity, id);
+       set_entity_variability(entity, variability_constant);
+       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);
+
+       return create_symconst(dbgi, entity);
+}
+
 static ir_node *deref_address(ir_type *const irtype, ir_node *const addr,
                               dbg_info *const dbgi)
 {
@@ -800,7 +936,7 @@ static ir_node *process_builtin_call(const call_expression_t *call)
        builtin_symbol_expression_t *builtin = &call->function->builtin_symbol;
 
        type_t *type = skip_typeref(builtin->expression.datatype);
-       assert(type->type == TYPE_POINTER);
+       assert(is_type_pointer(type));
 
        type_t   *function_type = skip_typeref(type->pointer.points_to);
        symbol_t *symbol        = builtin->symbol;
@@ -826,12 +962,14 @@ static ir_node *process_builtin_call(const call_expression_t *call)
        case T___builtin_nanf:
        case T___builtin_nand: {
                /* Ignore string for now... */
-               assert(function_type->type == TYPE_FUNCTION);
-               ir_mode *mode = get_ir_mode(function_type->function.result_type);
+               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");
        }
@@ -847,11 +985,12 @@ static ir_node *call_expression_to_firm(const call_expression_t *call)
        }
        ir_node *callee = expression_to_firm(function);
 
-       type_t *type = function->base.datatype;
-       assert(type->type == TYPE_POINTER);
-       pointer_type_t *const ptr_type = &type->pointer;
-       assert(ptr_type->points_to->type == TYPE_FUNCTION);
-       function_type_t *function_type = &ptr_type->points_to->function;
+       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;
@@ -908,13 +1047,13 @@ static ir_node *call_expression_to_firm(const call_expression_t *call)
        ir_node  *mem   = new_d_Proj(dbgi, node, mode_M, pn_Call_M_regular);
        set_store(mem);
 
-       type_t  *result_type = skip_typeref(function_type->result_type);
+       type_t  *return_type = skip_typeref(function_type->return_type);
        ir_node *result      = NULL;
 
-       if(!is_type_atomic(result_type, ATOMIC_TYPE_VOID)) {
+       if(!is_type_atomic(return_type, ATOMIC_TYPE_VOID)) {
                ir_mode *mode;
-               if(is_type_scalar(result_type)) {
-                       mode = get_ir_mode(result_type);
+               if(is_type_scalar(return_type)) {
+                       mode = get_ir_mode(return_type);
                } else {
                        mode = mode_P_data;
                }
@@ -933,6 +1072,25 @@ 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)
 {
@@ -950,20 +1108,9 @@ static void set_value_for_expression(const expression_t *expression,
                }
        }
 
-       ir_node  *addr   = expression_to_addr(expression);
-       ir_node  *memory = get_store();
-
-       type_t *type = skip_typeref(expression->base.datatype);
-       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);
-       }
+       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)
@@ -986,39 +1133,39 @@ static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode)
 static ir_node *create_incdec(const unary_expression_t *expression)
 {
        dbg_info     *dbgi  = get_dbg_info(&expression->expression.source_position);
-       type_t       *type  = expression->expression.datatype;
+       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(type->type == TYPE_POINTER) {
+       if(is_type_pointer(type)) {
                pointer_type_t *pointer_type = &type->pointer;
                unsigned        elem_size    = get_type_size(pointer_type->points_to);
-               offset = new_Const_long(mode_Is, elem_size);
+               offset = new_Const_long(mode_int, elem_size);
        } else {
                assert(is_type_arithmetic(type));
                offset = new_Const(mode, get_mode_one(mode));
        }
 
-       switch(expression->type) {
-       case UNEXPR_POSTFIX_INCREMENT: {
+       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 UNEXPR_POSTFIX_DECREMENT: {
+       case EXPR_UNARY_POSTFIX_DECREMENT: {
                ir_node *new_value = new_d_Sub(dbgi, value_node, offset, mode);
                set_value_for_expression(value, new_value);
                return value_node;
        }
-       case UNEXPR_PREFIX_INCREMENT: {
+       case EXPR_UNARY_PREFIX_INCREMENT: {
                ir_node *new_value = new_d_Add(dbgi, value_node, offset, mode);
                set_value_for_expression(value, new_value);
                return new_value;
        }
-       case UNEXPR_PREFIX_DECREMENT: {
+       case EXPR_UNARY_PREFIX_DECREMENT: {
                ir_node *new_value = new_d_Sub(dbgi, value_node, offset, mode);
                set_value_for_expression(value, new_value);
                return new_value;
@@ -1034,63 +1181,79 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression)
        dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
        type_t   *type = skip_typeref(expression->expression.datatype);
 
-       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:
-               return new_d_Minus(dbgi, value_node, get_ir_mode(type));
-       case UNEXPR_PLUS:
+       switch(expression->expression.type) {
+       case EXPR_UNARY_NEGATE: {
+               ir_mode *mode = get_ir_mode(type);
+               return new_d_Minus(dbgi, value_node, mode);
+       }
+       case EXPR_UNARY_PLUS:
                return value_node;
-       case UNEXPR_BITWISE_NEGATE:
-               return new_d_Not(dbgi, value_node, get_ir_mode(type));
-       case UNEXPR_NOT: {
+       case EXPR_UNARY_BITWISE_NEGATE: {
+               ir_mode *mode = get_ir_mode(type);
+               return new_d_Not(dbgi, value_node, mode);
+       }
+       case EXPR_UNARY_NOT: {
+               ir_mode *mode = get_ir_mode(type);
                if(get_irn_mode(value_node) != mode_b) {
                        value_node = create_conv(dbgi, value_node, mode_b);
                }
                value_node = new_d_Not(dbgi, value_node, mode_b);
-               ir_mode *const mode = get_ir_mode(type);
                if(mode != mode_b) {
                        value_node = create_conv(dbgi, value_node, mode);
                }
                return value_node;
        }
-       case UNEXPR_DEREFERENCE: {
-               ir_type *irtype = get_ir_type(type);
-               return deref_address(irtype, value_node, dbgi);
-       }
-       case UNEXPR_POSTFIX_INCREMENT:
-       case UNEXPR_POSTFIX_DECREMENT:
-       case UNEXPR_PREFIX_INCREMENT:
-       case UNEXPR_PREFIX_DECREMENT:
+       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 UNEXPR_CAST: {
-               ir_node *node = create_conv(dbgi, value_node, get_ir_mode(type));
+       case EXPR_UNARY_CAST: {
+               ir_mode *mode = get_ir_mode(type);
+               ir_node *node = create_conv(dbgi, value_node, mode);
                node = do_strict_conv(dbgi, node);
                return node;
        }
-       case UNEXPR_CAST_IMPLICIT:
-               return create_conv(dbgi, value_node, get_ir_mode(type));
+       case EXPR_UNARY_CAST_IMPLICIT: {
+               ir_mode *mode = get_ir_mode(type);
+               return create_conv(dbgi, value_node, mode);
+       }
 
-       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;
        }
@@ -1161,9 +1324,9 @@ static ir_node *pointer_arithmetic(ir_node  *const pointer,
 
        assert(elem_size >= 1);
        if (elem_size > 1) {
-               integer             = create_conv(dbgi, integer, mode_Is);
-               ir_node *const cnst = new_Const_long(mode_Is, (long)elem_size);
-               ir_node *const mul  = new_d_Mul(dbgi, integer, cnst, mode_Is);
+               integer             = create_conv(dbgi, integer, mode_int);
+               ir_node *const cnst = new_Const_long(mode_int, (long)elem_size);
+               ir_node *const mul  = new_d_Mul(dbgi, integer, cnst, mode_int);
                integer = mul;
        }
 
@@ -1175,10 +1338,10 @@ static ir_node *create_arithmetic_assign_binop(
                const binary_expression_t *expression, create_arithmetic_func func)
 {
        dbg_info *const dbgi = get_dbg_info(&expression->expression.source_position);
-       type_t   *const type = expression->expression.datatype;
+       type_t   *const type = skip_typeref(expression->expression.datatype);
        ir_node  *value;
 
-       if (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);
@@ -1210,10 +1373,10 @@ static ir_node *create_add(const binary_expression_t *expression)
                return new_d_Add(dbgi, left, right, mode);
        }
 
-       if (type_left->type == TYPE_POINTER || type_left->type == TYPE_ARRAY) {
+       if (is_type_pointer(type_left)) {
                return pointer_arithmetic(left, right, type, dbgi, new_d_Add);
        } else {
-               assert(type_right->type == TYPE_POINTER || type_right->type == TYPE_ARRAY);
+               assert(is_type_pointer(type_right));
                return pointer_arithmetic(right, left, type, dbgi, new_d_Add);
        }
 }
@@ -1232,20 +1395,19 @@ static ir_node *create_sub(const binary_expression_t *expression)
        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 (type_left->type == TYPE_POINTER
-                       && type_right->type == TYPE_POINTER) {
+       } 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 cnst   = new_Const_long(mode_int, (long)elem_size);
                ir_node *const no_mem = new_NoMem();
                ir_node *const div    = new_d_Div(dbgi, no_mem, sub, cnst, mode,
                                                  op_pin_state_floats);
                return new_d_Proj(dbgi, div, mode, pn_Div_res);
        }
 
-       assert(type_left->type == TYPE_POINTER);
+       assert(is_type_pointer(type_left));
        return pointer_arithmetic(left, right, type_left, dbgi, new_d_Sub);
 }
 
@@ -1258,17 +1420,17 @@ static ir_node *create_shift(const binary_expression_t *expression)
        ir_mode  *mode  = get_ir_mode(type);
 
        /* firm always wants the shift count to be unsigned */
-       right = create_conv(dbgi, right, mode_Iu);
+       right = create_conv(dbgi, right, mode_uint);
 
        ir_node *res;
 
-       switch(expression->type) {
-       case BINEXPR_SHIFTLEFT_ASSIGN:
-       case BINEXPR_SHIFTLEFT:
+       switch(expression->expression.type) {
+       case EXPR_BINARY_SHIFTLEFT_ASSIGN:
+       case EXPR_BINARY_SHIFTLEFT:
                res = new_d_Shl(dbgi, left, right, mode);
                break;
-       case BINEXPR_SHIFTRIGHT_ASSIGN:
-       case BINEXPR_SHIFTRIGHT: {
+       case EXPR_BINARY_SHIFTRIGHT_ASSIGN:
+       case EXPR_BINARY_SHIFTRIGHT: {
                 expression_t *expr_left = expression->left;
                 type_t       *type_left = skip_typeref(expr_left->base.datatype);
 
@@ -1301,26 +1463,26 @@ static ir_node *create_divmod(const binary_expression_t *expression)
        ir_node  *op;
        ir_node  *res;
 
-       switch (expression->type)  {
-               case BINEXPR_DIV:
-               case BINEXPR_DIV_ASSIGN:
-                       if(mode_is_float(mode)) {
-                               op  = new_d_Quot(dbgi, pin, left, right, mode, op_pin_state_floats);
-                               res = new_d_Proj(dbgi, op, mode, pn_Quot_res);
-                       } else {
-                               op  = new_d_Div(dbgi, pin, left, right, mode, op_pin_state_floats);
-                               res = new_d_Proj(dbgi, op, mode, pn_Div_res);
-                       }
-                       break;
+       switch (expression->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);
+               } else {
+                       op  = new_d_Div(dbgi, pin, left, right, mode, op_pin_state_floats);
+                       res = new_d_Proj(dbgi, op, mode, pn_Div_res);
+               }
+               break;
 
-               case BINEXPR_MOD:
-               case BINEXPR_MOD_ASSIGN:
-                       assert(!mode_is_float(mode));
-                       op  = new_d_Mod(dbgi, pin, left, right, mode, op_pin_state_floats);
-                       res = new_d_Proj(dbgi, op, mode, pn_Mod_res);
-                       break;
+       case EXPR_BINARY_MOD:
+       case EXPR_BINARY_MOD_ASSIGN:
+               assert(!mode_is_float(mode));
+               op  = new_d_Mod(dbgi, pin, left, right, mode, op_pin_state_floats);
+               res = new_d_Proj(dbgi, op, mode, pn_Mod_res);
+               break;
 
-               default: panic("unexpected binary expression type in create_divmod()");
+       default: panic("unexpected binary expression type in create_divmod()");
        }
 
        return res;
@@ -1358,14 +1520,21 @@ static ir_node *create_arithmetic_assign_shift(
 
 static ir_node *binary_expression_to_firm(const binary_expression_t *expression)
 {
-       binary_expression_type_t type = expression->type;
+       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);
@@ -1374,52 +1543,52 @@ 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:
-       case BINEXPR_SHIFTRIGHT:
+       case EXPR_BINARY_SHIFTLEFT:
+       case EXPR_BINARY_SHIFTRIGHT:
                return create_shift(expression);
-       case BINEXPR_DIV:
-       case BINEXPR_MOD:
+       case EXPR_BINARY_DIV:
+       case EXPR_BINARY_MOD:
                return create_divmod(expression);
-       case BINEXPR_LOGICAL_AND:
-       case BINEXPR_LOGICAL_OR:
+       case EXPR_BINARY_LOGICAL_AND:
+       case EXPR_BINARY_LOGICAL_OR:
                return create_lazy_op(expression);
-       case BINEXPR_COMMA:
+       case EXPR_BINARY_COMMA:
                expression_to_firm(expression->left);
                return expression_to_firm(expression->right);
-       case BINEXPR_ADD_ASSIGN:
+       case EXPR_BINARY_ADD_ASSIGN:
                return create_arithmetic_assign_binop(expression, new_d_Add);
-       case BINEXPR_SUB_ASSIGN:
+       case EXPR_BINARY_SUB_ASSIGN:
                return create_arithmetic_assign_binop(expression, new_d_Sub);
-       case BINEXPR_MUL_ASSIGN:
+       case EXPR_BINARY_MUL_ASSIGN:
                return create_arithmetic_assign_binop(expression, new_d_Mul);
-       case BINEXPR_DIV_ASSIGN:
+       case EXPR_BINARY_DIV_ASSIGN:
                return create_arithmetic_assign_divmod(expression);
-       case BINEXPR_BITWISE_AND_ASSIGN:
+       case EXPR_BINARY_BITWISE_AND_ASSIGN:
                return create_arithmetic_assign_binop(expression, new_d_And);
-       case BINEXPR_BITWISE_OR_ASSIGN:
+       case EXPR_BINARY_BITWISE_OR_ASSIGN:
                return create_arithmetic_assign_binop(expression, new_d_Or);
-       case BINEXPR_BITWISE_XOR_ASSIGN:
+       case EXPR_BINARY_BITWISE_XOR_ASSIGN:
                return create_arithmetic_assign_binop(expression, new_d_Eor);
-       case BINEXPR_SHIFTLEFT_ASSIGN:
-       case BINEXPR_SHIFTRIGHT_ASSIGN:
+       case EXPR_BINARY_SHIFTLEFT_ASSIGN:
+       case EXPR_BINARY_SHIFTRIGHT_ASSIGN:
                return create_arithmetic_assign_shift(expression);
        default:
                panic("TODO binexpr type");
@@ -1431,17 +1600,17 @@ static ir_node *array_access_addr(const array_access_expression_t *expression)
        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);
+       offset              = create_conv(dbgi, offset, mode_uint);
 
        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(pointer_type->points_to);
-       ir_node *elem_size_const = new_Const_long(mode_Iu, elem_size);
+       ir_node *elem_size_const = new_Const_long(mode_uint, elem_size);
        ir_node *real_offset     = new_d_Mul(dbgi, offset, elem_size_const,
-                                            mode_Iu);
-       ir_node *result          = new_d_Add(dbgi, base_addr, real_offset, mode_P);
+                                            mode_uint);
+       ir_node *result          = new_d_Add(dbgi, base_addr, real_offset, mode_P_data);
 
        return result;
 }
@@ -1474,10 +1643,53 @@ static ir_node *sizeof_to_firm(const sizeof_expression_t *expression)
        return size_node;
 }
 
+static tarval *try_fold_constant(const expression_t *expression)
+{
+       ir_graph *old_current_ir_graph = current_ir_graph;
+       if(current_ir_graph == NULL) {
+               current_ir_graph = get_const_code_irg();
+       }
+
+       ir_node *cnst = expression_to_firm(expression);
+       current_ir_graph = old_current_ir_graph;
+
+       if(!is_Const(cnst)) {
+               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 */
@@ -1505,7 +1717,8 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression)
        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;
+       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);
@@ -1579,19 +1792,19 @@ static ir_node *classify_type_to_firm(const classify_type_expression_t *const ex
                case TYPE_ATOMIC: {
                        const atomic_type_t *const atomic_type = &type->atomic;
                        switch (atomic_type->atype) {
-                               // should not be reached
+                               /* should not be reached */
                                case ATOMIC_TYPE_INVALID:
                                        tc = no_type_class;
                                        break;
 
-                               // gcc cannot do that
+                               /* 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_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:
@@ -1600,7 +1813,7 @@ static ir_node *classify_type_to_firm(const classify_type_expression_t *const ex
                                case ATOMIC_TYPE_ULONG:
                                case ATOMIC_TYPE_LONGLONG:
                                case ATOMIC_TYPE_ULONGLONG:
-                               case ATOMIC_TYPE_BOOL:      // gcc handles this as integer
+                               case ATOMIC_TYPE_BOOL:      /* gcc handles this as integer */
                                        tc = integer_type_class;
                                        break;
 
@@ -1629,13 +1842,13 @@ static ir_node *classify_type_to_firm(const classify_type_expression_t *const ex
                        break;
                }
 
-               case TYPE_ARRAY:           // gcc handles this as pointer
-               case TYPE_FUNCTION:        // gcc handles this as pointer
+               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
+               /* gcc handles this as integer */
                case TYPE_ENUM:            tc = integer_type_class; break;
 
                default:
@@ -1643,7 +1856,7 @@ static ir_node *classify_type_to_firm(const classify_type_expression_t *const ex
        }
 
        dbg_info *const dbgi = get_dbg_info(&expr->expression.source_position);
-       ir_mode  *const mode = mode_Is;
+       ir_mode  *const mode = mode_int;
        tarval   *const tv   = new_tarval_from_long(tc, mode);
        return new_d_Const(dbgi, mode, tv);
 }
@@ -1669,9 +1882,45 @@ static ir_node *statement_expression_to_firm(const statement_expression_t *expr)
        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_uint, 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_uint, 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->type == UNEXPR_DEREFERENCE);
+       assert(expression->expression.type == EXPR_UNARY_DEREFERENCE);
        return expression_to_firm(expression->value);
 }
 
@@ -1686,12 +1935,8 @@ static ir_node *expression_to_addr(const expression_t *expression)
                return select_addr(&expression->select);
        case EXPR_CALL:
                return call_expression_to_firm(&expression->call);
-       case EXPR_UNARY: {
-               const unary_expression_t *const unary_expr = &expression->unary;
-               if (unary_expr->type == UNEXPR_DEREFERENCE) {
-                       return dereference_addr(unary_expr);
-               }
-               break;
+       case EXPR_UNARY_DEREFERENCE: {
+               return dereference_addr(&expression->unary);
        }
        default:
                break;
@@ -1706,13 +1951,15 @@ static ir_node *_expression_to_firm(const expression_t *expression)
                return const_to_firm(&expression->conste);
        case EXPR_STRING_LITERAL:
                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(&expression->reference);
        case EXPR_CALL:
                return call_expression_to_firm(&expression->call);
-       case EXPR_UNARY:
+       EXPR_UNARY_CASES
                return unary_expression_to_firm(&expression->unary);
-       case EXPR_BINARY:
+       EXPR_BINARY_CASES
                return binary_expression_to_firm(&expression->binary);
        case EXPR_ARRAY_ACCESS:
                return array_access_to_firm(&expression->array_access);
@@ -1729,8 +1976,11 @@ static ir_node *_expression_to_firm(const expression_t *expression)
                return function_name_to_firm(&expression->string);
        case EXPR_STATEMENT:
                return statement_expression_to_firm(&expression->statement);
-       case EXPR_OFFSETOF:
+       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");
 
@@ -1770,43 +2020,39 @@ static void create_condition_evaluation(const expression_t *expression,
                                         ir_node *false_block)
 {
        switch(expression->type) {
-       case EXPR_UNARY: {
-               unary_expression_t *unary_expression = (unary_expression_t*) expression;
-               if(unary_expression->type == UNEXPR_NOT) {
-                       create_condition_evaluation(unary_expression->value, false_block,
-                                                   true_block);
-                       return;
-               }
-               break;
+       case EXPR_UNARY_NOT: {
+               const unary_expression_t *unary_expression = &expression->unary;
+               create_condition_evaluation(unary_expression->value, false_block,
+                                           true_block);
+               return;
        }
-       case EXPR_BINARY: {
-               binary_expression_t *binary_expression
-                       = (binary_expression_t*) expression;
-               if(binary_expression->type == BINEXPR_LOGICAL_AND) {
-                       ir_node *cur_block   = get_cur_block();
-                       ir_node *extra_block = new_immBlock();
-                       set_cur_block(cur_block);
-                       create_condition_evaluation(binary_expression->left, extra_block,
-                                                   false_block);
-                       mature_immBlock(extra_block);
-                       set_cur_block(extra_block);
-                       create_condition_evaluation(binary_expression->right, true_block,
-                                                   false_block);
-                       return;
-               }
-               if(binary_expression->type == BINEXPR_LOGICAL_OR) {
-                       ir_node *cur_block   = get_cur_block();
-                       ir_node *extra_block = new_immBlock();
-                       set_cur_block(cur_block);
-                       create_condition_evaluation(binary_expression->left, true_block,
-                                                   extra_block);
-                       mature_immBlock(extra_block);
-                       set_cur_block(extra_block);
-                       create_condition_evaluation(binary_expression->right, true_block,
-                                                   false_block);
-                       return;
-               }
-               break;
+       case EXPR_BINARY_LOGICAL_AND: {
+               const binary_expression_t *binary_expression = &expression->binary;
+
+               ir_node *cur_block   = get_cur_block();
+               ir_node *extra_block = new_immBlock();
+               set_cur_block(cur_block);
+               create_condition_evaluation(binary_expression->left, extra_block,
+                                           false_block);
+               mature_immBlock(extra_block);
+               set_cur_block(extra_block);
+               create_condition_evaluation(binary_expression->right, true_block,
+                                           false_block);
+               return;
+       }
+       case EXPR_BINARY_LOGICAL_OR: {
+               const binary_expression_t *binary_expression = &expression->binary;
+
+               ir_node *cur_block   = get_cur_block();
+               ir_node *extra_block = new_immBlock();
+               set_cur_block(cur_block);
+               create_condition_evaluation(binary_expression->left, true_block,
+                                           extra_block);
+               mature_immBlock(extra_block);
+               set_cur_block(extra_block);
+               create_condition_evaluation(binary_expression->right, true_block,
+                                           false_block);
+               return;
        }
        default:
                break;
@@ -1824,316 +2070,25 @@ static void create_condition_evaluation(const expression_t *expression,
        set_cur_block(NULL);
 }
 
-static void return_statement_to_firm(return_statement_t *statement)
-{
-       if(get_cur_block() == NULL)
-               return;
-
-       ir_type *func_irtype = get_ir_type(current_function_decl->type);
 
-       dbg_info *dbgi  = get_dbg_info(&statement->statement.source_position);
-
-       ir_node *in[1];
-       int      in_len;
-       if(get_method_n_ress(func_irtype) > 0) {
-               ir_type *res_type = get_method_res_type(func_irtype, 0);
-
-               if(statement->return_value != NULL) {
-                       ir_node *node = expression_to_firm(statement->return_value);
-                       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 {
-               /* 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 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->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 if_statement_to_firm(if_statement_t *statement)
-{
-       ir_node *cur_block = get_cur_block();
-
-       ir_node *fallthrough_block = new_immBlock();
-
-       /* the true (blocks) */
-       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) {
-               false_block = new_immBlock();
-
-               statement_to_firm(statement->false_statement);
-               if(get_cur_block() != NULL) {
-                       ir_node *jmp = new_Jmp();
-                       add_immBlock_pred(fallthrough_block, jmp);
-               }
-       } else {
-               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);
-
-       set_cur_block(fallthrough_block);
-}
-
-static void while_statement_to_firm(while_statement_t *statement)
-{
-       ir_node *jmp = NULL;
-       if(get_cur_block() != NULL) {
-               jmp = new_Jmp();
-       }
-
-       /* create the header block */
-       ir_node *header_block = new_immBlock();
-       if(jmp != NULL) {
-               add_immBlock_pred(header_block, jmp);
-       }
-
-       /* the false block */
-       ir_node *false_block = new_immBlock();
-
-       /* the loop body */
-       ir_node *body_block;
-       if (statement->body != NULL) {
-               ir_node *old_continue_label = continue_label;
-               ir_node *old_break_label    = break_label;
-               continue_label              = header_block;
-               break_label                 = false_block;
-
-               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;
-
-               if(get_cur_block() != NULL) {
-                       jmp = new_Jmp();
-                       add_immBlock_pred(header_block, jmp);
-               }
-       } else {
-               body_block = 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)
-{
-       ir_node *jmp = NULL;
-       if(get_cur_block() != NULL) {
-               jmp = new_Jmp();
-       }
-
-       /* create the header block */
-       ir_node *header_block = new_immBlock();
-
-       /* the false block */
-       ir_node *false_block = new_immBlock();
-
-       /* the loop body */
-       ir_node *body_block = new_immBlock();
-       if(jmp != NULL) {
-               add_immBlock_pred(body_block, jmp);
-       }
-
-       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);
-
-               assert(continue_label == header_block);
-               assert(break_label    == false_block);
-               continue_label = old_continue_label;
-               break_label    = old_break_label;
-
-               if (get_cur_block() == NULL) {
-                       mature_immBlock(header_block);
-                       mature_immBlock(body_block);
-                       mature_immBlock(false_block);
-                       return;
-               }
-       }
-
-       ir_node *body_jmp = new_Jmp();
-       add_immBlock_pred(header_block, body_jmp);
-       mature_immBlock(header_block);
-
-       /* 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 for_statement_to_firm(for_statement_t *statement)
-{
-       ir_node *jmp = NULL;
-       if (get_cur_block() != NULL) {
-               if(statement->initialisation != NULL) {
-                       expression_to_firm(statement->initialisation);
-               }
-               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();
-
-       /* create the header block */
-       ir_node *const header_block = new_immBlock();
-       if (jmp != NULL) {
-               add_immBlock_pred(header_block, jmp);
-       }
-       add_immBlock_pred(header_block, step_jmp);
-
-       /* the false block */
-       ir_node *const false_block = new_immBlock();
-
-       /* the loop body */
-       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 {
-               body_block = step_block;
-       }
-
-       /* create the condition */
-       set_cur_block(header_block);
-       if (statement->condition != NULL) {
-               create_condition_evaluation(statement->condition, body_block,
-                                           false_block);
-       } else {
-               keep_alive(header_block);
-               jmp = new_Jmp();
-               add_immBlock_pred(body_block, jmp);
-       }
-
-       mature_immBlock(body_block);
-       mature_immBlock(false_block);
-       mature_immBlock(step_block);
-       mature_immBlock(header_block);
-       mature_immBlock(false_block);
-
-       set_cur_block(false_block);
-}
 
 static void create_declaration_entity(declaration_t *declaration,
                                       declaration_type_t declaration_type,
                                       ir_type *parent_type)
 {
-       ident     *id     = new_id_from_str(declaration->symbol->string);
-       ir_type   *irtype = get_ir_type(declaration->type);
-       ir_entity *entity = new_entity(parent_type, id, irtype);
+       ident     *const id     = new_id_from_str(declaration->symbol->string);
+       ir_type   *const irtype = get_ir_type(declaration->type);
+       dbg_info  *const dbgi   = get_dbg_info(&declaration->source_position);
+       ir_entity *const entity = new_d_entity(parent_type, id, irtype, dbgi);
        set_entity_ld_ident(entity, id);
 
        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? */
 }
 
@@ -2209,295 +2164,646 @@ static void create_initializer_compound(initializer_list_t *initializer,
                if(compound_entry->namespc != NAMESPACE_NORMAL)
                        continue;
 
-               if(i >= initializer->len)
-                       break;
+               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_int, *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     *const id          = unique_ident("initializer");
+       ir_type   *const irtype      = get_ir_type(declaration->type);
+       ir_type   *const global_type = get_glob_type();
+       ir_entity *const init_entity = new_d_entity(global_type, id, irtype, dbgi);
+       set_entity_ld_ident(init_entity, id);
+
+       set_entity_variability(init_entity, variability_initialized);
+       set_entity_visibility(init_entity, visibility_local);
+       set_entity_allocation(init_entity, allocation_static);
+
+       ir_graph *const old_current_ir_graph = current_ir_graph;
+       current_ir_graph = get_const_code_irg();
+
+       type_t *const type = skip_typeref(declaration->type);
+       create_initializer_object(initializer, type, init_entity, NULL, 0);
+
+       assert(current_ir_graph == get_const_code_irg());
+       current_ir_graph = old_current_ir_graph;
+
+       ir_node *const src_addr  = create_symconst(dbgi, init_entity);
+       ir_node *const copyb     = new_d_CopyB(dbgi, memory, addr, src_addr, irtype);
+
+       ir_node *const copyb_mem = new_Proj(copyb, mode_M, pn_CopyB_M_regular);
+       set_store(copyb_mem);
+}
+
+static void create_initializer(declaration_t *declaration)
+{
+       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    *const type        = skip_typeref(declaration->type);
+       ir_type   *const global_type = get_glob_type();
+       ident     *const id          = unique_ident(declaration->symbol->string);
+       ir_type   *const irtype      = get_ir_type(type);
+       dbg_info  *const dbgi        = get_dbg_info(&declaration->source_position);
+       ir_entity *const entity      = new_d_entity(global_type, id, irtype, dbgi);
+       set_entity_ld_ident(entity, id);
+
+       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 *const 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;
 
-               entry.v.entity = compound_entry->v.entity;
+       ir_type *func_irtype = get_ir_type(current_function_decl->type);
 
-               initializer_t *sub_initializer = initializer->initializers[i];
+       dbg_info *dbgi  = get_dbg_info(&statement->statement.source_position);
 
-               assert(compound_entry != NULL);
-               assert(compound_entry->declaration_type
-                               == DECLARATION_TYPE_COMPOUND_MEMBER);
+       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(sub_initializer->type == INITIALIZER_VALUE) {
-                       create_initializer_value(&sub_initializer->value,
-                                                entity, &entry, len);
+               if(statement->return_value != NULL) {
+                       ir_node *node = expression_to_firm(statement->return_value);
+                       node  = do_strict_conv(dbgi, node);
+                       in[0] = node;
                } else {
-                       type_t *entry_type = skip_typeref(compound_entry->type);
-                       create_initializer_object(sub_initializer, entry_type, entity,
-                                                 &entry, len);
+                       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);
                }
-
-               ++i;
+               in_len = 1;
+       } else {
+               /* 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 create_initializer_array(initializer_list_t *initializer,
-                                     array_type_t *type, ir_entity *entity,
-                                     compound_graph_path_entry_t *last_entry,
-                                     int len)
+static ir_node *expression_statement_to_firm(expression_statement_t *statement)
 {
-       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;
+       if(get_cur_block() == NULL)
+               return NULL;
 
-       size_t i;
-       for(i = 0; i < initializer->len; ++i) {
-               entry.v.array_index = i;
+       return expression_to_firm(statement->expression);
+}
 
-               initializer_t *sub_initializer = initializer->initializers[i];
+static ir_node *compound_statement_to_firm(compound_statement_t *compound)
+{
+       ir_node     *result    = NULL;
+       statement_t *statement = compound->statements;
+       for( ; statement != NULL; statement = statement->base.next) {
+               //context2firm(&statement->context);
 
-               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(statement->base.next == NULL
+                               && statement->type == STATEMENT_EXPRESSION) {
+                       result = expression_statement_to_firm(
+                                       (expression_statement_t*) statement);
+                       break;
                }
+               statement_to_firm(statement);
        }
 
-#if 0
-       /* TODO: initialize rest... */
-       if(type->size_expression != NULL) {
-               size_t array_len = fold_constant(type->size_expression);
-               for( ; i < array_len; ++i) {
+       return result;
+}
 
+static void create_local_declaration(declaration_t *declaration)
+{
+       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;
        }
-#endif
+       panic("invalid storage class found");
 }
 
-static void create_initializer_string(initializer_string_t *initializer,
-                                      array_type_t *type, ir_entity *entity,
-                                      compound_graph_path_entry_t *last_entry,
-                                      int len)
+static void declaration_statement_to_firm(declaration_statement_t *statement)
 {
-       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;
+       declaration_t *declaration = statement->declarations_begin;
+       declaration_t *end         = statement->declarations_end->next;
+       for( ; declaration != end; declaration = declaration->next) {
+               create_local_variable(declaration);
+       }
+}
 
-       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;
+static void if_statement_to_firm(if_statement_t *statement)
+{
+       ir_node *cur_block = get_cur_block();
 
-               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);
+       ir_node *fallthrough_block = new_immBlock();
 
-               if(*p == '\0')
-                       break;
+       /* the true (blocks) */
+       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;
        }
-}
 
-static void create_initializer_object(initializer_t *initializer, type_t *type,
-               ir_entity *entity, compound_graph_path_entry_t *entry, int len)
-{
-       if(type->type == TYPE_ARRAY) {
-               array_type_t *array_type = &type->array;
+       /* the false (blocks) */
+       ir_node *false_block;
+       if(statement->false_statement != NULL) {
+               false_block = new_immBlock();
 
-               if(initializer->type == INITIALIZER_STRING) {
-                       initializer_string_t *string = &initializer->string;
-                       create_initializer_string(string, array_type, entity, entry, len);
-               } else {
-                       assert(initializer->type == INITIALIZER_LIST);
-                       initializer_list_t *list = &initializer->list;
-                       create_initializer_array(list, array_type, entity, entry, len);
+               statement_to_firm(statement->false_statement);
+               if(get_cur_block() != NULL) {
+                       ir_node *jmp = new_Jmp();
+                       add_immBlock_pred(fallthrough_block, jmp);
                }
        } else {
-               assert(initializer->type == INITIALIZER_LIST);
-               initializer_list_t *list = &initializer->list;
+               false_block = fallthrough_block;
+       }
 
-               assert(type->type == TYPE_COMPOUND_STRUCT
-                               || type->type == TYPE_COMPOUND_UNION);
-               compound_type_t *compound_type = &type->compound;
-               create_initializer_compound(list, compound_type, entity, entry, len);
+       /* 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);
+
+       set_cur_block(fallthrough_block);
 }
 
-static void create_initializer_local_variable_entity(declaration_t *declaration)
+static void while_statement_to_firm(while_statement_t *statement)
 {
-       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(is_atomic_entity(entity)) {
-               assert(initializer->type == INITIALIZER_VALUE);
-               initializer_value_t *initializer_value = &initializer->value;
+       ir_node *jmp = NULL;
+       if(get_cur_block() != NULL) {
+               jmp = new_Jmp();
+       }
 
-               ir_node *value     = expression_to_firm(initializer_value->value);
-               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);
-               return;
+       /* create the header block */
+       ir_node *header_block = new_immBlock();
+       if(jmp != NULL) {
+               add_immBlock_pred(header_block, jmp);
        }
 
-       /* 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);
+       /* the false block */
+       ir_node *false_block = new_immBlock();
 
-       set_entity_variability(init_entity, variability_initialized);
-       set_entity_visibility(init_entity, visibility_local);
+       /* the loop body */
+       ir_node *body_block;
+       if (statement->body != NULL) {
+               ir_node *old_continue_label = continue_label;
+               ir_node *old_break_label    = break_label;
+               continue_label              = header_block;
+               break_label                 = false_block;
 
-       ir_graph *old_current_ir_graph = current_ir_graph;
-       current_ir_graph = get_const_code_irg();
+               body_block = new_immBlock();
+               statement_to_firm(statement->body);
 
-       type_t *type = skip_typeref(declaration->type);
-       create_initializer_object(initializer, type, init_entity, NULL, 0);
+               assert(continue_label == header_block);
+               assert(break_label    == false_block);
+               continue_label = old_continue_label;
+               break_label    = old_break_label;
 
-       assert(current_ir_graph == get_const_code_irg());
-       current_ir_graph = old_current_ir_graph;
+               if(get_cur_block() != NULL) {
+                       jmp = new_Jmp();
+                       add_immBlock_pred(header_block, jmp);
+               }
+       } else {
+               body_block = header_block;
+       }
 
-       ir_node *src_addr  = create_symconst(dbgi, init_entity);
-       ir_node *copyb     = new_d_CopyB(dbgi, memory, addr, src_addr, irtype);
+       /* create the condition */
+       set_cur_block(header_block);
 
-       ir_node *copyb_mem = new_Proj(copyb, mode_M, pn_CopyB_M_regular);
-       set_store(copyb_mem);
+       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 create_initializer(declaration_t *declaration)
+static void do_while_statement_to_firm(do_while_statement_t *statement)
 {
-       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;
+       ir_node *jmp = NULL;
+       if(get_cur_block() != NULL) {
+               jmp = new_Jmp();
        }
 
-       if(initializer->type == INITIALIZER_VALUE) {
-               initializer_value_t *initializer_value = &initializer->value;
+       /* create the header block */
+       ir_node *header_block = new_immBlock();
 
-               ir_node *value = expression_to_firm(initializer_value->value);
+       /* the false block */
+       ir_node *false_block = new_immBlock();
 
-               if(declaration_type == DECLARATION_TYPE_LOCAL_VARIABLE) {
-                       set_value(declaration->v.value_number, value);
-               } else {
-                       assert(declaration_type == DECLARATION_TYPE_GLOBAL_VARIABLE);
+       /* the loop body */
+       ir_node *body_block = new_immBlock();
+       if(jmp != NULL) {
+               add_immBlock_pred(body_block, jmp);
+       }
 
-                       ir_entity *entity = declaration->v.entity;
+       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;
 
-                       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);
+               statement_to_firm(statement->body);
 
-               ir_entity *entity = declaration->v.entity;
-               set_entity_variability(entity, variability_initialized);
+               assert(continue_label == header_block);
+               assert(break_label    == false_block);
+               continue_label = old_continue_label;
+               break_label    = old_break_label;
 
-               type_t *type = skip_typeref(declaration->type);
-               create_initializer_object(initializer, type, entity, NULL, 0);
+               if (get_cur_block() == NULL) {
+                       mature_immBlock(header_block);
+                       mature_immBlock(body_block);
+                       mature_immBlock(false_block);
+                       return;
+               }
        }
+
+       ir_node *body_jmp = new_Jmp();
+       add_immBlock_pred(header_block, body_jmp);
+       mature_immBlock(header_block);
+
+       /* 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 create_local_variable(declaration_t *declaration)
+static void for_statement_to_firm(for_statement_t *statement)
 {
-       assert(declaration->declaration_type == DECLARATION_TYPE_UNKNOWN);
+       ir_node *jmp = NULL;
+       if (get_cur_block() != NULL) {
+               if(statement->initialisation != NULL) {
+                       expression_to_firm(statement->initialisation);
+               }
 
-       bool needs_entity = declaration->address_taken;
-       type_t *type = skip_typeref(declaration->type);
+               /* create declarations */
+               declaration_t *declaration = statement->context.declarations;
+               for( ; declaration != NULL; declaration = declaration->next) {
+                       create_local_declaration(declaration);
+               }
 
-       if(type->type == TYPE_ARRAY
-                       || type->type == TYPE_COMPOUND_STRUCT
-                       || type->type == TYPE_COMPOUND_UNION) {
-               needs_entity = true;
+               jmp = new_Jmp();
        }
 
-       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 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();
 
-       create_initializer(declaration);
-}
+       /* create the header block */
+       ir_node *const header_block = new_immBlock();
+       if (jmp != NULL) {
+               add_immBlock_pred(header_block, jmp);
+       }
+       add_immBlock_pred(header_block, step_jmp);
 
-static void create_local_static_variable(declaration_t *declaration)
-{
-       assert(declaration->declaration_type == DECLARATION_TYPE_UNKNOWN);
+       /* the false block */
+       ir_node *const false_block = new_immBlock();
 
-       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);
+       /* the loop body */
+       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;
 
-       declaration->declaration_type = DECLARATION_TYPE_GLOBAL_VARIABLE;
-       declaration->v.entity         = entity;
-       set_entity_variability(entity, variability_uninitialized);
-       set_entity_visibility(entity, visibility_local);
+               body_block = new_immBlock();
+               statement_to_firm(statement->body);
 
-       ir_graph *old_current_ir_graph = current_ir_graph;
-       current_ir_graph = get_const_code_irg();
+               assert(continue_label == step_block);
+               assert(break_label    == false_block);
+               continue_label = old_continue_label;
+               break_label    = old_break_label;
 
-       create_initializer(declaration);
+               if (get_cur_block() != NULL) {
+                       jmp = new_Jmp();
+                       add_immBlock_pred(step_block, jmp);
+               }
+       } else {
+               body_block = step_block;
+       }
 
-       assert(current_ir_graph == get_const_code_irg());
-       current_ir_graph = old_current_ir_graph;
-}
+       /* create the condition */
+       set_cur_block(header_block);
+       if (statement->condition != NULL) {
+               create_condition_evaluation(statement->condition, body_block,
+                                           false_block);
+       } else {
+               keep_alive(header_block);
+               jmp = new_Jmp();
+               add_immBlock_pred(body_block, jmp);
+       }
 
-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 ((storage_class_tag_t)declaration->storage_class) {
-               case STORAGE_CLASS_TYPEDEF:
-                       continue;
-               case STORAGE_CLASS_STATIC:
-                       create_local_static_variable(declaration);
-                       continue;
-               case STORAGE_CLASS_ENUM_ENTRY:
-                       panic("enum entry declaration in local block found");
-               case STORAGE_CLASS_EXTERN:
-                       panic("extern declaration in local block found");
-               case STORAGE_CLASS_NONE:
-               case STORAGE_CLASS_AUTO:
-               case STORAGE_CLASS_REGISTER:
-                       if(type->type == TYPE_FUNCTION) {
-                               panic("nested functions not supported yet");
-                       } else {
-                               create_local_variable(declaration);
-                       }
-                       continue;
-               case STORAGE_CLASS_THREAD:
-               case STORAGE_CLASS_THREAD_EXTERN:
-               case STORAGE_CLASS_THREAD_STATIC:
-                       break;
-               }
-               panic("invalid storage class found");
-       }
+       set_cur_block(false_block);
 }
 
 static void create_jump_statement(const statement_t *statement,
@@ -2553,26 +2859,6 @@ static void switch_statement_to_firm(const switch_statement_t *statement)
        set_cur_block(break_block);
 }
 
-static long fold_constant(const expression_t *expression)
-{
-       ir_graph *old_current_ir_graph = current_ir_graph;
-       current_ir_graph = get_const_code_irg();
-
-       ir_node *cnst = expression_to_firm(expression);
-       if(!is_Const(cnst)) {
-               panic("couldn't fold constantl");
-       }
-       tarval *tv = get_Const_tarval(cnst);
-       if(!tarval_is_long(tv)) {
-               panic("folded constant not an integer");
-       }
-
-       long res = get_tarval_long(tv);
-
-       current_ir_graph = old_current_ir_graph;
-       return res;
-}
-
 static void case_label_to_firm(const case_label_statement_t *statement)
 {
        dbg_info *dbgi = get_dbg_info(&statement->statement.source_position);
@@ -2654,6 +2940,101 @@ 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) {
@@ -2702,6 +3083,8 @@ static void statement_to_firm(statement_t *statement)
                goto_to_firm(&statement->gotos);
                return;
        case STATEMENT_ASM:
+               //asm_statement_to_firm(&statement->asms);
+               //return;
                break;
        }
        panic("Statement not implemented\n");
@@ -2727,14 +3110,19 @@ static int count_local_declarations(const declaration_t *      decl,
        return count;
 }
 
+static int count_decls_in_expr(const expression_t *expr) {
+       if (expr != NULL && expr->base.type == EXPR_STATEMENT)
+               return count_decls_in_stmts(expr->statement.statement);
+       return 0;
+}
+
 static int count_decls_in_stmts(const statement_t *stmt)
 {
        int count = 0;
        for (; stmt != NULL; stmt = stmt->base.next) {
                switch (stmt->type) {
                        case STATEMENT_DECLARATION: {
-                               const declaration_statement_t *const decl_stmt =
-                                       (const declaration_statement_t*)stmt;
+                               const declaration_statement_t *const decl_stmt = &stmt->declaration;
                                count += count_local_declarations(decl_stmt->declarations_begin,
                                                                  decl_stmt->declarations_end->next);
                                break;
@@ -2748,44 +3136,46 @@ static int count_decls_in_stmts(const statement_t *stmt)
                        }
 
                        case STATEMENT_IF: {
-                               const if_statement_t *const if_stmt = (const if_statement_t*)stmt;
+                               const if_statement_t *const if_stmt = &stmt->ifs;
+                               count += count_decls_in_expr(if_stmt->condition);
                                count += count_decls_in_stmts(if_stmt->true_statement);
                                count += count_decls_in_stmts(if_stmt->false_statement);
                                break;
                        }
 
                        case STATEMENT_SWITCH: {
-                               const switch_statement_t *const switch_stmt =
-                                       (const switch_statement_t*)stmt;
+                               const switch_statement_t *const switch_stmt = &stmt->switchs;
+                               count += count_decls_in_expr(switch_stmt->expression);
                                count += count_decls_in_stmts(switch_stmt->body);
                                break;
                        }
 
                        case STATEMENT_LABEL: {
-                               const label_statement_t *const label_stmt =
-                                       (const label_statement_t*)stmt;
+                               const label_statement_t *const label_stmt = &stmt->label;
                                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;
+                               const while_statement_t *const while_stmt = &stmt->whiles;
+                               count += count_decls_in_expr(while_stmt->condition);
                                count += count_decls_in_stmts(while_stmt->body);
                                break;
                        }
 
                        case STATEMENT_DO_WHILE: {
-                               const do_while_statement_t *const do_while_stmt =
-                                       (const do_while_statement_t*)stmt;
+                               const do_while_statement_t *const do_while_stmt = &stmt->do_while;
+                               count += count_decls_in_expr(do_while_stmt->condition);
                                count += count_decls_in_stmts(do_while_stmt->body);
                                break;
                        }
 
                        case STATEMENT_FOR: {
-                               const for_statement_t *const for_stmt =
-                                       (const for_statement_t*)stmt;
-                               /* TODO initialisation */
+                               const for_statement_t *const for_stmt = &stmt->fors;
+                               count += count_local_declarations(for_stmt->context.declarations, NULL);
+                               count += count_decls_in_expr(for_stmt->initialisation);
+                               count += count_decls_in_expr(for_stmt->condition);
+                               count += count_decls_in_expr(for_stmt->step);
                                count += count_decls_in_stmts(for_stmt->body);
                                break;
                        }
@@ -2794,11 +3184,23 @@ static int count_decls_in_stmts(const statement_t *stmt)
                        case STATEMENT_BREAK:
                        case STATEMENT_CASE_LABEL:
                        case STATEMENT_CONTINUE:
-                       case STATEMENT_EXPRESSION:
+                               break;
+
+                       case STATEMENT_EXPRESSION: {
+                               const expression_statement_t *expr_stmt = &stmt->expression;
+                               count += count_decls_in_expr(expr_stmt->expression);
+                               break;
+                       }
+
                        case STATEMENT_GOTO:
                        case STATEMENT_INVALID:
-                       case STATEMENT_RETURN:
                                break;
+
+                       case STATEMENT_RETURN: {
+                               const return_statement_t *ret_stmt = &stmt->returns;
+                               count += count_decls_in_expr(ret_stmt->return_value);
+                               break;
+                       }
                }
        }
        return count;
@@ -2814,10 +3216,6 @@ static int get_function_n_local_vars(declaration_t *declaration)
        /* 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;
 }
 
@@ -2835,8 +3233,8 @@ static void initialize_function_parameters(declaration_t *declaration)
                type_t *type = skip_typeref(parameter->type);
 
                bool needs_entity = parameter->address_taken;
-               if(type->type == TYPE_COMPOUND_STRUCT
-                               || type->type == TYPE_COMPOUND_UNION) {
+               assert(!is_type_array(type));
+               if(is_type_compound(type)) {
                        needs_entity = true;
                }
 
@@ -2863,6 +3261,41 @@ static void initialize_function_parameters(declaration_t *declaration)
        }
 }
 
+/**
+ * Handle additional decl modifiers for IR-graphs
+ *
+ * @param irg            the IR-graph
+ * @param dec_modifiers  additional modifiers
+ */
+static void handle_decl_modifier_irg(ir_graph_ptr irg, decl_modifiers_t decl_modifiers)
+{
+       if (decl_modifiers & DM_NORETURN) {
+               /* TRUE if the declaration includes the Microsoft
+                  __declspec(noreturn) specifier. */
+               set_irg_additional_property(irg, mtp_property_noreturn);
+       }
+       if (decl_modifiers & DM_NOTHROW) {
+               /* TRUE if the declaration includes the Microsoft
+                  __declspec(nothrow) specifier. */
+               set_irg_additional_property(irg, mtp_property_nothrow);
+       }
+       if (decl_modifiers & DM_NAKED) {
+               /* TRUE if the declaration includes the Microsoft
+                  __declspec(naked) specifier. */
+               set_irg_additional_property(irg, mtp_property_naked);
+       }
+       if (decl_modifiers & DM_FORCEINLINE) {
+               /* TRUE if the declaration includes the
+                  Microsoft __forceinline specifier. */
+               set_irg_inline_property(irg, irg_inline_forced);
+       }
+       if (decl_modifiers & DM_NOINLINE) {
+               /* TRUE if the declaration includes the Microsoft
+                  __declspec(noinline) specifier. */
+               set_irg_inline_property(irg, irg_inline_forbidden);
+       }
+}
+
 static void create_function(declaration_t *declaration)
 {
        ir_entity *function_entity = get_function_entity(declaration);
@@ -2880,6 +3313,11 @@ static void create_function(declaration_t *declaration)
        ir_graph *irg          = new_ir_graph(function_entity, n_local_vars);
        ir_node  *first_block  = get_cur_block();
 
+       /* set inline flags */
+       if (declaration->is_inline)
+       set_irg_inline_property(irg, irg_inline_recomended);
+    handle_decl_modifier_irg(irg, declaration->decl_modifiers);
+
        next_value_number_function = 0;
        initialize_function_parameters(declaration);
 
@@ -2889,23 +3327,25 @@ 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 = &declaration->type->function;
-               const type_t *result_type = skip_typeref(func_type->result_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 (is_type_atomic(result_type, ATOMIC_TYPE_VOID)) {
+               if (is_type_atomic(return_type, ATOMIC_TYPE_VOID)) {
                        ret = new_Return(get_store(), 0, NULL);
                } else {
                        ir_mode *mode;
-                       if(is_type_scalar(result_type)) {
-                               mode = get_ir_mode(func_type->result_type);
+                       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
+                       /* §5.1.2.2.3 main implicitly returns 0 */
                        if (strcmp(declaration->symbol->string, "main") == 0) {
                                in[0] = new_Const(mode, get_mode_null(mode));
                        } else {
@@ -3025,8 +3465,8 @@ static void context_to_firm(context_t *context)
                if(declaration->symbol == NULL)
                        continue;
 
-               type_t *type = declaration->type;
-               if(type->type == TYPE_FUNCTION) {
+               type_t *type = skip_typeref(declaration->type);
+               if(is_type_function(type)) {
                        get_function_entity(declaration);
                } else {
                        create_global_variable(declaration);
@@ -3052,8 +3492,31 @@ static void context_to_firm(context_t *context)
        }
 }
 
+void init_ast2firm(void)
+{
+       obstack_init(&asm_obst);
+       init_atomic_modes();
+}
+
+void exit_ast2firm(void)
+{
+       obstack_free(&asm_obst, NULL);
+}
+
 void translation_unit_to_firm(translation_unit_t *unit)
 {
+       type_const_char = make_atomic_type(ATOMIC_TYPE_CHAR, TYPE_QUALIFIER_CONST);
+       type_void       = make_atomic_type(ATOMIC_TYPE_VOID, TYPE_QUALIFIER_NONE);
+       type_int        = make_atomic_type(ATOMIC_TYPE_INT,  TYPE_QUALIFIER_NONE);
+
+       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;
        break_label         = NULL;