X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast2firm.c;h=c2277a96de5183c0283a009da6adaee2dcda1523;hb=7816b50631d689e88757f93dcbff5e30669a4c17;hp=4e346740dbcbdcc0b784aec14dae03dba4244a21;hpb=6f73320bef013a7777bacb5b9fb1a13fb66de118;p=cparser diff --git a/ast2firm.c b/ast2firm.c index 4e34674..c2277a9 100644 --- a/ast2firm.c +++ b/ast2firm.c @@ -64,7 +64,6 @@ fp_model_t firm_fp_model = fp_model_precise; static const backend_params *be_params; static ir_type *ir_type_char; -static ir_type *ir_type_wchar_t; /* architecture specific floating point arithmetic mode (if any) */ static ir_mode *mode_float_arithmetic; @@ -78,7 +77,8 @@ static jump_target break_target; static ir_node *current_switch; static bool saw_default_label; static entity_t **inner_functions; -static ir_node *ijmp_list; +static jump_target ijmp_target; +static ir_node **ijmp_ops; static ir_node **ijmp_blocks; static bool constant_folding; @@ -143,7 +143,7 @@ static ir_node *uninitialized_local_var(ir_graph *irg, ir_mode *mode, int pos) const entity_t *entity = get_irg_loc_description(irg, pos); if (entity != NULL) { - source_position_t const *const pos = &entity->base.source_position; + position_t const *const pos = &entity->base.pos; warningf(WARN_UNINITIALIZED, pos, "'%N' might be used uninitialized", entity); } return new_r_Unknown(irg, mode); @@ -151,7 +151,7 @@ static ir_node *uninitialized_local_var(ir_graph *irg, ir_mode *mode, int pos) static src_loc_t dbg_retrieve(const dbg_info *dbg) { - source_position_t const *const pos = (source_position_t const*)dbg; + position_t const *const pos = (position_t const*)dbg; if (pos) { return (src_loc_t){ pos->input_name, pos->lineno, pos->colno }; } else { @@ -159,7 +159,7 @@ static src_loc_t dbg_retrieve(const dbg_info *dbg) } } -static dbg_info *get_dbg_info(const source_position_t *pos) +static dbg_info *get_dbg_info(const position_t *pos) { return (dbg_info*) pos; } @@ -209,8 +209,7 @@ 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_FLOAT) - && !(flags & ATOMIC_TYPE_FLAG_COMPLEX)) { + if (flags & ATOMIC_TYPE_FLAG_FLOAT) { switch (size) { case 4: return get_modeF(); case 8: return get_modeD(); @@ -271,35 +270,50 @@ static unsigned count_parameters(const function_type_t *function_type) return count; } -/** - * Creates a Firm type for an atomic type - */ -static ir_type *create_atomic_type(atomic_type_kind_t akind, const type_t *type) +static ir_type *create_primitive_irtype(atomic_type_kind_t akind, + type_dbg_info *dbgi) { ir_mode *mode = atomic_modes[akind]; - type_dbg_info *dbgi = get_type_dbg_info_(type); ir_type *irtype = new_d_type_primitive(mode, dbgi); - il_alignment_t alignment = get_atomic_type_alignment(akind); + unsigned alignment = get_atomic_type_alignment(akind); + unsigned size = get_atomic_type_size(akind); - set_type_size_bytes(irtype, get_atomic_type_size(akind)); + set_type_size_bytes(irtype, size); set_type_alignment_bytes(irtype, alignment); return irtype; } +/** + * Creates a Firm type for an atomic type + */ +static ir_type *create_atomic_type(atomic_type_kind_t akind, const type_t *type) +{ + type_dbg_info *dbgi = get_type_dbg_info_(type); + return create_primitive_irtype(akind, dbgi); +} + /** * Creates a Firm type for a complex type */ -static ir_type *create_complex_type(const atomic_type_t *type) +static ir_type *create_complex_type(atomic_type_kind_t akind, + const type_t *type) { - atomic_type_kind_t kind = type->akind; - ir_mode *mode = atomic_modes[kind]; - ident *id = get_mode_ident(mode); + type_dbg_info *dbgi = get_type_dbg_info_(type); + ir_type *etype = create_primitive_irtype(akind, NULL); + ir_type *irtype = new_d_type_array(1, etype, dbgi); - (void) id; + int align = get_type_alignment_bytes(etype); + set_type_alignment_bytes(irtype, align); + unsigned n_elements = 2; + set_array_bounds_int(irtype, 0, 0, n_elements); + size_t elemsize = get_type_size_bytes(etype); + if (elemsize % align > 0) { + elemsize += align - (elemsize % align); + } + set_type_size_bytes(irtype, n_elements * elemsize); - /* FIXME: finish the array */ - return NULL; + return irtype; } /** @@ -600,7 +614,7 @@ static ir_type *create_compound_type(compound_type_t *const type, bool const inc ident = new_id_from_str(symbol->string); } - dbg_info *dbgi = get_dbg_info(&entry->base.source_position); + dbg_info *dbgi = get_dbg_info(&entry->base.pos); ir_type *entry_irtype; if (entry->compound_member.bitfield) { @@ -682,7 +696,7 @@ ir_type *get_ir_type(type_t *type) firm_type = create_atomic_type(type->atomic.akind, type); break; case TYPE_COMPLEX: - firm_type = create_complex_type(&type->atomic); + firm_type = create_complex_type(type->atomic.akind, type); break; case TYPE_IMAGINARY: firm_type = create_imaginary_type(&type->atomic); @@ -883,7 +897,7 @@ static bool declaration_is_definition(const entity_t *entity) case ENTITY_LOCAL_LABEL: break; } - panic("declaration_is_definition called on non-declaration"); + panic("entity is not a declaration"); } /** @@ -981,7 +995,7 @@ static ir_entity *get_function_entity(entity_t *entity, ir_type *owner_type) else nested_function = true; - dbg_info *const dbgi = get_dbg_info(&entity->base.source_position); + dbg_info *const dbgi = get_dbg_info(&entity->base.pos); irentity = new_d_entity(owner_type, id, ir_type_method, dbgi); ident *ld_id; @@ -1120,6 +1134,12 @@ static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode) return new_d_Conv(dbgi, value, dest_mode); } +static ir_node *conv_to_storage_type(dbg_info *const dbgi, ir_node *const val, type_t *const type) +{ + ir_mode *const mode = get_ir_mode_storage(type); + return create_conv(dbgi, val, mode); +} + /** * Creates a SymConst node representing a string constant. * @@ -1127,13 +1147,14 @@ static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode) * @param id_prefix a prefix for the name of the generated string constant * @param value the value of the string constant */ -static ir_node *string_to_firm(source_position_t const *const src_pos, char const *const id_prefix, string_t const *const value) +static ir_node *string_to_firm(position_t const *const src_pos, char const *const id_prefix, string_t const *const value) { size_t const slen = get_string_len(value) + 1; ir_initializer_t *const initializer = create_initializer_compound(slen); ir_type * elem_type; switch (value->encoding) { - case STRING_ENCODING_CHAR: { + case STRING_ENCODING_CHAR: + case STRING_ENCODING_UTF8: { elem_type = ir_type_char; ir_mode *const mode = get_type_mode(elem_type); @@ -1146,8 +1167,13 @@ static ir_node *string_to_firm(source_position_t const *const src_pos, char cons goto finish; } - case STRING_ENCODING_WIDE: { - elem_type = ir_type_wchar_t; + { + type_t *type; + case STRING_ENCODING_CHAR16: type = type_char16_t; goto init_wide; + case STRING_ENCODING_CHAR32: type = type_char32_t; goto init_wide; + case STRING_ENCODING_WIDE: type = type_wchar_t; goto init_wide; +init_wide:; + elem_type = get_ir_type(type); ir_mode *const mode = get_type_mode(elem_type); char const *p = value->begin; @@ -1269,10 +1295,10 @@ static ir_node *literal_to_firm(const literal_expression_t *literal) break; default: - panic("Invalid literal kind found"); + panic("invalid literal kind"); } - dbg_info *dbgi = get_dbg_info(&literal->base.source_position); + dbg_info *dbgi = get_dbg_info(&literal->base.pos); ir_node *res = new_d_Const(dbgi, tv); ir_mode *mode_arith = get_ir_mode_arithmetic(type); return create_conv(dbgi, res, mode_arith); @@ -1319,10 +1345,10 @@ static ir_node *char_literal_to_firm(string_literal_expression_t const *literal) } default: - panic("Invalid literal kind found"); + panic("invalid literal kind"); } - dbg_info *dbgi = get_dbg_info(&literal->base.source_position); + dbg_info *dbgi = get_dbg_info(&literal->base.pos); ir_node *res = new_d_Const(dbgi, tv); ir_mode *mode_arith = get_ir_mode_arithmetic(type); return create_conv(dbgi, res, mode_arith); @@ -1462,16 +1488,13 @@ static ir_node *get_local_frame(ir_entity *const ent) } /** - * Keep all memory edges of the given block. + * Keep the current block and memory. + * This is necessary for all loops, because they could become infinite. */ -static void keep_all_memory(ir_node *block) +static void keep_loop(void) { - ir_node *old = get_cur_block(); - - set_cur_block(block); + keep_alive(get_cur_block()); keep_alive(get_store()); - /* TODO: keep all memory edges from restricted pointers */ - set_cur_block(old); } static ir_node *enum_constant_to_firm(reference_expression_t const *const ref) @@ -1488,7 +1511,7 @@ static ir_node *enum_constant_to_firm(reference_expression_t const *const ref) static ir_node *reference_addr(const reference_expression_t *ref) { - dbg_info *dbgi = get_dbg_info(&ref->base.source_position); + dbg_info *dbgi = get_dbg_info(&ref->base.pos); entity_t *entity = ref->entity; assert(is_declaration(entity)); @@ -1498,7 +1521,7 @@ static ir_node *reference_addr(const reference_expression_t *ref) /* for gcc compatibility we have to produce (dummy) addresses for some * builtins which don't have entities */ if (irentity == NULL) { - source_position_t const *const pos = &ref->base.source_position; + position_t const *const pos = &ref->base.pos; warningf(WARN_OTHER, pos, "taking address of builtin '%N'", ref->entity); /* simply create a NULL pointer */ @@ -1553,12 +1576,12 @@ static ir_node *reference_addr(const reference_expression_t *ref) panic("not implemented reference type"); } - panic("reference to declaration with unknown type found"); + panic("reference to declaration with unknown type"); } static ir_node *reference_expression_to_firm(const reference_expression_t *ref) { - dbg_info *const dbgi = get_dbg_info(&ref->base.source_position); + dbg_info *const dbgi = get_dbg_info(&ref->base.pos); entity_t *const entity = ref->entity; assert(is_declaration(entity)); @@ -1583,7 +1606,7 @@ static ir_node *reference_expression_to_firm(const reference_expression_t *ref) */ static ir_node *process_builtin_call(const call_expression_t *call) { - dbg_info *dbgi = get_dbg_info(&call->base.source_position); + dbg_info *dbgi = get_dbg_info(&call->base.pos); assert(call->function->kind == EXPR_REFERENCE); reference_expression_t *builtin = &call->function->reference; @@ -1667,7 +1690,7 @@ static ir_node *process_builtin_call(const call_expression_t *call) case BUILTIN_LIBC_CHECK: panic("builtin did not produce an entity"); } - panic("invalid builtin found"); + panic("invalid builtin"); } /** @@ -1679,7 +1702,7 @@ static ir_node *process_builtin_call(const call_expression_t *call) */ static ir_node *call_expression_to_firm(const call_expression_t *const call) { - dbg_info *const dbgi = get_dbg_info(&call->base.source_position); + dbg_info *const dbgi = get_dbg_info(&call->base.pos); assert(currently_reachable()); expression_t *function = call->function; @@ -1753,14 +1776,8 @@ static ir_node *call_expression_to_firm(const call_expression_t *const call) for (int n = 0; n < n_parameters; ++n) { expression_t *expression = argument->expression; ir_node *arg_node = expression_to_firm(expression); - - type_t *arg_type = skip_typeref(expression->base.type); - if (!is_type_compound(arg_type)) { - ir_mode *const mode = get_ir_mode_storage(arg_type); - arg_node = create_conv(dbgi, arg_node, mode); - } - - in[n] = arg_node; + type_t *arg_type = skip_typeref(expression->base.type); + in[n] = conv_to_storage_type(dbgi, arg_node, arg_type); argument = argument->next; } @@ -1827,10 +1844,7 @@ static ir_node *create_condition_evaluation(expression_t const *expression, jump static void assign_value(dbg_info *dbgi, ir_node *addr, type_t *type, ir_node *value) { - if (!is_type_compound(type)) { - ir_mode *mode = get_ir_mode_storage(type); - value = create_conv(dbgi, value, mode); - } + value = conv_to_storage_type(dbgi, value, type); ir_node *memory = get_store(); @@ -1929,7 +1943,7 @@ static ir_node *bitfield_store_to_firm(dbg_info *dbgi, static ir_node *bitfield_extract_to_firm(const select_expression_t *expression, ir_node *addr) { - dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + dbg_info *dbgi = get_dbg_info(&expression->base.pos); entity_t *entity = expression->compound_entry; type_t *base_type = entity->declaration.type; ir_mode *mode = get_ir_mode_storage(base_type); @@ -1988,13 +2002,9 @@ static void construct_select_compound(const select_expression_t *expression) static ir_node *set_value_for_expression_addr(const expression_t *expression, ir_node *value, ir_node *addr) { - dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + dbg_info *dbgi = get_dbg_info(&expression->base.pos); type_t *type = skip_typeref(expression->base.type); - - if (!is_type_compound(type)) { - ir_mode *mode = get_ir_mode_storage(type); - value = create_conv(dbgi, value, mode); - } + value = conv_to_storage_type(dbgi, value, type); if (expression->kind == EXPR_REFERENCE) { const reference_expression_t *ref = &expression->reference; @@ -2063,7 +2073,7 @@ static ir_node *get_value_from_lvalue(const expression_t *expression, } assert(addr != NULL); - dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + dbg_info *dbgi = get_dbg_info(&expression->base.pos); ir_node *value; if (expression->kind == EXPR_SELECT && @@ -2077,52 +2087,29 @@ static ir_node *get_value_from_lvalue(const expression_t *expression, return value; } - -static ir_node *create_incdec(const unary_expression_t *expression) +static ir_node *create_incdec(unary_expression_t const *const expr, bool const inc, bool const pre) { - dbg_info *const dbgi = get_dbg_info(&expression->base.source_position); - const expression_t *value_expr = expression->value; - ir_node *addr = expression_to_addr(value_expr); - ir_node *value = get_value_from_lvalue(value_expr, addr); - - type_t *type = skip_typeref(expression->base.type); - ir_mode *mode = get_ir_mode_arithmetic(expression->base.type); + type_t *const type = skip_typeref(expr->base.type); + ir_mode *const mode = get_ir_mode_arithmetic(type); ir_node *offset; if (is_type_pointer(type)) { - pointer_type_t *pointer_type = &type->pointer; - offset = get_type_size_node(pointer_type->points_to); + offset = get_type_size_node(type->pointer.points_to); } else { assert(is_type_arithmetic(type)); offset = new_Const(get_mode_one(mode)); } - ir_node *result; - ir_node *store_value; - switch(expression->base.kind) { - case EXPR_UNARY_POSTFIX_INCREMENT: - result = value; - store_value = new_d_Add(dbgi, value, offset, mode); - break; - case EXPR_UNARY_POSTFIX_DECREMENT: - result = value; - store_value = new_d_Sub(dbgi, value, offset, mode); - break; - case EXPR_UNARY_PREFIX_INCREMENT: - result = new_d_Add(dbgi, value, offset, mode); - store_value = result; - break; - case EXPR_UNARY_PREFIX_DECREMENT: - result = new_d_Sub(dbgi, value, offset, mode); - store_value = result; - break; - default: - panic("no incdec expr in create_incdec"); - } - - set_value_for_expression_addr(value_expr, store_value, addr); + dbg_info *const dbgi = get_dbg_info(&expr->base.pos); + expression_t const *const value_expr = expr->value; + ir_node *const addr = expression_to_addr(value_expr); + ir_node *const value = get_value_from_lvalue(value_expr, addr); + ir_node *const new_value = inc + ? new_d_Add(dbgi, value, offset, mode) + : new_d_Sub(dbgi, value, offset, mode); - return result; + ir_node *const store_value = set_value_for_expression_addr(value_expr, new_value, addr); + return pre ? store_value : value; } static bool is_local_variable(expression_t *expression) @@ -2291,7 +2278,7 @@ static ir_node *create_cast(dbg_info *dbgi, ir_node *value_node, static ir_node *unary_expression_to_firm(const unary_expression_t *expression) { - dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + dbg_info *dbgi = get_dbg_info(&expression->base.pos); type_t *type = skip_typeref(expression->base.type); const expression_t *value = expression->value; @@ -2333,11 +2320,18 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression) type_t *points_to = value_type->pointer.points_to; return deref_address(dbgi, points_to, value_node); } - case EXPR_UNARY_POSTFIX_INCREMENT: - case EXPR_UNARY_POSTFIX_DECREMENT: - case EXPR_UNARY_PREFIX_INCREMENT: - case EXPR_UNARY_PREFIX_DECREMENT: - return create_incdec(expression); + + { + bool inc; + bool pre; + case EXPR_UNARY_POSTFIX_DECREMENT: inc = false; pre = false; goto incdec; + case EXPR_UNARY_POSTFIX_INCREMENT: inc = true; pre = false; goto incdec; + case EXPR_UNARY_PREFIX_DECREMENT: inc = false; pre = true; goto incdec; + case EXPR_UNARY_PREFIX_INCREMENT: inc = true; pre = true; goto incdec; +incdec: + return create_incdec(expression, inc, pre); + } + case EXPR_UNARY_CAST: { ir_node *value_node = expression_to_firm(value); type_t *from_type = value->base.type; @@ -2349,7 +2343,7 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression) default: break; } - panic("invalid UNEXPR type found"); + panic("invalid unary expression type"); } /** @@ -2517,7 +2511,7 @@ normal_node: static ir_node *create_lazy_op(const binary_expression_t *expression) { - dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + dbg_info *dbgi = get_dbg_info(&expression->base.pos); type_t *type = skip_typeref(expression->base.type); ir_mode *mode = get_ir_mode_arithmetic(type); @@ -2547,12 +2541,9 @@ static ir_node *create_lazy_op(const binary_expression_t *expression) dbgi); } -typedef ir_node * (*create_arithmetic_func)(dbg_info *dbgi, ir_node *left, - ir_node *right, ir_mode *mode); - static ir_node *create_assign_binop(const binary_expression_t *expression) { - dbg_info *const dbgi = get_dbg_info(&expression->base.source_position); + dbg_info *const dbgi = get_dbg_info(&expression->base.pos); const expression_t *left_expr = expression->left; type_t *type = skip_typeref(left_expr->base.type); ir_node *right = expression_to_firm(expression->right); @@ -2588,7 +2579,7 @@ static ir_node *binary_expression_to_firm(const binary_expression_t *expression) case EXPR_BINARY_ISLESSEQUAL: case EXPR_BINARY_ISLESSGREATER: case EXPR_BINARY_ISUNORDERED: { - dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + dbg_info *dbgi = get_dbg_info(&expression->base.pos); ir_node *left = expression_to_firm(expression->left); ir_node *right = expression_to_firm(expression->right); ir_relation relation = get_relation(kind); @@ -2619,7 +2610,7 @@ static ir_node *binary_expression_to_firm(const binary_expression_t *expression) case EXPR_BINARY_SHIFTLEFT: case EXPR_BINARY_SHIFTRIGHT: { - dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + dbg_info *dbgi = get_dbg_info(&expression->base.pos); ir_node *left = expression_to_firm(expression->left); ir_node *right = expression_to_firm(expression->right); return create_op(dbgi, expression, left, right); @@ -2650,7 +2641,7 @@ 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); + dbg_info *dbgi = get_dbg_info(&expression->base.pos); 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); @@ -2663,7 +2654,7 @@ static ir_node *array_access_addr(const array_access_expression_t *expression) static ir_node *array_access_to_firm( const array_access_expression_t *expression) { - dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + dbg_info *dbgi = get_dbg_info(&expression->base.pos); ir_node *addr = array_access_addr(expression); type_t *type = revert_automatic_type_conversion( (const expression_t*) expression); @@ -2720,7 +2711,7 @@ static ir_node *offsetof_to_firm(const offsetof_expression_t *expression) ir_mode *mode = get_ir_mode_arithmetic(expression->base.type); long offset = get_offsetof_offset(expression); ir_tarval *tv = new_tarval_from_long(offset, mode); - dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + dbg_info *dbgi = get_dbg_info(&expression->base.pos); return new_d_Const(dbgi, tv); } @@ -2752,11 +2743,13 @@ static ir_entity *create_initializer_entity(dbg_info *dbgi, static ir_node *compound_literal_addr(compound_literal_expression_t const *const expression) { - dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + dbg_info *dbgi = get_dbg_info(&expression->base.pos); type_t *type = expression->type; initializer_t *initializer = expression->initializer; - if (is_constant_initializer(initializer) == EXPR_CLASS_CONSTANT) { + if (expression->global_scope || + ((type->base.qualifiers & TYPE_QUALIFIER_CONST) + && is_constant_initializer(initializer) == EXPR_CLASS_CONSTANT)) { ir_entity *entity = create_initializer_entity(dbgi, initializer, type); return create_symconst(dbgi, entity); } else { @@ -2780,7 +2773,7 @@ static ir_node *compound_literal_addr(compound_literal_expression_t const *const 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); + dbg_info *const dbgi = get_dbg_info(&expr->base.pos); type_t *const type = expr->type; ir_node *const addr = compound_literal_addr(expr); return deref_address(dbgi, type, addr); @@ -2845,7 +2838,7 @@ static ir_node *alignof_to_firm(const typeprop_expression_t *expression) alignment = get_type_alignment(type); } - dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + dbg_info *dbgi = get_dbg_info(&expression->base.pos); ir_mode *mode = get_ir_mode_arithmetic(expression->base.type); ir_tarval *tv = new_tarval_from_long(alignment, mode); return new_d_Const(dbgi, tv); @@ -2909,8 +2902,6 @@ bool fold_constant_to_bool(const expression_t *expression) static ir_node *conditional_to_firm(const conditional_expression_t *expression) { - dbg_info *const dbgi = get_dbg_info(&expression->base.source_position); - /* first try to fold a constant condition */ if (is_constant_expression(expression->condition) == EXPR_CLASS_CONSTANT) { bool val = fold_constant_to_bool(expression->condition); @@ -2951,7 +2942,8 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression) ir_node *const false_val = expression_to_firm(expression->false_expression); jump_to_target(&exit_target); if (val) { - ir_node *const in[] = { val, false_val }; + ir_node *const in[] = { val, false_val }; + dbg_info *const dbgi = get_dbg_info(&expression->base.pos); val = new_rd_Phi(dbgi, exit_target.block, lengthof(in), in, get_irn_mode(val)); } else { val = false_val; @@ -2972,7 +2964,7 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression) */ static ir_node *select_addr(const select_expression_t *expression) { - dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + dbg_info *dbgi = get_dbg_info(&expression->base.pos); construct_select_compound(expression); @@ -2996,7 +2988,7 @@ static ir_node *select_addr(const select_expression_t *expression) static ir_node *select_to_firm(const select_expression_t *expression) { - dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + dbg_info *dbgi = get_dbg_info(&expression->base.pos); ir_node *addr = select_addr(expression); type_t *type = revert_automatic_type_conversion( (const expression_t*) expression); @@ -3077,7 +3069,7 @@ static ir_node *classify_type_to_firm(const classify_type_expression_t *const ex tc = real_type_class; goto make_const; } - panic("Unexpected atomic type in classify_type_to_firm()."); + panic("Unexpected atomic type."); } case TYPE_COMPLEX: tc = complex_type_class; goto make_const; @@ -3100,11 +3092,11 @@ static ir_node *classify_type_to_firm(const classify_type_expression_t *const ex case TYPE_ERROR: break; } - panic("unexpected TYPE classify_type_to_firm()."); + panic("unexpected type."); } make_const:; - dbg_info *const dbgi = get_dbg_info(&expr->base.source_position); + dbg_info *const dbgi = get_dbg_info(&expr->base.pos); 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); @@ -3118,18 +3110,18 @@ static ir_node *function_name_to_firm( case FUNCNAME_PRETTY_FUNCTION: case FUNCNAME_FUNCDNAME: if (current_function_name == NULL) { - source_position_t const *const src_pos = &expr->base.source_position; - char const *const name = current_function_entity->base.symbol->string; - string_t const string = { name, strlen(name), STRING_ENCODING_CHAR }; + position_t const *const src_pos = &expr->base.pos; + char const *const name = current_function_entity->base.symbol->string; + string_t const string = { name, strlen(name), STRING_ENCODING_CHAR }; current_function_name = string_to_firm(src_pos, "__func__.%u", &string); } return current_function_name; case FUNCNAME_FUNCSIG: if (current_funcsig == NULL) { - source_position_t const *const src_pos = &expr->base.source_position; - ir_entity *const ent = get_irg_entity(current_ir_graph); - char const *const name = get_entity_ld_name(ent); - string_t const string = { name, strlen(name), STRING_ENCODING_CHAR }; + position_t const *const src_pos = &expr->base.pos; + ir_entity *const ent = get_irg_entity(current_ir_graph); + char const *const name = get_entity_ld_name(ent); + string_t const string = { name, strlen(name), STRING_ENCODING_CHAR }; current_funcsig = string_to_firm(src_pos, "__FUNCSIG__.%u", &string); } return current_funcsig; @@ -3158,7 +3150,7 @@ static ir_node *va_start_expression_to_firm( } ir_node *const frame = get_irg_frame(current_ir_graph); - dbg_info *const dbgi = get_dbg_info(&expr->base.source_position); + dbg_info *const dbgi = get_dbg_info(&expr->base.pos); ir_node *const no_mem = new_NoMem(); ir_node *const arg_sel = new_d_simpleSel(dbgi, no_mem, frame, param_ent); @@ -3173,7 +3165,7 @@ static ir_node *va_arg_expression_to_firm(const va_arg_expression_t *const expr) expression_t *const ap_expr = expr->ap; ir_node *const ap_addr = expression_to_addr(ap_expr); ir_node *const ap = get_value_from_lvalue(ap_expr, ap_addr); - dbg_info *const dbgi = get_dbg_info(&expr->base.source_position); + dbg_info *const dbgi = get_dbg_info(&expr->base.pos); ir_node *const res = deref_address(dbgi, type, ap); ir_node *const cnst = get_type_size_node(expr->base.type); @@ -3213,8 +3205,6 @@ static ir_node *expression_to_addr(const expression_t *expression) switch(expression->kind) { case EXPR_ARRAY_ACCESS: return array_access_addr(&expression->array_access); - case EXPR_CALL: - return call_expression_to_firm(&expression->call); case EXPR_COMPOUND_LITERAL: return compound_literal_addr(&expression->compound_literal); case EXPR_REFERENCE: @@ -3247,16 +3237,14 @@ static ir_node *builtin_types_compatible_to_firm( return create_Const_from_bool(mode, value); } -static ir_node *get_label_block(label_t *label) +static void prepare_label_target(label_t *const label) { - if (label->block != NULL) - return label->block; - - ir_node *block = new_immBlock(); - label->block = block; - if (label->address_taken) - ARR_APP1(ir_node*, ijmp_blocks, block); - return block; + if (label->address_taken && !label->indirect_block) { + ir_node *const iblock = new_immBlock(); + label->indirect_block = iblock; + ARR_APP1(ir_node*, ijmp_blocks, iblock); + jump_from_block_to_target(&label->target, iblock); + } } /** @@ -3268,13 +3256,12 @@ static ir_node *label_address_to_firm(const label_address_expression_t *label) /* Beware: Might be called from create initializer with current_ir_graph * set to const_code_irg. */ PUSH_IRG(current_function); - dbg_info *dbgi = get_dbg_info(&label->base.source_position); - ir_node *block = get_label_block(label->label); - ir_entity *entity = create_Block_entity(block); + prepare_label_target(label->label); POP_IRG(); symconst_symbol value; - value.entity_p = entity; + value.entity_p = create_Block_entity(label->label->indirect_block); + dbg_info *const dbgi = get_dbg_info(&label->base.pos); return new_d_SymConst(dbgi, mode_P_code, value, symconst_addr_ent); } @@ -3317,11 +3304,11 @@ static ir_node *_expression_to_firm(expression_t const *const expr) 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_STRING_LITERAL: return string_to_firm(&expr->base.source_position, "str.%u", &expr->string_literal.value); + case EXPR_STRING_LITERAL: return string_to_firm(&expr->base.pos, "str.%u", &expr->string_literal.value); case EXPR_ERROR: break; } - panic("invalid expression found"); + panic("invalid expression"); } /** @@ -3388,7 +3375,7 @@ 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); + dbg_info *dbgi = get_dbg_info(&expression->base.pos); ir_mode *mode = get_ir_mode_arithmetic(expression->base.type); return produce_condition_result(expression, mode, dbgi); } @@ -3425,26 +3412,33 @@ static ir_node *create_condition_evaluation(expression_t const *const expression break; } - dbg_info *dbgi = get_dbg_info(&expression->base.source_position); - ir_node *cond_expr = _expression_to_firm(expression); - ir_node *condition = create_conv(dbgi, cond_expr, mode_b); - ir_node *cond = new_d_Cond(dbgi, condition); - ir_node *true_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_true); - ir_node *false_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_false); - - /* set branch prediction info based on __builtin_expect */ - if (is_builtin_expect(expression) && is_Cond(cond)) { - call_argument_t *argument = expression->call.arguments->next; - if (is_constant_expression(argument->expression) == EXPR_CLASS_CONSTANT) { - bool const cnst = fold_constant_to_bool(argument->expression); - cond_jmp_predicate const pred = cnst ? COND_JMP_PRED_TRUE : COND_JMP_PRED_FALSE; - set_Cond_jmp_pred(cond, pred); + ir_node *cond_expr = _expression_to_firm(expression); + if (is_Const(cond_expr)) { + if (tarval_is_null(get_Const_tarval(cond_expr))) { + jump_to_target(false_target); + } else { + jump_to_target(true_target); + } + } else { + dbg_info *dbgi = get_dbg_info(&expression->base.pos); + ir_node *condition = create_conv(dbgi, cond_expr, mode_b); + ir_node *cond = new_d_Cond(dbgi, condition); + ir_node *true_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_true); + ir_node *false_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_false); + + /* set branch prediction info based on __builtin_expect */ + if (is_builtin_expect(expression) && is_Cond(cond)) { + call_argument_t *argument = expression->call.arguments->next; + if (is_constant_expression(argument->expression) == EXPR_CLASS_CONSTANT) { + bool const cnst = fold_constant_to_bool(argument->expression); + cond_jmp_predicate const pred = cnst ? COND_JMP_PRED_TRUE : COND_JMP_PRED_FALSE; + set_Cond_jmp_pred(cond, pred); + } } - } - - add_pred_to_jump_target(true_target, true_proj); - add_pred_to_jump_target(false_target, false_proj); + add_pred_to_jump_target(true_target, true_proj); + add_pred_to_jump_target(false_target, false_proj); + } set_unreachable_now(); return cond_expr; } @@ -3458,7 +3452,7 @@ static void create_variable_entity(entity_t *variable, ident *const id = new_id_from_str(variable->base.symbol->string); ir_type *const irtype = get_ir_type(type); - dbg_info *const dbgi = get_dbg_info(&variable->base.source_position); + dbg_info *const dbgi = get_dbg_info(&variable->base.pos); ir_entity *const irentity = new_d_entity(parent_type, id, irtype, dbgi); unsigned alignment = variable->declaration.alignment; @@ -3686,7 +3680,7 @@ static void advance_current_object(type_path_t *path) { if (path->invalid) { /* TODO: handle this... */ - panic("invalid initializer in ast2firm (excessive elements)"); + panic("invalid initializer (excessive elements)"); } type_path_entry_t *top = get_type_path_top(path); @@ -3731,18 +3725,27 @@ static void advance_current_object(type_path_t *path) static ir_initializer_t *create_ir_initializer_value( const initializer_value_t *initializer) { - if (is_type_compound(initializer->value->base.type)) { - panic("initializer creation for compounds not implemented yet"); - } - type_t *type = initializer->value->base.type; expression_t *expr = initializer->value; + type_t *type = skip_typeref(expr->base.type); + + if (is_type_compound(type)) { + if (expr->kind == EXPR_UNARY_CAST) { + expr = expr->unary.value; + type = skip_typeref(expr->base.type); + } + /* must be a compound literal... */ + if (expr->kind == EXPR_COMPOUND_LITERAL) { + return create_ir_initializer(expr->compound_literal.initializer, + type); + } + } + ir_node *value = expression_to_firm(expr); - ir_mode *mode = get_ir_mode_storage(type); - value = create_conv(NULL, value, mode); + value = conv_to_storage_type(NULL, value, type); return create_initializer_const(value); } -/** test wether type can be initialized by a string constant */ +/** Tests whether type can be initialized by a string constant */ static bool is_string_type(type_t *type) { if (!is_type_array(type)) @@ -3771,13 +3774,14 @@ static ir_initializer_t *create_ir_initializer_list( } if (sub_initializer->kind == INITIALIZER_VALUE) { - /* we might have to descend into types until we're at a scalar - * type */ + const expression_t *expr = sub_initializer->value.value; + const type_t *expr_type = skip_typeref(expr->base.type); + /* we might have to descend into types until the types match */ while(true) { type_t *orig_top_type = path.top_type; type_t *top_type = skip_typeref(orig_top_type); - if (is_type_scalar(top_type)) + if (types_compatible(top_type, expr_type)) break; descend_into_subtype(&path); } @@ -3828,6 +3832,7 @@ static ir_initializer_t *create_ir_initializer_string(initializer_t const *const char const * p = str->value.begin; switch (str->value.encoding) { case STRING_ENCODING_CHAR: + case STRING_ENCODING_UTF8: for (size_t i = 0; i != arr_len; ++i) { char const c = i < str_len ? *p++ : 0; ir_tarval *const tv = new_tarval_from_long(c, mode); @@ -3836,6 +3841,8 @@ static ir_initializer_t *create_ir_initializer_string(initializer_t const *const } break; + case STRING_ENCODING_CHAR16: + case STRING_ENCODING_CHAR32: case STRING_ENCODING_WIDE: for (size_t i = 0; i != arr_len; ++i) { utf32 const c = i < str_len ? read_utf8_char(&p) : 0; @@ -3863,7 +3870,7 @@ static ir_initializer_t *create_ir_initializer( return create_ir_initializer_value(&initializer->value); case INITIALIZER_DESIGNATOR: - panic("unexpected designator initializer found"); + panic("unexpected designator initializer"); } panic("unknown initializer"); } @@ -3942,11 +3949,17 @@ static void create_dynamic_initializer_sub(ir_initializer_t *initializer, return; } - assert(get_type_mode(type) == get_irn_mode(node)); - ir_node *mem = get_store(); - ir_node *store = new_d_Store(dbgi, mem, base_addr, node, cons_none); - ir_node *proj_m = new_Proj(store, mode_M, pn_Store_M); - set_store(proj_m); + ir_node *mem = get_store(); + ir_node *new_mem; + if (is_compound_type(ent_type)) { + ir_node *copyb = new_d_CopyB(dbgi, mem, base_addr, node, ent_type); + new_mem = new_Proj(copyb, mode_M, pn_CopyB_M); + } else { + assert(get_type_mode(type) == get_irn_mode(node)); + ir_node *store = new_d_Store(dbgi, mem, base_addr, node, cons_none); + new_mem = new_Proj(store, mode_M, pn_Store_M); + } + set_store(new_mem); return; } case IR_INITIALIZER_TARVAL: { @@ -4012,7 +4025,7 @@ static void create_dynamic_initializer_sub(ir_initializer_t *initializer, } } - panic("invalid IR_INITIALIZER found"); + panic("invalid ir_initializer"); } static void create_dynamic_initializer(ir_initializer_t *initializer, @@ -4065,7 +4078,7 @@ static void create_initializer_local_variable_entity(entity_t *entity) { assert(entity->kind == ENTITY_VARIABLE); initializer_t *initializer = entity->variable.initializer; - dbg_info *dbgi = get_dbg_info(&entity->base.source_position); + dbg_info *dbgi = get_dbg_info(&entity->base.pos); ir_entity *irentity = entity->variable.v.entity; type_t *type = entity->declaration.type; @@ -4105,9 +4118,8 @@ static void create_variable_initializer(entity_t *entity) } 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); + dbg_info *const dbgi = get_dbg_info(&entity->base.pos); + node = conv_to_storage_type(dbgi, node, init_type); if (declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE) { set_value(entity->variable.v.value_number, node); @@ -4156,7 +4168,7 @@ static void allocate_variable_length_array(entity_t *entity) assert(entity->variable.initializer == NULL); assert(currently_reachable()); - dbg_info *dbgi = get_dbg_info(&entity->base.source_position); + dbg_info *dbgi = get_dbg_info(&entity->base.pos); type_t *type = entity->declaration.type; ir_type *el_type = get_ir_type(type->array.element_type); @@ -4218,7 +4230,7 @@ static void create_local_static_variable(entity_t *entity) 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); + dbg_info *const dbgi = get_dbg_info(&entity->base.pos); size_t l = strlen(entity->base.symbol->string); char buf[l + sizeof(".%u")]; @@ -4253,17 +4265,16 @@ static ir_node *return_statement_to_firm(return_statement_t *statement) if (!currently_reachable()) return NULL; - dbg_info *const dbgi = get_dbg_info(&statement->base.source_position); + dbg_info *const dbgi = get_dbg_info(&statement->base.pos); 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 = conv_to_storage_type(dbgi, res, type); } else { - res = new_Unknown(mode); + res = new_Unknown(get_ir_mode_storage(type)); } in_len = 1; } else { @@ -4392,7 +4403,7 @@ static void create_local_declaration(entity_t *entity) case STORAGE_CLASS_TYPEDEF: break; } - panic("invalid storage class found"); + panic("invalid storage class"); } static void create_local_declarations(entity_t *e) @@ -4494,18 +4505,6 @@ static ir_node *if_statement_to_firm(if_statement_t *statement) return NULL; } -/** - * 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); - set_cur_block(target_block); -} - static ir_node *do_while_statement_to_firm(do_while_statement_t *statement) { create_local_declarations(statement->scope.entities); @@ -4526,6 +4525,7 @@ static ir_node *do_while_statement_to_firm(do_while_statement_t *statement) init_jump_target(&body_target, NULL); jump_to_target(&body_target); enter_immature_jump_target(&body_target); + keep_loop(); statement_to_firm(statement->body); jump_to_target(&continue_target); if (enter_jump_target(&continue_target)) @@ -4562,6 +4562,7 @@ static ir_node *for_statement_to_firm(for_statement_t *statement) init_jump_target(&header_target, NULL); jump_to_target(&header_target); enter_immature_jump_target(&header_target); + keep_loop(); expression_t *const step = statement->step; PUSH_BREAK(NULL); @@ -4574,10 +4575,6 @@ static ir_node *for_statement_to_firm(for_statement_t *statement) init_jump_target(&body_target, NULL); create_condition_evaluation(cond, &body_target, &break_target); enter_jump_target(&body_target); - } else { - /* for-ever. */ - keep_alive(header_target.block); - keep_all_memory(header_target.block); } /* Create the loop body. */ @@ -4598,19 +4595,6 @@ static ir_node *for_statement_to_firm(for_statement_t *statement) return NULL; } -static ir_node *create_jump_statement(const statement_t *statement, ir_node *target_block) -{ - if (!currently_reachable()) - 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 ir_switch_table *create_switch_table(const switch_statement_t *statement) { /* determine number of cases */ @@ -4646,7 +4630,7 @@ static ir_switch_table *create_switch_table(const switch_statement_t *statement) static ir_node *switch_statement_to_firm(switch_statement_t *statement) { - dbg_info *dbgi = get_dbg_info(&statement->base.source_position); + dbg_info *dbgi = get_dbg_info(&statement->base.pos); ir_node *switch_node = NULL; if (currently_reachable()) { @@ -4702,22 +4686,17 @@ static ir_node *case_label_to_firm(const case_label_statement_t *statement) return statement_to_firm(statement->statement); } -static void try_mature_label(label_t *const label) -{ - if (--label->n_users == 0 && !label->address_taken) - mature_immBlock(label->block); -} - static ir_node *label_to_firm(const label_statement_t *statement) { label_t *const label = statement->label; - ir_node *const block = get_label_block(label); - jump_to(block); - - keep_alive(block); - keep_all_memory(block); - - try_mature_label(label); + prepare_label_target(label); + jump_to_target(&label->target); + if (--label->n_users == 0) { + enter_jump_target(&label->target); + } else { + enter_immature_jump_target(&label->target); + keep_loop(); + } return statement_to_firm(statement->statement); } @@ -4725,24 +4704,22 @@ static ir_node *label_to_firm(const label_statement_t *statement) static ir_node *goto_statement_to_firm(goto_statement_t *const stmt) { label_t *const label = stmt->label; - create_jump_statement((statement_t*)stmt, get_label_block(label)); - try_mature_label(label); + prepare_label_target(label); + jump_to_target(&label->target); + if (--label->n_users == 0) + enter_jump_target(&label->target); + set_unreachable_now(); return NULL; } static ir_node *computed_goto_to_firm(computed_goto_statement_t const *const statement) { - if (!currently_reachable()) - return NULL; - - 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_unreachable_now(); + if (currently_reachable()) { + ir_node *const op = expression_to_firm(statement->expression); + ARR_APP1(ir_node*, ijmp_ops, op); + jump_to_target(&ijmp_target); + set_unreachable_now(); + } return NULL; } @@ -4755,7 +4732,7 @@ static ir_node *asm_statement_to_firm(const asm_statement_t *statement) const char *clobber_str = clobber->clobber.begin; if (!be_is_valid_clobber(clobber_str)) { - errorf(&statement->base.source_position, + errorf(&statement->base.pos, "invalid clobber '%s' specified", clobber->clobber); continue; } @@ -4802,7 +4779,7 @@ static ir_node *asm_statement_to_firm(const asm_statement_t *statement) = be_parse_asm_constraints(constraints); { - source_position_t const *const pos = &statement->base.source_position; + position_t const *const pos = &statement->base.pos; if (asm_flags & ASM_CONSTRAINT_FLAG_NO_SUPPORT) { warningf(WARN_OTHER, pos, "some constraints in '%s' are not supported", constraints); } @@ -4863,7 +4840,7 @@ static ir_node *asm_statement_to_firm(const asm_statement_t *statement) ++in_size; continue; } else { - errorf(&statement->base.source_position, + errorf(&statement->base.pos, "only modifiers but no place set in constraints '%s'", constraints); continue; @@ -4891,17 +4868,17 @@ static ir_node *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, + errorf(&statement->base.pos, "some constraints in '%s' are not supported", constraints); continue; } if (asm_flags & ASM_CONSTRAINT_FLAG_INVALID) { - errorf(&statement->base.source_position, + errorf(&statement->base.pos, "some constraints in '%s' are invalid", constraints); continue; } if (asm_flags & ASM_CONSTRAINT_FLAG_MODIFIER_WRITE) { - errorf(&statement->base.source_position, + errorf(&statement->base.pos, "write flag specified for input constraints '%s'", constraints); continue; @@ -4921,7 +4898,7 @@ static ir_node *asm_statement_to_firm(const asm_statement_t *statement) needs_memory = true; input = expression_to_addr(argument->expression); } else { - errorf(&statement->base.source_position, + errorf(&statement->base.pos, "only modifiers but no place set in constraints '%s'", constraints); continue; @@ -4942,7 +4919,7 @@ static ir_node *asm_statement_to_firm(const asm_statement_t *statement) ir_asm_constraint *input_constraints = obstack_finish(&asm_obst); /* create asm node */ - dbg_info *dbgi = get_dbg_info(&statement->base.source_position); + dbg_info *dbgi = get_dbg_info(&statement->base.pos); ident *asm_text = new_id_from_str(statement->asm_text.begin); @@ -4979,14 +4956,14 @@ static ir_node *asm_statement_to_firm(const asm_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; + position_t const *const pos = &statement->base.pos; warningf(WARN_OTHER, pos, "structured exception handling ignored"); return NULL; } static ir_node *leave_statement_to_firm(leave_statement_t *statement) { - errorf(&statement->base.source_position, "__leave not supported yet"); + errorf(&statement->base.pos, "__leave not supported yet"); return NULL; } @@ -5028,7 +5005,7 @@ jump: return NULL; } - case STATEMENT_ERROR: panic("error statement found"); + case STATEMENT_ERROR: panic("error statement"); } panic("statement not implemented"); } @@ -5116,7 +5093,7 @@ static void initialize_function_parameters(entity_t *entity) assert(parameter->declaration.kind == DECLARATION_KIND_UNKNOWN); type_t *type = skip_typeref(parameter->declaration.type); - dbg_info *const dbgi = get_dbg_info(¶meter->base.source_position); + dbg_info *const dbgi = get_dbg_info(¶meter->base.pos); ir_type *const param_irtype = get_method_param_type(function_irtype, n); if (var_needs_entity(¶meter->variable)) { ir_type *frame_type = get_irg_frame_type(irg); @@ -5130,9 +5107,7 @@ static void initialize_function_parameters(entity_t *entity) ir_mode *param_mode = get_type_mode(param_irtype); long pn = n; ir_node *value = new_rd_Proj(dbgi, args, param_mode, pn); - - ir_mode *mode = get_ir_mode_storage(type); - value = create_conv(NULL, value, mode); + value = conv_to_storage_type(dbgi, value, type); parameter->declaration.kind = DECLARATION_KIND_PARAMETER; parameter->variable.v.value_number = next_value_number_function; @@ -5167,17 +5142,6 @@ static void add_function_pointer(ir_type *segment, ir_entity *method, set_atomic_ent_value(ptr, val); } -/** - * Generate possible IJmp branches to a given label block. - */ -static void gen_ijmp_branches(ir_node *block) -{ - ir_node *ijmp; - for (ijmp = ijmp_list; ijmp != NULL; ijmp = get_irn_link(ijmp)) { - add_immBlock_pred(block, ijmp); - } -} - /** * Create code for a function and all inner functions. * @@ -5207,9 +5171,11 @@ static void create_function(entity_t *entity) current_function_name = NULL; current_funcsig = NULL; - assert(ijmp_blocks == NULL); + assert(!ijmp_ops); + assert(!ijmp_blocks); + init_jump_target(&ijmp_target, NULL); + ijmp_ops = NEW_ARR_F(ir_node*, 0); ijmp_blocks = NEW_ARR_F(ir_node*, 0); - ijmp_list = NULL; int n_local_vars = get_function_n_local_vars(entity); ir_graph *irg = new_ir_graph(function_entity, n_local_vars); @@ -5222,7 +5188,6 @@ static void create_function(entity_t *entity) current_vararg_entity = NULL; set_irg_fp_model(irg, firm_fp_model); - tarval_enable_fp_ops(1); set_irn_dbg_info(get_irg_start_block(irg), get_entity_dbg_info(function_entity)); @@ -5258,13 +5223,21 @@ static void create_function(entity_t *entity) add_immBlock_pred(end_block, ret); } - for (size_t i = ARR_LEN(ijmp_blocks); i-- != 0;) { - ir_node *const block = ijmp_blocks[i]; - gen_ijmp_branches(block); - mature_immBlock(block); + if (enter_jump_target(&ijmp_target)) { + keep_loop(); + size_t const n = ARR_LEN(ijmp_ops); + ir_node *const op = n == 1 ? ijmp_ops[0] : new_Phi(n, ijmp_ops, get_irn_mode(ijmp_ops[0])); + ir_node *const ijmp = new_IJmp(op); + for (size_t i = ARR_LEN(ijmp_blocks); i-- != 0;) { + ir_node *const block = ijmp_blocks[i]; + add_immBlock_pred(block, ijmp); + mature_immBlock(block); + } } + DEL_ARR_F(ijmp_ops); DEL_ARR_F(ijmp_blocks); + ijmp_ops = NULL; ijmp_blocks = NULL; irg_finalize_cons(irg); @@ -5383,8 +5356,7 @@ static void init_ir_types(void) return; ir_types_initialized = 1; - ir_type_char = get_ir_type(type_char); - ir_type_wchar_t = get_ir_type(type_wchar_t); + ir_type_char = get_ir_type(type_char); be_params = be_get_backend_param(); mode_float_arithmetic = be_params->mode_float_arithmetic;