X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast2firm.c;h=75b674c7824142952b4dde66fe71dbac02c67e6e;hb=23ebb996cbe0f5d2c74184d1cfb783cb2a529a13;hp=4394f5d380a8944cdc24e7e7da2c76554c7def6a;hpb=e148abb62889e5c132d1686ab5bdcf3d3c5a8c18;p=cparser diff --git a/ast2firm.c b/ast2firm.c index 4394f5d..75b674c 100644 --- a/ast2firm.c +++ b/ast2firm.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -64,8 +65,6 @@ static const backend_params *be_params; static ir_type *ir_type_char; static ir_type *ir_type_const_char; static ir_type *ir_type_wchar_t; -static ir_type *ir_type_void; -static ir_type *ir_type_int; /* architecture specific floating point arithmetic mode (if any) */ static ir_mode *mode_float_arithmetic; @@ -76,7 +75,7 @@ static unsigned stack_param_align; static int next_value_number_function; static ir_node *continue_label; static ir_node *break_label; -static ir_node *current_switch_cond; +static ir_node *current_switch; static bool saw_default_label; static label_t **all_labels; static entity_t **inner_functions; @@ -86,7 +85,6 @@ static bool constant_folding; static const entity_t *current_function_entity; static ir_node *current_function_name; static ir_node *current_funcsig; -static switch_statement_t *current_switch; static ir_graph *current_function; static translation_unit_t *current_translation_unit; static trampoline_region *current_trampolines; @@ -111,8 +109,6 @@ typedef enum declaration_kind_t { DECLARATION_KIND_INNER_FUNCTION } declaration_kind_t; -static ir_mode *get_ir_mode_storage(type_t *type); - static ir_type *get_ir_type_incomplete(type_t *type); static void enqueue_inner_function(entity_t *entity) @@ -133,14 +129,14 @@ static ir_node *uninitialized_local_var(ir_graph *irg, ir_mode *mode, int pos) return new_r_Unknown(irg, mode); } -static const char *dbg_retrieve(const dbg_info *dbg, unsigned *line) +static src_loc_t dbg_retrieve(const dbg_info *dbg) { - const source_position_t *pos = (const source_position_t*) dbg; - if (pos == NULL) - return NULL; - if (line != NULL) - *line = pos->lineno; - return pos->input_name; + source_position_t const *const pos = (source_position_t const*)dbg; + if (pos) { + return (src_loc_t){ pos->input_name, pos->lineno, pos->colno }; + } else { + return (src_loc_t){ NULL, 0, 0 }; + } } static dbg_info *get_dbg_info(const source_position_t *pos) @@ -175,9 +171,7 @@ static void set_unreachable_now(void) set_cur_block(NULL); } -static ir_mode *atomic_modes[ATOMIC_TYPE_LAST+1]; - -static ir_mode *mode_int, *mode_uint; +ir_mode *atomic_modes[ATOMIC_TYPE_LAST+1]; static ir_node *_expression_to_firm(const expression_t *expression); static ir_node *expression_to_firm(const expression_t *expression); @@ -196,30 +190,24 @@ static ir_mode *init_atomic_ir_mode(atomic_type_kind_t kind) { unsigned flags = get_atomic_type_flags(kind); unsigned size = get_atomic_type_size(kind); - if ( (flags & (ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_FLOAT)) - && !(flags & ATOMIC_TYPE_FLAG_COMPLEX)) { + if ((flags & ATOMIC_TYPE_FLAG_FLOAT) + && !(flags & ATOMIC_TYPE_FLAG_COMPLEX)) { + if (size == 4) { + return get_modeF(); + } else if (size == 8) { + return get_modeD(); + } else { + panic("unexpected kind"); + } + } else if (flags & ATOMIC_TYPE_FLAG_INTEGER) { char name[64]; - ir_mode_sort sort; unsigned bit_size = size * 8; bool is_signed = (flags & ATOMIC_TYPE_FLAG_SIGNED) != 0; - unsigned modulo_shift = 0; - ir_mode_arithmetic arithmetic; - - if (flags & ATOMIC_TYPE_FLAG_INTEGER) { - assert(! (flags & ATOMIC_TYPE_FLAG_FLOAT)); - snprintf(name, sizeof(name), "%s%u", is_signed ? "I" : "U", - bit_size); - sort = irms_int_number; - arithmetic = irma_twos_complement; - modulo_shift = decide_modulo_shift(bit_size); - } else { - assert(flags & ATOMIC_TYPE_FLAG_FLOAT); - snprintf(name, sizeof(name), "F%u", bit_size); - sort = irms_float_number; - arithmetic = irma_ieee754; - } - return new_ir_mode(name, sort, bit_size, is_signed, arithmetic, - modulo_shift); + unsigned modulo_shift = decide_modulo_shift(bit_size); + + snprintf(name, sizeof(name), "%s%u", is_signed ? "I" : "U", bit_size); + return new_int_mode(name, irma_twos_complement, bit_size, is_signed, + modulo_shift); } return NULL; @@ -230,14 +218,12 @@ static ir_mode *init_atomic_ir_mode(atomic_type_kind_t kind) */ static void init_atomic_modes(void) { + atomic_modes[ATOMIC_TYPE_VOID] = mode_ANY; for (int i = 0; i <= ATOMIC_TYPE_LAST; ++i) { + if (atomic_modes[i] != NULL) + continue; atomic_modes[i] = init_atomic_ir_mode((atomic_type_kind_t) i); } - mode_int = atomic_modes[ATOMIC_TYPE_INT]; - mode_uint = atomic_modes[ATOMIC_TYPE_UINT]; - - /* there's no real void type in firm */ - atomic_modes[ATOMIC_TYPE_VOID] = atomic_modes[ATOMIC_TYPE_CHAR]; } ir_mode *get_atomic_mode(atomic_type_kind_t kind) @@ -256,27 +242,6 @@ static ir_node *get_vla_size(array_type_t *const type) return size_node; } -/** - * Return a node representing the size of a type. - */ -static ir_node *get_type_size_node(type_t *type) -{ - type = skip_typeref(type); - - if (is_type_array(type) && type->array.is_vla) { - ir_node *size_node = get_vla_size(&type->array); - ir_node *elem_size = get_type_size_node(type->array.element_type); - ir_mode *mode = get_irn_mode(size_node); - ir_node *real_size = new_d_Mul(NULL, size_node, elem_size, mode); - return real_size; - } - - ir_mode *mode = get_ir_mode_storage(type_size_t); - symconst_symbol sym; - sym.type_p = get_ir_type(type); - return new_SymConst(mode, sym, symconst_type_size); -} - static unsigned count_parameters(const function_type_t *function_type) { unsigned count = 0; @@ -299,6 +264,7 @@ static ir_type *create_atomic_type(atomic_type_kind_t akind, const type_t *type) ir_type *irtype = new_d_type_primitive(mode, dbgi); il_alignment_t alignment = get_atomic_type_alignment(akind); + set_type_size_bytes(irtype, get_atomic_type_size(akind)); set_type_alignment_bytes(irtype, alignment); return irtype; @@ -349,11 +315,11 @@ static ir_type *create_method_type(const function_type_t *function_type, bool fo int n_parameters = count_parameters(function_type) + (for_closure ? 1 : 0); - int n_results = return_type == type_void ? 0 : 1; + int n_results = is_type_void(return_type) ? 0 : 1; type_dbg_info *dbgi = get_type_dbg_info_((const type_t*) function_type); ir_type *irtype = new_d_type_method(n_parameters, n_results, dbgi); - if (return_type != type_void) { + if (!is_type_void(return_type)) { ir_type *restype = get_ir_type(return_type); set_method_res_type(irtype, 0, restype); } @@ -494,8 +460,7 @@ static ir_type *get_signed_int_type_for_bit_size(ir_type *base_tp, char name[32]; snprintf(name, sizeof(name), "bf_I%u", size); - mode = new_ir_mode(name, irms_int_number, size, 1, irma_twos_complement, - size <= 32 ? 32 : size ); + mode = new_int_mode(name, irma_twos_complement, size, 1, 0); s_modes[size] = mode; } @@ -527,8 +492,7 @@ static ir_type *get_unsigned_int_type_for_bit_size(ir_type *base_tp, char name[32]; snprintf(name, sizeof(name), "bf_U%u", size); - mode = new_ir_mode(name, irms_int_number, size, 0, irma_twos_complement, - size <= 32 ? 32 : size ); + mode = new_int_mode(name, irma_twos_complement, size, 0, 0); u_modes[size] = mode; } @@ -556,8 +520,6 @@ static ir_type *create_bitfield_type(const entity_t *entity) } } -#define INVALID_TYPE ((ir_type_ptr)-1) - enum { COMPOUND_IS_STRUCT = false, COMPOUND_IS_UNION = true @@ -653,15 +615,14 @@ static ir_type *create_compound_type(compound_type_t *type, return irtype; } +static ir_tarval *fold_constant_to_tarval(expression_t const *); + static void determine_enum_values(enum_type_t *const type) { ir_mode *const mode = atomic_modes[type->base.akind]; ir_tarval *const one = get_mode_one(mode); ir_tarval * tv_next = get_mode_null(mode); - bool constant_folding_old = constant_folding; - constant_folding = true; - enum_t *enume = type->enume; entity_t *entry = enume->base.next; for (; entry != NULL; entry = entry->base.next) { @@ -670,18 +631,12 @@ static void determine_enum_values(enum_type_t *const type) expression_t *const init = entry->enum_value.value; if (init != NULL) { - ir_node *const cnst = expression_to_firm(init); - if (!is_Const(cnst)) { - panic("couldn't fold constant"); - } - tv_next = get_Const_tarval(cnst); + tv_next = fold_constant_to_tarval(init); } assert(entry->enum_value.tv == NULL || entry->enum_value.tv == tv_next); entry->enum_value.tv = tv_next; tv_next = tarval_add(tv_next, one); } - - constant_folding = constant_folding_old; } static ir_type *create_enum_type(enum_type_t *const type) @@ -695,7 +650,6 @@ static ir_type *get_ir_type_incomplete(type_t *type) type = skip_typeref(type); if (type->base.firm_type != NULL) { - assert(type->base.firm_type != INVALID_TYPE); return type->base.firm_type; } @@ -716,16 +670,11 @@ ir_type *get_ir_type(type_t *type) type = skip_typeref(type); if (type->base.firm_type != NULL) { - assert(type->base.firm_type != INVALID_TYPE); return type->base.firm_type; } ir_type *firm_type = NULL; switch (type->kind) { - case TYPE_ERROR: - /* Happens while constant folding, when there was an error */ - return create_atomic_type(ATOMIC_TYPE_VOID, NULL); - case TYPE_ATOMIC: firm_type = create_atomic_type(type->atomic.akind, type); break; @@ -757,6 +706,7 @@ ir_type *get_ir_type(type_t *type) firm_type = create_enum_type(&type->enumt); break; + case TYPE_ERROR: case TYPE_TYPEOF: case TYPE_TYPEDEF: break; @@ -770,14 +720,15 @@ ir_type *get_ir_type(type_t *type) static ir_mode *get_ir_mode_storage(type_t *type) { - ir_type *irtype = get_ir_type(type); + type = skip_typeref(type); - /* firm doesn't report a mode for arrays somehow... */ - if (is_Array_type(irtype)) { + /* Firm doesn't report a mode for arrays and structs/unions. */ + if (!is_type_scalar(type)) { return mode_P_data; } - ir_mode *mode = get_type_mode(irtype); + ir_type *const irtype = get_ir_type(type); + ir_mode *const mode = get_type_mode(irtype); assert(mode != NULL); return mode; } @@ -797,6 +748,26 @@ static ir_mode *get_ir_mode_arithmetic(type_t *type) return mode; } +/** + * Return a node representing the size of a type. + */ +static ir_node *get_type_size_node(type_t *type) +{ + unsigned size; + ir_mode *mode = get_ir_mode_arithmetic(type_size_t); + type = skip_typeref(type); + + if (is_type_array(type) && type->array.is_vla) { + ir_node *size_node = get_vla_size(&type->array); + ir_node *elem_size = get_type_size_node(type->array.element_type); + ir_node *real_size = new_d_Mul(NULL, size_node, elem_size, mode); + return real_size; + } + + size = get_type_size(type); + return new_Const_long(mode, size); +} + /** Names of the runtime functions. */ static const struct { int id; /**< the rts id */ @@ -1052,7 +1023,7 @@ static ir_entity *get_function_entity(entity_t *entity, ir_type *owner_type) continue; type_t *return_type = skip_typeref(function_type->return_type); - int n_res = return_type != type_void ? 1 : 0; + int n_res = is_type_void(return_type) ? 0 : 1; if (n_res != rts_data[i].n_res) continue; @@ -1087,6 +1058,38 @@ static ir_node *create_symconst(dbg_info *dbgi, ir_entity *entity) return new_d_SymConst(dbgi, mode_P, sym, symconst_addr_ent); } +static ir_node *create_Const_from_bool(ir_mode *const mode, bool const v) +{ + return new_Const((v ? get_mode_one : get_mode_null)(mode)); +} + +static ir_node *create_conv_from_b(dbg_info *dbgi, ir_node *value, + ir_mode *dest_mode) +{ + if (is_Const(value)) { + return create_Const_from_bool(dest_mode, !is_Const_null(value)); + } + + ir_node *cond = new_d_Cond(dbgi, value); + ir_node *proj_true = new_Proj(cond, mode_X, pn_Cond_true); + ir_node *proj_false = new_Proj(cond, mode_X, pn_Cond_false); + ir_node *tblock = new_Block(1, &proj_true); + ir_node *fblock = new_Block(1, &proj_false); + set_cur_block(tblock); + ir_node *const1 = new_Const(get_mode_one(dest_mode)); + ir_node *tjump = new_Jmp(); + set_cur_block(fblock); + ir_node *const0 = new_Const(get_mode_null(dest_mode)); + ir_node *fjump = new_Jmp(); + + ir_node *in[2] = { tjump, fjump }; + ir_node *mergeblock = new_Block(2, in); + set_cur_block(mergeblock); + ir_node *phi_in[2] = { const1, const0 }; + ir_node *phi = new_Phi(2, phi_in, dest_mode); + return phi; +} + static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode) { ir_mode *value_mode = get_irn_mode(value); @@ -1096,18 +1099,15 @@ static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode) if (dest_mode == mode_b) { ir_node *zero = new_Const(get_mode_null(value_mode)); - ir_node *cmp = new_d_Cmp(dbgi, value, zero, ir_relation_less_greater); + ir_node *cmp = new_d_Cmp(dbgi, value, zero, ir_relation_unordered_less_greater); return cmp; + } else if (value_mode == mode_b) { + return create_conv_from_b(dbgi, value, dest_mode); } return new_d_Conv(dbgi, value, dest_mode); } -static ir_node *create_Const_from_bool(ir_mode *const mode, bool const v) -{ - return new_Const((v ? get_mode_one : get_mode_null)(mode)); -} - /** * Creates a SymConst node representing a wide string literal. * @@ -1436,7 +1436,7 @@ static ir_node *create_trampoline(dbg_info *dbgi, ir_mode *mode, ir_node *irn = new_d_Builtin(dbgi, get_store(), 3, in, ir_bk_inner_trampoline, get_unknown_type()); set_store(new_Proj(irn, mode_M, pn_Builtin_M)); - return new_Proj(irn, mode, pn_Builtin_1_result); + return new_Proj(irn, mode, pn_Builtin_max+1); } /** @@ -1449,14 +1449,18 @@ static ir_node *create_trampoline(dbg_info *dbgi, ir_mode *mode, static ir_node *deref_address(dbg_info *const dbgi, type_t *const type, ir_node *const addr) { - ir_type *irtype = get_ir_type(type); + type_t *skipped = skip_typeref(type); + if (is_type_incomplete(skipped)) + return addr; + + ir_type *irtype = get_ir_type(skipped); if (is_compound_type(irtype) - || is_Method_type(irtype) - || is_Array_type(irtype)) { + || is_Method_type(irtype) + || is_Array_type(irtype)) { return addr; } - ir_cons_flags flags = type->base.qualifiers & TYPE_QUALIFIER_VOLATILE + ir_cons_flags flags = skipped->base.qualifiers & TYPE_QUALIFIER_VOLATILE ? cons_volatile : cons_none; ir_mode *const mode = get_type_mode(irtype); ir_node *const memory = get_store(); @@ -1466,7 +1470,7 @@ static ir_node *deref_address(dbg_info *const dbgi, type_t *const type, set_store(load_mem); - ir_mode *const mode_arithmetic = get_ir_mode_arithmetic(type); + ir_mode *const mode_arithmetic = get_ir_mode_arithmetic(skipped); return create_conv(dbgi, load_res, mode_arithmetic); } @@ -1525,8 +1529,7 @@ static void keep_all_memory(ir_node *block) set_cur_block(old); } -static ir_node *reference_expression_enum_value_to_firm( - const reference_expression_t *ref) +static ir_node *enum_constant_to_firm(reference_expression_t const *const ref) { entity_t *entity = ref->entity; if (entity->enum_value.tv == NULL) { @@ -1704,7 +1707,7 @@ static ir_node *process_builtin_call(const call_expression_t *call) ir_node *size = expression_to_firm(argument); ir_node *store = get_store(); - ir_node *alloca = new_d_Alloc(dbgi, store, size, firm_unknown_type, + ir_node *alloca = new_d_Alloc(dbgi, store, size, get_unknown_type(), stack_alloc); ir_node *proj_m = new_Proj(alloca, mode_M, pn_Alloc_M); set_store(proj_m); @@ -1752,12 +1755,14 @@ static ir_node *process_builtin_call(const call_expression_t *call) ir_node *val = expression_to_firm(call->arguments->expression); ir_node *shf = expression_to_firm(call->arguments->next->expression); ir_mode *mode = get_irn_mode(val); + ir_mode *mode_uint = atomic_modes[ATOMIC_TYPE_UINT]; return new_d_Rotl(dbgi, val, create_conv(dbgi, shf, mode_uint), mode); } case BUILTIN_ROTR: { ir_node *val = expression_to_firm(call->arguments->expression); ir_node *shf = expression_to_firm(call->arguments->next->expression); ir_mode *mode = get_irn_mode(val); + ir_mode *mode_uint = atomic_modes[ATOMIC_TYPE_UINT]; ir_node *c = new_Const_long(mode_uint, get_mode_size_bits(mode)); ir_node *sub = new_d_Sub(dbgi, c, create_conv(dbgi, shf, mode_uint), mode_uint); return new_d_Rotl(dbgi, val, sub, mode); @@ -1857,9 +1862,9 @@ static ir_node *call_expression_to_firm(const call_expression_t *const call) type_t *arg_type = skip_typeref(expression->base.type); if (!is_type_compound(arg_type)) { - ir_mode *mode = get_ir_mode_storage(expression->base.type); - arg_node = create_conv(dbgi, arg_node, mode); - arg_node = do_strict_conv(dbgi, arg_node); + ir_mode *const mode = get_ir_mode_storage(arg_type); + arg_node = create_conv(dbgi, arg_node, mode); + arg_node = do_strict_conv(dbgi, arg_node); } in[n] = arg_node; @@ -1885,10 +1890,10 @@ static ir_node *call_expression_to_firm(const call_expression_t *const call) set_store(mem); } - if (!is_type_atomic(return_type, ATOMIC_TYPE_VOID)) { + if (!is_type_void(return_type)) { assert(is_type_scalar(return_type)); ir_mode *mode = get_ir_mode_storage(return_type); - result = new_Proj(node, mode, pn_Builtin_1_result); + result = new_Proj(node, mode, pn_Builtin_max+1); ir_mode *mode_arith = get_ir_mode_arithmetic(return_type); result = create_conv(NULL, result, mode_arith); } @@ -1899,18 +1904,12 @@ static ir_node *call_expression_to_firm(const call_expression_t *const call) set_store(mem); } - if (!is_type_atomic(return_type, ATOMIC_TYPE_VOID)) { - ir_node *resproj = new_Proj(node, mode_T, pn_Call_T_result); - - if (is_type_scalar(return_type)) { - ir_mode *mode = get_ir_mode_storage(return_type); - result = new_Proj(resproj, mode, 0); - ir_mode *mode_arith = get_ir_mode_arithmetic(return_type); - result = create_conv(NULL, result, mode_arith); - } else { - ir_mode *mode = mode_P_data; - result = new_Proj(resproj, mode, 0); - } + if (!is_type_void(return_type)) { + ir_node *const resproj = new_Proj(node, mode_T, pn_Call_T_result); + ir_mode *const mode = get_ir_mode_storage(return_type); + result = new_Proj(resproj, mode, 0); + ir_mode *const mode_arith = get_ir_mode_arithmetic(return_type); + result = create_conv(NULL, result, mode_arith); } } @@ -1926,7 +1925,7 @@ static ir_node *call_expression_to_firm(const call_expression_t *const call) return result; } -static void statement_to_firm(statement_t *statement); +static ir_node *statement_to_firm(statement_t *statement); static ir_node *compound_statement_to_firm(compound_statement_t *compound); static ir_node *expression_to_addr(const expression_t *expression); @@ -1963,6 +1962,7 @@ static ir_tarval *create_bitfield_mask(ir_mode *mode, int offset, int size) { ir_tarval *all_one = get_mode_all_one(mode); int mode_size = get_mode_size_bits(mode); + ir_mode *mode_uint = atomic_modes[ATOMIC_TYPE_UINT]; assert(offset >= 0); assert(size >= 0); @@ -1988,6 +1988,7 @@ static ir_node *bitfield_store_to_firm(dbg_info *dbgi, ir_type *entity_type = get_entity_type(entity); ir_type *base_type = get_primitive_base_type(entity_type); ir_mode *mode = get_type_mode(base_type); + ir_mode *mode_uint = atomic_modes[ATOMIC_TYPE_UINT]; value = create_conv(dbgi, value, mode); @@ -2046,6 +2047,7 @@ static ir_node *bitfield_extract_to_firm(const select_expression_t *expression, ir_node *load = new_d_Load(dbgi, mem, addr, mode, cons_none); ir_node *load_mem = new_d_Proj(dbgi, load, mode_M, pn_Load_M); ir_node *load_res = new_d_Proj(dbgi, load, mode, pn_Load_res); + ir_mode *mode_uint = atomic_modes[ATOMIC_TYPE_UINT]; ir_mode *amode = mode; /* optimisation, since shifting in modes < machine_size is usually @@ -2362,7 +2364,7 @@ static ir_node *create_cast(dbg_info *dbgi, ir_node *value_node, type_t *from_type, type_t *type) { type = skip_typeref(type); - if (type == type_void) { + if (is_type_void(type)) { /* make sure firm type is constructed */ (void) get_ir_type(type); return NULL; @@ -2383,7 +2385,7 @@ static ir_node *create_cast(dbg_info *dbgi, ir_node *value_node, if (from_var != NULL) { ir_node *const addr = create_symconst(dbgi, from_var->v.entity); ir_node *const base = deref_address(dbgi, from_var->base.type, addr); - value_node = new_d_Add(dbgi, value_node, base, get_ir_mode_storage(from_type)); + value_node = new_d_Add(dbgi, value_node, base, mode); } if (to_var != NULL) { ir_node *const addr = create_symconst(dbgi, to_var->v.entity); @@ -2412,12 +2414,12 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression) dbg_info *dbgi = get_dbg_info(&expression->base.source_position); type_t *type = skip_typeref(expression->base.type); - if (expression->base.kind == EXPR_UNARY_TAKE_ADDRESS) - return expression_to_addr(expression->value); - const expression_t *value = expression->value; switch(expression->base.kind) { + case EXPR_UNARY_TAKE_ADDRESS: + return expression_to_addr(value); + case EXPR_UNARY_NEGATE: { ir_node *value_node = expression_to_firm(value); ir_mode *mode = get_ir_mode_arithmetic(type); @@ -2525,7 +2527,7 @@ static ir_node *create_op(dbg_info *dbgi, const binary_expression_t *expression, case EXPR_BINARY_SHIFTLEFT_ASSIGN: case EXPR_BINARY_SHIFTRIGHT_ASSIGN: mode = get_ir_mode_arithmetic(expression->base.type); - right = create_conv(dbgi, right, mode_uint); + right = create_conv(dbgi, right, atomic_modes[ATOMIC_TYPE_UINT]); break; case EXPR_BINARY_SUB: @@ -2839,29 +2841,67 @@ static ir_node *offsetof_to_firm(const offsetof_expression_t *expression) static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi, ir_entity *entity, type_t *type); +static ir_initializer_t *create_ir_initializer( + const initializer_t *initializer, type_t *type); -static ir_node *compound_literal_to_firm( - const compound_literal_expression_t *expression) +static ir_entity *create_initializer_entity(dbg_info *dbgi, + initializer_t *initializer, + type_t *type) { - type_t *type = expression->type; + /* create the ir_initializer */ + ir_graph *const old_current_ir_graph = current_ir_graph; + current_ir_graph = get_const_code_irg(); - /* create an entity on the stack */ - ir_type *frame_type = get_irg_frame_type(current_ir_graph); + ir_initializer_t *irinitializer = create_ir_initializer(initializer, type); + + assert(current_ir_graph == get_const_code_irg()); + current_ir_graph = old_current_ir_graph; - ident *const id = id_unique("CompLit.%u"); - ir_type *const irtype = get_ir_type(type); - dbg_info *const dbgi = get_dbg_info(&expression->base.source_position); - ir_entity *const entity = new_d_entity(frame_type, id, irtype, dbgi); + ident *const id = id_unique("initializer.%u"); + ir_type *const irtype = get_ir_type(type); + ir_type *const global_type = get_glob_type(); + ir_entity *const entity = new_d_entity(global_type, id, irtype, dbgi); set_entity_ld_ident(entity, id); + set_entity_visibility(entity, ir_visibility_private); + add_entity_linkage(entity, IR_LINKAGE_CONSTANT); + set_entity_initializer(entity, irinitializer); + return entity; +} - /* create initialisation code */ +static ir_node *compound_literal_addr(compound_literal_expression_t const *const expression) +{ + dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + type_t *type = expression->type; initializer_t *initializer = expression->initializer; - create_local_initializer(initializer, dbgi, entity, type); - /* create a sel for the compound literal address */ - ir_node *frame = get_irg_frame(current_ir_graph); - ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, entity); - return sel; + if (is_constant_initializer(initializer) == EXPR_CLASS_CONSTANT) { + ir_entity *entity = create_initializer_entity(dbgi, initializer, type); + return create_symconst(dbgi, entity); + } else { + /* create an entity on the stack */ + ident *const id = id_unique("CompLit.%u"); + ir_type *const irtype = get_ir_type(type); + ir_type *frame_type = get_irg_frame_type(current_ir_graph); + + ir_entity *const entity = new_d_entity(frame_type, id, irtype, dbgi); + set_entity_ld_ident(entity, id); + + /* create initialisation code */ + create_local_initializer(initializer, dbgi, entity, type); + + /* create a sel for the compound literal address */ + ir_node *frame = get_irg_frame(current_ir_graph); + ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, entity); + return sel; + } +} + +static ir_node *compound_literal_to_firm(compound_literal_expression_t const* const expr) +{ + dbg_info *const dbgi = get_dbg_info(&expr->base.source_position); + type_t *const type = expr->type; + ir_node *const addr = compound_literal_addr(expr); + return deref_address(dbgi, type, addr); } /** @@ -2875,11 +2915,6 @@ static ir_node *sizeof_to_firm(const typeprop_expression_t *expression) && expression->tp_expression != NULL) { expression_to_firm(expression->tp_expression); } - /* strange gnu extensions: sizeof(function) == 1 */ - if (is_type_function(type)) { - ir_mode *mode = get_ir_mode_storage(type_size_t); - return new_Const(get_mode_one(mode)); - } return get_type_size_node(type); } @@ -2895,7 +2930,7 @@ static entity_t *get_expression_entity(const expression_t *expression) static unsigned get_cparser_entity_alignment(const entity_t *entity) { switch(entity->kind) { - DECLARATION_KIND_CASES + case DECLARATION_KIND_CASES: return entity->declaration.alignment; case ENTITY_STRUCT: case ENTITY_UNION: @@ -2943,20 +2978,24 @@ static void init_ir_types(void); static ir_tarval *fold_constant_to_tarval(const expression_t *expression) { - assert(is_type_valid(skip_typeref(expression->base.type))); + assert(is_constant_expression(expression) == EXPR_CLASS_CONSTANT); bool constant_folding_old = constant_folding; constant_folding = true; + int old_optimize = get_optimize(); + int old_constant_folding = get_opt_constant_folding(); + set_optimize(1); + set_opt_constant_folding(1); init_ir_types(); - assert(is_constant_expression(expression) == EXPR_CLASS_CONSTANT); - ir_graph *old_current_ir_graph = current_ir_graph; current_ir_graph = get_const_code_irg(); ir_node *cnst = expression_to_firm(expression); current_ir_graph = old_current_ir_graph; + set_optimize(old_optimize); + set_opt_constant_folding(old_constant_folding); if (!is_Const(cnst)) { panic("couldn't fold constant"); @@ -2970,16 +3009,12 @@ static ir_tarval *fold_constant_to_tarval(const expression_t *expression) /* this function is only used in parser.c, but it relies on libfirm functionality */ bool constant_is_negative(const expression_t *expression) { - assert(is_constant_expression(expression) == EXPR_CLASS_CONSTANT); ir_tarval *tv = fold_constant_to_tarval(expression); return tarval_is_negative(tv); } long fold_constant_to_int(const expression_t *expression) { - if (expression->kind == EXPR_ERROR) - return 0; - ir_tarval *tv = fold_constant_to_tarval(expression); if (!tarval_is_long(tv)) { panic("result of constant folding is not integer"); @@ -2990,8 +3025,6 @@ long fold_constant_to_int(const expression_t *expression) bool fold_constant_to_bool(const expression_t *expression) { - if (expression->kind == EXPR_ERROR) - return false; ir_tarval *tv = fold_constant_to_tarval(expression); return !tarval_is_null(tv); } @@ -3047,12 +3080,7 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression) ir_node *const in[2] = { true_val, false_val }; type_t *const type = skip_typeref(expression->base.type); - ir_mode *mode; - if (is_type_compound(type)) { - mode = mode_P; - } else { - mode = get_ir_mode_arithmetic(type); - } + ir_mode *const mode = get_ir_mode_arithmetic(type); ir_node *const val = new_d_Phi(dbgi, lengthof(in), in, mode); return val; @@ -3074,9 +3102,9 @@ static ir_node *select_addr(const select_expression_t *expression) assert(entry->declaration.kind == DECLARATION_KIND_COMPOUND_MEMBER); 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); + ir_mode *mode = get_irn_mode(compound_addr); + ir_mode *mode_uint = get_reference_mode_unsigned_eq(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; @@ -3201,7 +3229,8 @@ static ir_node *classify_type_to_firm(const classify_type_expression_t *const ex make_const:; dbg_info *const dbgi = get_dbg_info(&expr->base.source_position); - ir_tarval *const tv = new_tarval_from_long(tc, mode_int); + ir_mode *const mode = atomic_modes[ATOMIC_TYPE_INT]; + ir_tarval *const tv = new_tarval_from_long(tc, mode); return new_d_Const(dbgi, tv); } @@ -3311,7 +3340,7 @@ static ir_node *expression_to_addr(const expression_t *expression) case EXPR_CALL: return call_expression_to_firm(&expression->call); case EXPR_COMPOUND_LITERAL: - return compound_literal_to_firm(&expression->compound_literal); + return compound_literal_addr(&expression->compound_literal); case EXPR_REFERENCE: return reference_addr(&expression->reference); case EXPR_SELECT: @@ -3377,79 +3406,48 @@ static ir_node *label_address_to_firm(const label_address_expression_t *label) return new_d_SymConst(dbgi, mode_P_code, value, symconst_addr_ent); } -static ir_node *error_to_firm(const expression_t *expression) -{ - ir_mode *mode = get_ir_mode_arithmetic(expression->base.type); - return new_Bad(mode); -} - /** * creates firm nodes for an expression. The difference between this function * and expression_to_firm is, that this version might produce mode_b nodes * instead of mode_Is. */ -static ir_node *_expression_to_firm(const expression_t *expression) +static ir_node *_expression_to_firm(expression_t const *const expr) { #ifndef NDEBUG if (!constant_folding) { - assert(!expression->base.transformed); - ((expression_t*) expression)->base.transformed = true; + assert(!expr->base.transformed); + ((expression_t*)expr)->base.transformed = true; } #endif - switch (expression->kind) { - EXPR_LITERAL_CASES - return literal_to_firm(&expression->literal); - case EXPR_STRING_LITERAL: - return string_to_firm(&expression->base.source_position, "str.%u", - &expression->literal.value); - case EXPR_WIDE_STRING_LITERAL: - return wide_string_literal_to_firm(&expression->string_literal); - case EXPR_REFERENCE: - return reference_expression_to_firm(&expression->reference); - case EXPR_REFERENCE_ENUM_VALUE: - return reference_expression_enum_value_to_firm(&expression->reference); - case EXPR_CALL: - return call_expression_to_firm(&expression->call); - EXPR_UNARY_CASES - return unary_expression_to_firm(&expression->unary); - EXPR_BINARY_CASES - return binary_expression_to_firm(&expression->binary); - case EXPR_ARRAY_ACCESS: - return array_access_to_firm(&expression->array_access); - case EXPR_SIZEOF: - return sizeof_to_firm(&expression->typeprop); - case EXPR_ALIGNOF: - return alignof_to_firm(&expression->typeprop); - case EXPR_CONDITIONAL: - return conditional_to_firm(&expression->conditional); - case EXPR_SELECT: - return select_to_firm(&expression->select); - case EXPR_CLASSIFY_TYPE: - return classify_type_to_firm(&expression->classify_type); - case EXPR_FUNCNAME: - return function_name_to_firm(&expression->funcname); - case EXPR_STATEMENT: - return statement_expression_to_firm(&expression->statement); - case EXPR_VA_START: - return va_start_expression_to_firm(&expression->va_starte); - case EXPR_VA_ARG: - return va_arg_expression_to_firm(&expression->va_arge); - case EXPR_VA_COPY: - return va_copy_expression_to_firm(&expression->va_copye); - case EXPR_BUILTIN_CONSTANT_P: - return builtin_constant_to_firm(&expression->builtin_constant); - case EXPR_BUILTIN_TYPES_COMPATIBLE_P: - return builtin_types_compatible_to_firm(&expression->builtin_types_compatible); - case EXPR_OFFSETOF: - return offsetof_to_firm(&expression->offsetofe); - case EXPR_COMPOUND_LITERAL: - return compound_literal_to_firm(&expression->compound_literal); - case EXPR_LABEL_ADDRESS: - return label_address_to_firm(&expression->label_address); - - case EXPR_ERROR: - return error_to_firm(expression); + switch (expr->kind) { + case EXPR_ALIGNOF: return alignof_to_firm( &expr->typeprop); + case EXPR_ARRAY_ACCESS: return array_access_to_firm( &expr->array_access); + case EXPR_BINARY_CASES: return binary_expression_to_firm( &expr->binary); + case EXPR_BUILTIN_CONSTANT_P: return builtin_constant_to_firm( &expr->builtin_constant); + case EXPR_BUILTIN_TYPES_COMPATIBLE_P: return builtin_types_compatible_to_firm(&expr->builtin_types_compatible); + case EXPR_CALL: return call_expression_to_firm( &expr->call); + case EXPR_CLASSIFY_TYPE: return classify_type_to_firm( &expr->classify_type); + case EXPR_COMPOUND_LITERAL: return compound_literal_to_firm( &expr->compound_literal); + case EXPR_CONDITIONAL: return conditional_to_firm( &expr->conditional); + case EXPR_FUNCNAME: return function_name_to_firm( &expr->funcname); + case EXPR_LABEL_ADDRESS: return label_address_to_firm( &expr->label_address); + case EXPR_LITERAL_CASES: return literal_to_firm( &expr->literal); + case EXPR_OFFSETOF: return offsetof_to_firm( &expr->offsetofe); + case EXPR_REFERENCE: return reference_expression_to_firm( &expr->reference); + case EXPR_ENUM_CONSTANT: return enum_constant_to_firm( &expr->reference); + case EXPR_SELECT: return select_to_firm( &expr->select); + case EXPR_SIZEOF: return sizeof_to_firm( &expr->typeprop); + case EXPR_STATEMENT: return statement_expression_to_firm( &expr->statement); + case EXPR_UNARY_CASES: return unary_expression_to_firm( &expr->unary); + case EXPR_VA_ARG: return va_arg_expression_to_firm( &expr->va_arge); + case EXPR_VA_COPY: return va_copy_expression_to_firm( &expr->va_copye); + case EXPR_VA_START: return va_start_expression_to_firm( &expr->va_starte); + case EXPR_WIDE_STRING_LITERAL: return wide_string_literal_to_firm( &expr->string_literal); + + case EXPR_STRING_LITERAL: return string_to_firm(&expr->base.source_position, "str.%u", &expr->literal.value); + + case EXPR_ERROR: break; } panic("invalid expression found"); } @@ -3887,9 +3885,6 @@ static void advance_current_object(type_path_t *path) } -static ir_initializer_t *create_ir_initializer( - const initializer_t *initializer, type_t *type); - static ir_initializer_t *create_ir_initializer_value( const initializer_value_t *initializer) { @@ -4087,6 +4082,7 @@ static void create_dynamic_null_initializer(ir_entity *entity, dbg_info *dbgi, assert(has_array_upper_bound(ent_type, 0)); long n = get_array_upper_bound_int(ent_type, 0); for (long i = 0; i < n; ++i) { + ir_mode *mode_uint = atomic_modes[ATOMIC_TYPE_UINT]; ir_tarval *index_tv = new_tarval_from_long(i, mode_uint); ir_node *cnst = new_d_Const(dbgi, index_tv); ir_node *in[1] = { cnst }; @@ -4177,6 +4173,7 @@ static void create_dynamic_initializer_sub(ir_initializer_t *initializer, ir_type *irtype; ir_entity *sub_entity; if (is_Array_type(type)) { + ir_mode *mode_uint = atomic_modes[ATOMIC_TYPE_UINT]; ir_tarval *index_tv = new_tarval_from_long(i, mode_uint); ir_node *cnst = new_d_Const(dbgi, index_tv); ir_node *in[1] = { cnst }; @@ -4239,28 +4236,11 @@ static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi, return; } - /* create the ir_initializer */ - ir_graph *const old_current_ir_graph = current_ir_graph; - current_ir_graph = get_const_code_irg(); - - ir_initializer_t *irinitializer = create_ir_initializer(initializer, type); - - assert(current_ir_graph == get_const_code_irg()); - current_ir_graph = old_current_ir_graph; - /* create a "template" entity which is copied to the entity on the stack */ - ident *const id = id_unique("initializer.%u"); - ir_type *const irtype = get_ir_type(type); - ir_type *const global_type = get_glob_type(); - ir_entity *const init_entity = new_d_entity(global_type, id, irtype, dbgi); - set_entity_ld_ident(init_entity, id); - - set_entity_visibility(init_entity, ir_visibility_private); - add_entity_linkage(init_entity, IR_LINKAGE_CONSTANT); - - set_entity_initializer(init_entity, irinitializer); - + ir_entity *const init_entity + = create_initializer_entity(dbgi, initializer, type); ir_node *const src_addr = create_symconst(dbgi, init_entity); + ir_type *const irtype = get_ir_type(type); ir_node *const copyb = new_d_CopyB(dbgi, memory, addr, src_addr, irtype); ir_node *const copyb_mem = new_Proj(copyb, mode_M, pn_CopyB_M); @@ -4296,18 +4276,28 @@ static void create_variable_initializer(entity_t *entity) type_qualifiers_t tq = get_type_qualifier(type, true); if (initializer->kind == INITIALIZER_VALUE) { - initializer_value_t *initializer_value = &initializer->value; - dbg_info *dbgi = get_dbg_info(&entity->base.source_position); - - ir_node *value = expression_to_firm(initializer_value->value); + expression_t * value = initializer->value.value; + type_t *const init_type = skip_typeref(value->base.type); + + if (!is_type_scalar(init_type)) { + /* skip convs */ + while (value->kind == EXPR_UNARY_CAST) + value = value->unary.value; + + if (value->kind != EXPR_COMPOUND_LITERAL) + panic("expected non-scalar initializer to be a compound literal"); + initializer = value->compound_literal.initializer; + goto have_initializer; + } - type_t *init_type = initializer_value->value->base.type; - ir_mode *mode = get_ir_mode_storage(init_type); - value = create_conv(dbgi, value, mode); - value = do_strict_conv(dbgi, value); + ir_node * node = expression_to_firm(value); + dbg_info *const dbgi = get_dbg_info(&entity->base.source_position); + ir_mode *const mode = get_ir_mode_storage(init_type); + node = create_conv(dbgi, node, mode); + node = do_strict_conv(dbgi, node); if (declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE) { - set_value(entity->variable.v.value_number, value); + set_value(entity->variable.v.value_number, node); } else { assert(declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE); @@ -4317,9 +4307,10 @@ static void create_variable_initializer(entity_t *entity) && get_entity_owner(irentity) != get_tls_type()) { add_entity_linkage(irentity, IR_LINKAGE_CONSTANT); } - set_atomic_ent_value(irentity, value); + set_atomic_ent_value(irentity, node); } } else { +have_initializer: assert(declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE_ENTITY || declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE); @@ -4443,54 +4434,38 @@ static void create_local_static_variable(entity_t *entity) -static void return_statement_to_firm(return_statement_t *statement) +static ir_node *return_statement_to_firm(return_statement_t *statement) { if (!currently_reachable()) - return; + return NULL; - dbg_info *dbgi = get_dbg_info(&statement->base.source_position); - type_t *type = current_function_entity->declaration.type; - ir_type *func_irtype = get_ir_type(type); - - ir_node *in[1]; - int in_len; - if (get_method_n_ress(func_irtype) > 0) { - ir_type *res_type = get_method_res_type(func_irtype, 0); - - if (statement->value != NULL) { - ir_node *node = expression_to_firm(statement->value); - if (!is_compound_type(res_type)) { - type_t *ret_value_type = statement->value->base.type; - ir_mode *mode = get_ir_mode_storage(ret_value_type); - node = create_conv(dbgi, node, mode); - node = do_strict_conv(dbgi, node); - } - in[0] = node; + dbg_info *const dbgi = get_dbg_info(&statement->base.source_position); + type_t *const type = skip_typeref(current_function_entity->declaration.type->function.return_type); + ir_node * res = statement->value ? expression_to_firm(statement->value) : NULL; + + int in_len; + if (!is_type_void(type)) { + ir_mode *const mode = get_ir_mode_storage(type); + if (res) { + res = create_conv(dbgi, res, mode); + res = do_strict_conv(dbgi, res); } else { - ir_mode *mode; - if (is_compound_type(res_type)) { - mode = mode_P_data; - } else { - mode = get_type_mode(res_type); - } - in[0] = new_Unknown(mode); + res = new_Unknown(mode); } in_len = 1; } else { - /* build return_value for its side effects */ - if (statement->value != NULL) { - expression_to_firm(statement->value); - } in_len = 0; } - ir_node *store = get_store(); - ir_node *ret = new_d_Return(dbgi, store, in_len, in); + ir_node *const in[1] = { res }; + ir_node *const store = get_store(); + ir_node *const ret = new_d_Return(dbgi, store, in_len, in); ir_node *end_block = get_irg_end_block(current_ir_graph); add_immBlock_pred(end_block, ret); set_unreachable_now(); + return NULL; } static ir_node *expression_statement_to_firm(expression_statement_t *statement) @@ -4514,13 +4489,7 @@ static ir_node *compound_statement_to_firm(compound_statement_t *compound) ir_node *result = NULL; statement_t *statement = compound->statements; for ( ; statement != NULL; statement = statement->base.next) { - if (statement->base.next == NULL - && statement->kind == STATEMENT_EXPRESSION) { - result = expression_statement_to_firm( - &statement->expression); - break; - } - statement_to_firm(statement); + result = statement_to_firm(statement); } return result; @@ -4645,11 +4614,11 @@ static void initialize_local_declaration(entity_t *entity) panic("invalid declaration kind"); } -static void declaration_statement_to_firm(declaration_statement_t *statement) +static ir_node *declaration_statement_to_firm(declaration_statement_t *statement) { entity_t *entity = statement->declarations_begin; if (entity == NULL) - return; + return NULL; entity_t *const last = statement->declarations_end; for ( ;; entity = entity->base.next) { @@ -4666,9 +4635,11 @@ static void declaration_statement_to_firm(declaration_statement_t *statement) if (entity == last) break; } + + return NULL; } -static void if_statement_to_firm(if_statement_t *statement) +static ir_node *if_statement_to_firm(if_statement_t *statement) { /* Create the condition. */ ir_node *true_block = NULL; @@ -4678,56 +4649,64 @@ static void if_statement_to_firm(if_statement_t *statement) false_block = new_immBlock(); create_condition_evaluation(statement->condition, true_block, false_block); mature_immBlock(true_block); + mature_immBlock(false_block); } - /* Create the false statement. - * Handle false before true, so if no false statement is present, then the - * empty false block is reused as fallthrough block. */ - ir_node *fallthrough_block = NULL; + /* Create the true statement. */ + set_cur_block(true_block); + statement_to_firm(statement->true_statement); + ir_node *fallthrough_block = get_cur_block(); + + /* Create the false statement. */ + set_cur_block(false_block); if (statement->false_statement != NULL) { - if (false_block != NULL) { - mature_immBlock(false_block); - } - set_cur_block(false_block); statement_to_firm(statement->false_statement); - if (currently_reachable()) { - fallthrough_block = new_immBlock(); - add_immBlock_pred(fallthrough_block, new_Jmp()); - } - } else { - fallthrough_block = false_block; } - /* Create the true statement. */ - set_cur_block(true_block); - statement_to_firm(statement->true_statement); - if (currently_reachable()) { - if (fallthrough_block == NULL) { - fallthrough_block = new_immBlock(); + /* Handle the block after the if-statement. Minor simplification and + * optimisation: Reuse the false/true block as fallthrough block, if the + * true/false statement does not pass control to the fallthrough block, e.g. + * in the typical if (x) return; pattern. */ + if (fallthrough_block) { + if (currently_reachable()) { + ir_node *const t_jump = new_r_Jmp(fallthrough_block); + ir_node *const f_jump = new_Jmp(); + ir_node *const in[] = { t_jump, f_jump }; + fallthrough_block = new_Block(2, in); } - add_immBlock_pred(fallthrough_block, new_Jmp()); + set_cur_block(fallthrough_block); } - /* Handle the block after the if-statement. */ - if (fallthrough_block != NULL) { - mature_immBlock(fallthrough_block); - } - set_cur_block(fallthrough_block); + return NULL; } -/* Create a jump node which jumps into target_block, if the current block is - * reachable. */ -static void jump_if_reachable(ir_node *const target_block) +/** + * Add an unconditional jump to the target block. If the source block is not + * reachable, then a Bad predecessor is created to prevent Phi-less unreachable + * loops. This is necessary if the jump potentially enters a loop. + */ +static void jump_to(ir_node *const target_block) { ir_node *const pred = currently_reachable() ? new_Jmp() : new_Bad(mode_X); add_immBlock_pred(target_block, pred); } -static void while_statement_to_firm(while_statement_t *statement) +/** + * Add an unconditional jump to the target block, if the current block is + * reachable and do nothing otherwise. This is only valid if the jump does not + * enter a loop (a back edge is ok). + */ +static void jump_if_reachable(ir_node *const target_block) +{ + if (currently_reachable()) + add_immBlock_pred(target_block, new_Jmp()); +} + +static ir_node *while_statement_to_firm(while_statement_t *statement) { /* Create the header block */ ir_node *const header_block = new_immBlock(); - jump_if_reachable(header_block); + jump_to(header_block); /* Create the condition. */ ir_node * body_block; @@ -4771,6 +4750,7 @@ static void while_statement_to_firm(while_statement_t *statement) assert(continue_label == header_block); continue_label = old_continue_label; break_label = old_break_label; + return NULL; } static ir_node *get_break_label(void) @@ -4781,14 +4761,14 @@ static ir_node *get_break_label(void) return break_label; } -static void do_while_statement_to_firm(do_while_statement_t *statement) +static ir_node *do_while_statement_to_firm(do_while_statement_t *statement) { /* create the header block */ ir_node *header_block = new_immBlock(); /* the loop body */ ir_node *body_block = new_immBlock(); - jump_if_reachable(body_block); + jump_to(body_block); ir_node *old_continue_label = continue_label; ir_node *old_break_label = break_label; @@ -4814,9 +4794,10 @@ static void do_while_statement_to_firm(do_while_statement_t *statement) mature_immBlock(false_block); set_cur_block(false_block); + return NULL; } -static void for_statement_to_firm(for_statement_t *statement) +static ir_node *for_statement_to_firm(for_statement_t *statement) { /* create declarations */ entity_t *entity = statement->scope.entities; @@ -4843,7 +4824,7 @@ static void for_statement_to_firm(for_statement_t *statement) /* Create the header block */ ir_node *const header_block = new_immBlock(); - jump_if_reachable(header_block); + jump_to(header_block); /* Create the condition. */ ir_node *body_block; @@ -4900,108 +4881,87 @@ static void for_statement_to_firm(for_statement_t *statement) assert(continue_label == step_block); continue_label = old_continue_label; break_label = old_break_label; + return NULL; } -static void create_jump_statement(const statement_t *statement, - ir_node *target_block) +static ir_node *create_jump_statement(const statement_t *statement, ir_node *target_block) { if (!currently_reachable()) - return; + return NULL; dbg_info *dbgi = get_dbg_info(&statement->base.source_position); ir_node *jump = new_d_Jmp(dbgi); add_immBlock_pred(target_block, jump); set_unreachable_now(); + return NULL; } -static void switch_statement_to_firm(switch_statement_t *statement) +static ir_switch_table *create_switch_table(const switch_statement_t *statement) +{ + /* determine number of cases */ + size_t n_cases = 0; + for (case_label_statement_t *l = statement->first_case; l != NULL; + l = l->next) { + /* default case */ + if (l->expression == NULL) + continue; + if (l->is_empty_range) + continue; + ++n_cases; + } + + ir_switch_table *res = ir_new_switch_table(current_ir_graph, n_cases); + size_t i = 0; + for (case_label_statement_t *l = statement->first_case; l != NULL; + l = l->next) { + if (l->expression == NULL) { + l->pn = pn_Switch_default; + continue; + } + if (l->is_empty_range) + continue; + ir_tarval *min = fold_constant_to_tarval(l->expression); + ir_tarval *max = min; + long pn = (long) i+1; + if (l->end_range != NULL) + max = fold_constant_to_tarval(l->end_range); + ir_switch_table_set(res, i++, min, max, pn); + l->pn = pn; + } + return res; +} + +static ir_node *switch_statement_to_firm(switch_statement_t *statement) { - ir_node *first_block = NULL; dbg_info *dbgi = get_dbg_info(&statement->base.source_position); - ir_node *cond = NULL; + ir_node *switch_node = NULL; if (currently_reachable()) { ir_node *expression = expression_to_firm(statement->expression); - cond = new_d_Cond(dbgi, expression); - first_block = get_cur_block(); + ir_switch_table *table = create_switch_table(statement); + unsigned n_outs = (unsigned)ir_switch_table_get_n_entries(table) + 1; + + switch_node = new_d_Switch(dbgi, expression, n_outs, table); } set_unreachable_now(); - ir_node *const old_switch_cond = current_switch_cond; + ir_node *const old_switch = current_switch; ir_node *const old_break_label = break_label; const bool old_saw_default_label = saw_default_label; saw_default_label = false; - current_switch_cond = cond; + current_switch = switch_node; break_label = NULL; - switch_statement_t *const old_switch = current_switch; - current_switch = statement; - - /* determine a free number for the default label */ - unsigned long num_cases = 0; - long default_proj_nr = 0; - for (case_label_statement_t *l = statement->first_case; l != NULL; l = l->next) { - if (l->expression == NULL) { - /* default case */ - continue; - } - if (l->last_case >= l->first_case) - num_cases += l->last_case - l->first_case + 1; - if (l->last_case > default_proj_nr) - default_proj_nr = l->last_case; - } - - if (default_proj_nr == LONG_MAX) { - /* Bad: an overflow will occur, we cannot be sure that the - * maximum + 1 is a free number. Scan the values a second - * time to find a free number. - */ - unsigned char *bits = xmalloc((num_cases + 7) >> 3); - - memset(bits, 0, (num_cases + 7) >> 3); - for (case_label_statement_t *l = statement->first_case; l != NULL; l = l->next) { - if (l->expression == NULL) { - /* default case */ - continue; - } - unsigned long start = l->first_case > 0 ? (unsigned long)l->first_case : 0; - if (start < num_cases && l->last_case >= 0) { - unsigned long end = (unsigned long)l->last_case < num_cases ? - (unsigned long)l->last_case : num_cases - 1; - for (unsigned long cns = start; cns <= end; ++cns) { - bits[cns >> 3] |= (1 << (cns & 7)); - } - } - } - /* We look at the first num_cases constants: - * Either they are dense, so we took the last (num_cases) - * one, or they are not dense, so we will find one free - * there... - */ - unsigned long i; - for (i = 0; i < num_cases; ++i) - if ((bits[i >> 3] & (1 << (i & 7))) == 0) - break; - - free(bits); - default_proj_nr = i; - } else { - ++default_proj_nr; - } - statement->default_proj_nr = default_proj_nr; - /* safety check: cond might already be folded to a Bad */ - if (cond != NULL && is_Cond(cond)) { - set_Cond_default_proj(cond, default_proj_nr); - } statement_to_firm(statement->body); - jump_if_reachable(get_break_label()); + if (currently_reachable()) { + add_immBlock_pred(get_break_label(), new_Jmp()); + } - if (!saw_default_label && first_block != NULL) { - set_cur_block(first_block); - ir_node *const proj = new_d_Proj(dbgi, cond, mode_X, default_proj_nr); + if (!saw_default_label && switch_node) { + ir_node *proj = new_d_Proj(dbgi, switch_node, mode_X, pn_Switch_default); add_immBlock_pred(get_break_label(), proj); } @@ -5010,81 +4970,64 @@ static void switch_statement_to_firm(switch_statement_t *statement) } set_cur_block(break_label); - assert(current_switch_cond == cond); - current_switch = old_switch; - current_switch_cond = old_switch_cond; - break_label = old_break_label; - saw_default_label = old_saw_default_label; + assert(current_switch == switch_node); + current_switch = old_switch; + break_label = old_break_label; + saw_default_label = old_saw_default_label; + return NULL; } -static void case_label_to_firm(const case_label_statement_t *statement) +static ir_node *case_label_to_firm(const case_label_statement_t *statement) { if (statement->is_empty_range) - return; + return NULL; - ir_node *block = new_immBlock(); - /* Fallthrough from previous case */ - jump_if_reachable(block); - - if (current_switch_cond != NULL) { - set_cur_block(get_nodes_block(current_switch_cond)); - dbg_info *const dbgi = get_dbg_info(&statement->base.source_position); - if (statement->expression != NULL) { - long pn = statement->first_case; - long end_pn = statement->last_case; - assert(pn <= end_pn); - /* create jumps for all cases in the given range */ - do { - ir_node *const proj = new_d_Proj(dbgi, current_switch_cond, mode_X, pn); - add_immBlock_pred(block, proj); - } while (pn++ < end_pn); - } else { + if (current_switch != NULL) { + ir_node *block = new_immBlock(); + /* Fallthrough from previous case */ + jump_if_reachable(block); + + ir_node *const proj = new_Proj(current_switch, mode_X, statement->pn); + add_immBlock_pred(block, proj); + if (statement->expression == NULL) saw_default_label = true; - ir_node *const proj = new_d_Proj(dbgi, current_switch_cond, mode_X, - current_switch->default_proj_nr); - add_immBlock_pred(block, proj); - } - } - mature_immBlock(block); - set_cur_block(block); + mature_immBlock(block); + set_cur_block(block); + } - statement_to_firm(statement->statement); + return statement_to_firm(statement->statement); } -static void label_to_firm(const label_statement_t *statement) +static ir_node *label_to_firm(const label_statement_t *statement) { ir_node *block = get_label_block(statement->label); - jump_if_reachable(block); + jump_to(block); set_cur_block(block); keep_alive(block); keep_all_memory(block); - statement_to_firm(statement->statement); + return statement_to_firm(statement->statement); } -static void goto_to_firm(const goto_statement_t *statement) +static ir_node *computed_goto_to_firm(computed_goto_statement_t const *const statement) { if (!currently_reachable()) - return; + return NULL; - if (statement->expression) { - ir_node *irn = expression_to_firm(statement->expression); - dbg_info *dbgi = get_dbg_info(&statement->base.source_position); - ir_node *ijmp = new_d_IJmp(dbgi, irn); + ir_node *const irn = expression_to_firm(statement->expression); + dbg_info *const dbgi = get_dbg_info(&statement->base.source_position); + ir_node *const ijmp = new_d_IJmp(dbgi, irn); + + set_irn_link(ijmp, ijmp_list); + ijmp_list = ijmp; - set_irn_link(ijmp, ijmp_list); - ijmp_list = ijmp; - } else { - ir_node *block = get_label_block(statement->label); - ir_node *jmp = new_Jmp(); - add_immBlock_pred(block, jmp); - } set_unreachable_now(); + return NULL; } -static void asm_statement_to_firm(const asm_statement_t *statement) +static ir_node *asm_statement_to_firm(const asm_statement_t *statement) { bool needs_memory = false; @@ -5199,7 +5142,7 @@ static void asm_statement_to_firm(const asm_statement_t *statement) ir_asm_constraint constraint; constraint.pos = pos; constraint.constraint = new_id_from_str(constraints); - constraint.mode = NULL; + constraint.mode = mode_M; tmp_in_constraints[in_size] = constraint; ins[in_size] = expression_to_addr(expr); @@ -5324,87 +5267,57 @@ static void asm_statement_to_firm(const asm_statement_t *statement) set_value_for_expression_addr(out_expr, proj, addr); } + + return NULL; } -static void ms_try_statement_to_firm(ms_try_statement_t *statement) +static ir_node *ms_try_statement_to_firm(ms_try_statement_t *statement) { statement_to_firm(statement->try_statement); source_position_t const *const pos = &statement->base.source_position; warningf(WARN_OTHER, pos, "structured exception handling ignored"); + return NULL; } -static void leave_statement_to_firm(leave_statement_t *statement) +static ir_node *leave_statement_to_firm(leave_statement_t *statement) { errorf(&statement->base.source_position, "__leave not supported yet"); + return NULL; } /** * Transform a statement. */ -static void statement_to_firm(statement_t *statement) +static ir_node *statement_to_firm(statement_t *const stmt) { #ifndef NDEBUG - assert(!statement->base.transformed); - statement->base.transformed = true; + assert(!stmt->base.transformed); + stmt->base.transformed = true; #endif - switch (statement->kind) { - case STATEMENT_ERROR: - panic("error statement found"); - case STATEMENT_EMPTY: - /* nothing */ - return; - case STATEMENT_COMPOUND: - compound_statement_to_firm(&statement->compound); - return; - case STATEMENT_RETURN: - return_statement_to_firm(&statement->returns); - return; - case STATEMENT_EXPRESSION: - expression_statement_to_firm(&statement->expression); - return; - case STATEMENT_IF: - if_statement_to_firm(&statement->ifs); - return; - case STATEMENT_WHILE: - while_statement_to_firm(&statement->whiles); - return; - case STATEMENT_DO_WHILE: - do_while_statement_to_firm(&statement->do_while); - return; - case STATEMENT_DECLARATION: - declaration_statement_to_firm(&statement->declaration); - return; - case STATEMENT_BREAK: - create_jump_statement(statement, get_break_label()); - return; - case STATEMENT_CONTINUE: - create_jump_statement(statement, continue_label); - return; - case STATEMENT_SWITCH: - switch_statement_to_firm(&statement->switchs); - return; - case STATEMENT_CASE_LABEL: - case_label_to_firm(&statement->case_label); - return; - case STATEMENT_FOR: - for_statement_to_firm(&statement->fors); - return; - case STATEMENT_LABEL: - label_to_firm(&statement->label); - return; - case STATEMENT_GOTO: - goto_to_firm(&statement->gotos); - return; - case STATEMENT_ASM: - asm_statement_to_firm(&statement->asms); - return; - case STATEMENT_MS_TRY: - ms_try_statement_to_firm(&statement->ms_try); - return; - case STATEMENT_LEAVE: - leave_statement_to_firm(&statement->leave); - return; + switch (stmt->kind) { + case STATEMENT_ASM: return asm_statement_to_firm( &stmt->asms); + case STATEMENT_CASE_LABEL: return case_label_to_firm( &stmt->case_label); + case STATEMENT_COMPOUND: return compound_statement_to_firm( &stmt->compound); + case STATEMENT_COMPUTED_GOTO: return computed_goto_to_firm( &stmt->computed_goto); + case STATEMENT_DECLARATION: return declaration_statement_to_firm(&stmt->declaration); + case STATEMENT_DO_WHILE: return do_while_statement_to_firm( &stmt->do_while); + case STATEMENT_EMPTY: return NULL; /* nothing */ + case STATEMENT_EXPRESSION: return expression_statement_to_firm( &stmt->expression); + case STATEMENT_FOR: return for_statement_to_firm( &stmt->fors); + case STATEMENT_IF: return if_statement_to_firm( &stmt->ifs); + case STATEMENT_LABEL: return label_to_firm( &stmt->label); + case STATEMENT_LEAVE: return leave_statement_to_firm( &stmt->leave); + case STATEMENT_MS_TRY: return ms_try_statement_to_firm( &stmt->ms_try); + case STATEMENT_RETURN: return return_statement_to_firm( &stmt->returns); + case STATEMENT_SWITCH: return switch_statement_to_firm( &stmt->switchs); + case STATEMENT_WHILE: return while_statement_to_firm( &stmt->whiles); + + case STATEMENT_BREAK: return create_jump_statement(stmt, get_break_label()); + case STATEMENT_CONTINUE: return create_jump_statement(stmt, continue_label); + case STATEMENT_GOTO: return create_jump_statement(stmt, get_label_block(stmt->gotos.label)); + + case STATEMENT_ERROR: panic("error statement found"); } panic("statement not implemented"); } @@ -5545,7 +5458,7 @@ static void initialize_function_parameters(entity_t *entity) * @param irg the IR-graph * @param dec_modifiers additional modifiers */ -static void handle_decl_modifier_irg(ir_graph_ptr irg, +static void handle_decl_modifier_irg(ir_graph *irg, decl_modifiers_t decl_modifiers) { if (decl_modifiers & DM_NAKED) { @@ -5647,8 +5560,6 @@ static void create_function(entity_t *entity) set_irn_dbg_info(get_irg_start_block(irg), get_entity_dbg_info(function_entity)); - ir_node *first_block = get_cur_block(); - /* set inline flags */ if (entity->function.is_inline) set_irg_inline_property(irg, irg_inline_recomended); @@ -5666,20 +5577,13 @@ static void create_function(entity_t *entity) if (currently_reachable()) { type_t *type = skip_typeref(entity->declaration.type); assert(is_type_function(type)); - const function_type_t *func_type = &type->function; - const type_t *return_type - = skip_typeref(func_type->return_type); + type_t *const return_type = skip_typeref(type->function.return_type); ir_node *ret; - if (is_type_atomic(return_type, ATOMIC_TYPE_VOID)) { + if (is_type_void(return_type)) { ret = new_Return(get_store(), 0, NULL); } else { - ir_mode *mode; - if (is_type_scalar(return_type)) { - mode = get_ir_mode_storage(func_type->return_type); - } else { - mode = mode_P_data; - } + ir_mode *const mode = get_ir_mode_storage(return_type); ir_node *in[1]; /* §5.1.2.2.3 main implicitly returns 0 */ @@ -5693,30 +5597,17 @@ static void create_function(entity_t *entity) add_immBlock_pred(end_block, ret); } - bool has_computed_gotos = false; for (int i = ARR_LEN(all_labels) - 1; i >= 0; --i) { label_t *label = all_labels[i]; if (label->address_taken) { gen_ijmp_branches(label->block); - has_computed_gotos = true; } mature_immBlock(label->block); } - if (has_computed_gotos) { - /* if we have computed goto's in the function, we cannot inline it */ - if (get_irg_inline_property(irg) >= irg_inline_recomended) { - source_position_t const *const pos = &entity->base.source_position; - warningf(WARN_OTHER, pos, "'%N' can never be inlined because it contains a computed goto", entity); - } - set_irg_inline_property(irg, irg_inline_forbidden); - } DEL_ARR_F(all_labels); all_labels = NULL; - mature_immBlock(first_block); - mature_immBlock(end_block); - irg_finalize_cons(irg); /* finalize the frame type */ @@ -5833,11 +5724,9 @@ static void init_ir_types(void) return; ir_types_initialized = 1; - ir_type_int = get_ir_type(type_int); ir_type_char = get_ir_type(type_char); ir_type_const_char = get_ir_type(type_const_char); ir_type_wchar_t = get_ir_type(type_wchar_t); - ir_type_void = get_ir_type(type_void); be_params = be_get_backend_param(); mode_float_arithmetic = be_params->mode_float_arithmetic; @@ -5868,8 +5757,27 @@ static void global_asm_to_firm(statement_t *s) } } +static const char *get_cwd(void) +{ + static char buf[1024]; + if (buf[0] == '\0') + getcwd(buf, sizeof(buf)); + return buf; +} + void translation_unit_to_firm(translation_unit_t *unit) { + if (c_mode & _CXX) { + be_dwarf_set_source_language(DW_LANG_C_plus_plus); + } else if (c_mode & _C99) { + be_dwarf_set_source_language(DW_LANG_C99); + } else if (c_mode & _C89) { + be_dwarf_set_source_language(DW_LANG_C89); + } else { + be_dwarf_set_source_language(DW_LANG_C); + } + be_dwarf_set_compilation_directory(get_cwd()); + /* initialize firm arithmetic */ tarval_set_integer_overflow_mode(TV_OVERFLOW_WRAP); ir_set_uninitialized_local_variable_func(uninitialized_local_var); @@ -5877,7 +5785,7 @@ void translation_unit_to_firm(translation_unit_t *unit) /* just to be sure */ continue_label = NULL; break_label = NULL; - current_switch_cond = NULL; + current_switch = NULL; current_translation_unit = unit; init_ir_types();