compound type specifiers can have __attribute__, too. Parse it (and ignore it for...
[cparser] / ast2firm.c
index 60ebd63..3f90847 100644 (file)
@@ -32,6 +32,7 @@ static int       next_value_number_function;
 static ir_node  *continue_label;
 static ir_node  *break_label;
 static ir_node  *current_switch_cond;
+static bool      saw_default_label;
 static ir_node **imature_blocks;
 
 typedef enum declaration_type_t {
@@ -82,8 +83,8 @@ const char *retrieve_dbg(const dbg_info *dbg, unsigned *line)
 void init_ast2firm(void)
 {
        type_const_char = make_atomic_type(ATOMIC_TYPE_CHAR, TYPE_QUALIFIER_CONST);
-       type_void       = make_atomic_type(ATOMIC_TYPE_VOID, 0);
-       type_int        = make_atomic_type(ATOMIC_TYPE_INT, 0);
+       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);
@@ -256,6 +257,8 @@ static unsigned count_parameters(const function_type_t *function_type)
 
 
 
+static long fold_constant(const expression_t *expression);
+
 static ir_type *create_atomic_type(const atomic_type_t *type)
 {
        ir_mode *mode   = get_atomic_mode(type);
@@ -317,21 +320,23 @@ static ir_type *create_array_type(array_type_t *type)
        type_t  *element_type    = type->element_type;
        ir_type *ir_element_type = get_ir_type(element_type);
 
-       /* TODO... */
-       int n_elements = 0;
-       panic("TODO arraytpye size not implemented yet");
+       ident   *id      = unique_ident("array");
+       ir_type *ir_type = new_type_array(id, 1, ir_element_type);
+
+       if(type->size != NULL) {
+               int n_elements = fold_constant(type->size);
 
-       ir_type *ir_type = new_type_array(unique_ident("array"), 1, ir_element_type);
-       set_array_bounds_int(ir_type, 0, 0, n_elements);
+               set_array_bounds_int(ir_type, 0, 0, n_elements);
 
-       size_t elemsize = get_type_size_bytes(ir_element_type);
-       int align = get_type_alignment_bytes(ir_element_type);
-       if(elemsize % align > 0) {
-               elemsize += align - (elemsize % align);
+               size_t elemsize = get_type_size_bytes(ir_element_type);
+               int align = get_type_alignment_bytes(ir_element_type);
+               if(elemsize % align > 0) {
+                       elemsize += align - (elemsize % align);
+               }
+               set_type_size_bytes(ir_type, n_elements * elemsize);
+               set_type_alignment_bytes(ir_type, align);
+               set_type_state(ir_type, layout_fixed);
        }
-       set_type_size_bytes(ir_type, n_elements * elemsize);
-       set_type_alignment_bytes(ir_type, align);
-       set_type_state(ir_type, layout_fixed);
 
        return ir_type;
 }
@@ -355,7 +360,7 @@ static ir_type *create_struct_type(compound_type_t *type)
        int offset    = 0;
        declaration_t *entry = type->declaration->context.declarations;
        for( ; entry != NULL; entry = entry->next) {
-               if(entry->namespace != NAMESPACE_NORMAL)
+               if(entry->namespc != NAMESPACE_NORMAL)
                        continue;
 
                ident       *ident         = new_id_from_str(entry->symbol->string);
@@ -408,7 +413,7 @@ static ir_type *create_union_type(compound_type_t *type)
        int size      = 0;
        declaration_t *entry = declaration->context.declarations;
        for( ; entry != NULL; entry = entry->next) {
-               if(entry->namespace != NAMESPACE_NORMAL)
+               if(entry->namespc != NAMESPACE_NORMAL)
                        continue;
 
                ident       *ident         = new_id_from_str(entry->symbol->string);
@@ -491,7 +496,13 @@ static ir_type *get_ir_type(type_t *type)
 static inline ir_mode *get_ir_mode(type_t *type)
 {
        ir_type *irtype = get_ir_type(type);
-       ir_mode *mode   = get_type_mode(irtype);
+
+       /* firm doesn't report a mode for arrays somehow... */
+       if(is_Array_type(irtype)) {
+               return mode_P;
+       }
+
+       ir_mode *mode = get_type_mode(irtype);
        assert(mode != NULL);
        return mode;
 }
@@ -509,11 +520,10 @@ static ir_entity* get_function_entity(declaration_t *declaration)
        ir_type  *ir_type_method = get_ir_type(declaration->type);
        assert(is_Method_type(ir_type_method));
 
-       type_t    *type   = declaration->type;
        ir_entity *entity = new_entity(global_type, id, ir_type_method);
        set_entity_ld_ident(entity, id);
-       if(declaration->storage_class & STORAGE_CLASS_STATIC
-                       || type->qualifiers & TYPE_QUALIFIER_INLINE) {
+       if(declaration->storage_class == STORAGE_CLASS_STATIC
+                       || declaration->is_inline) {
                set_entity_visibility(entity, visibility_local);
        } else if(declaration->init.statement != NULL) {
                set_entity_visibility(entity, visibility_external_visible);
@@ -530,7 +540,6 @@ static ir_entity* get_function_entity(declaration_t *declaration)
 
 
 static ir_node *expression_to_firm(const expression_t *expression);
-static ir_node *expression_to_modeb(const expression_t *expression);
 
 static dbg_info *get_dbg_info(const source_position_t *pos)
 {
@@ -595,40 +604,55 @@ static ir_node *string_literal_to_firm(const string_literal_t* literal)
        return create_symconst(dbgi, entity);
 }
 
-static ir_node *load_from_expression_addr(type_t *type, ir_node *addr,
-                                          dbg_info *dbgi)
+static ir_node *deref_address(type_t *const type, ir_node *const addr,
+                              dbg_info *const dbgi)
 {
-       ir_mode *mode     = get_ir_mode(type);
-       ir_node *memory   = get_store();
-       ir_node *load     = new_d_Load(dbgi, memory, addr, mode);
-       ir_node *load_mem = new_d_Proj(dbgi, load, mode_M, pn_Load_M);
-       ir_node *load_res = new_d_Proj(dbgi, load, mode, pn_Load_res);
-       set_store(load_mem);
+       switch (type->type) {
+               case TYPE_ARRAY:
+               case TYPE_COMPOUND_STRUCT:
+               case TYPE_COMPOUND_UNION:
+                       return addr;
 
-       return load_res;
+               default: {
+                       ir_mode *const mode     = get_ir_mode(type);
+                       ir_node *const memory   = get_store();
+                       ir_node *const load     = new_d_Load(dbgi, memory, addr, mode);
+                       ir_node *const load_mem = new_d_Proj(dbgi, load, mode_M, pn_Load_M);
+                       ir_node *const load_res = new_d_Proj(dbgi, load, mode,   pn_Load_res);
+                       set_store(load_mem);
+                       return load_res;
+               }
+       }
 }
 
 static ir_node *reference_expression_to_firm(const reference_expression_t *ref)
 {
        dbg_info      *dbgi        = get_dbg_info(&ref->expression.source_position);
        declaration_t *declaration = ref->declaration;
-       type_t        *type        = declaration->type;
-       ir_mode       *mode        = get_ir_mode(type);
+       type_t        *type        = skip_typeref(declaration->type);
 
        switch((declaration_type_t) declaration->declaration_type) {
        case DECLARATION_TYPE_UNKNOWN:
                break;
-       case DECLARATION_TYPE_LOCAL_VARIABLE:
+       case DECLARATION_TYPE_LOCAL_VARIABLE: {
+               ir_mode *mode = get_ir_mode(type);
                return get_value(declaration->v.value_number, mode);
+       }
        case DECLARATION_TYPE_FUNCTION: {
                return create_symconst(dbgi, declaration->v.entity);
        }
        case DECLARATION_TYPE_GLOBAL_VARIABLE: {
                ir_entity *entity   = declaration->v.entity;
                ir_node   *symconst = create_symconst(dbgi, entity);
-               return load_from_expression_addr(type, symconst, dbgi);
+               return deref_address(type, symconst, dbgi);
        }
-       case DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY:
+       case DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY: {
+               ir_entity *entity = declaration->v.entity;
+               ir_node   *frame  = get_irg_frame(current_ir_graph);
+               ir_node   *sel    = new_d_simpleSel(dbgi, new_NoMem(), frame, entity);
+               return deref_address(type, sel, dbgi);
+       }
+
        case DECLARATION_TYPE_COMPOUND_MEMBER:
        case DECLARATION_TYPE_LABEL_BLOCK:
                panic("not implemented reference type");
@@ -655,7 +679,13 @@ static ir_node *reference_addr(const reference_expression_t *ref)
                ir_node   *symconst = create_symconst(dbgi, entity);
                return symconst;
        }
-       case DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY:
+       case DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY: {
+               ir_entity *entity = declaration->v.entity;
+               ir_node   *frame  = get_irg_frame(current_ir_graph);
+               ir_node   *sel    = new_d_simpleSel(dbgi, new_NoMem(), frame, entity);
+
+               return sel;
+       }
        case DECLARATION_TYPE_COMPOUND_MEMBER:
        case DECLARATION_TYPE_LABEL_BLOCK:
                panic("not implemented reference type");
@@ -671,8 +701,15 @@ static ir_node *call_expression_to_firm(const call_expression_t *call)
        expression_t  *function = call->function;
        ir_node       *callee   = expression_to_firm(function);
 
-       assert(function->datatype->type == TYPE_FUNCTION);
-       function_type_t *function_type = (function_type_t*) function->datatype;
+       function_type_t *function_type;
+       if (function->datatype->type == TYPE_POINTER) {
+               pointer_type_t *const ptr_type = (pointer_type_t*)function->datatype;
+               assert(ptr_type->points_to->type == TYPE_FUNCTION);
+               function_type = (function_type_t*)ptr_type->points_to;
+       } else {
+               assert(function->datatype->type == TYPE_FUNCTION);
+               function_type = (function_type_t*)function->datatype;
+       }
 
        int              n_parameters = 0;
        call_argument_t *argument     = call->arguments;
@@ -738,6 +775,9 @@ static ir_node *call_expression_to_firm(const call_expression_t *call)
 }
 
 static ir_node *expression_to_addr(const expression_t *expression);
+static void create_condition_evaluation(const expression_t *expression,
+                                        ir_node *true_block,
+                                        ir_node *false_block);
 
 static void set_value_for_expression(const expression_t *expression,
                                      ir_node *value)
@@ -779,11 +819,58 @@ static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode)
        return new_d_Conv(dbgi, value, dest_mode);
 }
 
+static ir_node *create_incdec(const unary_expression_t *expression)
+{
+       dbg_info     *dbgi  = get_dbg_info(&expression->expression.source_position);
+       type_t       *type  = 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) {
+               pointer_type_t *pointer_type = (pointer_type_t*) type;
+               unsigned        elem_size    = get_type_size(pointer_type->points_to);
+               offset = new_Const_long(mode_Is, elem_size);
+       } else {
+               assert(is_type_arithmetic(type));
+               offset = new_Const(mode, get_mode_one(mode));
+       }
+
+       ir_node *new_value;
+       switch(expression->type) {
+       case UNEXPR_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: {
+               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: {
+               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: {
+               ir_node *new_value = new_d_Sub(dbgi, value_node, offset, mode);
+               set_value_for_expression(value, new_value);
+               return new_value;
+       }
+       default:
+               panic("no incdec expr in create_incdec");
+       }
+
+       return new_value;
+}
+
 static ir_node *unary_expression_to_firm(const unary_expression_t *expression)
 {
        dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
        type_t   *type = expression->expression.datatype;
-       ir_mode  *mode = get_ir_mode(type);
 
        if(expression->type == UNEXPR_TAKE_ADDRESS)
                return expression_to_addr(expression->value);
@@ -793,48 +880,31 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression)
 
        switch(expression->type) {
        case UNEXPR_NEGATE:
-               return new_d_Minus(dbgi, value_node, mode);
+               return new_d_Minus(dbgi, value_node, get_ir_mode(type));
        case UNEXPR_PLUS:
                return value_node;
        case UNEXPR_BITWISE_NEGATE:
-               return new_d_Not(dbgi, value_node, mode);
-       case UNEXPR_NOT:
+               return new_d_Not(dbgi, value_node, get_ir_mode(type));
+       case UNEXPR_NOT: {
                if(get_irn_mode(value_node) != mode_b) {
                        value_node = create_conv(dbgi, value_node, mode_b);
                }
                value_node = new_d_Not(dbgi, value_node, mode_b);
+               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:
-               return load_from_expression_addr(type, value_node, dbgi);
-       case UNEXPR_POSTFIX_INCREMENT: {
-               ir_node *one       = new_Const(mode, get_mode_one(mode));
-               ir_node *new_value = new_d_Add(dbgi, value_node, one, mode);
-               set_value_for_expression(value, new_value);
-               return value_node;
-       }
-       case UNEXPR_POSTFIX_DECREMENT: {
-               ir_node *one       = new_Const(mode, get_mode_one(mode));
-               ir_node *new_value = new_d_Sub(dbgi, value_node, one, mode);
-               set_value_for_expression(value, new_value);
-               return value_node;
-       }
-       case UNEXPR_PREFIX_INCREMENT: {
-               ir_node *one       = new_Const(mode, get_mode_one(mode));
-               ir_node *new_value = new_d_Add(dbgi, value_node, one, mode);
-               set_value_for_expression(value, new_value);
-               return new_value;
-       }
-       case UNEXPR_PREFIX_DECREMENT: {
-               ir_node *one       = new_Const(mode, get_mode_one(mode));
-               ir_node *new_value = new_d_Sub(dbgi, value_node, one, mode);
-               set_value_for_expression(value, new_value);
-               return new_value;
        }
+       case UNEXPR_DEREFERENCE:
+               return deref_address(type, value_node, dbgi);
+       case UNEXPR_POSTFIX_INCREMENT:
+       case UNEXPR_POSTFIX_DECREMENT:
+       case UNEXPR_PREFIX_INCREMENT:
+       case UNEXPR_PREFIX_DECREMENT:
+               return create_incdec(expression);
        case UNEXPR_CAST:
-               return create_conv(dbgi, value_node, mode);
+               return create_conv(dbgi, value_node, get_ir_mode(type));
 
        case UNEXPR_TAKE_ADDRESS:
        case UNEXPR_INVALID:
@@ -861,48 +931,32 @@ static long get_pnc(binary_expression_type_t type)
 static ir_node *create_lazy_op(const binary_expression_t *expression)
 {
        dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
+       type_t   *type = expression->expression.datatype;
+       ir_mode  *mode = get_ir_mode(type);
 
-       bool is_or = (expression->type == BINEXPR_LOGICAL_OR);
-       assert(is_or || expression->type == BINEXPR_LOGICAL_AND);
-
-       ir_node  *val1       = expression_to_modeb(expression->left);
-       ir_node  *cond       = new_d_Cond(dbgi, val1);
-       ir_node  *true_proj  = new_d_Proj(dbgi, cond, mode_X, pn_Cond_true);
-       ir_node  *false_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_false);
+       ir_node *cur_block = get_cur_block();
 
-       ir_node *fallthrough_block = new_immBlock();
+       ir_node *one_block = new_immBlock();
+       ir_node *one       = new_Const(mode, get_mode_one(mode));
+       ir_node *jmp_one   = new_d_Jmp(dbgi);
 
-       /* the true case */
-       ir_node *calc_val2_block = new_immBlock();
-       if(is_or) {
-               add_immBlock_pred(calc_val2_block, false_proj);
-       } else {
-               add_immBlock_pred(calc_val2_block, true_proj);
-       }
+       ir_node *zero_block = new_immBlock();
+       ir_node *zero       = new_Const(mode, get_mode_null(mode));
+       ir_node *jmp_zero   = new_d_Jmp(dbgi);
 
-       mature_immBlock(calc_val2_block);
+       set_cur_block(cur_block);
+       create_condition_evaluation((const expression_t*) expression,
+                                   one_block, zero_block);
+       mature_immBlock(one_block);
+       mature_immBlock(zero_block);
 
-       ir_node *val2 = expression_to_modeb(expression->right);
-       if(get_cur_block() != NULL) {
-               ir_node *jmp = new_d_Jmp(dbgi);
-               add_immBlock_pred(fallthrough_block, jmp);
-       }
-
-       /* fallthrough */
-       ir_node *constb;
-       if(is_or) {
-               constb = new_d_Const(dbgi, mode_b, get_tarval_b_true());
-               add_immBlock_pred(fallthrough_block, true_proj);
-       } else {
-               constb = new_d_Const(dbgi, mode_b, get_tarval_b_false());
-               add_immBlock_pred(fallthrough_block, false_proj);
-       }
-       mature_immBlock(fallthrough_block);
-
-       set_cur_block(fallthrough_block);
+       ir_node *common_block = new_immBlock();
+       add_immBlock_pred(common_block, jmp_one);
+       add_immBlock_pred(common_block, jmp_zero);
+       mature_immBlock(common_block);
 
-       ir_node *in[2] = { val2, constb };
-       ir_node *val   = new_d_Phi(dbgi, 2, in, mode_b);
+       ir_node *in[2] = { one, zero };
+       ir_node *val   = new_d_Phi(dbgi, 2, in, mode);
 
        return val;
 }
@@ -917,8 +971,8 @@ static ir_node *create_arithmetic_binop(const binary_expression_t *expression,
        ir_node  *left  = expression_to_firm(expression->left);
        ir_node  *right = expression_to_firm(expression->right);
        type_t   *type  = expression->right->datatype;
-       /* be careful with the modes, because in asithmetic assign nodes only
-        * the right operand has the mode of the arithmetic alread */
+       /* be careful with the modes, because in arithmetic assign nodes only
+        * the right operand has the mode of the arithmetic already */
        ir_mode  *mode  = get_ir_mode(type);
        left            = create_conv(dbgi, left, mode);
        ir_node  *res   = func(dbgi, left, right, mode);
@@ -926,16 +980,44 @@ static ir_node *create_arithmetic_binop(const binary_expression_t *expression,
        return res;
 }
 
+static ir_node *pointer_arithmetic(ir_node  *const pointer,
+                                   ir_node  *      integer,
+                                   type_t   *const type,
+                                   dbg_info *const dbgi,
+                                   const create_arithmetic_func func)
+{
+       pointer_type_t *const pointer_type = (pointer_type_t*)type;
+       type_t         *const points_to    = pointer_type->points_to;
+       const unsigned        elem_size    = get_type_size(points_to);
+
+       assert(elem_size >= 1);
+       if (elem_size > 1) {
+               integer             = create_conv(dbgi, integer, mode_Is);
+               ir_node *const cnst = new_Const_long(mode_Is, (long)elem_size);
+               ir_node *const mul  = new_d_Mul(dbgi, integer, cnst, mode_Is);
+               integer = mul;
+       }
+
+       ir_mode *const mode = get_ir_mode(type);
+       return func(dbgi, pointer, integer, mode);
+}
+
 static ir_node *create_arithmetic_assign_binop(
                const binary_expression_t *expression, create_arithmetic_func func)
 {
-       dbg_info *dbgi  = get_dbg_info(&expression->expression.source_position);
-       ir_node  *value = create_arithmetic_binop(expression, func);
-       type_t   *type  = expression->expression.datatype;
-       ir_mode  *mode  = get_ir_mode(type);
+       dbg_info *const dbgi = get_dbg_info(&expression->expression.source_position);
+       type_t   *const type = expression->expression.datatype;
+       ir_node  *value;
 
-       assert(type->type != TYPE_POINTER);
+       if (type->type == TYPE_POINTER) {
+               ir_node        *const pointer = expression_to_firm(expression->left);
+               ir_node        *      integer = expression_to_firm(expression->right);
+               value = pointer_arithmetic(pointer, integer, type, dbgi, func);
+       } else {
+               value = create_arithmetic_binop(expression, func);
+       }
 
+       ir_mode  *const mode = get_ir_mode(type);
        value = create_conv(dbgi, value, mode);
        set_value_for_expression(expression->left, value);
 
@@ -948,7 +1030,6 @@ static ir_node *create_add(const binary_expression_t *expression)
        ir_node  *left  = expression_to_firm(expression->left);
        ir_node  *right = expression_to_firm(expression->right);
        type_t   *type  = expression->expression.datatype;
-       ir_mode  *mode  = get_ir_mode(type);
 
        expression_t *expr_left  = expression->left;
        expression_t *expr_right = expression->right;
@@ -956,40 +1037,40 @@ static ir_node *create_add(const binary_expression_t *expression)
        type_t       *type_right = skip_typeref(expr_right->datatype);
 
        if(is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) {
+               ir_mode *const mode = get_ir_mode(type);
                return new_d_Add(dbgi, left, right, mode);
        }
 
-       ir_node        *pointer;
-       ir_node        *integer;
-       pointer_type_t *pointer_type;
-       if(type_left->type == TYPE_POINTER) {
-               pointer      = left;
-               integer      = right;
-               pointer_type = (pointer_type_t*) type_left;
+       if (type_left->type == TYPE_POINTER || type_left->type == TYPE_ARRAY) {
+               return pointer_arithmetic(left, right, type, dbgi, new_d_Add);
        } else {
-               assert(type_right->type == TYPE_POINTER);
-               pointer      = right;
-               integer      = left;
-               pointer_type = (pointer_type_t*) type_right;
+               assert(type_right->type == TYPE_POINTER || type_right->type == TYPE_ARRAY);
+               return pointer_arithmetic(right, left, type, dbgi, new_d_Add);
        }
+}
 
-       type_t   *points_to = pointer_type->points_to;
-       unsigned  elem_size = get_type_size(points_to);
-
-       assert(elem_size >= 1);
-       if(elem_size > 1) {
-               integer       = create_conv(dbgi, integer, mode_Is);
-               ir_node *cnst = new_Const_long(mode_Is, (int) elem_size);
-               ir_node *mul  = new_d_Mul(dbgi, integer, cnst, mode_Is);
-               integer = mul;
+static ir_node *create_sub(const binary_expression_t *expression)
+{
+       dbg_info *const dbgi  = get_dbg_info(&expression->expression.source_position);
+       expression_t *const expr_left  = expression->left;
+       expression_t *const expr_right = expression->right;
+       ir_node      *const left       = expression_to_firm(expr_left);
+       ir_node      *const right      = expression_to_firm(expr_right);
+       type_t       *const type       = expression->expression.datatype;
+       type_t       *const type_left  = skip_typeref(expr_left->datatype);
+       type_t       *const type_right = skip_typeref(expr_right->datatype);
+
+       if ((is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) ||
+           (type_left->type == TYPE_POINTER && type_right->type == TYPE_POINTER)) {
+               ir_mode *const mode = get_ir_mode(type);
+               return new_d_Sub(dbgi, left, right, mode);
        }
 
-       ir_node *res = new_d_Add(dbgi, pointer, integer, mode);
-
-       return res;
+       assert(type_left->type == TYPE_POINTER);
+       return pointer_arithmetic(left, right, type_left, dbgi, new_d_Sub);
 }
 
-static ir_node *create_sub(const binary_expression_t *expression)
+static ir_node *create_shift(const binary_expression_t *expression)
 {
        dbg_info *dbgi  = get_dbg_info(&expression->expression.source_position);
        ir_node  *left  = expression_to_firm(expression->left);
@@ -997,37 +1078,34 @@ static ir_node *create_sub(const binary_expression_t *expression)
        type_t   *type  = expression->expression.datatype;
        ir_mode  *mode  = get_ir_mode(type);
 
-       expression_t *expr_left  = expression->left;
-       expression_t *expr_right = expression->right;
-       type_t       *type_left  = skip_typeref(expr_left->datatype);
-       type_t       *type_right = skip_typeref(expr_right->datatype);
+       /* firm always wants the shift count to be unsigned */
+       right = create_conv(dbgi, right, mode_Iu);
 
-       if((is_type_arithmetic(type_left) && is_type_arithmetic(type_right))
-                       || (type_left->type == TYPE_POINTER
-                               && type_right->type == TYPE_POINTER)) {
-               return new_d_Sub(dbgi, left, right, mode);
-       }
-
-       assert(type_right->type == TYPE_POINTER);
-       ir_node        *pointer      = left;
-       ir_node        *integer      = right;
-       pointer_type_t *pointer_type = (pointer_type_t*) type_right;
+       ir_node *res;
 
-       type_t   *points_to = pointer_type->points_to;
-       unsigned  elem_size = get_type_size(points_to);
+       switch(expression->type) {
+       case BINEXPR_SHIFTLEFT:
+               res = new_d_Shl(dbgi, left, right, mode);
+               break;
+       case BINEXPR_SHIFTRIGHT: {
+                expression_t *expr_left = expression->left;
+                type_t       *type_left = skip_typeref(expr_left->datatype);
 
-       assert(elem_size >= 1);
-       if(elem_size > 1) {
-               ir_node *cnst = new_Const_long(mode_Iu, elem_size);
-               ir_node *mul  = new_d_Mul(dbgi, integer, cnst, mode_Iu);
-               integer = mul;
+                if(is_type_signed(type_left)) {
+                       res = new_d_Shrs(dbgi, left, right, mode);
+                } else {
+                        res = new_d_Shr(dbgi, left, right, mode);
+                }
+                break;
+       }
+       default:
+               panic("create shift op called for non-shift op");
        }
-
-       ir_node *res = new_d_Sub(dbgi, pointer, integer, mode);
 
        return res;
 }
 
+
 static ir_node *create_divmod(const binary_expression_t *expression)
 {
        dbg_info *dbgi  = get_dbg_info(&expression->expression.source_position);
@@ -1039,24 +1117,46 @@ static ir_node *create_divmod(const binary_expression_t *expression)
        ir_node  *op;
        ir_node  *res;
 
-       if(expression->type == BINEXPR_DIV) {
-               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);
-               }
-       } else {
-               assert(expression->type == BINEXPR_MOD);
-               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);
+       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;
+
+               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;
+
+               default: panic("unexpected binary expression type in create_divmod()");
        }
 
        return res;
 }
 
+static ir_node *create_arithmetic_assign_divmod(
+               const binary_expression_t *expression)
+{
+       ir_node  *      value = create_divmod(expression);
+       dbg_info *const dbgi  = get_dbg_info(&expression->expression.source_position);
+       type_t   *const type  = expression->expression.datatype;
+       ir_mode  *const mode  = get_ir_mode(type);
+
+       assert(type->type != TYPE_POINTER);
+
+       value = create_conv(dbgi, value, mode);
+       set_value_for_expression(expression->left, value);
+
+       return value;
+}
 
 
 static ir_node *binary_expression_to_firm(const binary_expression_t *expression)
@@ -1095,9 +1195,8 @@ static ir_node *binary_expression_to_firm(const binary_expression_t *expression)
        case BINEXPR_BITWISE_XOR:
                return create_arithmetic_binop(expression, new_d_Eor);
        case BINEXPR_SHIFTLEFT:
-               return create_arithmetic_binop(expression, new_d_Shl);
        case BINEXPR_SHIFTRIGHT:
-               return create_arithmetic_binop(expression, new_d_Shr);
+               return create_shift(expression);
        case BINEXPR_DIV:
        case BINEXPR_MOD:
                return create_divmod(expression);
@@ -1113,6 +1212,8 @@ static ir_node *binary_expression_to_firm(const binary_expression_t *expression)
                return create_arithmetic_assign_binop(expression, new_d_Sub);
        case BINEXPR_MUL_ASSIGN:
                return create_arithmetic_assign_binop(expression, new_d_Mul);
+       case BINEXPR_DIV_ASSIGN:
+               return create_arithmetic_assign_divmod(expression);
        case BINEXPR_BITWISE_AND_ASSIGN:
                return create_arithmetic_assign_binop(expression, new_d_And);
        case BINEXPR_BITWISE_OR_ASSIGN:
@@ -1148,12 +1249,10 @@ static ir_node *array_access_addr(const array_access_expression_t *expression)
 static ir_node *array_access_to_firm(
                const array_access_expression_t *expression)
 {
-
        dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
        ir_node  *addr = array_access_addr(expression);
-       type_t   *type = expression->expression.datatype;
-
-       return load_from_expression_addr(type, addr, dbgi);
+       type_t   *type = skip_typeref(expression->expression.datatype);
+       return deref_address(type, addr, dbgi);
 }
 
 static ir_node *sizeof_to_firm(const sizeof_expression_t *expression)
@@ -1175,27 +1274,26 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression)
 {
        dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
 
-       ir_node *condition  = expression_to_modeb(expression->condition);
-       ir_node *cond       = new_d_Cond(dbgi, condition);
-       ir_node *true_proj  = new_d_Proj(dbgi, cond, mode_X, pn_Cond_true);
-       ir_node *false_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_false);
+       ir_node *cur_block   = get_cur_block();
 
        /* create the true block */
-       ir_node *true_block = new_immBlock();
-       add_immBlock_pred(true_block, true_proj);
-       mature_immBlock(true_block);
+       ir_node *true_block  = new_immBlock();
 
        ir_node *true_val = expression_to_firm(expression->true_expression);
        ir_node *true_jmp = new_Jmp();
 
        /* create the false block */
        ir_node *false_block = new_immBlock();
-       add_immBlock_pred(false_block, false_proj);
-       mature_immBlock(false_block);
 
        ir_node *false_val = expression_to_firm(expression->false_expression);
        ir_node *false_jmp = new_Jmp();
 
+       /* create the condition evaluation */
+       set_cur_block(cur_block);
+       create_condition_evaluation(expression->condition, true_block, false_block);
+       mature_immBlock(true_block);
+       mature_immBlock(false_block);
+
        /* create the common block */
        ir_node *common_block = new_immBlock();
        add_immBlock_pred(common_block, true_jmp);
@@ -1210,6 +1308,37 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression)
        return val;
 }
 
+static ir_node *select_addr(const select_expression_t *expression)
+{
+       dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
+
+       ir_node *compound_addr = expression_to_firm(expression->compound);
+
+       declaration_t *entry = expression->compound_entry;
+       assert(entry->declaration_type == DECLARATION_TYPE_COMPOUND_MEMBER);
+       ir_entity     *entity = entry->v.entity;
+
+       assert(entity != NULL);
+
+       ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), compound_addr, entity);
+
+       return sel;
+}
+
+static ir_node *select_to_firm(const select_expression_t *expression)
+{
+       dbg_info *dbgi = get_dbg_info(&expression->expression.source_position);
+       ir_node  *addr = select_addr(expression);
+       type_t   *type = skip_typeref(expression->expression.datatype);
+       return deref_address(type, addr, dbgi);
+}
+
+static ir_node *dereference_addr(const unary_expression_t *const expression)
+{
+       assert(expression->type == UNEXPR_DEREFERENCE);
+       return expression_to_firm(expression->value);
+}
+
 static ir_node *expression_to_addr(const expression_t *expression)
 {
        switch(expression->type) {
@@ -1217,6 +1346,16 @@ static ir_node *expression_to_addr(const expression_t *expression)
                return reference_addr((const reference_expression_t*) expression);
        case EXPR_ARRAY_ACCESS:
                return array_access_addr((const array_access_expression_t*) expression);
+       case EXPR_SELECT:
+               return select_addr((const select_expression_t*) expression);
+       case EXPR_UNARY: {
+               const unary_expression_t *const unary_expr =
+                       (const unary_expression_t*)expression;
+               if (unary_expr->type == UNEXPR_DEREFERENCE) {
+                       return dereference_addr(unary_expr);
+               }
+               break;
+       }
        default:
                break;
        }
@@ -1247,21 +1386,32 @@ static ir_node *_expression_to_firm(const expression_t *expression)
                return sizeof_to_firm((const sizeof_expression_t*) expression);
        case EXPR_CONDITIONAL:
                return conditional_to_firm((const conditional_expression_t*)expression);
-       default:
+       case EXPR_SELECT:
+               return select_to_firm((const select_expression_t*) expression);
+       case EXPR_FUNCTION:
+       case EXPR_OFFSETOF:
+       case EXPR_PRETTY_FUNCTION:
+       case EXPR_VA_ARG:
+       case EXPR_STATEMENT:
+       case EXPR_BUILTIN_SYMBOL:
+               panic("unimplemented expression found");
+
+       case EXPR_UNKNOWN:
+       case EXPR_INVALID:
                break;
        }
-       panic("unsupported expression found");
+       panic("invalid expression found");
 }
 
 static ir_node *expression_to_firm(const expression_t *expression)
 {
-       ir_node *res  = _expression_to_firm(expression);
+       ir_node *res = _expression_to_firm(expression);
 
-       if(expression->datatype == type_void)
-               return NULL;
+       if(res != NULL && get_irn_mode(res) == mode_b) {
+               ir_mode *mode = get_ir_mode(expression->datatype);
+               res           = create_conv(NULL, res, mode);
+       }
 
-       ir_mode *mode = get_ir_mode(expression->datatype);
-       res           = create_conv(NULL, res, mode);
        return res;
 }
 
@@ -1273,10 +1423,76 @@ static ir_node *expression_to_modeb(const expression_t *expression)
        return res;
 }
 
+/**
+ * create a short-circuit expression evaluation that tries to construct
+ * efficient control flow structures for &&, || and ! expressions
+ */
+static void create_condition_evaluation(const expression_t *expression,
+                                        ir_node *true_block,
+                                        ir_node *false_block)
+{
+       switch(expression->type) {
+       case EXPR_UNARY: {
+               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_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;
+       }
+       default:
+               break;
+       }
+
+       dbg_info *dbgi       = get_dbg_info(&expression->source_position);
+       ir_node  *condition  = expression_to_modeb(expression);
+       ir_node  *cond       = new_d_Cond(dbgi, condition);
+       ir_node  *true_proj  = new_d_Proj(dbgi, cond, mode_X, pn_Cond_true);
+       ir_node  *false_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_false);
+
+       add_immBlock_pred(true_block, true_proj);
+       add_immBlock_pred(false_block, false_proj);
+
+       set_cur_block(NULL);
+}
+
 static void statement_to_firm(statement_t *statement);
 
 static void return_statement_to_firm(return_statement_t *statement)
 {
+       if(get_cur_block() == NULL)
+               return;
+
        dbg_info *dbgi = get_dbg_info(&statement->statement.source_position);
        ir_node  *ret;
 
@@ -1306,37 +1522,35 @@ static void compound_statement_to_firm(compound_statement_t *compound)
 
 static void expression_statement_to_firm(expression_statement_t *statement)
 {
+       if(get_cur_block() == NULL)
+               return;
+
        expression_to_firm(statement->expression);
 }
 
 static void if_statement_to_firm(if_statement_t *statement)
 {
-       dbg_info *dbgi      = get_dbg_info(&statement->statement.source_position);
-       ir_node  *condition = expression_to_modeb(statement->condition);
-
-       /* make sure we have a mode_b condition */
-       ir_node *cond       = new_d_Cond(dbgi, condition);
-       ir_node *true_proj  = new_d_Proj(dbgi, cond, mode_X, pn_Cond_true);
-       ir_node *false_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_false);
+       ir_node *cur_block = get_cur_block();
 
        ir_node *fallthrough_block = new_immBlock();
 
        /* the true (blocks) */
-       ir_node *true_block = new_immBlock();
-       add_immBlock_pred(true_block, true_proj);
-       mature_immBlock(true_block);
-
-       statement_to_firm(statement->true_statement);
-       if(get_cur_block() != NULL) {
-               ir_node *jmp = new_Jmp();
-               add_immBlock_pred(fallthrough_block, jmp);
+       ir_node *true_block;
+       if (statement->true_statement != NULL) {
+               true_block = new_immBlock();
+               statement_to_firm(statement->true_statement);
+               if(get_cur_block() != NULL) {
+                       ir_node *jmp = new_Jmp();
+                       add_immBlock_pred(fallthrough_block, jmp);
+               }
+       } else {
+               true_block = fallthrough_block;
        }
 
        /* the false (blocks) */
+       ir_node *false_block;
        if(statement->false_statement != NULL) {
-               ir_node *false_block = new_immBlock();
-               add_immBlock_pred(false_block, false_proj);
-               mature_immBlock(false_block);
+               false_block = new_immBlock();
 
                statement_to_firm(statement->false_statement);
                if(get_cur_block() != NULL) {
@@ -1344,7 +1558,19 @@ static void if_statement_to_firm(if_statement_t *statement)
                        add_immBlock_pred(fallthrough_block, jmp);
                }
        } else {
-               add_immBlock_pred(fallthrough_block, false_proj);
+               false_block = fallthrough_block;
+       }
+
+       /* create the condition */
+       if(cur_block != NULL) {
+               set_cur_block(cur_block);
+               create_condition_evaluation(statement->condition, true_block,
+                                           false_block);
+       }
+
+       mature_immBlock(true_block);
+       if(false_block != fallthrough_block) {
+               mature_immBlock(false_block);
        }
        mature_immBlock(fallthrough_block);
 
@@ -1353,8 +1579,6 @@ static void if_statement_to_firm(if_statement_t *statement)
 
 static void while_statement_to_firm(while_statement_t *statement)
 {
-       dbg_info *dbgi = get_dbg_info(&statement->statement.source_position);
-
        ir_node *jmp = NULL;
        if(get_cur_block() != NULL) {
                jmp = new_Jmp();
@@ -1366,48 +1590,46 @@ static void while_statement_to_firm(while_statement_t *statement)
                add_immBlock_pred(header_block, jmp);
        }
 
-       /* create the condition */
-       ir_node *condition  = expression_to_modeb(statement->condition);
-       ir_node *cond       = new_d_Cond(dbgi, condition);
-       ir_node *true_proj  = new_d_Proj(dbgi, cond, mode_X, pn_Cond_true);
-       ir_node *false_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_false);
-
        /* the false block */
        ir_node *false_block = new_immBlock();
-       add_immBlock_pred(false_block, false_proj);
 
        /* the loop body */
-       ir_node *body_block = new_immBlock();
-       add_immBlock_pred(body_block, true_proj);
-       mature_immBlock(body_block);
+       ir_node *body_block;
+       if (statement->body != NULL) {
+               ir_node *old_continue_label = continue_label;
+               ir_node *old_break_label    = break_label;
+               continue_label              = header_block;
+               break_label                 = false_block;
 
-       ir_node *old_continue_label = continue_label;
-       ir_node *old_break_label    = break_label;
-       continue_label              = header_block;
-       break_label                 = false_block;
+               body_block = new_immBlock();
+               statement_to_firm(statement->body);
 
-       statement_to_firm(statement->body);
+               assert(continue_label == header_block);
+               assert(break_label    == false_block);
+               continue_label = old_continue_label;
+               break_label    = old_break_label;
 
-       assert(continue_label == header_block);
-       assert(break_label    == false_block);
-       continue_label = old_continue_label;
-       break_label    = old_break_label;
-
-       if(get_cur_block() != NULL) {
-               ir_node *jmp = new_Jmp();
-               add_immBlock_pred(header_block, jmp);
+               if(get_cur_block() != NULL) {
+                       ir_node *jmp = new_Jmp();
+                       add_immBlock_pred(header_block, jmp);
+               }
+       } else {
+               body_block = header_block;
        }
 
-       mature_immBlock(header_block);
+       /* create the condition */
+       set_cur_block(header_block);
+
+       create_condition_evaluation(statement->condition, body_block, false_block);
+       mature_immBlock(body_block);
        mature_immBlock(false_block);
+       mature_immBlock(header_block);
 
        set_cur_block(false_block);
 }
 
 static void do_while_statement_to_firm(do_while_statement_t *statement)
 {
-       dbg_info *dbgi = get_dbg_info(&statement->statement.source_position);
-
        ir_node *jmp = NULL;
        if(get_cur_block() != NULL) {
                jmp = new_Jmp();
@@ -1425,22 +1647,25 @@ static void do_while_statement_to_firm(do_while_statement_t *statement)
                add_immBlock_pred(body_block, jmp);
        }
 
-       ir_node *old_continue_label = continue_label;
-       ir_node *old_break_label    = break_label;
-       continue_label              = header_block;
-       break_label                 = false_block;
+       if (statement->body != NULL) {
+               ir_node *old_continue_label = continue_label;
+               ir_node *old_break_label    = break_label;
+               continue_label              = header_block;
+               break_label                 = false_block;
 
-       statement_to_firm(statement->body);
+               statement_to_firm(statement->body);
 
-       assert(continue_label == header_block);
-       assert(break_label    == false_block);
-       continue_label = old_continue_label;
-       break_label    = old_break_label;
+               assert(continue_label == header_block);
+               assert(break_label    == false_block);
+               continue_label = old_continue_label;
+               break_label    = old_break_label;
 
-       if(get_cur_block() == NULL) {
-               mature_immBlock(header_block);
-               mature_immBlock(body_block);
-               return;
+               if (get_cur_block() == NULL) {
+                       mature_immBlock(header_block);
+                       mature_immBlock(body_block);
+                       mature_immBlock(false_block);
+                       return;
+               }
        }
 
        ir_node *body_jmp = new_Jmp();
@@ -1448,24 +1673,18 @@ static void do_while_statement_to_firm(do_while_statement_t *statement)
        mature_immBlock(header_block);
 
        /* create the condition */
-       ir_node *condition  = expression_to_modeb(statement->condition);
-       ir_node *cond       = new_d_Cond(dbgi, condition);
-       ir_node *true_proj  = new_d_Proj(dbgi, cond, mode_X, pn_Cond_true);
-       ir_node *false_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_false);
+       set_cur_block(header_block);
 
-       add_immBlock_pred(body_block, true_proj);
+       create_condition_evaluation(statement->condition, body_block, false_block);
        mature_immBlock(body_block);
-
-       add_immBlock_pred(false_block, false_proj);
        mature_immBlock(false_block);
+       mature_immBlock(header_block);
 
        set_cur_block(false_block);
 }
 
 static void for_statement_to_firm(for_statement_t *statement)
 {
-       dbg_info *const dbgi = get_dbg_info(&statement->statement.source_position);
-
        ir_node *jmp = NULL;
        if (get_cur_block() != NULL) {
                if(statement->initialisation != NULL) {
@@ -1479,7 +1698,7 @@ static void for_statement_to_firm(for_statement_t *statement)
        if (statement->step != NULL) {
                expression_to_firm(statement->step);
        }
-       ir_node *const step_jmp   = new_Jmp();
+       ir_node *const step_jmp = new_Jmp();
 
        /* create the header block */
        ir_node *const header_block = new_immBlock();
@@ -1488,48 +1707,46 @@ static void for_statement_to_firm(for_statement_t *statement)
        }
        add_immBlock_pred(header_block, step_jmp);
 
-       /* create the condition */
-       ir_node *true_proj;
-       ir_node *false_proj;
-       if (statement->condition != NULL) {
-               ir_node *const condition  = expression_to_modeb(statement->condition);
-               ir_node *const cond       = new_d_Cond(dbgi, condition);
-               true_proj  = new_d_Proj(dbgi, cond, mode_X, pn_Cond_true);
-               false_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_false);
-       } else {
-               keep_alive(header_block);
-               true_proj  = new_Jmp();
-               false_proj = NULL;
-       }
-
        /* the false block */
        ir_node *const false_block = new_immBlock();
-       if (false_proj != NULL) {
-               add_immBlock_pred(false_block, false_proj);
-       }
 
        /* the loop body */
-       ir_node *const body_block = new_immBlock();
-       add_immBlock_pred(body_block, true_proj);
-       mature_immBlock(body_block);
-
-       ir_node *const old_continue_label = continue_label;
-       ir_node *const old_break_label    = break_label;
-       continue_label = step_block;
-       break_label    = false_block;
-
-       statement_to_firm(statement->body);
-
-       assert(continue_label == step_block);
-       assert(break_label    == false_block);
-       continue_label = old_continue_label;
-       break_label    = old_break_label;
+       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) {
+                       ir_node *const jmp = new_Jmp();
+                       add_immBlock_pred(step_block, jmp);
+               }
+       } else {
+               body_block = step_block;
+       }
 
-       if (get_cur_block() != NULL) {
-               ir_node *const jmp = new_Jmp();
-               add_immBlock_pred(step_block, jmp);
+       /* 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);
+               ir_node *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);
@@ -1579,9 +1796,16 @@ static void create_initializer(declaration_t *declaration)
 
 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);
 
-       assert(declaration->declaration_type == DECLARATION_TYPE_UNKNOWN);
+       if(type->type == TYPE_ARRAY
+                       || type->type == TYPE_COMPOUND_STRUCT
+                       || type->type == TYPE_COMPOUND_UNION) {
+               needs_entity = true;
+       }
 
        if(needs_entity) {
                ir_type *frame_type = get_irg_frame_type(current_ir_graph);
@@ -1630,6 +1854,9 @@ static void declaration_statement_to_firm(declaration_statement_t *statement)
 static void create_jump_statement(const statement_t *statement,
                                   ir_node *target_block)
 {
+       if(get_cur_block() == NULL)
+               return;
+
        dbg_info *dbgi = get_dbg_info(&statement->source_position);
        ir_node  *jump = new_d_Jmp(dbgi);
        add_immBlock_pred(target_block, jump);
@@ -1647,10 +1874,11 @@ static void switch_statement_to_firm(const switch_statement_t *statement)
 
        set_cur_block(NULL);
 
-       ir_node *old_switch_cond = current_switch_cond;
-       ir_node *old_break_label = break_label;
-       current_switch_cond      = cond;
-       break_label              = break_block;
+       ir_node *const old_switch_cond       = current_switch_cond;
+       ir_node *const old_break_label       = break_label;
+       const bool     old_saw_default_label = saw_default_label;
+       current_switch_cond                  = cond;
+       break_label                          = break_block;
 
        statement_to_firm(statement->body);
 
@@ -1659,52 +1887,77 @@ static void switch_statement_to_firm(const switch_statement_t *statement)
                add_immBlock_pred(break_block, jmp);
        }
 
+       if (!saw_default_label) {
+               set_cur_block(get_nodes_block(cond));
+               ir_node *const proj = new_d_defaultProj(dbgi, cond,
+                                                       MAGIC_DEFAULT_PN_NUMBER);
+               add_immBlock_pred(break_block, proj);
+       }
+
        assert(current_switch_cond == cond);
        assert(break_label         == break_block);
        current_switch_cond = old_switch_cond;
        break_label         = old_break_label;
+       saw_default_label   = old_saw_default_label;
 
        mature_immBlock(break_block);
        set_cur_block(break_block);
 }
 
+static long fold_constant(const expression_t *expression)
+{
+       ir_graph *old_current_ir_graph = current_ir_graph;
+       current_ir_graph = get_const_code_irg();
+
+       ir_node *cnst = expression_to_firm(expression);
+       if(!is_Const(cnst)) {
+               panic("couldn't fold constantl");
+       }
+       tarval *tv = get_Const_tarval(cnst);
+       if(!tarval_is_long(tv)) {
+               panic("folded constant not an integer");
+       }
+
+       long res = get_tarval_long(tv);
+
+       current_ir_graph = old_current_ir_graph;
+       return res;
+}
+
 static void case_label_to_firm(const case_label_statement_t *statement)
 {
        dbg_info *dbgi = get_dbg_info(&statement->statement.source_position);
 
+       ir_node *const fallthrough = (get_cur_block() == NULL ? NULL : new_Jmp());
+
        /* let's create a node and hope firm constant folding creates a Const
         * node... */
        ir_node *proj;
        set_cur_block(get_nodes_block(current_switch_cond));
        if(statement->expression) {
-               ir_node *cnst = expression_to_firm(statement->expression);
-               if(!is_Const(cnst)) {
-                       panic("couldn't fold constant for case label");
-               }
-               tarval *tv = get_Const_tarval(cnst);
-               if(!mode_is_int(get_tarval_mode(tv))) {
-                       panic("case label not an integer");
-               }
-
-               long pn = get_tarval_long(tv);
+               long pn = fold_constant(statement->expression);
                if(pn == MAGIC_DEFAULT_PN_NUMBER) {
                        /* oops someone detected our cheating... */
                        panic("magic default pn used");
                }
                proj = new_d_Proj(dbgi, current_switch_cond, mode_X, pn);
        } else {
+               saw_default_label = true;
                proj = new_d_defaultProj(dbgi, current_switch_cond,
                                         MAGIC_DEFAULT_PN_NUMBER);
        }
 
        ir_node *block = new_immBlock();
+       if (fallthrough != NULL) {
+               add_immBlock_pred(block, fallthrough);
+       }
        add_immBlock_pred(block, proj);
        mature_immBlock(block);
 }
 
 static ir_node *get_label_block(declaration_t *label)
 {
-       assert(label->namespace == NAMESPACE_LABEL);
+       assert(label->namespc == NAMESPACE_LABEL);
 
        if(label->declaration_type == DECLARATION_TYPE_LABEL_BLOCK) {
                return label->v.block;
@@ -1718,7 +1971,7 @@ static ir_node *get_label_block(declaration_t *label)
        label->declaration_type = DECLARATION_TYPE_LABEL_BLOCK;
        label->v.block          = block;
 
-       ARR_APP1(imature_blocks, block);
+       ARR_APP1(ir_node *, imature_blocks, block);
 
        return block;
 }
@@ -1734,6 +1987,8 @@ static void label_to_firm(const label_statement_t *statement)
 
        set_cur_block(block);
        keep_alive(block);
+
+       statement_to_firm(statement->label_statement);
 }
 
 static void goto_to_firm(const goto_statement_t *statement)
@@ -1799,11 +2054,112 @@ static void statement_to_firm(statement_t *statement)
        panic("Statement not implemented\n");
 }
 
+static int count_local_declarations(const declaration_t *      decl,
+                                    const declaration_t *const end)
+{
+       int count = 0;
+       for (; decl != end; decl = decl->next) {
+               const type_t *type = skip_typeref(decl->type);
+               switch (type->type) {
+                       case TYPE_ATOMIC:
+                       case TYPE_ENUM:
+                       case TYPE_POINTER:
+                               if (!decl->address_taken) ++count;
+                               break;
+
+                       default: break;
+               }
+       }
+       return count;
+}
+
+static int count_decls_in_stmts(const statement_t *stmt)
+{
+       int count = 0;
+       for (; stmt != NULL; stmt = stmt->next) {
+               switch (stmt->type) {
+                       case STATEMENT_DECLARATION: {
+                               const declaration_statement_t *const decl_stmt =
+                                       (const declaration_statement_t*)stmt;
+                               count += count_local_declarations(decl_stmt->declarations_begin,
+                                                                 decl_stmt->declarations_end->next);
+                               break;
+                       }
+
+                       case STATEMENT_COMPOUND: {
+                               const compound_statement_t *const comp =
+                                       (const compound_statement_t*)stmt;
+                               count += count_decls_in_stmts(comp->statements);
+                               break;
+                       }
+
+                       case STATEMENT_IF: {
+                               const if_statement_t *const if_stmt = (const if_statement_t*)stmt;
+                               count += count_decls_in_stmts(if_stmt->true_statement);
+                               count += count_decls_in_stmts(if_stmt->false_statement);
+                               break;
+                       }
+
+                       case STATEMENT_SWITCH: {
+                               const switch_statement_t *const switch_stmt =
+                                       (const switch_statement_t*)stmt;
+                               count += count_decls_in_stmts(switch_stmt->body);
+                               break;
+                       }
+
+                       case STATEMENT_LABEL: {
+                               const label_statement_t *const label_stmt =
+                                       (const label_statement_t*)stmt;
+                               count += count_decls_in_stmts(label_stmt->label_statement);
+                               break;
+                       }
+
+                       case STATEMENT_WHILE: {
+                               const while_statement_t *const while_stmt =
+                                       (const while_statement_t*)stmt;
+                               count += count_decls_in_stmts(while_stmt->body);
+                               break;
+                       }
+
+                       case STATEMENT_DO_WHILE: {
+                               const do_while_statement_t *const do_while_stmt =
+                                       (const do_while_statement_t*)stmt;
+                               count += count_decls_in_stmts(do_while_stmt->body);
+                               break;
+                       }
+
+                       case STATEMENT_FOR: {
+                               const for_statement_t *const for_stmt =
+                                       (const for_statement_t*)stmt;
+                               /* TODO initialisation */
+                               count += count_decls_in_stmts(for_stmt->body);
+                               break;
+                       }
+
+                       case STATEMENT_BREAK:
+                       case STATEMENT_CASE_LABEL:
+                       case STATEMENT_CONTINUE:
+                       case STATEMENT_EXPRESSION:
+                       case STATEMENT_GOTO:
+                       case STATEMENT_INVALID:
+                       case STATEMENT_RETURN:
+                               break;
+               }
+       }
+       return count;
+}
+
 static int get_function_n_local_vars(declaration_t *declaration)
 {
-       (void) declaration;
-       /* TODO */
-       return 30;
+       int count = 0;
+
+       /* count parameters */
+       count += count_local_declarations(declaration->context.declarations, NULL);
+
+       /* count local variables declared in body */
+       count += count_decls_in_stmts(declaration->init.statement);
+
+       return count;
 }
 
 static void initialize_function_parameters(declaration_t *declaration)
@@ -1816,9 +2172,16 @@ static void initialize_function_parameters(declaration_t *declaration)
        declaration_t *parameter = declaration->context.declarations;
        for( ; parameter != NULL; parameter = parameter->next) {
                assert(parameter->declaration_type == DECLARATION_TYPE_UNKNOWN);
+               type_t *type = parameter->type;
+
+               bool needs_entity = parameter->address_taken;
+               if(type->type == TYPE_COMPOUND_STRUCT
+                               || type->type == TYPE_COMPOUND_UNION) {
+                       needs_entity = true;
+               }
 
-               if(parameter->address_taken) {
-                       panic("address take from parameter not implemented yet");
+               if(needs_entity) {
+                       panic("entities for function parameters not implemented yet");
                }
 
                ir_mode *mode = get_ir_mode(parameter->type);
@@ -1938,7 +2301,7 @@ static void context_to_firm(context_t *context)
 {
        declaration_t *declaration = context->declarations;
        for( ; declaration != NULL; declaration = declaration->next) {
-               if(declaration->namespace != NAMESPACE_NORMAL)
+               if(declaration->namespc != NAMESPACE_NORMAL)
                        continue;
                if(declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY
                                || declaration->storage_class == STORAGE_CLASS_TYPEDEF)