X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast2firm.c;h=848d28069d4ed94e5293538771a411e3b8448700;hb=373937ba4ad87e9fa55dbf89644182050ed1b75a;hp=05ed110e55cc07857938e98fed67024ca8f071c5;hpb=99f5a3cd09e0d7d6127751fc9f6550b5dcbbbd33;p=cparser diff --git a/ast2firm.c b/ast2firm.c index 05ed110..848d280 100644 --- a/ast2firm.c +++ b/ast2firm.c @@ -35,6 +35,7 @@ #include "adt/array.h" #include "adt/strutil.h" #include "adt/util.h" +#include "jump_target.h" #include "symbol_t.h" #include "token_t.h" #include "type_t.h" @@ -63,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; @@ -71,15 +71,36 @@ static ir_mode *mode_float_arithmetic; /* alignment of stack parameters */ 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; -static bool saw_default_label; -static label_t **all_labels; -static entity_t **inner_functions; -static ir_node *ijmp_list; -static bool constant_folding; +static int next_value_number_function; +static jump_target continue_target; +static jump_target break_target; +static ir_node *current_switch; +static bool saw_default_label; +static entity_t **inner_functions; +static jump_target ijmp_target; +static ir_node **ijmp_ops; +static ir_node **ijmp_blocks; +static bool constant_folding; + +#define PUSH_BREAK(val) \ + jump_target const old_break_target = break_target; \ + (init_jump_target(&break_target, (val))) +#define POP_BREAK() \ + ((void)(break_target = old_break_target)) + +#define PUSH_CONTINUE(val) \ + jump_target const old_continue_target = continue_target; \ + (init_jump_target(&continue_target, (val))) +#define POP_CONTINUE() \ + ((void)(continue_target = old_continue_target)) + +#define PUSH_IRG(val) \ + ir_graph *const old_irg = current_ir_graph; \ + ir_graph *const new_irg = (val); \ + ((void)(current_ir_graph = new_irg)) + +#define POP_IRG() \ + (assert(current_ir_graph == new_irg), (void)(current_ir_graph = old_irg)) static const entity_t *current_function_entity; static ir_node *current_function_name; @@ -122,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); @@ -130,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 { @@ -138,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; } @@ -188,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(); @@ -250,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; } /** @@ -579,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) { @@ -605,9 +640,7 @@ static ir_type *create_compound_type(compound_type_t *const type, bool const inc return irtype; } -static ir_tarval *fold_constant_to_tarval(expression_t const *); - -static void determine_enum_values(enum_type_t *const type) +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); @@ -663,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); @@ -852,7 +885,7 @@ static bool declaration_is_definition(const entity_t *entity) case ENTITY_VARIABLE: return entity->declaration.storage_class != STORAGE_CLASS_EXTERN; case ENTITY_FUNCTION: - return entity->function.statement != NULL; + return entity->function.body != NULL; case ENTITY_PARAMETER: case ENTITY_COMPOUND_MEMBER: return false; @@ -864,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"); } /** @@ -879,12 +912,19 @@ static void handle_decl_modifiers(ir_entity *irentity, entity_t *entity) decl_modifiers_t modifiers = entity->declaration.modifiers; if (is_method_entity(irentity)) { - if (modifiers & DM_PURE) { - set_entity_additional_properties(irentity, mtp_property_pure); - } - if (modifiers & DM_CONST) { + if (modifiers & DM_PURE) + add_entity_additional_properties(irentity, mtp_property_pure); + if (modifiers & DM_CONST) add_entity_additional_properties(irentity, mtp_property_const); - } + if (modifiers & DM_NOINLINE) + add_entity_additional_properties(irentity, mtp_property_noinline); + if (modifiers & DM_FORCEINLINE) + add_entity_additional_properties(irentity, mtp_property_always_inline); + if (modifiers & DM_NAKED) + add_entity_additional_properties(irentity, mtp_property_naked); + if (entity->kind == ENTITY_FUNCTION && entity->function.is_inline) + add_entity_additional_properties(irentity, + mtp_property_inline_recommended); } if ((modifiers & DM_USED) && declaration_is_definition(entity)) { add_entity_linkage(irentity, IR_LINKAGE_HIDDEN_USER); @@ -938,7 +978,7 @@ static ir_entity *get_function_entity(entity_t *entity, ir_type *owner_type) /* already an entity defined? */ ir_entity *irentity = entitymap_get(&entitymap, symbol); - bool const has_body = entity->function.statement != NULL; + bool const has_body = entity->function.body != NULL; if (irentity != NULL) { goto entity_created; } @@ -955,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; @@ -1101,13 +1141,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_encoding_t const enc, 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(enc, value) + 1; + size_t const slen = get_string_len(value) + 1; ir_initializer_t *const initializer = create_initializer_compound(slen); ir_type * elem_type; - switch (enc) { - case STRING_ENCODING_CHAR: { + switch (value->encoding) { + case STRING_ENCODING_CHAR: + case STRING_ENCODING_UTF8: { elem_type = ir_type_char; ir_mode *const mode = get_type_mode(elem_type); @@ -1120,8 +1161,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; @@ -1157,14 +1203,12 @@ finish:; static bool try_create_integer(literal_expression_t *literal, type_t *type) { - const char *string = literal->value.begin; - size_t size = literal->value.size; - assert(type->kind == TYPE_ATOMIC); atomic_type_kind_t akind = type->atomic.akind; - ir_mode *const mode = atomic_modes[akind]; - ir_tarval *const tv = new_tarval_from_str(string, size, mode); + ir_mode *const mode = atomic_modes[akind]; + char const *const str = literal->value.begin; + ir_tarval *const tv = new_tarval_from_str(str, literal->suffix - str, mode); if (tv == tarval_bad) return false; @@ -1173,36 +1217,29 @@ static bool try_create_integer(literal_expression_t *literal, type_t *type) return true; } -static void create_integer_tarval(literal_expression_t *literal) +void determine_literal_type(literal_expression_t *const literal) { + assert(literal->base.kind == EXPR_LITERAL_INTEGER); + /* -1: signed only, 0: any, 1: unsigned only */ - int sign = literal->value.begin[0] != '0' /* decimal */ ? -1 : 0; - unsigned ls = 0; - const string_t *suffix = &literal->suffix; - /* parse suffix */ - if (suffix->size > 0) { - for (const char *c = suffix->begin; *c != '\0'; ++c) { - if (*c == 'u' || *c == 'U') sign = 1; - if (*c == 'l' || *c == 'L') { ++ls; } - } - } + int const sign = + !is_type_signed(literal->base.type) ? 1 : + literal->value.begin[0] == '0' ? 0 : + -1; /* Decimal literals only try signed types. */ tarval_int_overflow_mode_t old_mode = tarval_get_integer_overflow_mode(); + tarval_set_integer_overflow_mode(TV_OVERFLOW_BAD); + + if (try_create_integer(literal, literal->base.type)) + goto finished; /* now try if the constant is small enough for some types */ - tarval_set_integer_overflow_mode(TV_OVERFLOW_BAD); - if (ls < 1) { - if (sign <= 0 && try_create_integer(literal, type_int)) - goto finished; - if (sign >= 0 && try_create_integer(literal, type_unsigned_int)) - goto finished; - } - if (ls < 2) { - if (sign <= 0 && try_create_integer(literal, type_long)) - goto finished; - if (sign >= 0 && try_create_integer(literal, type_unsigned_long)) - goto finished; - } + if (sign >= 0 && try_create_integer(literal, type_unsigned_int)) + goto finished; + if (sign <= 0 && try_create_integer(literal, type_long)) + goto finished; + if (sign >= 0 && try_create_integer(literal, type_unsigned_long)) + goto finished; /* last try? then we should not report tarval_bad */ if (sign < 0) tarval_set_integer_overflow_mode(TV_OVERFLOW_WRAP); @@ -1220,17 +1257,6 @@ finished: tarval_set_integer_overflow_mode(old_mode); } -void determine_literal_type(literal_expression_t *literal) -{ - switch (literal->base.kind) { - case EXPR_LITERAL_INTEGER: - create_integer_tarval(literal); - return; - default: - break; - } -} - /** * Creates a Const node representing a constant. */ @@ -1263,10 +1289,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); @@ -1283,7 +1309,7 @@ static ir_node *char_literal_to_firm(string_literal_expression_t const *literal) size_t size = literal->value.size; ir_tarval *tv; - switch (literal->encoding) { + switch (literal->value.encoding) { case STRING_ENCODING_WIDE: { utf32 v = read_utf8_char(&string); char buf[128]; @@ -1313,10 +1339,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); @@ -1439,32 +1465,6 @@ static ir_node *deref_address(dbg_info *const dbgi, type_t *const type, return create_conv(dbgi, load_res, mode_arithmetic); } -/** - * Creates a strict Conv (to the node's mode) if necessary. - * - * @param dbgi debug info - * @param node the node to strict conv - */ -static ir_node *do_strict_conv(dbg_info *dbgi, ir_node *node) -{ - ir_mode *mode = get_irn_mode(node); - - if (!(get_irg_fp_model(current_ir_graph) & fp_explicit_rounding)) - return node; - if (!mode_is_float(mode)) - return node; - - /* check if there is already a Conv */ - if (is_Conv(node)) { - /* convert it into a strict Conv */ - set_Conv_strict(node, 1); - return node; - } - - /* otherwise create a new one */ - return new_d_strictConv(dbgi, node, mode); -} - /** * Returns the correct base address depending on whether it is a parameter or a * normal local variable. @@ -1482,16 +1482,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) @@ -1508,7 +1505,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)); @@ -1518,7 +1515,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 */ @@ -1573,12 +1570,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)); @@ -1603,7 +1600,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; @@ -1687,7 +1684,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"); } /** @@ -1699,7 +1696,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; @@ -1778,7 +1775,6 @@ static ir_node *call_expression_to_firm(const call_expression_t *const call) if (!is_type_compound(arg_type)) { 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; @@ -1843,17 +1839,14 @@ 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); -static ir_node *create_condition_evaluation(const expression_t *expression, - ir_node *true_block, - ir_node *false_block); +static ir_node *create_condition_evaluation(expression_t const *expression, jump_target *true_target, jump_target *false_target); static void assign_value(dbg_info *dbgi, ir_node *addr, type_t *type, ir_node *value) { - if (!is_type_compound(type)) { + if (is_type_scalar(type)) { ir_mode *mode = get_ir_mode_storage(type); value = create_conv(dbgi, value, mode); - value = do_strict_conv(dbgi, value); } ir_node *memory = get_store(); @@ -1953,7 +1946,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); @@ -2012,13 +2005,12 @@ 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 = do_strict_conv(dbgi, value); } if (expression->kind == EXPR_REFERENCE) { @@ -2088,7 +2080,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 && @@ -2105,7 +2097,7 @@ static ir_node *get_value_from_lvalue(const expression_t *expression, static ir_node *create_incdec(const unary_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 *value_expr = expression->value; ir_node *addr = expression_to_addr(value_expr); ir_node *value = get_value_from_lvalue(value_expr, addr); @@ -2142,7 +2134,7 @@ static ir_node *create_incdec(const unary_expression_t *expression) store_value = result; break; default: - panic("no incdec expr in create_incdec"); + panic("no incdec expr"); } set_value_for_expression_addr(value_expr, store_value, addr); @@ -2309,7 +2301,6 @@ static ir_node *create_cast(dbg_info *dbgi, ir_node *value_node, ir_mode *mode_arith = get_ir_mode_arithmetic(type); ir_node *node = create_conv(dbgi, value_node, mode); - node = do_strict_conv(dbgi, node); node = create_conv(dbgi, node, mode_arith); return node; @@ -2317,7 +2308,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; @@ -2375,7 +2366,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"); } /** @@ -2384,23 +2375,36 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression) static ir_node *produce_condition_result(const expression_t *expression, ir_mode *mode, dbg_info *dbgi) { - ir_node *const one_block = new_immBlock(); - ir_node *const zero_block = new_immBlock(); - create_condition_evaluation(expression, one_block, zero_block); - mature_immBlock(one_block); - mature_immBlock(zero_block); + jump_target true_target; + jump_target false_target; + init_jump_target(&true_target, NULL); + init_jump_target(&false_target, NULL); + create_condition_evaluation(expression, &true_target, &false_target); - ir_node *const jmp_one = new_rd_Jmp(dbgi, one_block); - ir_node *const jmp_zero = new_rd_Jmp(dbgi, zero_block); - ir_node *const in_cf[2] = { jmp_one, jmp_zero }; - ir_node *const block = new_Block(lengthof(in_cf), in_cf); - set_cur_block(block); + ir_node *val = NULL; + jump_target exit_target; + init_jump_target(&exit_target, NULL); - ir_node *const one = new_Const(get_mode_one(mode)); - ir_node *const zero = new_Const(get_mode_null(mode)); - ir_node *const in[2] = { one, zero }; - ir_node *const val = new_d_Phi(dbgi, lengthof(in), in, mode); + if (enter_jump_target(&true_target)) { + val = new_Const(get_mode_one(mode)); + jump_to_target(&exit_target); + } + + if (enter_jump_target(&false_target)) { + ir_node *const zero = new_Const(get_mode_null(mode)); + jump_to_target(&exit_target); + if (val) { + ir_node *const in[] = { val, zero }; + val = new_rd_Phi(dbgi, exit_target.block, lengthof(in), in, mode); + } else { + val = zero; + } + } + if (!enter_jump_target(&exit_target)) { + set_cur_block(new_Block(0, NULL)); + val = new_Unknown(mode); + } return val; } @@ -2530,7 +2534,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); @@ -2565,7 +2569,7 @@ typedef ir_node * (*create_arithmetic_func)(dbg_info *dbgi, ir_node *left, 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); @@ -2574,7 +2578,6 @@ static ir_node *create_assign_binop(const binary_expression_t *expression) ir_node *result = create_op(dbgi, expression, left, right); result = create_cast(dbgi, result, expression->right->base.type, type); - result = do_strict_conv(dbgi, result); result = set_value_for_expression_addr(left_expr, result, left_addr); @@ -2602,7 +2605,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); @@ -2633,7 +2636,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); @@ -2664,7 +2667,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); @@ -2677,7 +2680,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); @@ -2734,7 +2737,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); } @@ -2749,13 +2752,9 @@ static ir_entity *create_initializer_entity(dbg_info *dbgi, type_t *type) { /* create the ir_initializer */ - ir_graph *const old_current_ir_graph = current_ir_graph; - current_ir_graph = get_const_code_irg(); - + PUSH_IRG(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; + POP_IRG(); ident *const id = id_unique("initializer.%u"); ir_type *const irtype = get_ir_type(type); @@ -2770,11 +2769,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 { @@ -2798,7 +2799,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); @@ -2863,7 +2864,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); @@ -2871,7 +2872,7 @@ static ir_node *alignof_to_firm(const typeprop_expression_t *expression) static void init_ir_types(void); -static ir_tarval *fold_constant_to_tarval(const expression_t *expression) +ir_tarval *fold_constant_to_tarval(const expression_t *expression) { assert(is_constant_expression(expression) == EXPR_CLASS_CONSTANT); @@ -2884,12 +2885,10 @@ static ir_tarval *fold_constant_to_tarval(const expression_t *expression) init_ir_types(); - ir_graph *old_current_ir_graph = current_ir_graph; - current_ir_graph = get_const_code_irg(); - + PUSH_IRG(get_const_code_irg()); ir_node *const cnst = _expression_to_firm(expression); + POP_IRG(); - current_ir_graph = old_current_ir_graph; set_optimize(old_optimize); set_opt_constant_folding(old_constant_folding); @@ -2929,8 +2928,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); @@ -2944,43 +2941,47 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression) } } - ir_node *const true_block = new_immBlock(); - ir_node *const false_block = new_immBlock(); - ir_node *const cond_expr = create_condition_evaluation(expression->condition, true_block, false_block); - mature_immBlock(true_block); - mature_immBlock(false_block); - - set_cur_block(true_block); - ir_node *true_val; - if (expression->true_expression != NULL) { - true_val = expression_to_firm(expression->true_expression); - } else if (cond_expr != NULL && get_irn_mode(cond_expr) != mode_b) { - true_val = cond_expr; - } else { - /* Condition ended with a short circuit (&&, ||, !) operation or a - * comparison. Generate a "1" as value for the true branch. */ - true_val = new_Const(get_mode_one(mode_Is)); - } - ir_node *const true_jmp = new_d_Jmp(dbgi); - - set_cur_block(false_block); - ir_node *const false_val = expression_to_firm(expression->false_expression); - ir_node *const false_jmp = new_d_Jmp(dbgi); + jump_target true_target; + jump_target false_target; + init_jump_target(&true_target, NULL); + init_jump_target(&false_target, NULL); + ir_node *const cond_expr = create_condition_evaluation(expression->condition, &true_target, &false_target); - /* create the common block */ - ir_node *const in_cf[2] = { true_jmp, false_jmp }; - ir_node *const block = new_Block(lengthof(in_cf), in_cf); - set_cur_block(block); + ir_node *val = NULL; + jump_target exit_target; + init_jump_target(&exit_target, NULL); - /* TODO improve static semantics, so either both or no values are NULL */ - if (true_val == NULL || false_val == NULL) - return NULL; + if (enter_jump_target(&true_target)) { + if (expression->true_expression) { + val = expression_to_firm(expression->true_expression); + } else if (cond_expr && get_irn_mode(cond_expr) != mode_b) { + val = cond_expr; + } else { + /* Condition ended with a short circuit (&&, ||, !) operation or a + * comparison. Generate a "1" as value for the true branch. */ + val = new_Const(get_mode_one(mode_Is)); + } + jump_to_target(&exit_target); + } - ir_node *const in[2] = { true_val, false_val }; - type_t *const type = skip_typeref(expression->base.type); - ir_mode *const mode = get_ir_mode_arithmetic(type); - ir_node *const val = new_d_Phi(dbgi, lengthof(in), in, mode); + if (enter_jump_target(&false_target)) { + 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 }; + 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; + } + } + if (!enter_jump_target(&exit_target)) { + set_cur_block(new_Block(0, NULL)); + type_t *const type = skip_typeref(expression->base.type); + if (!is_type_void(type)) + val = new_Unknown(get_ir_mode_arithmetic(type)); + } return val; } @@ -2989,7 +2990,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); @@ -3013,7 +3014,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); @@ -3067,11 +3068,6 @@ static ir_node *classify_type_to_firm(const classify_type_expression_t *const ex case TYPE_ATOMIC: { const atomic_type_t *const atomic_type = &type->atomic; switch (atomic_type->akind) { - /* should not be reached */ - case ATOMIC_TYPE_INVALID: - tc = no_type_class; - goto make_const; - /* gcc cannot do that */ case ATOMIC_TYPE_VOID: tc = void_type_class; @@ -3099,7 +3095,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; @@ -3122,11 +3118,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); @@ -3140,19 +3136,19 @@ static ir_node *function_name_to_firm( case FUNCNAME_PRETTY_FUNCTION: case FUNCNAME_FUNCDNAME: if (current_function_name == NULL) { - const source_position_t *const src_pos = &expr->base.source_position; - const char *name = current_function_entity->base.symbol->string; - const string_t string = { name, strlen(name) }; - current_function_name = string_to_firm(src_pos, "__func__.%u", STRING_ENCODING_CHAR, &string); + 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) { - const source_position_t *const src_pos = &expr->base.source_position; - ir_entity *ent = get_irg_entity(current_ir_graph); - const char *const name = get_entity_ld_name(ent); - const string_t string = { name, strlen(name) }; - current_funcsig = string_to_firm(src_pos, "__FUNCSIG__.%u", STRING_ENCODING_CHAR, &string); + 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; } @@ -3180,7 +3176,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); @@ -3195,7 +3191,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); @@ -3269,24 +3265,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; - - /* beware: might be called from create initializer with current_ir_graph - * set to const_code_irg. */ - ir_graph *rem = current_ir_graph; - current_ir_graph = current_function; - - ir_node *block = new_immBlock(); - - label->block = block; - - ARR_APP1(label_t *, all_labels, label); - - current_ir_graph = rem; - 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); + } } /** @@ -3295,12 +3281,15 @@ static ir_node *get_label_block(label_t *label) */ static ir_node *label_address_to_firm(const label_address_expression_t *label) { - 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); + /* Beware: Might be called from create initializer with current_ir_graph + * set to const_code_irg. */ + PUSH_IRG(current_function); + 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); } @@ -3343,11 +3332,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.encoding, &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"); } /** @@ -3414,7 +3403,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); } @@ -3423,65 +3412,61 @@ static ir_node *expression_to_firm(const expression_t *expression) * create a short-circuit expression evaluation that tries to construct * efficient control flow structures for &&, || and ! expressions */ -static ir_node *create_condition_evaluation(const expression_t *expression, - ir_node *true_block, - ir_node *false_block) +static ir_node *create_condition_evaluation(expression_t const *const expression, jump_target *const true_target, jump_target *const false_target) { switch(expression->kind) { case EXPR_UNARY_NOT: { const unary_expression_t *unary_expression = &expression->unary; - create_condition_evaluation(unary_expression->value, false_block, - true_block); + create_condition_evaluation(unary_expression->value, false_target, true_target); return NULL; } case EXPR_BINARY_LOGICAL_AND: { - const binary_expression_t *binary_expression = &expression->binary; - - ir_node *extra_block = new_immBlock(); - create_condition_evaluation(binary_expression->left, extra_block, - false_block); - mature_immBlock(extra_block); - set_cur_block(extra_block); - create_condition_evaluation(binary_expression->right, true_block, - false_block); + jump_target extra_target; + init_jump_target(&extra_target, NULL); + create_condition_evaluation(expression->binary.left, &extra_target, false_target); + if (enter_jump_target(&extra_target)) + create_condition_evaluation(expression->binary.right, true_target, false_target); return NULL; } case EXPR_BINARY_LOGICAL_OR: { - const binary_expression_t *binary_expression = &expression->binary; - - ir_node *extra_block = new_immBlock(); - create_condition_evaluation(binary_expression->left, true_block, - extra_block); - mature_immBlock(extra_block); - set_cur_block(extra_block); - create_condition_evaluation(binary_expression->right, true_block, - false_block); + jump_target extra_target; + init_jump_target(&extra_target, NULL); + create_condition_evaluation(expression->binary.left, true_target, &extra_target); + if (enter_jump_target(&extra_target)) + create_condition_evaluation(expression->binary.right, true_target, false_target); return NULL; } default: 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_immBlock_pred(true_block, true_proj); - add_immBlock_pred(false_block, 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; } @@ -3495,7 +3480,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; @@ -3723,7 +3708,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); @@ -3768,18 +3753,30 @@ 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); + if (!is_type_compound(type)) { + ir_mode *mode = get_ir_mode_storage(type); + value = create_conv(NULL, value, mode); + } 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)) @@ -3808,13 +3805,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); } @@ -3863,8 +3861,9 @@ static ir_initializer_t *create_ir_initializer_string(initializer_t const *const ir_initializer_t *const irinit = create_initializer_compound(arr_len); ir_mode *const mode = get_ir_mode_storage(type->array.element_type); char const * p = str->value.begin; - switch (str->encoding) { + 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); @@ -3873,6 +3872,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; @@ -3900,7 +3901,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"); } @@ -3979,11 +3980,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: { @@ -4049,7 +4056,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, @@ -4102,7 +4109,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; @@ -4142,10 +4149,9 @@ 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); + dbg_info *const dbgi = get_dbg_info(&entity->base.pos); 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, node); @@ -4194,7 +4200,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); @@ -4212,6 +4218,14 @@ static void allocate_variable_length_array(entity_t *entity) entity->variable.v.vla_base = addr; } +static bool var_needs_entity(variable_t const *const var) +{ + if (var->address_taken) + return true; + type_t *const type = skip_typeref(var->base.type); + return !is_type_scalar(type) || type->base.qualifiers & TYPE_QUALIFIER_VOLATILE; +} + /** * Creates a Firm local variable from a declaration. */ @@ -4220,31 +4234,23 @@ static void create_local_variable(entity_t *entity) assert(entity->kind == ENTITY_VARIABLE); assert(entity->declaration.kind == DECLARATION_KIND_UNKNOWN); - bool needs_entity = entity->variable.address_taken; - type_t *type = skip_typeref(entity->declaration.type); + if (!var_needs_entity(&entity->variable)) { + entity->declaration.kind = DECLARATION_KIND_LOCAL_VARIABLE; + entity->variable.v.value_number = next_value_number_function; + set_irg_loc_description(current_ir_graph, next_value_number_function, entity); + ++next_value_number_function; + return; + } /* is it a variable length array? */ + type_t *const type = skip_typeref(entity->declaration.type); if (is_type_array(type) && !type->array.size_constant) { create_variable_length_array(entity); return; - } else if (is_type_array(type) || is_type_compound(type)) { - needs_entity = true; - } else if (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) { - needs_entity = true; } - if (needs_entity) { - ir_type *frame_type = get_irg_frame_type(current_ir_graph); - create_variable_entity(entity, - DECLARATION_KIND_LOCAL_VARIABLE_ENTITY, - frame_type); - } else { - entity->declaration.kind = DECLARATION_KIND_LOCAL_VARIABLE; - entity->variable.v.value_number = next_value_number_function; - set_irg_loc_description(current_ir_graph, next_value_number_function, - entity); - ++next_value_number_function; - } + ir_type *const frame_type = get_irg_frame_type(current_ir_graph); + create_variable_entity(entity, DECLARATION_KIND_LOCAL_VARIABLE_ENTITY, frame_type); } static void create_local_static_variable(entity_t *entity) @@ -4256,7 +4262,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")]; @@ -4279,13 +4285,9 @@ static void create_local_static_variable(entity_t *entity) set_entity_initializer(irentity, null_init); } - ir_graph *const old_current_ir_graph = current_ir_graph; - current_ir_graph = get_const_code_irg(); - + PUSH_IRG(get_const_code_irg()); create_variable_initializer(entity); - - assert(current_ir_graph == get_const_code_irg()); - current_ir_graph = old_current_ir_graph; + POP_IRG(); } @@ -4295,7 +4297,7 @@ 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; @@ -4304,7 +4306,6 @@ static ir_node *return_statement_to_firm(return_statement_t *statement) ir_mode *const mode = get_ir_mode_storage(type); if (res) { res = create_conv(dbgi, res, mode); - res = do_strict_conv(dbgi, res); } else { res = new_Unknown(mode); } @@ -4409,7 +4410,7 @@ static void create_local_declaration(entity_t *entity) return; case STORAGE_CLASS_EXTERN: if (entity->kind == ENTITY_FUNCTION) { - assert(entity->function.statement == NULL); + assert(entity->function.body == NULL); (void)get_function_entity(entity, NULL); } else { create_global_variable(entity); @@ -4420,7 +4421,7 @@ static void create_local_declaration(entity_t *entity) case STORAGE_CLASS_AUTO: case STORAGE_CLASS_REGISTER: if (entity->kind == ENTITY_FUNCTION) { - if (entity->function.statement != NULL) { + if (entity->function.body != NULL) { ir_type *owner = get_irg_frame_type(current_ir_graph); (void)get_function_entity(entity, owner); entity->declaration.kind = DECLARATION_KIND_INNER_FUNCTION; @@ -4435,7 +4436,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) @@ -4512,162 +4513,62 @@ static ir_node *if_statement_to_firm(if_statement_t *statement) create_local_declarations(statement->scope.entities); /* Create the condition. */ - ir_node *true_block = NULL; - ir_node *false_block = NULL; - if (currently_reachable()) { - true_block = new_immBlock(); - false_block = new_immBlock(); - create_condition_evaluation(statement->condition, true_block, false_block); - mature_immBlock(true_block); - mature_immBlock(false_block); - } + jump_target true_target; + jump_target false_target; + init_jump_target(&true_target, NULL); + init_jump_target(&false_target, NULL); + if (currently_reachable()) + create_condition_evaluation(statement->condition, &true_target, &false_target); + + jump_target exit_target; + init_jump_target(&exit_target, NULL); /* Create the true statement. */ - set_cur_block(true_block); + enter_jump_target(&true_target); statement_to_firm(statement->true_statement); - ir_node *fallthrough_block = get_cur_block(); + jump_to_target(&exit_target); /* Create the false statement. */ - set_cur_block(false_block); - if (statement->false_statement != NULL) { + enter_jump_target(&false_target); + if (statement->false_statement) statement_to_firm(statement->false_statement); - } - - /* 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); - } - set_cur_block(fallthrough_block); - } + jump_to_target(&exit_target); + enter_jump_target(&exit_target); 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); -} - -/** - * 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) +static ir_node *do_while_statement_to_firm(do_while_statement_t *statement) { create_local_declarations(statement->scope.entities); - /* Create the header block */ - ir_node *const header_block = new_immBlock(); - jump_to(header_block); + PUSH_BREAK(NULL); + PUSH_CONTINUE(NULL); - /* Create the condition. */ - ir_node * body_block; - ir_node * false_block; expression_t *const cond = statement->condition; - if (is_constant_expression(cond) == EXPR_CLASS_CONSTANT && - fold_constant_to_bool(cond)) { - /* Shortcut for while (true). */ - body_block = header_block; - false_block = NULL; - - keep_alive(header_block); - keep_all_memory(header_block); + /* Avoid an explicit body block in case of do ... while (0);. */ + if (is_constant_expression(cond) == EXPR_CLASS_CONSTANT && !fold_constant_to_bool(cond)) { + /* do ... while (0);. */ + statement_to_firm(statement->body); + jump_to_target(&continue_target); + enter_jump_target(&continue_target); + jump_to_target(&break_target); } else { - body_block = new_immBlock(); - false_block = new_immBlock(); - - set_cur_block(header_block); - create_condition_evaluation(cond, body_block, false_block); - mature_immBlock(body_block); - } - - ir_node *const old_continue_label = continue_label; - ir_node *const old_break_label = break_label; - continue_label = header_block; - break_label = false_block; - - /* Create the loop body. */ - set_cur_block(body_block); - statement_to_firm(statement->body); - jump_if_reachable(header_block); - - mature_immBlock(header_block); - assert(false_block == NULL || false_block == break_label); - false_block = break_label; - if (false_block != NULL) { - mature_immBlock(false_block); - } - set_cur_block(false_block); - - assert(continue_label == header_block); - continue_label = old_continue_label; - break_label = old_break_label; - return NULL; -} - -static ir_node *get_break_label(void) -{ - if (break_label == NULL) { - break_label = new_immBlock(); - } - return break_label; -} - -static ir_node *do_while_statement_to_firm(do_while_statement_t *statement) -{ - create_local_declarations(statement->scope.entities); - - /* create the header block */ - ir_node *header_block = new_immBlock(); - - /* the loop body */ - ir_node *body_block = new_immBlock(); - jump_to(body_block); - - ir_node *old_continue_label = continue_label; - ir_node *old_break_label = break_label; - continue_label = header_block; - break_label = NULL; - - set_cur_block(body_block); - statement_to_firm(statement->body); - ir_node *const false_block = get_break_label(); - - assert(continue_label == header_block); - continue_label = old_continue_label; - break_label = old_break_label; - - jump_if_reachable(header_block); - - /* create the condition */ - mature_immBlock(header_block); - set_cur_block(header_block); - - create_condition_evaluation(statement->condition, body_block, false_block); - mature_immBlock(body_block); - mature_immBlock(false_block); - - set_cur_block(false_block); + jump_target body_target; + 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)) + create_condition_evaluation(statement->condition, &body_target, &break_target); + enter_jump_target(&body_target); + } + enter_jump_target(&break_target); + + POP_CONTINUE(); + POP_BREAK(); return NULL; } @@ -4690,77 +4591,40 @@ static ir_node *for_statement_to_firm(for_statement_t *statement) } /* Create the header block */ - ir_node *const header_block = new_immBlock(); - jump_to(header_block); - - /* Create the condition. */ - ir_node *body_block; - ir_node *false_block; - if (statement->condition != NULL) { - body_block = new_immBlock(); - false_block = new_immBlock(); - - set_cur_block(header_block); - create_condition_evaluation(statement->condition, body_block, false_block); - mature_immBlock(body_block); - } else { - /* for-ever. */ - body_block = header_block; - false_block = NULL; + jump_target header_target; + init_jump_target(&header_target, NULL); + jump_to_target(&header_target); + enter_immature_jump_target(&header_target); + keep_loop(); - keep_alive(header_block); - keep_all_memory(header_block); - } + expression_t *const step = statement->step; + PUSH_BREAK(NULL); + PUSH_CONTINUE(step ? NULL : header_target.block); - /* Create the step block, if necessary. */ - ir_node * step_block = header_block; - expression_t *const step = statement->step; - if (step != NULL) { - step_block = new_immBlock(); + /* Create the condition. */ + expression_t *const cond = statement->condition; + if (cond && (is_constant_expression(cond) != EXPR_CLASS_CONSTANT || !fold_constant_to_bool(cond))) { + jump_target body_target; + init_jump_target(&body_target, NULL); + create_condition_evaluation(cond, &body_target, &break_target); + enter_jump_target(&body_target); } - ir_node *const old_continue_label = continue_label; - ir_node *const old_break_label = break_label; - continue_label = step_block; - break_label = false_block; - /* Create the loop body. */ - set_cur_block(body_block); statement_to_firm(statement->body); - jump_if_reachable(step_block); + jump_to_target(&continue_target); /* Create the step code. */ - if (step != NULL) { - mature_immBlock(step_block); - set_cur_block(step_block); + if (step && enter_jump_target(&continue_target)) { expression_to_firm(step); - jump_if_reachable(header_block); - } - - mature_immBlock(header_block); - assert(false_block == NULL || false_block == break_label); - false_block = break_label; - if (false_block != NULL) { - mature_immBlock(false_block); + jump_to_target(&header_target); } - set_cur_block(false_block); - - assert(continue_label == step_block); - continue_label = old_continue_label; - break_label = old_break_label; - 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); + enter_jump_target(&header_target); + enter_jump_target(&break_target); - set_unreachable_now(); + POP_CONTINUE(); + POP_BREAK(); return NULL; } @@ -4788,11 +4652,9 @@ static ir_switch_table *create_switch_table(const switch_statement_t *statement) } if (l->is_empty_range) continue; - ir_tarval *min = fold_constant_to_tarval(l->expression); - ir_tarval *max = min; + ir_tarval *min = l->first_case; + ir_tarval *max = l->last_case; 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; } @@ -4801,7 +4663,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()) { @@ -4814,53 +4676,44 @@ static ir_node *switch_statement_to_firm(switch_statement_t *statement) set_unreachable_now(); + PUSH_BREAK(NULL); 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 = switch_node; - break_label = NULL; statement_to_firm(statement->body); - - if (currently_reachable()) { - add_immBlock_pred(get_break_label(), new_Jmp()); - } + jump_to_target(&break_target); 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); + add_pred_to_jump_target(&break_target, proj); } - if (break_label != NULL) { - mature_immBlock(break_label); - } - set_cur_block(break_label); + enter_jump_target(&break_target); assert(current_switch == switch_node); current_switch = old_switch; - break_label = old_break_label; saw_default_label = old_saw_default_label; + POP_BREAK(); return NULL; } static ir_node *case_label_to_firm(const case_label_statement_t *statement) { - if (statement->is_empty_range) - return NULL; + if (current_switch != NULL && !statement->is_empty_range) { + jump_target case_target; + init_jump_target(&case_target, NULL); - if (current_switch != NULL) { - ir_node *block = new_immBlock(); /* Fallthrough from previous case */ - jump_if_reachable(block); + jump_to_target(&case_target); - ir_node *const proj = new_Proj(current_switch, mode_X, statement->pn); - add_immBlock_pred(block, proj); + ir_node *const proj = new_Proj(current_switch, mode_X, statement->pn); + add_pred_to_jump_target(&case_target, proj); if (statement->expression == NULL) saw_default_label = true; - mature_immBlock(block); - set_cur_block(block); + enter_jump_target(&case_target); } return statement_to_firm(statement->statement); @@ -4868,47 +4721,51 @@ static ir_node *case_label_to_firm(const case_label_statement_t *statement) static ir_node *label_to_firm(const label_statement_t *statement) { - ir_node *block = get_label_block(statement->label); - jump_to(block); - - set_cur_block(block); - keep_alive(block); - keep_all_memory(block); + label_t *const label = statement->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); } -static ir_node *computed_goto_to_firm(computed_goto_statement_t const *const statement) +static ir_node *goto_statement_to_firm(goto_statement_t *const stmt) { - 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; - + label_t *const label = stmt->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 *asm_statement_to_firm(const asm_statement_t *statement) +static ir_node *computed_goto_to_firm(computed_goto_statement_t const *const statement) { - bool needs_memory = false; - - if (statement->is_volatile) { - needs_memory = true; + 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; +} - size_t n_clobbers = 0; - asm_clobber_t *clobber = statement->clobbers; +static ir_node *asm_statement_to_firm(const asm_statement_t *statement) +{ + bool needs_memory = statement->is_volatile; + size_t n_clobbers = 0; + asm_clobber_t *clobber = statement->clobbers; for ( ; clobber != NULL; clobber = clobber->next) { 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; } @@ -4955,7 +4812,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); } @@ -5012,11 +4869,11 @@ static ir_node *asm_statement_to_firm(const asm_statement_t *statement) constraint.mode = mode_M; tmp_in_constraints[in_size] = constraint; - ins[in_size] = expression_to_addr(expr); + ins[in_size] = expression_to_addr(expr); ++in_size; continue; } else { - errorf(&statement->base.source_position, + errorf(&statement->base.pos, "only modifiers but no place set in constraints '%s'", constraints); continue; @@ -5044,17 +4901,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; @@ -5074,7 +4931,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; @@ -5089,26 +4946,17 @@ static ir_node *asm_statement_to_firm(const asm_statement_t *statement) ins[in_size++] = input; } - if (needs_memory) { - ir_asm_constraint constraint; - constraint.pos = next_pos++; - constraint.constraint = new_id_from_str(""); - constraint.mode = mode_M; - - obstack_grow(&asm_obst, &constraint, sizeof(constraint)); - ins[in_size++] = get_store(); - } - + ir_node *mem = needs_memory ? get_store() : new_NoMem(); assert(obstack_object_size(&asm_obst) == in_size * sizeof(ir_asm_constraint)); 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); - ir_node *node = new_d_ASM(dbgi, in_size, ins, input_constraints, + ir_node *node = new_d_ASM(dbgi, mem, in_size, ins, input_constraints, out_size, output_constraints, n_clobbers, clobbers, asm_text); @@ -5141,14 +4989,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; } @@ -5172,19 +5020,25 @@ static ir_node *statement_to_firm(statement_t *const stmt) 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_GOTO: return goto_statement_to_firm( &stmt->gotos); 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)); + { + jump_target *tgt; + case STATEMENT_BREAK: tgt = &break_target; goto jump; + case STATEMENT_CONTINUE: tgt = &continue_target; goto jump; +jump: + jump_to_target(tgt); + set_unreachable_now(); + return NULL; + } - case STATEMENT_ERROR: panic("error statement found"); + case STATEMENT_ERROR: panic("error statement"); } panic("statement not implemented"); } @@ -5196,8 +5050,7 @@ static int count_local_variables(const entity_t *entity, entity_t const *const end = last != NULL ? last->base.next : NULL; for (; entity != end; entity = entity->base.next) { if ((entity->kind == ENTITY_VARIABLE || entity->kind == ENTITY_PARAMETER) && - !entity->variable.address_taken && - is_type_scalar(skip_typeref(entity->declaration.type))) + !var_needs_entity(&entity->variable)) ++count; } return count; @@ -5236,7 +5089,7 @@ static int get_function_n_local_vars(entity_t *entity) count += count_local_variables(function->parameters.entities, NULL); /* count local variables declared in body */ - walk_statements(function->statement, count_local_variables_in_stmt, &count); + walk_statements(function->body, count_local_variables_in_stmt, &count); return count; } @@ -5273,14 +5126,12 @@ static void initialize_function_parameters(entity_t *entity) assert(parameter->declaration.kind == DECLARATION_KIND_UNKNOWN); type_t *type = skip_typeref(parameter->declaration.type); - assert(!is_type_array(type)); - bool const needs_entity = parameter->variable.address_taken || is_type_compound(type); - - ir_type *param_irtype = get_method_param_type(function_irtype, n); - if (needs_entity) { + 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); ir_entity *param - = new_parameter_entity(frame_type, n, param_irtype); + = new_d_parameter_entity(frame_type, n, param_irtype, dbgi); parameter->declaration.kind = DECLARATION_KIND_PARAMETER_ENTITY; parameter->variable.v.entity = param; continue; @@ -5288,11 +5139,10 @@ static void initialize_function_parameters(entity_t *entity) ir_mode *param_mode = get_type_mode(param_irtype); long pn = n; - ir_node *value = new_r_Proj(args, param_mode, pn); + 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 = do_strict_conv(NULL, value); parameter->declaration.kind = DECLARATION_KIND_PARAMETER; parameter->variable.v.value_number = next_value_number_function; @@ -5304,32 +5154,6 @@ static void initialize_function_parameters(entity_t *entity) } } -/** - * Handle additional decl modifiers for IR-graphs - * - * @param irg the IR-graph - * @param dec_modifiers additional modifiers - */ -static void handle_decl_modifier_irg(ir_graph *irg, - decl_modifiers_t decl_modifiers) -{ - if (decl_modifiers & DM_NAKED) { - /* TRUE if the declaration includes the Microsoft - __declspec(naked) specifier. */ - add_irg_additional_properties(irg, mtp_property_naked); - } - if (decl_modifiers & DM_FORCEINLINE) { - /* TRUE if the declaration includes the - Microsoft __forceinline specifier. */ - set_irg_inline_property(irg, irg_inline_forced); - } - if (decl_modifiers & DM_NOINLINE) { - /* TRUE if the declaration includes the Microsoft - __declspec(noinline) specifier. */ - set_irg_inline_property(irg, irg_inline_forbidden); - } -} - static void add_function_pointer(ir_type *segment, ir_entity *method, const char *unique_template) { @@ -5353,17 +5177,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. * @@ -5374,7 +5187,7 @@ static void create_function(entity_t *entity) assert(entity->kind == ENTITY_FUNCTION); ir_entity *function_entity = get_function_entity(entity, current_outer_frame); - if (entity->function.statement == NULL) + if (entity->function.body == NULL) return; inner_functions = NULL; @@ -5393,9 +5206,11 @@ static void create_function(entity_t *entity) current_function_name = NULL; current_funcsig = NULL; - assert(all_labels == NULL); - all_labels = NEW_ARR_F(label_t *, 0); - ijmp_list = 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); int n_local_vars = get_function_n_local_vars(entity); ir_graph *irg = new_ir_graph(function_entity, n_local_vars); @@ -5408,20 +5223,14 @@ 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)); - /* set inline flags */ - if (entity->function.is_inline) - set_irg_inline_property(irg, irg_inline_recomended); - handle_decl_modifier_irg(irg, entity->declaration.modifiers); - next_value_number_function = 0; initialize_function_parameters(entity); current_static_link = entity->function.static_link; - statement_to_firm(entity->function.statement); + statement_to_firm(entity->function.body); ir_node *end_block = get_irg_end_block(irg); @@ -5449,16 +5258,22 @@ static void create_function(entity_t *entity) add_immBlock_pred(end_block, ret); } - 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); + 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); } - mature_immBlock(label->block); } - DEL_ARR_F(all_labels); - all_labels = NULL; + DEL_ARR_F(ijmp_ops); + DEL_ARR_F(ijmp_blocks); + ijmp_ops = NULL; + ijmp_blocks = NULL; irg_finalize_cons(irg); @@ -5576,8 +5391,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; @@ -5606,8 +5420,9 @@ 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)); + if (buf[0] == '\0') { + return getcwd(buf, sizeof(buf)); + } return buf; } @@ -5622,15 +5437,18 @@ void translation_unit_to_firm(translation_unit_t *unit) } else { be_dwarf_set_source_language(DW_LANG_C); } - be_dwarf_set_compilation_directory(get_cwd()); + const char *cwd = get_cwd(); + if (cwd != NULL) { + be_dwarf_set_compilation_directory(cwd); + } /* initialize firm arithmetic */ tarval_set_integer_overflow_mode(TV_OVERFLOW_WRAP); ir_set_uninitialized_local_variable_func(uninitialized_local_var); /* just to be sure */ - continue_label = NULL; - break_label = NULL; + init_jump_target(&break_target, NULL); + init_jump_target(&continue_target, NULL); current_switch = NULL; current_translation_unit = unit;