Adapted tokens.inc for Cygwin and MinGW
[cparser] / ast2firm.c
index bffaed2..581b983 100644 (file)
@@ -83,6 +83,8 @@ typedef enum declaration_kind_t {
        DECLARATION_KIND_GLOBAL_VARIABLE,
        DECLARATION_KIND_LOCAL_VARIABLE,
        DECLARATION_KIND_LOCAL_VARIABLE_ENTITY,
+       DECLARATION_KIND_PARAMETER,
+       DECLARATION_KIND_PARAMETER_ENTITY,
        DECLARATION_KIND_FUNCTION,
        DECLARATION_KIND_COMPOUND_MEMBER,
        DECLARATION_KIND_INNER_FUNCTION
@@ -110,12 +112,13 @@ static entity_t *next_inner_function(void)
 
 ir_node *uninitialized_local_var(ir_graph *irg, ir_mode *mode, int pos)
 {
-       const variable_t *variable = get_irg_loc_description(irg, pos);
+       const entity_t *entity = get_irg_loc_description(irg, pos);
 
-       if (variable != NULL) {
-               warningf(&variable->base.base.source_position,
-                        "variable '%#T' might be used uninitialized",
-                        variable->base.type, variable->base.base.symbol);
+       if (entity != NULL) {
+               warningf(&entity->base.source_position,
+                        "%s '%#T' might be used uninitialized",
+                        get_entity_kind_name(entity->kind),
+                        entity->declaration.type, entity->base.symbol);
        }
        return new_r_Unknown(irg, mode);
 }
@@ -162,6 +165,7 @@ static ir_mode *init_atomic_ir_mode(atomic_type_kind_t kind)
                ir_mode_sort    sort;
                unsigned        bit_size     = size * 8;
                bool            is_signed    = (flags & ATOMIC_TYPE_FLAG_SIGNED) != 0;
+               unsigned        modulo_shift;
                ir_mode_arithmetic arithmetic;
 
                if (flags & ATOMIC_TYPE_FLAG_INTEGER) {
@@ -170,16 +174,16 @@ static ir_mode *init_atomic_ir_mode(atomic_type_kind_t kind)
                                 bit_size);
                        sort         = irms_int_number;
                        arithmetic   = irma_twos_complement;
+                       modulo_shift = bit_size < machine_size ? machine_size : bit_size;
                } else {
                        assert(flags & ATOMIC_TYPE_FLAG_FLOAT);
                        snprintf(name, sizeof(name), "F%u", bit_size);
                        sort         = irms_float_number;
                        arithmetic   = irma_ieee754;
+                       modulo_shift = 0;
                }
-               /* note: modulo_shift is 0, as in C it's undefined anyway to shift
-                * a too big amount */
                return new_ir_mode(name, sort, bit_size, is_signed, arithmetic,
-                                  0);
+                                  modulo_shift);
        }
 
        return NULL;
@@ -197,7 +201,7 @@ static void init_atomic_modes(void)
        mode_uint = atomic_modes[ATOMIC_TYPE_UINT];
 
        /* there's no real void type in firm */
-       atomic_modes[ATOMIC_TYPE_VOID] = mode_int;
+       atomic_modes[ATOMIC_TYPE_VOID] = atomic_modes[ATOMIC_TYPE_CHAR];
 
        /* initialize pointer modes */
        char            name[64];
@@ -259,6 +263,7 @@ static unsigned get_type_size_const(type_t *type)
                /* just a pointer to the function */
                return get_mode_size_bytes(mode_P_code);
        case TYPE_POINTER:
+       case TYPE_REFERENCE:
                return get_mode_size_bytes(mode_P_data);
        case TYPE_ARRAY:
                return get_array_type_size(&type->array);
@@ -282,7 +287,6 @@ static ir_node *get_type_size(type_t *type)
                ir_node *size_node = type->array.size_node;
                if (size_node == NULL) {
                        size_node = expression_to_firm(type->array.size_expression);
-                       assert(!is_Const(size_node));
                        type->array.size_node = size_node;
                }
 
@@ -438,6 +442,16 @@ static ir_type *create_pointer_type(pointer_type_t *type)
        return ir_type;
 }
 
+static ir_type *create_reference_type(reference_type_t *type)
+{
+       type_t  *refers_to    = type->refers_to;
+       ir_type *ir_refers_to = get_ir_type_incomplete(refers_to);
+       ir_type *ir_type      = new_type_pointer(id_unique("reference.%u"),
+                                                ir_refers_to, mode_P_data);
+
+       return ir_type;
+}
+
 static ir_type *create_array_type(array_type_t *type)
 {
        type_t  *element_type    = type->element_type;
@@ -834,6 +848,9 @@ ir_type *get_ir_type(type_t *type)
        case TYPE_POINTER:
                firm_type = create_pointer_type(&type->pointer);
                break;
+       case TYPE_REFERENCE:
+               firm_type = create_reference_type(&type->reference);
+               break;
        case TYPE_ARRAY:
                firm_type = create_array_type(&type->array);
                break;
@@ -1131,7 +1148,7 @@ static ir_node *const_to_firm(const const_expression_t *cnst)
                tv = new_tarval_from_str(buf, len, mode);
        }
 
-       return new_d_Const(dbgi, mode, tv);
+       return new_d_Const(dbgi, tv);
 }
 
 /**
@@ -1154,7 +1171,7 @@ static ir_node *character_constant_to_firm(const const_expression_t *cnst)
        size_t  len = snprintf(buf, sizeof(buf), "%lld", v);
        tarval *tv = new_tarval_from_str(buf, len, mode);
 
-       return new_d_Const(dbgi, mode, tv);
+       return new_d_Const(dbgi, tv);
 }
 
 /**
@@ -1171,7 +1188,7 @@ static ir_node *wide_character_constant_to_firm(const const_expression_t *cnst)
        size_t  len = snprintf(buf, sizeof(buf), "%lld", v);
        tarval *tv = new_tarval_from_str(buf, len, mode);
 
-       return new_d_Const(dbgi, mode, tv);
+       return new_d_Const(dbgi, tv);
 }
 
 /**
@@ -1303,7 +1320,7 @@ static ir_node *deref_address(dbg_info *const dbgi, type_t *const type,
        ir_node *const load_mem = new_d_Proj(dbgi, load, mode_M, pn_Load_M);
        ir_node *const load_res = new_d_Proj(dbgi, load, mode,   pn_Load_res);
 
-       if (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) {
+       if (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE && !is_Bad(load)) {
                set_Load_volatility(load, volatility_is_volatile);
        }
 
@@ -1341,17 +1358,12 @@ static ir_node *get_global_var_address(dbg_info *const dbgi,
        assert(entity->declaration.kind == DECLARATION_KIND_GLOBAL_VARIABLE);
 
        ir_entity *const irentity = entity->variable.v.entity;
-       switch ((storage_class_tag_t) entity->declaration.storage_class) {
-               case STORAGE_CLASS_THREAD:
-               case STORAGE_CLASS_THREAD_EXTERN:
-               case STORAGE_CLASS_THREAD_STATIC: {
-                       ir_node *const no_mem = new_NoMem();
-                       ir_node *const tls    = get_irg_tls(current_ir_graph);
-                       return new_d_simpleSel(dbgi, no_mem, tls, irentity);
-               }
-
-               default:
-                       return create_symconst(dbgi, mode_P_data, irentity);
+       if (entity->variable.thread_local) {
+               ir_node *const no_mem = new_NoMem();
+               ir_node *const tls    = get_irg_tls(current_ir_graph);
+               return new_d_simpleSel(dbgi, no_mem, tls, irentity);
+       } else {
+               return create_symconst(dbgi, mode_P_data, irentity);
        }
 }
 
@@ -1379,7 +1391,7 @@ static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode)
                return value;
 
        if (dest_mode == mode_b) {
-               ir_node *zero = new_Const(value_mode, get_mode_null(value_mode));
+               ir_node *zero = new_Const(get_mode_null(value_mode));
                ir_node *cmp  = new_d_Cmp(dbgi, value, zero);
                ir_node *proj = new_d_Proj(dbgi, cmp, mode_b, pn_Cmp_Lg);
                return proj;
@@ -1408,8 +1420,7 @@ static ir_node *reference_expression_enum_value_to_firm(
        /* make sure the type is constructed */
        (void) get_ir_type(type);
 
-       ir_mode *const mode = get_ir_mode(type);
-       return new_Const(mode, entity->enum_value.tv);
+       return new_Const(entity->enum_value.tv);
 }
 
 static ir_node *reference_expression_to_firm(const reference_expression_t *ref)
@@ -1430,6 +1441,10 @@ static ir_node *reference_expression_to_firm(const reference_expression_t *ref)
                ir_mode *const mode = get_ir_mode(type);
                return get_value(entity->variable.v.value_number, mode);
        }
+       case DECLARATION_KIND_PARAMETER: {
+               ir_mode *const mode = get_ir_mode(type);
+               return get_value(entity->parameter.v.value_number, mode);
+       }
        case DECLARATION_KIND_FUNCTION: {
                ir_mode *const mode = get_ir_mode(type);
                return create_symconst(dbgi, mode, entity->function.entity);
@@ -1456,6 +1471,12 @@ static ir_node *reference_expression_to_firm(const reference_expression_t *ref)
                ir_node   *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, irentity);
                return deref_address(dbgi, entity->declaration.type, sel);
        }
+       case DECLARATION_KIND_PARAMETER_ENTITY: {
+               ir_entity *irentity = entity->parameter.v.entity;
+               ir_node   *frame    = get_local_frame(irentity);
+               ir_node   *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, irentity);
+               return deref_address(dbgi, entity->declaration.type, sel);
+       }
 
        case DECLARATION_KIND_VARIABLE_LENGTH_ARRAY:
                return entity->variable.v.vla_base;
@@ -1476,6 +1497,7 @@ static ir_node *reference_addr(const reference_expression_t *ref)
        switch((declaration_kind_t) entity->declaration.kind) {
        case DECLARATION_KIND_UNKNOWN:
                break;
+       case DECLARATION_KIND_PARAMETER:
        case DECLARATION_KIND_LOCAL_VARIABLE:
                /* you can store to a local variable (so we don't panic but return NULL
                 * as an indicator for no real address) */
@@ -1491,6 +1513,13 @@ static ir_node *reference_addr(const reference_expression_t *ref)
 
                return sel;
        }
+       case DECLARATION_KIND_PARAMETER_ENTITY: {
+               ir_entity *irentity = entity->parameter.v.entity;
+               ir_node   *frame    = get_local_frame(irentity);
+               ir_node   *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, irentity);
+
+               return sel;
+       }
 
        case DECLARATION_KIND_VARIABLE_LENGTH_ARRAY:
                return entity->variable.v.vla_base;
@@ -1549,7 +1578,7 @@ static ir_node *process_builtin_call(const call_expression_t *call)
        case T___builtin_infl: {
                ir_mode *mode = get_ir_mode(function_type->function.return_type);
                tarval  *tv   = get_mode_infinite(mode);
-               ir_node *res  = new_d_Const(dbgi, mode, tv);
+               ir_node *res  = new_d_Const(dbgi, tv);
                return   res;
        }
        case T___builtin_nan:
@@ -1559,10 +1588,16 @@ static ir_node *process_builtin_call(const call_expression_t *call)
                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);
+               ir_node *res  = new_d_Const(dbgi, tv);
                return res;
        }
+       case T___builtin_expect: {
+               expression_t *argument = call->arguments->expression;
+               return _expression_to_firm(argument);
+       }
        case T___builtin_va_end:
+               /* evaluate the argument of va_end for its side effects */
+               _expression_to_firm(call->arguments->expression);
                return NULL;
        default:
                panic("Unsupported builtin found\n");
@@ -1718,7 +1753,7 @@ static void assign_value(dbg_info *dbgi, ir_node *addr, type_t *type,
        if (is_type_scalar(type)) {
                ir_node  *store     = new_d_Store(dbgi, memory, addr, value);
                ir_node  *store_mem = new_d_Proj(dbgi, store, mode_M, pn_Store_M);
-               if (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE)
+               if (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE && !is_Bad(store))
                        set_Store_volatility(store, volatility_is_volatile);
                set_store(store_mem);
        } else {
@@ -1766,10 +1801,10 @@ static void bitfield_store_to_firm(dbg_info *dbgi,
        int      bitsize      = get_mode_size_bits(get_type_mode(entity_type));
 
        tarval  *mask            = create_bitfield_mask(mode, 0, bitsize);
-       ir_node *mask_node       = new_d_Const(dbgi, mode, mask);
+       ir_node *mask_node       = new_d_Const(dbgi, mask);
        ir_node *value_masked    = new_d_And(dbgi, value, mask_node, mode);
        tarval  *shiftl          = new_tarval_from_long(bitoffset, mode_uint);
-       ir_node *shiftcount      = new_d_Const(dbgi, mode_uint, shiftl);
+       ir_node *shiftcount      = new_d_Const(dbgi, shiftl);
        ir_node *value_maskshift = new_d_Shl(dbgi, value_masked, shiftcount, mode);
 
        /* load current value */
@@ -1779,7 +1814,7 @@ static void bitfield_store_to_firm(dbg_info *dbgi,
        ir_node  *load_res        = new_d_Proj(dbgi, load, mode, pn_Load_res);
        tarval   *shift_mask      = create_bitfield_mask(mode, bitoffset, bitsize);
        tarval   *inv_mask        = tarval_not(shift_mask);
-       ir_node  *inv_mask_node   = new_d_Const(dbgi, mode, inv_mask);
+       ir_node  *inv_mask_node   = new_d_Const(dbgi, inv_mask);
        ir_node  *load_res_masked = new_d_And(dbgi, load_res, inv_mask_node, mode);
 
        /* construct new value and store */
@@ -1789,8 +1824,10 @@ static void bitfield_store_to_firm(dbg_info *dbgi,
        set_store(store_mem);
 
        if (set_volatile) {
-               set_Load_volatility(load, volatility_is_volatile);
-               set_Store_volatility(store, volatility_is_volatile);
+               if (!is_Bad(load))
+                       set_Load_volatility(load, volatility_is_volatile);
+               if (!is_Bad(store))
+                       set_Store_volatility(store, volatility_is_volatile);
        }
 }
 
@@ -1818,13 +1855,13 @@ static ir_node *bitfield_extract_to_firm(const select_expression_t *expression,
        long       shift_bitsl  = machine_size - bitoffset - bitsize;
        assert(shift_bitsl >= 0);
        tarval    *tvl          = new_tarval_from_long(shift_bitsl, mode_uint);
-       ir_node   *countl       = new_d_Const(dbgi, mode_uint, tvl);
+       ir_node   *countl       = new_d_Const(dbgi, tvl);
        ir_node   *shiftl       = new_d_Shl(dbgi, load_res, countl, mode_int);
 
        long       shift_bitsr  = bitoffset + shift_bitsl;
        assert(shift_bitsr <= (long) machine_size);
        tarval    *tvr          = new_tarval_from_long(shift_bitsr, mode_uint);
-       ir_node   *countr       = new_d_Const(dbgi, mode_uint, tvr);
+       ir_node   *countr       = new_d_Const(dbgi, tvr);
        ir_node   *shiftr;
        if (mode_is_signed(mode)) {
                shiftr = new_d_Shrs(dbgi, shiftl, countr, mode_int);
@@ -1860,11 +1897,15 @@ static void set_value_for_expression_addr(const expression_t *expression,
                if (entity->declaration.kind == DECLARATION_KIND_LOCAL_VARIABLE) {
                        set_value(entity->variable.v.value_number, value);
                        return;
+               } else if (entity->declaration.kind == DECLARATION_KIND_PARAMETER) {
+                       set_value(entity->parameter.v.value_number, value);
+                       return;
                }
        }
 
        if (addr == NULL)
                addr = expression_to_addr(expression);
+       assert(addr != NULL);
 
        type_t *type = skip_typeref(expression->base.type);
 
@@ -1900,12 +1941,17 @@ static ir_node *get_value_from_lvalue(const expression_t *expression,
                const reference_expression_t *ref = &expression->reference;
 
                entity_t *entity = ref->entity;
-               assert(entity->kind == ENTITY_VARIABLE);
+               assert(entity->kind == ENTITY_VARIABLE
+                               || entity->kind == ENTITY_PARAMETER);
                assert(entity->declaration.kind != DECLARATION_KIND_UNKNOWN);
                if (entity->declaration.kind == DECLARATION_KIND_LOCAL_VARIABLE) {
                        assert(addr == NULL);
                        ir_mode *mode = get_ir_mode(expression->base.type);
                        return get_value(entity->variable.v.value_number, mode);
+               } else if (entity->declaration.kind == DECLARATION_KIND_PARAMETER) {
+                       assert(addr == NULL);
+                       ir_mode *mode = get_ir_mode(expression->base.type);
+                       return get_value(entity->parameter.v.value_number, mode);
                }
        }
 
@@ -1941,7 +1987,7 @@ static ir_node *create_incdec(const unary_expression_t *expression)
                offset                       = get_type_size(pointer_type->points_to);
        } else {
                assert(is_type_arithmetic(type));
-               offset = new_Const(mode, get_mode_one(mode));
+               offset = new_Const(get_mode_one(mode));
        }
 
        ir_node *result;
@@ -2169,17 +2215,16 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression)
  * produces a 0/1 depending of the value of a mode_b node
  */
 static ir_node *produce_condition_result(const expression_t *expression,
-                                         dbg_info *dbgi)
+                                         ir_mode *mode, dbg_info *dbgi)
 {
-       ir_mode *mode      = get_ir_mode(expression->base.type);
        ir_node *cur_block = get_cur_block();
 
        ir_node *one_block = new_immBlock();
-       ir_node *one       = new_Const(mode, get_mode_one(mode));
+       ir_node *one       = new_Const(get_mode_one(mode));
        ir_node *jmp_one   = new_d_Jmp(dbgi);
 
        ir_node *zero_block = new_immBlock();
-       ir_node *zero       = new_Const(mode, get_mode_null(mode));
+       ir_node *zero       = new_Const(get_mode_null(mode));
        ir_node *jmp_zero   = new_d_Jmp(dbgi);
 
        set_cur_block(cur_block);
@@ -2199,10 +2244,14 @@ static ir_node *produce_condition_result(const expression_t *expression,
 static ir_node *adjust_for_pointer_arithmetic(dbg_info *dbgi,
                ir_node *value, type_t *type)
 {
+       ir_mode        *const mode         = get_ir_mode(type_ptrdiff_t);
+       assert(is_type_pointer(type));
        pointer_type_t *const pointer_type = &type->pointer;
        type_t         *const points_to    = skip_typeref(pointer_type->points_to);
        unsigned              elem_size    = get_type_size_const(points_to);
 
+       value = create_conv(dbgi, value, mode);
+
        /* gcc extension: allow arithmetic with void * and function * */
        if ((elem_size == 0 && is_type_atomic(points_to, ATOMIC_TYPE_VOID)) ||
            is_type_function(points_to))  {
@@ -2213,9 +2262,8 @@ static ir_node *adjust_for_pointer_arithmetic(dbg_info *dbgi,
        if (elem_size == 1)
                return value;
 
-       value = create_conv(dbgi, value, mode_int);
-       ir_node *const cnst = new_Const_long(mode_int, (long)elem_size);
-       ir_node *const mul  = new_d_Mul(dbgi, value, cnst, mode_int);
+       ir_node *const cnst = new_Const_long(mode, (long)elem_size);
+       ir_node *const mul  = new_d_Mul(dbgi, value, cnst, mode);
        return mul;
 }
 
@@ -2274,7 +2322,7 @@ static ir_node *create_op(dbg_info *dbgi, const binary_expression_t *expression,
 
        default:
 normal_node:
-               mode = get_irn_mode(right);
+               mode = get_ir_mode(type_right);
                left = create_conv(dbgi, left, mode);
                break;
        }
@@ -2346,15 +2394,28 @@ static ir_node *create_lazy_op(const binary_expression_t *expression)
                long val = fold_constant(expression->left);
                expression_kind_t ekind = expression->base.kind;
                assert(ekind == EXPR_BINARY_LOGICAL_AND || ekind == EXPR_BINARY_LOGICAL_OR);
-               if ((ekind == EXPR_BINARY_LOGICAL_AND && val != 0) ||
-                   (ekind == EXPR_BINARY_LOGICAL_OR  && val == 0)) {
-                       return expression_to_firm(expression->right);
+               if (ekind == EXPR_BINARY_LOGICAL_AND) {
+                       if (val == 0) {
+                               return new_Const(get_mode_null(mode));
+                       }
                } else {
-                       return new_Const(mode, get_mode_one(mode));
+                       if (val != 0) {
+                               return new_Const(get_mode_one(mode));
+                       }
                }
+
+               if (is_constant_expression(expression->right)) {
+                       long const valr = fold_constant(expression->left);
+                       return valr != 0 ?
+                               new_Const(get_mode_one(mode)) :
+                               new_Const(get_mode_null(mode));
+               }
+
+               return produce_condition_result(expression->right, mode, dbgi);
        }
 
-       return produce_condition_result((const expression_t*) expression, dbgi);
+       return produce_condition_result((const expression_t*) expression, mode,
+                                       dbgi);
 }
 
 typedef ir_node * (*create_arithmetic_func)(dbg_info *dbgi, ir_node *left,
@@ -2445,8 +2506,6 @@ static ir_node *binary_expression_to_firm(const binary_expression_t *expression)
        case EXPR_BINARY_SHIFTLEFT_ASSIGN:
        case EXPR_BINARY_SHIFTRIGHT_ASSIGN:
                return create_assign_binop(expression);
-       case EXPR_BINARY_BUILTIN_EXPECT:
-               return _expression_to_firm(expression->left);
        default:
                panic("TODO binexpr type");
        }
@@ -2454,28 +2513,12 @@ static ir_node *binary_expression_to_firm(const binary_expression_t *expression)
 
 static ir_node *array_access_addr(const array_access_expression_t *expression)
 {
-       dbg_info *dbgi      = get_dbg_info(&expression->base.source_position);
-       ir_node  *base_addr = expression_to_firm(expression->array_ref);
-       ir_node  *offset    = expression_to_firm(expression->index);
-
-       type_t  *offset_type = skip_typeref(expression->index->base.type);
-       ir_mode *mode;
-       if (is_type_signed(offset_type)) {
-               mode = get_ir_mode(type_ssize_t);
-       } else {
-               mode = get_ir_mode(type_size_t);
-       }
-       offset = create_conv(dbgi, offset, mode);
-
-       type_t *ref_type = skip_typeref(expression->array_ref->base.type);
-       assert(is_type_pointer(ref_type));
-       pointer_type_t *pointer_type = &ref_type->pointer;
-
-       ir_node *elem_size_const = get_type_size(pointer_type->points_to);
-       elem_size_const          = create_conv(dbgi, elem_size_const, mode);
-       ir_node *real_offset     = new_d_Mul(dbgi, offset, elem_size_const,
-                                            mode);
-       ir_node *result          = new_d_Add(dbgi, base_addr, real_offset, mode_P_data);
+       dbg_info *dbgi        = get_dbg_info(&expression->base.source_position);
+       ir_node  *base_addr   = expression_to_firm(expression->array_ref);
+       ir_node  *offset      = expression_to_firm(expression->index);
+       type_t   *ref_type    = skip_typeref(expression->array_ref->base.type);
+       ir_node  *real_offset = adjust_for_pointer_arithmetic(dbgi, offset, ref_type);
+       ir_node  *result      = new_d_Add(dbgi, base_addr, real_offset, mode_P_data);
 
        return result;
 }
@@ -2547,7 +2590,7 @@ static ir_node *offsetof_to_firm(const offsetof_expression_t *expression)
        tarval   *tv     = new_tarval_from_long(offset, mode);
        dbg_info *dbgi   = get_dbg_info(&expression->base.source_position);
 
-       return new_d_Const(dbgi, mode, tv);
+       return new_d_Const(dbgi, tv);
 }
 
 static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi,
@@ -2701,8 +2744,7 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression)
                } else {
                        /* Condition ended with a short circuit (&&, ||, !) operation.
                         * Generate a "1" as value for the true branch. */
-                       ir_mode *const mode = mode_Is;
-                       true_val = new_Const(mode, get_mode_one(mode));
+                       true_val = new_Const(get_mode_one(mode_Is));
                }
        }
        mature_immBlock(true_block);
@@ -2738,13 +2780,17 @@ static ir_node *select_addr(const select_expression_t *expression)
        entity_t *entry = expression->compound_entry;
        assert(entry->kind == ENTITY_COMPOUND_MEMBER);
        assert(entry->declaration.kind == DECLARATION_KIND_COMPOUND_MEMBER);
-       ir_entity *irentity = entry->compound_member.entity;
-
-       assert(irentity != NULL);
-
-       ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), compound_addr, irentity);
 
-       return sel;
+       if (constant_folding) {
+               ir_mode *mode = get_irn_mode(compound_addr);
+               /* FIXME: here, we need an integer mode with the same number of bits as mode */
+               ir_node *ofs  = new_Const_long(mode_uint, entry->compound_member.offset);
+               return new_d_Add(dbgi, compound_addr, ofs, mode);
+       } else {
+               ir_entity *irentity = entry->compound_member.entity;
+               assert(irentity != NULL);
+               return new_d_simpleSel(dbgi, new_NoMem(), compound_addr, irentity);
+       }
 }
 
 static ir_node *select_to_firm(const select_expression_t *expression)
@@ -2793,75 +2839,82 @@ typedef enum gcc_type_class
 
 static ir_node *classify_type_to_firm(const classify_type_expression_t *const expr)
 {
-       const type_t *const type = skip_typeref(expr->type_expression->base.type);
+       type_t *type = expr->type_expression->base.type;
 
+       /* FIXME gcc returns different values depending on whether compiling C or C++
+        * e.g. int x[10] is pointer_type_class in C, but array_type_class in C++ */
        gcc_type_class tc;
-       switch (type->kind)
-       {
-               case TYPE_ATOMIC: {
-                       const atomic_type_t *const atomic_type = &type->atomic;
-                       switch (atomic_type->akind) {
-                               /* should not be reached */
-                               case ATOMIC_TYPE_INVALID:
-                                       tc = no_type_class;
-                                       goto make_const;
-
-                               /* gcc cannot do that */
-                               case ATOMIC_TYPE_VOID:
-                                       tc = void_type_class;
-                                       goto make_const;
-
-                               case ATOMIC_TYPE_CHAR:      /* gcc handles this as integer */
-                               case ATOMIC_TYPE_SCHAR:     /* gcc handles this as integer */
-                               case ATOMIC_TYPE_UCHAR:     /* gcc handles this as integer */
-                               case ATOMIC_TYPE_SHORT:
-                               case ATOMIC_TYPE_USHORT:
-                               case ATOMIC_TYPE_INT:
-                               case ATOMIC_TYPE_UINT:
-                               case ATOMIC_TYPE_LONG:
-                               case ATOMIC_TYPE_ULONG:
-                               case ATOMIC_TYPE_LONGLONG:
-                               case ATOMIC_TYPE_ULONGLONG:
-                               case ATOMIC_TYPE_BOOL:      /* gcc handles this as integer */
-                                       tc = integer_type_class;
-                                       goto make_const;
-
-                               case ATOMIC_TYPE_FLOAT:
-                               case ATOMIC_TYPE_DOUBLE:
-                               case ATOMIC_TYPE_LONG_DOUBLE:
-                                       tc = real_type_class;
-                                       goto make_const;
+       for (;;) {
+               type = skip_typeref(type);
+               switch (type->kind) {
+                       case TYPE_ATOMIC: {
+                               const atomic_type_t *const atomic_type = &type->atomic;
+                               switch (atomic_type->akind) {
+                                       /* should not be reached */
+                                       case ATOMIC_TYPE_INVALID:
+                                               tc = no_type_class;
+                                               goto make_const;
+
+                                       /* gcc cannot do that */
+                                       case ATOMIC_TYPE_VOID:
+                                               tc = void_type_class;
+                                               goto make_const;
+
+                                       case ATOMIC_TYPE_WCHAR_T:   /* 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:
+                                       case ATOMIC_TYPE_UINT:
+                                       case ATOMIC_TYPE_LONG:
+                                       case ATOMIC_TYPE_ULONG:
+                                       case ATOMIC_TYPE_LONGLONG:
+                                       case ATOMIC_TYPE_ULONGLONG:
+                                       case ATOMIC_TYPE_BOOL:      /* gcc handles this as integer */
+                                               tc = integer_type_class;
+                                               goto make_const;
+
+                                       case ATOMIC_TYPE_FLOAT:
+                                       case ATOMIC_TYPE_DOUBLE:
+                                       case ATOMIC_TYPE_LONG_DOUBLE:
+                                               tc = real_type_class;
+                                               goto make_const;
+                               }
+                               panic("Unexpected atomic type in classify_type_to_firm().");
                        }
-                       panic("Unexpected atomic type in classify_type_to_firm().");
-               }
 
-               case TYPE_COMPLEX:         tc = complex_type_class; goto make_const;
-               case TYPE_IMAGINARY:       tc = complex_type_class; goto make_const;
-               case TYPE_BITFIELD:        tc = integer_type_class; goto make_const;
-               case TYPE_ARRAY:           /* gcc handles this as pointer */
-               case TYPE_FUNCTION:        /* gcc handles this as pointer */
-               case TYPE_POINTER:         tc = pointer_type_class; goto make_const;
-               case TYPE_COMPOUND_STRUCT: tc = record_type_class;  goto make_const;
-               case TYPE_COMPOUND_UNION:  tc = union_type_class;   goto make_const;
-
-               /* gcc handles this as integer */
-               case TYPE_ENUM:            tc = integer_type_class; goto make_const;
-
-               case TYPE_BUILTIN:
-               /* typedef/typeof should be skipped already */
-               case TYPE_TYPEDEF:
-               case TYPE_TYPEOF:
-               case TYPE_INVALID:
-               case TYPE_ERROR:
-                       break;
+                       case TYPE_COMPLEX:         tc = complex_type_class; goto make_const;
+                       case TYPE_IMAGINARY:       tc = complex_type_class; goto make_const;
+                       case TYPE_BITFIELD:        tc = integer_type_class; goto make_const;
+                       case TYPE_ARRAY:           /* gcc handles this as pointer */
+                       case TYPE_FUNCTION:        /* gcc handles this as pointer */
+                       case TYPE_POINTER:         tc = pointer_type_class; goto make_const;
+                       case TYPE_COMPOUND_STRUCT: tc = record_type_class;  goto make_const;
+                       case TYPE_COMPOUND_UNION:  tc = union_type_class;   goto make_const;
+
+                       /* gcc handles this as integer */
+                       case TYPE_ENUM:            tc = integer_type_class; goto make_const;
+
+                       /* gcc classifies the referenced type */
+                       case TYPE_REFERENCE: type = type->reference.refers_to; continue;
+
+                       case TYPE_BUILTIN:
+                       /* typedef/typeof should be skipped already */
+                       case TYPE_TYPEDEF:
+                       case TYPE_TYPEOF:
+                       case TYPE_INVALID:
+                       case TYPE_ERROR:
+                               break;
+               }
+               panic("unexpected TYPE classify_type_to_firm().");
        }
-       panic("unexpected TYPE classify_type_to_firm().");
 
-make_const: ;
+make_const:;
        dbg_info *const dbgi = get_dbg_info(&expr->base.source_position);
-       ir_mode  *const mode = mode_int;
-       tarval   *const tv   = new_tarval_from_long(tc, mode);
-       return new_d_Const(dbgi, mode, tv);
+       tarval   *const tv   = new_tarval_from_long(tc, mode_int);
+       return new_d_Const(dbgi, tv);
 }
 
 static ir_node *function_name_to_firm(
@@ -2948,17 +3001,18 @@ static ir_node *dereference_addr(const unary_expression_t *const expression)
 static ir_node *expression_to_addr(const expression_t *expression)
 {
        switch(expression->kind) {
-       case EXPR_REFERENCE:
-               return reference_addr(&expression->reference);
        case EXPR_ARRAY_ACCESS:
                return array_access_addr(&expression->array_access);
-       case EXPR_SELECT:
-               return select_addr(&expression->select);
        case EXPR_CALL:
                return call_expression_to_firm(&expression->call);
-       case EXPR_UNARY_DEREFERENCE: {
+       case EXPR_COMPOUND_LITERAL:
+               return compound_literal_to_firm(&expression->compound_literal);
+       case EXPR_REFERENCE:
+               return reference_addr(&expression->reference);
+       case EXPR_SELECT:
+               return select_addr(&expression->select);
+       case EXPR_UNARY_DEREFERENCE:
                return dereference_addr(&expression->unary);
-       }
        default:
                break;
        }
@@ -3029,6 +3083,23 @@ static ir_node *label_address_to_firm(
        return new_SymConst(mode_P_code, value, symconst_label);
 }
 
+static ir_node *builtin_symbol_to_firm(
+               const builtin_symbol_expression_t *expression)
+{
+       /* for gcc compatibility we have to produce (dummy) addresses for some
+        * builtins */
+       if (warning.other) {
+               warningf(&expression->base.source_position,
+                                "taking address of builtin '%Y'", expression->symbol);
+       }
+
+       /* simply create a NULL pointer */
+       ir_mode  *mode = get_ir_mode(type_void_ptr);
+       ir_node  *res  = new_Const_long(mode, 0);
+
+       return res;
+}
+
 /**
  * creates firm nodes for an expression. The difference between this function
  * and expression_to_firm is, that this version might produce mode_b nodes
@@ -3085,7 +3156,7 @@ static ir_node *_expression_to_firm(const expression_t *expression)
        case EXPR_VA_ARG:
                return va_arg_expression_to_firm(&expression->va_arge);
        case EXPR_BUILTIN_SYMBOL:
-               panic("unimplemented expression found");
+               return builtin_symbol_to_firm(&expression->builtin_symbol);
        case EXPR_BUILTIN_CONSTANT_P:
                return builtin_constant_to_firm(&expression->builtin_constant);
        case EXPR_BUILTIN_PREFETCH:
@@ -3104,6 +3175,20 @@ static ir_node *_expression_to_firm(const expression_t *expression)
        panic("invalid expression found");
 }
 
+static bool is_builtin_expect(const expression_t *expression)
+{
+       if (expression->kind != EXPR_CALL)
+               return false;
+
+       expression_t *function = expression->call.function;
+       if (function->kind != EXPR_BUILTIN_SYMBOL)
+               return false;
+       if (function->builtin_symbol.symbol->ID != T___builtin_expect)
+               return false;
+
+       return true;
+}
+
 static bool produces_mode_b(const expression_t *expression)
 {
        switch (expression->kind) {
@@ -3122,8 +3207,12 @@ static bool produces_mode_b(const expression_t *expression)
        case EXPR_UNARY_NOT:
                return true;
 
-       case EXPR_BINARY_BUILTIN_EXPECT:
-               return produces_mode_b(expression->binary.left);
+       case EXPR_CALL:
+               if (is_builtin_expect(expression)) {
+                       expression_t *argument = expression->call.arguments->expression;
+                       return produces_mode_b(argument);
+               }
+               return false;
        case EXPR_BINARY_COMMA:
                return produces_mode_b(expression->binary.right);
 
@@ -3153,7 +3242,8 @@ static ir_node *expression_to_firm(const expression_t *expression)
 
        /* we have to produce a 0/1 from the mode_b expression */
        dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
-       return produce_condition_result(expression, dbgi);
+       ir_mode  *mode = get_ir_mode(expression->base.type);
+       return produce_condition_result(expression, mode, dbgi);
 }
 
 /**
@@ -3211,22 +3301,23 @@ static ir_node *create_condition_evaluation(const expression_t *expression,
        ir_node  *false_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_false);
 
        /* set branch prediction info based on __builtin_expect */
-       if (expression->kind == EXPR_BINARY_BUILTIN_EXPECT) {
-               long               cnst = fold_constant(expression->binary.right);
-               cond_jmp_predicate pred;
-
-               if (cnst == 0) {
-                       pred = COND_JMP_PRED_FALSE;
-               } else {
-                       pred = COND_JMP_PRED_TRUE;
+       if (is_builtin_expect(expression)) {
+               call_argument_t *argument = expression->call.arguments->next;
+               if (is_constant_expression(argument->expression)) {
+                       long               cnst = fold_constant(argument->expression);
+                       cond_jmp_predicate pred;
+
+                       if (cnst == 0) {
+                               pred = COND_JMP_PRED_FALSE;
+                       } else {
+                               pred = COND_JMP_PRED_TRUE;
+                       }
+                       set_Cond_jmp_pred(cond, pred);
                }
-               set_Cond_jmp_pred(cond, pred);
        }
 
        add_immBlock_pred(true_block, true_proj);
-       if (false_block != NULL) {
-               add_immBlock_pred(false_block, false_proj);
-       }
+       add_immBlock_pred(false_block, false_proj);
 
        set_cur_block(NULL);
        return cond_expr;
@@ -3463,7 +3554,6 @@ static void advance_current_object(type_path_t *path)
        if (path->invalid) {
                /* TODO: handle this... */
                panic("invalid initializer in ast2firm (excessive elements)");
-               return;
        }
 
        type_path_entry_t *top = get_type_path_top(path);
@@ -3678,7 +3768,7 @@ static void create_dynamic_null_initializer(ir_type *type, dbg_info *dbgi,
        if (is_atomic_type(type)) {
                ir_mode *mode = get_type_mode(type);
                tarval  *zero = get_mode_null(mode);
-               ir_node *cnst = new_d_Const(dbgi, mode, zero);
+               ir_node *cnst = new_d_Const(dbgi, zero);
 
                /* TODO: bitfields */
                ir_node *mem    = get_store();
@@ -3702,7 +3792,7 @@ static void create_dynamic_null_initializer(ir_type *type, dbg_info *dbgi,
                        if (is_Array_type(type)) {
                                ir_entity *entity   = get_array_element_entity(type);
                                tarval    *index_tv = new_tarval_from_long(i, mode_uint);
-                               ir_node   *cnst     = new_d_Const(dbgi, mode_uint, index_tv);
+                               ir_node   *cnst     = new_d_Const(dbgi, index_tv);
                                ir_node   *in[1]    = { cnst };
                                irtype = get_array_element_type(type);
                                addr   = new_d_Sel(dbgi, new_NoMem(), base_addr, 1, in, entity);
@@ -3748,7 +3838,7 @@ static void create_dynamic_initializer_sub(ir_initializer_t *initializer,
        case IR_INITIALIZER_TARVAL: {
                tarval  *tv       = get_initializer_tarval_value(initializer);
                ir_mode *mode     = get_tarval_mode(tv);
-               ir_node *cnst     = new_d_Const(dbgi, mode, tv);
+               ir_node *cnst     = new_d_Const(dbgi, tv);
                ir_type *ent_type = get_entity_type(entity);
 
                /* is it a bitfield type? */
@@ -3785,7 +3875,7 @@ static void create_dynamic_initializer_sub(ir_initializer_t *initializer,
                        ir_entity *sub_entity;
                        if (is_Array_type(type)) {
                                tarval    *index_tv = new_tarval_from_long(i, mode_uint);
-                               ir_node   *cnst     = new_d_Const(dbgi, mode_uint, index_tv);
+                               ir_node   *cnst     = new_d_Const(dbgi, index_tv);
                                ir_node   *in[1]    = { cnst };
                                irtype     = get_array_element_type(type);
                                sub_entity = get_array_element_entity(type);
@@ -4006,7 +4096,7 @@ static void create_local_variable(entity_t *entity)
                entity->declaration.kind        = DECLARATION_KIND_LOCAL_VARIABLE;
                entity->variable.v.value_number = next_value_number_function;
                set_irg_loc_description(current_ir_graph, next_value_number_function,
-                                       (variable_t*) &entity->variable);
+                                       entity);
                ++next_value_number_function;
        }
 }
@@ -4016,17 +4106,18 @@ static void create_local_static_variable(entity_t *entity)
        assert(entity->kind == ENTITY_VARIABLE);
        assert(entity->declaration.kind == DECLARATION_KIND_UNKNOWN);
 
-       type_t    *const type        = skip_typeref(entity->declaration.type);
-       ir_type   *const global_type = get_glob_type();
-       ir_type   *const irtype      = get_ir_type(type);
-       dbg_info  *const dbgi        = get_dbg_info(&entity->base.source_position);
+       type_t    *const type     = skip_typeref(entity->declaration.type);
+       ir_type   *const var_type = entity->variable.thread_local ?
+               get_tls_type() : get_glob_type();
+       ir_type   *const irtype   = get_ir_type(type);
+       dbg_info  *const dbgi     = get_dbg_info(&entity->base.source_position);
 
        size_t l = strlen(entity->base.symbol->string);
        char   buf[l + sizeof(".%u")];
        snprintf(buf, sizeof(buf), "%s.%%u", entity->base.symbol->string);
        ident     *const id = id_unique(buf);
 
-       ir_entity *const irentity = new_d_entity(global_type, id, irtype, dbgi);
+       ir_entity *const irentity = new_d_entity(var_type, id, irtype, dbgi);
 
        if (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) {
                set_entity_volatility(irentity, volatility_is_volatile);
@@ -4037,7 +4128,8 @@ static void create_local_static_variable(entity_t *entity)
        set_entity_ld_ident(irentity, id);
        set_entity_variability(irentity, variability_uninitialized);
        set_entity_visibility(irentity, visibility_local);
-       set_entity_allocation(irentity, allocation_static);
+       set_entity_allocation(irentity, entity->variable.thread_local ?
+               allocation_automatic : allocation_static);
 
        ir_graph *const old_current_ir_graph = current_ir_graph;
        current_ir_graph = get_const_code_irg();
@@ -4133,63 +4225,20 @@ static void create_global_variable(entity_t *entity)
 {
        assert(entity->kind == ENTITY_VARIABLE);
 
-       ir_visibility  vis;
-       ir_type       *var_type;
-       switch ((storage_class_tag_t) entity->declaration.storage_class) {
-               case STORAGE_CLASS_STATIC:
-                       vis = visibility_local;
-                       goto global_var;
-
-               case STORAGE_CLASS_EXTERN:
-                       vis = visibility_external_allocated;
-                       goto global_var;
-
-               case STORAGE_CLASS_NONE:
-                       vis = visibility_external_visible;
-                       goto global_var;
-
-               case STORAGE_CLASS_THREAD:
-                       vis = visibility_external_visible;
-                       goto tls_var;
-
-               case STORAGE_CLASS_THREAD_EXTERN:
-                       vis = visibility_external_allocated;
-                       goto tls_var;
-
-               case STORAGE_CLASS_THREAD_STATIC:
-                       vis = visibility_local;
-                       goto tls_var;
-
-tls_var:
-                       var_type = get_tls_type();
-                       goto create_var;
-
-global_var:
-                       var_type = get_glob_type();
-                       goto create_var;
-
-create_var:
-                       create_variable_entity(entity,
-                                              DECLARATION_KIND_GLOBAL_VARIABLE,
-                                              var_type);
-                       /* Matze: I'm confused, shouldn't we only be here when creating
-                        * variables? */
-#if 0
-                       if (!is_type_function(skip_typeref(entity->declaration.type))) {
-                               set_entity_visibility(declaration->v.entity, vis);
-                       }
-#else
-                       set_entity_visibility(entity->variable.v.entity, vis);
-#endif
-
-                       return;
+       ir_visibility vis;
+       switch ((storage_class_tag_t)entity->declaration.storage_class) {
+               case STORAGE_CLASS_STATIC: vis = visibility_local;              break;
+               case STORAGE_CLASS_EXTERN: vis = visibility_external_allocated; break;
+               case STORAGE_CLASS_NONE:   vis = visibility_external_visible;   break;
 
-               case STORAGE_CLASS_TYPEDEF:
-               case STORAGE_CLASS_AUTO:
-               case STORAGE_CLASS_REGISTER:
-                       break;
+               default: panic("Invalid storage class for global variable");
        }
-       panic("Invalid storage class for global variable");
+
+       ir_type *var_type = entity->variable.thread_local ?
+               get_tls_type() : get_glob_type();
+       create_variable_entity(entity,
+                       DECLARATION_KIND_GLOBAL_VARIABLE, var_type);
+       set_entity_visibility(entity->variable.v.entity, vis);
 }
 
 static void create_local_declaration(entity_t *entity)
@@ -4231,9 +4280,6 @@ static void create_local_declaration(entity_t *entity)
                }
                return;
        case STORAGE_CLASS_TYPEDEF:
-       case STORAGE_CLASS_THREAD:
-       case STORAGE_CLASS_THREAD_EXTERN:
-       case STORAGE_CLASS_THREAD_STATIC:
                break;
        }
        panic("invalid storage class found");
@@ -4260,6 +4306,10 @@ static void initialize_local_declaration(entity_t *entity)
        case DECLARATION_KIND_INNER_FUNCTION:
                return;
 
+       case DECLARATION_KIND_PARAMETER:
+       case DECLARATION_KIND_PARAMETER_ENTITY:
+               panic("can't initialize parameters");
+
        case DECLARATION_KIND_UNKNOWN:
                panic("can't initialize unknown declaration");
        }
@@ -4268,12 +4318,15 @@ static void initialize_local_declaration(entity_t *entity)
 
 static void declaration_statement_to_firm(declaration_statement_t *statement)
 {
-       entity_t *entity = statement->declarations_begin;
-       entity_t *end    = statement->declarations_end->base.next;
-       for ( ; entity != end; entity = entity->base.next) {
-               if (!is_declaration(entity))
-                       continue;
-               initialize_local_declaration(entity);
+       entity_t *      entity = statement->declarations_begin;
+       entity_t *const last   = statement->declarations_end;
+       if (entity != NULL) {
+               for ( ;; entity = entity->base.next) {
+                       if (is_declaration(entity))
+                               initialize_local_declaration(entity);
+                       if (entity == last)
+                               break;
+               }
        }
 }
 
@@ -4444,9 +4497,7 @@ static void do_while_statement_to_firm(do_while_statement_t *statement)
        create_condition_evaluation(statement->condition, body_block, false_block);
        mature_immBlock(body_block);
        mature_immBlock(header_block);
-       if (false_block != NULL) {
-               mature_immBlock(false_block);
-       }
+       mature_immBlock(false_block);
 
        set_cur_block(false_block);
 }
@@ -4499,7 +4550,7 @@ static void for_statement_to_firm(for_statement_t *statement)
        ir_node *const false_block = new_immBlock();
 
        /* the loop body */
-       ir_node * body_block;
+       ir_node *body_block;
        if (statement->body != NULL) {
                ir_node *const old_continue_label = continue_label;
                ir_node *const old_break_label    = break_label;
@@ -4806,9 +4857,8 @@ static void asm_statement_to_firm(const asm_statement_t *statement)
                        = be_parse_asm_constraints(constraints);
 
                if (asm_flags & ASM_CONSTRAINT_FLAG_NO_SUPPORT) {
-                       errorf(&statement->base.source_position,
+                       warningf(&statement->base.source_position,
                               "some constraints in '%s' are not supported", constraints);
-                       continue;
                }
                if (asm_flags & ASM_CONSTRAINT_FLAG_INVALID) {
                        errorf(&statement->base.source_position,
@@ -5011,7 +5061,6 @@ static void statement_to_firm(statement_t *statement)
        switch (statement->kind) {
        case STATEMENT_INVALID:
                panic("invalid statement found");
-               return;
        case STATEMENT_EMPTY:
                /* nothing */
                return;
@@ -5075,16 +5124,28 @@ static void statement_to_firm(statement_t *statement)
 }
 
 static int count_local_variables(const entity_t *entity,
-                                 const entity_t *const end)
+                                 const entity_t *const last)
 {
        int count = 0;
-       for (; entity != end; entity = entity->base.next) {
-               if (entity->kind != ENTITY_VARIABLE)
+       for (; entity != NULL; entity = entity->base.next) {
+               type_t *type;
+               bool    address_taken;
+
+               if (entity->kind == ENTITY_VARIABLE) {
+                       type          = skip_typeref(entity->declaration.type);
+                       address_taken = entity->variable.address_taken;
+               } else if (entity->kind == ENTITY_PARAMETER) {
+                       type          = skip_typeref(entity->declaration.type);
+                       address_taken = entity->parameter.address_taken;
+               } else {
                        continue;
-               type_t *type = skip_typeref(entity->declaration.type);
+               }
 
-               if (!entity->variable.address_taken && is_type_scalar(type))
+               if (!address_taken && is_type_scalar(type))
                        ++count;
+
+               if (entity == last)
+                       break;
        }
        return count;
 }
@@ -5097,7 +5158,7 @@ static void count_local_variables_in_stmt(statement_t *stmt, void *const env)
        case STATEMENT_DECLARATION: {
                const declaration_statement_t *const decl_stmt = &stmt->declaration;
                *count += count_local_variables(decl_stmt->declarations_begin,
-                                                                               decl_stmt->declarations_end->base.next);
+                               decl_stmt->declarations_end);
                break;
        }
 
@@ -5134,11 +5195,11 @@ static void initialize_function_parameters(entity_t *entity)
        int       n         = 0;
        entity_t *parameter = entity->function.parameters.entities;
        for ( ; parameter != NULL; parameter = parameter->base.next, ++n) {
-               assert(parameter->kind == ENTITY_VARIABLE);
+               assert(parameter->kind == ENTITY_PARAMETER);
                assert(parameter->declaration.kind == DECLARATION_KIND_UNKNOWN);
                type_t *type = skip_typeref(parameter->declaration.type);
 
-               bool needs_entity = parameter->variable.address_taken;
+               bool needs_entity = parameter->parameter.address_taken;
                assert(!is_type_array(type));
                if (is_type_compound(type)) {
                        needs_entity = true;
@@ -5150,8 +5211,8 @@ static void initialize_function_parameters(entity_t *entity)
                        set_entity_ident(entity, id);
 
                        parameter->declaration.kind
-                               = DECLARATION_KIND_LOCAL_VARIABLE_ENTITY;
-                       parameter->variable.v.entity = entity;
+                               = DECLARATION_KIND_PARAMETER_ENTITY;
+                       parameter->parameter.v.entity = entity;
                        continue;
                }
 
@@ -5165,13 +5226,13 @@ static void initialize_function_parameters(entity_t *entity)
                value = create_conv(NULL, value, mode);
                value = do_strict_conv(NULL, value);
 
-               parameter->declaration.kind        = DECLARATION_KIND_LOCAL_VARIABLE;
-               parameter->variable.v.value_number = next_value_number_function;
+               parameter->declaration.kind         = DECLARATION_KIND_PARAMETER;
+               parameter->parameter.v.value_number = next_value_number_function;
                set_irg_loc_description(current_ir_graph, next_value_number_function,
-                                       (variable_t*) &parameter->variable);
+                                       parameter);
                ++next_value_number_function;
 
-               set_value(parameter->variable.v.value_number, value);
+               set_value(parameter->parameter.v.value_number, value);
        }
 }
 
@@ -5312,7 +5373,7 @@ static void create_function(entity_t *entity)
                        ir_node *in[1];
                        /* ยง5.1.2.2.3 main implicitly returns 0 */
                        if (is_main(entity)) {
-                               in[0] = new_Const(mode, get_mode_null(mode));
+                               in[0] = new_Const(get_mode_null(mode));
                        } else {
                                in[0] = new_Unknown(mode);
                        }