X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast2firm.c;h=81ffb1a058560560adc0cb975471f4bac2ddbe7a;hb=0eaaf660d76f79c7d64ea61d81bd1ee812b99c49;hp=1447635217bf68a66c0a2bddb5796422c6a52c7f;hpb=06e304a5b4dd5f5fd0d0a1c5f89e1d996443a103;p=cparser diff --git a/ast2firm.c b/ast2firm.c index 1447635..81ffb1a 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,27 +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) \ - ir_node *const old_break_label = break_label; \ - ((void)(break_label = (val))) + jump_target const old_break_target = break_target; \ + (init_jump_target(&break_target, (val))) #define POP_BREAK() \ - ((void)(break_label = old_break_label)) + ((void)(break_target = old_break_target)) #define PUSH_CONTINUE(val) \ - ir_node *const old_continue_label = continue_label; \ - ((void)(continue_label = (val))) + jump_target const old_continue_target = continue_target; \ + (init_jump_target(&continue_target, (val))) #define POP_CONTINUE() \ - ((void)(continue_label = old_continue_label)) + ((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; @@ -134,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); @@ -142,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 { @@ -150,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; } @@ -184,8 +193,8 @@ static void set_unreachable_now(void) ir_mode *atomic_modes[ATOMIC_TYPE_LAST+1]; -static ir_node *_expression_to_firm(const expression_t *expression); -static ir_node *expression_to_firm(const expression_t *expression); +static ir_node *expression_to_control_flow(expression_t const *expr, jump_target *true_target, jump_target *false_target); +static ir_node *expression_to_value(expression_t const *expr); static unsigned decide_modulo_shift(unsigned type_size) { @@ -200,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(); @@ -244,7 +252,7 @@ static ir_node *get_vla_size(array_type_t *const type) { ir_node *size_node = type->size_node; if (size_node == NULL) { - size_node = expression_to_firm(type->size_expression); + size_node = expression_to_value(type->size_expression); type->size_node = size_node; } return size_node; @@ -262,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; } /** @@ -591,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) { @@ -617,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); @@ -675,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); @@ -876,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"); } /** @@ -891,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); @@ -967,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; @@ -1061,33 +1089,6 @@ static ir_node *create_Const_from_bool(ir_mode *const mode, bool const v) return new_Const((v ? get_mode_one : get_mode_null)(mode)); } -static ir_node *create_conv_from_b(dbg_info *dbgi, ir_node *value, - ir_mode *dest_mode) -{ - if (is_Const(value)) { - return create_Const_from_bool(dest_mode, !is_Const_null(value)); - } - - ir_node *cond = new_d_Cond(dbgi, value); - ir_node *proj_true = new_Proj(cond, mode_X, pn_Cond_true); - ir_node *proj_false = new_Proj(cond, mode_X, pn_Cond_false); - ir_node *tblock = new_Block(1, &proj_true); - ir_node *fblock = new_Block(1, &proj_false); - set_cur_block(tblock); - ir_node *const1 = new_Const(get_mode_one(dest_mode)); - ir_node *tjump = new_Jmp(); - set_cur_block(fblock); - ir_node *const0 = new_Const(get_mode_null(dest_mode)); - ir_node *fjump = new_Jmp(); - - ir_node *in[2] = { tjump, fjump }; - ir_node *mergeblock = new_Block(2, in); - set_cur_block(mergeblock); - ir_node *phi_in[2] = { const1, const0 }; - ir_node *phi = new_Phi(2, phi_in, dest_mode); - return phi; -} - static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode) { ir_mode *value_mode = get_irn_mode(value); @@ -1095,17 +1096,15 @@ static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode) if (value_mode == dest_mode) return value; - if (dest_mode == mode_b) { - ir_node *zero = new_Const(get_mode_null(value_mode)); - ir_node *cmp = new_d_Cmp(dbgi, value, zero, ir_relation_unordered_less_greater); - return cmp; - } else if (value_mode == mode_b) { - return create_conv_from_b(dbgi, value, dest_mode); - } - return new_d_Conv(dbgi, value, dest_mode); } +static ir_node *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. * @@ -1113,13 +1112,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); @@ -1132,8 +1132,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; @@ -1255,10 +1260,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); @@ -1305,10 +1310,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); @@ -1448,16 +1453,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) @@ -1474,7 +1476,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)); @@ -1484,7 +1486,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 */ @@ -1539,12 +1541,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)); @@ -1569,7 +1571,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; @@ -1584,7 +1586,7 @@ static ir_node *process_builtin_call(const call_expression_t *call) break; case BUILTIN_ALLOCA: { expression_t *argument = call->arguments->expression; - ir_node *size = expression_to_firm(argument); + ir_node *size = expression_to_value(argument); ir_node *store = get_store(); ir_node *alloca = new_d_Alloc(dbgi, store, size, get_unknown_type(), @@ -1613,11 +1615,11 @@ static ir_node *process_builtin_call(const call_expression_t *call) } case BUILTIN_EXPECT: { expression_t *argument = call->arguments->expression; - return _expression_to_firm(argument); + return expression_to_value(argument); } case BUILTIN_VA_END: /* evaluate the argument of va_end for its side effects */ - _expression_to_firm(call->arguments->expression); + expression_to_value(call->arguments->expression); return NULL; case BUILTIN_OBJECT_SIZE: { /* determine value of "type" */ @@ -1632,15 +1634,15 @@ static ir_node *process_builtin_call(const call_expression_t *call) return new_d_Const(dbgi, result); } case BUILTIN_ROTL: { - ir_node *val = expression_to_firm(call->arguments->expression); - ir_node *shf = expression_to_firm(call->arguments->next->expression); + ir_node *val = expression_to_value(call->arguments->expression); + ir_node *shf = expression_to_value(call->arguments->next->expression); ir_mode *mode = get_irn_mode(val); ir_mode *mode_uint = atomic_modes[ATOMIC_TYPE_UINT]; return new_d_Rotl(dbgi, val, create_conv(dbgi, shf, mode_uint), mode); } case BUILTIN_ROTR: { - ir_node *val = expression_to_firm(call->arguments->expression); - ir_node *shf = expression_to_firm(call->arguments->next->expression); + ir_node *val = expression_to_value(call->arguments->expression); + ir_node *shf = expression_to_value(call->arguments->next->expression); ir_mode *mode = get_irn_mode(val); ir_mode *mode_uint = atomic_modes[ATOMIC_TYPE_UINT]; ir_node *c = new_Const_long(mode_uint, get_mode_size_bits(mode)); @@ -1653,7 +1655,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"); } /** @@ -1665,7 +1667,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; @@ -1688,7 +1690,7 @@ static ir_node *call_expression_to_firm(const call_expression_t *const call) } } if (!firm_builtin) - callee = expression_to_firm(function); + callee = expression_to_value(function); type_t *type = skip_typeref(function->base.type); assert(is_type_pointer(type)); @@ -1738,15 +1740,9 @@ static ir_node *call_expression_to_firm(const call_expression_t *const call) const call_argument_t *argument = call->arguments; 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; + ir_node *arg_node = expression_to_value(expression); + type_t *arg_type = skip_typeref(expression->base.type); + in[n] = conv_to_storage_type(dbgi, arg_node, arg_type); argument = argument->next; } @@ -1806,19 +1802,12 @@ static ir_node *call_expression_to_firm(const call_expression_t *const call) 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 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(); @@ -1917,7 +1906,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); @@ -1976,13 +1965,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; @@ -2022,12 +2007,6 @@ static ir_node *set_value_for_expression_addr(const expression_t *expression, return value; } -static void set_value_for_expression(const expression_t *expression, - ir_node *value) -{ - set_value_for_expression_addr(expression, value, NULL); -} - static ir_node *get_value_from_lvalue(const expression_t *expression, ir_node *addr) { @@ -2051,7 +2030,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 && @@ -2065,52 +2044,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 *incdec_to_firm(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) @@ -2202,7 +2158,7 @@ static ir_node *handle_assume_compare(dbg_info *dbi, ir_mode *const mode = get_ir_mode_storage(type); res = get_value(var->variable.v.value_number, mode); - res = new_d_Confirm(dbi, res, expression_to_firm(con), relation); + res = new_d_Confirm(dbi, res, expression_to_value(con), relation); set_value(var->variable.v.value_number, res); } return res; @@ -2214,38 +2170,34 @@ static ir_node *handle_assume_compare(dbg_info *dbi, * @param dbi debug info * @param expr the IL assume expression */ -static ir_node *handle_assume(dbg_info *dbi, const expression_t *expression) +static ir_node *handle_assume(expression_t const *const expr) { - switch(expression->kind) { + switch (expr->kind) { case EXPR_BINARY_EQUAL: case EXPR_BINARY_NOTEQUAL: case EXPR_BINARY_LESS: case EXPR_BINARY_LESSEQUAL: case EXPR_BINARY_GREATER: - case EXPR_BINARY_GREATEREQUAL: - return handle_assume_compare(dbi, &expression->binary); + case EXPR_BINARY_GREATEREQUAL: { + dbg_info *const dbgi = get_dbg_info(&expr->base.pos); + return handle_assume_compare(dbgi, &expr->binary); + } + default: return NULL; } } -static ir_node *create_cast(dbg_info *dbgi, ir_node *value_node, - type_t *from_type, type_t *type) +static ir_node *create_cast(unary_expression_t const *const expr) { - type = skip_typeref(type); - if (is_type_void(type)) { - /* make sure firm type is constructed */ - (void) get_ir_type(type); + type_t *const type = skip_typeref(expr->base.type); + if (is_type_void(type)) return NULL; - } - if (!is_type_scalar(type)) { - /* make sure firm type is constructed */ - (void) get_ir_type(type); - return value_node; - } - from_type = skip_typeref(from_type); - ir_mode *mode = get_ir_mode_storage(type); + ir_node *value = expression_to_value(expr->value); + dbg_info *const dbgi = get_dbg_info(&expr->base.pos); + type_t *const from_type = skip_typeref(expr->value->base.type); + ir_mode *const mode = get_ir_mode_storage(type); /* check for conversion from / to __based types */ if (is_type_pointer(type) && is_type_pointer(from_type)) { const variable_t *from_var = from_type->pointer.base_variable; @@ -2254,116 +2206,56 @@ static ir_node *create_cast(dbg_info *dbgi, ir_node *value_node, if (from_var != NULL) { ir_node *const addr = create_symconst(dbgi, from_var->v.entity); ir_node *const base = deref_address(dbgi, from_var->base.type, addr); - value_node = new_d_Add(dbgi, value_node, base, mode); + value = new_d_Add(dbgi, value, base, mode); } if (to_var != NULL) { ir_node *const addr = create_symconst(dbgi, to_var->v.entity); ir_node *const base = deref_address(dbgi, to_var->base.type, addr); - value_node = new_d_Sub(dbgi, value_node, base, mode); + value = new_d_Sub(dbgi, value, base, mode); } } } - if (is_type_atomic(type, ATOMIC_TYPE_BOOL)) { - /* bool adjustments (we save a mode_Bu, but have to temporarily - * convert to mode_b so we only get a 0/1 value */ - value_node = create_conv(dbgi, value_node, mode_b); - } - ir_mode *mode_arith = get_ir_mode_arithmetic(type); - ir_node *node = create_conv(dbgi, value_node, mode); + ir_node *node = create_conv(dbgi, value, mode); node = create_conv(dbgi, node, mode_arith); - return node; } -static ir_node *unary_expression_to_firm(const unary_expression_t *expression) +static ir_node *complement_to_firm(unary_expression_t const *const expr) { - dbg_info *dbgi = get_dbg_info(&expression->base.source_position); - type_t *type = skip_typeref(expression->base.type); - - const expression_t *value = expression->value; - - switch(expression->base.kind) { - case EXPR_UNARY_TAKE_ADDRESS: - return expression_to_addr(value); + dbg_info *const dbgi = get_dbg_info(&expr->base.pos); + ir_node *const value = expression_to_value(expr->value); + type_t *const type = skip_typeref(expr->base.type); + ir_mode *const mode = get_ir_mode_arithmetic(type); + return new_d_Not(dbgi, value, mode); +} - case EXPR_UNARY_NEGATE: { - ir_node *value_node = expression_to_firm(value); - ir_mode *mode = get_ir_mode_arithmetic(type); - return new_d_Minus(dbgi, value_node, mode); - } - case EXPR_UNARY_PLUS: - return expression_to_firm(value); - case EXPR_UNARY_BITWISE_NEGATE: { - ir_node *value_node = expression_to_firm(value); - ir_mode *mode = get_ir_mode_arithmetic(type); - return new_d_Not(dbgi, value_node, mode); - } - case EXPR_UNARY_NOT: { - ir_node *value_node = _expression_to_firm(value); - value_node = create_conv(dbgi, value_node, mode_b); - ir_node *res = new_d_Not(dbgi, value_node, mode_b); - return res; - } - case EXPR_UNARY_DEREFERENCE: { - ir_node *value_node = expression_to_firm(value); - type_t *value_type = skip_typeref(value->base.type); - assert(is_type_pointer(value_type)); - - /* check for __based */ - const variable_t *const base_var = value_type->pointer.base_variable; - if (base_var != NULL) { - ir_node *const addr = create_symconst(dbgi, base_var->v.entity); - ir_node *const base = deref_address(dbgi, base_var->base.type, addr); - value_node = new_d_Add(dbgi, value_node, base, get_ir_mode_storage(value_type)); - } - 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); - case EXPR_UNARY_CAST: { - ir_node *value_node = expression_to_firm(value); - type_t *from_type = value->base.type; - return create_cast(dbgi, value_node, from_type, type); - } - case EXPR_UNARY_ASSUME: - return handle_assume(dbgi, value); +static ir_node *dereference_to_firm(unary_expression_t const *const expr) +{ + dbg_info *const dbgi = get_dbg_info(&expr->base.pos); + ir_node *value = expression_to_value(expr->value); + type_t *const value_type = skip_typeref(expr->value->base.type); + assert(is_type_pointer(value_type)); - default: - break; + /* check for __based */ + variable_t const *const base_var = value_type->pointer.base_variable; + if (base_var) { + ir_node *const addr = create_symconst(dbgi, base_var->v.entity); + ir_node *const base = deref_address(dbgi, base_var->base.type, addr); + value = new_d_Add(dbgi, value, base, get_ir_mode_storage(value_type)); } - panic("invalid UNEXPR type found"); + type_t *const points_to = value_type->pointer.points_to; + return deref_address(dbgi, points_to, value); } -/** - * produces a 0/1 depending of the value of a mode_b node - */ -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); - - 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 *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); - - return val; +static ir_node *negate_to_firm(unary_expression_t const *const expr) +{ + dbg_info *const dbgi = get_dbg_info(&expr->base.pos); + ir_node *const value = expression_to_value(expr->value); + type_t *const type = skip_typeref(expr->base.type); + ir_mode *const mode = get_ir_mode_arithmetic(type); + return new_d_Minus(dbgi, value, mode); } static ir_node *adjust_for_pointer_arithmetic(dbg_info *dbgi, @@ -2380,21 +2272,19 @@ static ir_node *adjust_for_pointer_arithmetic(dbg_info *dbgi, return mul; } -static ir_node *create_op(dbg_info *dbgi, const binary_expression_t *expression, - ir_node *left, ir_node *right) +static ir_node *create_op(binary_expression_t const *const expr, ir_node *left, ir_node *right) { - ir_mode *mode; - type_t *type_left = skip_typeref(expression->left->base.type); - type_t *type_right = skip_typeref(expression->right->base.type); - - expression_kind_t kind = expression->base.kind; - + ir_mode *mode; + dbg_info *const dbgi = get_dbg_info(&expr->base.pos); + type_t *const type_left = skip_typeref(expr->left->base.type); + type_t *const type_right = skip_typeref(expr->right->base.type); + expression_kind_t const kind = expr->base.kind; switch (kind) { case EXPR_BINARY_SHIFTLEFT: case EXPR_BINARY_SHIFTRIGHT: case EXPR_BINARY_SHIFTLEFT_ASSIGN: case EXPR_BINARY_SHIFTRIGHT_ASSIGN: - mode = get_ir_mode_arithmetic(expression->base.type); + mode = get_ir_mode_arithmetic(expr->base.type); right = create_conv(dbgi, right, atomic_modes[ATOMIC_TYPE_UINT]); break; @@ -2402,7 +2292,7 @@ static ir_node *create_op(dbg_info *dbgi, const binary_expression_t *expression, if (is_type_pointer(type_left) && is_type_pointer(type_right)) { const pointer_type_t *const ptr_type = &type_left->pointer; - mode = get_ir_mode_arithmetic(expression->base.type); + mode = get_ir_mode_arithmetic(expr->base.type); ir_node *const elem_size = get_type_size_node(ptr_type->points_to); ir_node *const conv_size = new_d_Conv(dbgi, elem_size, mode); ir_node *const sub = new_d_Sub(dbgi, left, right, mode); @@ -2490,144 +2380,148 @@ normal_node: } } -static ir_node *create_lazy_op(const binary_expression_t *expression) +static ir_node *binop_to_firm(binary_expression_t const *const expr) { - dbg_info *dbgi = get_dbg_info(&expression->base.source_position); - type_t *type = skip_typeref(expression->base.type); - ir_mode *mode = get_ir_mode_arithmetic(type); - - if (is_constant_expression(expression->left) == EXPR_CLASS_CONSTANT) { - bool val = fold_constant_to_bool(expression->left); - expression_kind_t ekind = expression->base.kind; - assert(ekind == EXPR_BINARY_LOGICAL_AND || ekind == EXPR_BINARY_LOGICAL_OR); - if (ekind == EXPR_BINARY_LOGICAL_AND) { - if (!val) { - return new_Const(get_mode_null(mode)); - } + ir_node *const left = expression_to_value(expr->left); + ir_node *const right = expression_to_value(expr->right); + return create_op(expr, left, right); +} + +/** + * Check if a given expression is a GNU __builtin_expect() call. + */ +static bool is_builtin_expect(const expression_t *expression) +{ + if (expression->kind != EXPR_CALL) + return false; + + expression_t *function = expression->call.function; + if (function->kind != EXPR_REFERENCE) + return false; + reference_expression_t *ref = &function->reference; + if (ref->entity->kind != ENTITY_FUNCTION || + ref->entity->function.btk != BUILTIN_EXPECT) + return false; + + return true; +} + +static void compare_to_control_flow(expression_t const *const expr, ir_node *const left, ir_node *const right, ir_relation const relation, jump_target *const true_target, jump_target *const false_target) +{ + dbg_info *const dbgi = get_dbg_info(&expr->base.pos); + ir_node *const cmp = new_d_Cmp(dbgi, left, right, relation); + if (is_Const(cmp)) { + if (tarval_is_null(get_Const_tarval(cmp))) { + jump_to_target(false_target); } else { - if (val) { - return new_Const(get_mode_one(mode)); + jump_to_target(true_target); + } + } else { + ir_node *const cond = new_d_Cond(dbgi, cmp); + ir_node *const true_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_true); + ir_node *const false_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_false); + + /* set branch prediction info based on __builtin_expect */ + if (is_builtin_expect(expr) && is_Cond(cond)) { + call_argument_t *const argument = expr->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); } } - if (is_constant_expression(expression->right) == EXPR_CLASS_CONSTANT) { - bool valr = fold_constant_to_bool(expression->right); - return create_Const_from_bool(mode, valr); - } + add_pred_to_jump_target(true_target, true_proj); + add_pred_to_jump_target(false_target, false_proj); + } + set_unreachable_now(); +} - return produce_condition_result(expression->right, mode, dbgi); +static ir_node *control_flow_to_1_0(expression_t const *const expr, jump_target *const true_target, jump_target *const false_target) +{ + ir_node *val = NULL; + dbg_info *const dbgi = get_dbg_info(&expr->base.pos); + ir_mode *const mode = get_ir_mode_arithmetic(expr->base.type); + jump_target exit_target; + init_jump_target(&exit_target, NULL); + + if (enter_jump_target(true_target)) { + jump_to_target(&exit_target); + val = new_d_Const(dbgi, get_mode_one(mode)); } - return produce_condition_result((const expression_t*) expression, mode, - dbgi); -} + if (enter_jump_target(false_target)) { + jump_to_target(&exit_target); + ir_node *const zero = new_d_Const(dbgi, get_mode_null(mode)); + if (val) { + ir_node *const in[] = { val, zero }; + val = new_rd_Phi(dbgi, exit_target.block, lengthof(in), in, mode); + } else { + val = zero; + } + } -typedef ir_node * (*create_arithmetic_func)(dbg_info *dbgi, ir_node *left, - ir_node *right, ir_mode *mode); + if (!enter_jump_target(&exit_target)) { + set_cur_block(new_Block(0, NULL)); + val = new_d_Bad(dbgi, mode); + } + return val; +} -static ir_node *create_assign_binop(const binary_expression_t *expression) +static ir_node *binop_assign_to_firm(binary_expression_t const *const expr) { - dbg_info *const dbgi = get_dbg_info(&expression->base.source_position); - const expression_t *left_expr = expression->left; - type_t *type = skip_typeref(left_expr->base.type); - ir_node *right = expression_to_firm(expression->right); - ir_node *left_addr = expression_to_addr(left_expr); - ir_node *left = get_value_from_lvalue(left_expr, left_addr); - ir_node *result = create_op(dbgi, expression, left, right); + ir_node *const right = expression_to_value(expr->right); + expression_t const *const left_expr = expr->left; + ir_node *const addr = expression_to_addr(left_expr); + ir_node *const left = get_value_from_lvalue(left_expr, addr); + ir_node *result = create_op(expr, left, right); - result = create_cast(dbgi, result, expression->right->base.type, type); + type_t *const type = skip_typeref(expr->base.type); + if (is_type_atomic(type, ATOMIC_TYPE_BOOL)) { + jump_target true_target; + jump_target false_target; + init_jump_target(&true_target, NULL); + init_jump_target(&false_target, NULL); + ir_mode *const mode = get_irn_mode(result); + ir_node *const zero = new_Const(get_mode_null(mode)); + compare_to_control_flow((expression_t const*)expr, result, zero, ir_relation_unordered_less_greater, &true_target, &false_target); + result = control_flow_to_1_0((expression_t const*)expr, &true_target, &false_target); + } - result = set_value_for_expression_addr(left_expr, result, left_addr); + result = set_value_for_expression_addr(left_expr, result, addr); if (!is_type_compound(type)) { - ir_mode *mode_arithmetic = get_ir_mode_arithmetic(type); - result = create_conv(dbgi, result, mode_arithmetic); + dbg_info *const dbgi = get_dbg_info(&expr->base.pos); + ir_mode *const mode = get_ir_mode_arithmetic(type); + result = create_conv(dbgi, result, mode); } return result; } -static ir_node *binary_expression_to_firm(const binary_expression_t *expression) +static ir_node *assign_expression_to_firm(binary_expression_t const *const expr) { - expression_kind_t kind = expression->base.kind; - - switch(kind) { - case EXPR_BINARY_EQUAL: - case EXPR_BINARY_NOTEQUAL: - case EXPR_BINARY_LESS: - case EXPR_BINARY_LESSEQUAL: - case EXPR_BINARY_GREATER: - case EXPR_BINARY_GREATEREQUAL: - case EXPR_BINARY_ISGREATER: - case EXPR_BINARY_ISGREATEREQUAL: - case EXPR_BINARY_ISLESS: - case EXPR_BINARY_ISLESSEQUAL: - case EXPR_BINARY_ISLESSGREATER: - case EXPR_BINARY_ISUNORDERED: { - dbg_info *dbgi = get_dbg_info(&expression->base.source_position); - ir_node *left = expression_to_firm(expression->left); - ir_node *right = expression_to_firm(expression->right); - ir_relation relation = get_relation(kind); - ir_node *cmp = new_d_Cmp(dbgi, left, right, relation); - return cmp; - } - case EXPR_BINARY_ASSIGN: { - ir_node *addr = expression_to_addr(expression->left); - ir_node *right = expression_to_firm(expression->right); - ir_node *res - = set_value_for_expression_addr(expression->left, right, addr); - - type_t *type = skip_typeref(expression->base.type); - if (!is_type_compound(type)) { - ir_mode *mode_arithmetic = get_ir_mode_arithmetic(type); - res = create_conv(NULL, res, mode_arithmetic); - } - return res; - } - case EXPR_BINARY_ADD: - case EXPR_BINARY_SUB: - case EXPR_BINARY_MUL: - case EXPR_BINARY_DIV: - case EXPR_BINARY_MOD: - case EXPR_BINARY_BITWISE_AND: - case EXPR_BINARY_BITWISE_OR: - case EXPR_BINARY_BITWISE_XOR: - case EXPR_BINARY_SHIFTLEFT: - case EXPR_BINARY_SHIFTRIGHT: - { - dbg_info *dbgi = get_dbg_info(&expression->base.source_position); - ir_node *left = expression_to_firm(expression->left); - ir_node *right = expression_to_firm(expression->right); - return create_op(dbgi, expression, left, right); + ir_node *const addr = expression_to_addr(expr->left); + ir_node *const right = expression_to_value(expr->right); + ir_node *res = set_value_for_expression_addr(expr->left, right, addr); + type_t *const type = skip_typeref(expr->base.type); + if (!is_type_compound(type)) { + ir_mode *const mode_arithmetic = get_ir_mode_arithmetic(type); + res = create_conv(NULL, res, mode_arithmetic); } - case EXPR_BINARY_LOGICAL_AND: - case EXPR_BINARY_LOGICAL_OR: - return create_lazy_op(expression); - case EXPR_BINARY_COMMA: - /* create side effects of left side */ - (void) expression_to_firm(expression->left); - return _expression_to_firm(expression->right); + return res; +} - case EXPR_BINARY_ADD_ASSIGN: - case EXPR_BINARY_SUB_ASSIGN: - case EXPR_BINARY_MUL_ASSIGN: - case EXPR_BINARY_MOD_ASSIGN: - case EXPR_BINARY_DIV_ASSIGN: - case EXPR_BINARY_BITWISE_AND_ASSIGN: - case EXPR_BINARY_BITWISE_OR_ASSIGN: - case EXPR_BINARY_BITWISE_XOR_ASSIGN: - case EXPR_BINARY_SHIFTLEFT_ASSIGN: - case EXPR_BINARY_SHIFTRIGHT_ASSIGN: - return create_assign_binop(expression); - default: - panic("invalid binexpr type"); - } +static ir_node *comma_expression_to_firm(binary_expression_t const *const expr) +{ + expression_to_value(expr->left); + return expression_to_value(expr->right); } static ir_node *array_access_addr(const array_access_expression_t *expression) { - dbg_info *dbgi = get_dbg_info(&expression->base.source_position); - ir_node *base_addr = expression_to_firm(expression->array_ref); - ir_node *offset = expression_to_firm(expression->index); + dbg_info *dbgi = get_dbg_info(&expression->base.pos); + ir_node *base_addr = expression_to_value(expression->array_ref); + ir_node *offset = expression_to_value(expression->index); type_t *ref_type = skip_typeref(expression->array_ref->base.type); ir_node *real_offset = adjust_for_pointer_arithmetic(dbgi, offset, ref_type); ir_node *result = new_d_Add(dbgi, base_addr, real_offset, mode_P_data); @@ -2638,7 +2532,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); @@ -2695,7 +2589,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); } @@ -2710,13 +2604,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); @@ -2731,11 +2621,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 { @@ -2759,7 +2651,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); @@ -2774,7 +2666,7 @@ static ir_node *sizeof_to_firm(const typeprop_expression_t *expression) /* §6.5.3.4:2 if the type is a VLA, evaluate the expression. */ if (is_type_array(type) && type->array.is_vla && expression->tp_expression != NULL) { - expression_to_firm(expression->tp_expression); + expression_to_value(expression->tp_expression); } return get_type_size_node(type); @@ -2824,7 +2716,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); @@ -2832,7 +2724,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); @@ -2845,24 +2737,17 @@ 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(); - - ir_node *const cnst = _expression_to_firm(expression); + PUSH_IRG(get_const_code_irg()); + ir_node *const cnst = expression_to_value(expression); + POP_IRG(); - current_ir_graph = old_current_ir_graph; set_optimize(old_optimize); set_opt_constant_folding(old_constant_folding); - - if (!is_Const(cnst)) { - panic("couldn't fold constant"); - } - constant_folding = constant_folding_old; - ir_tarval *const tv = get_Const_tarval(cnst); - ir_mode *const mode = get_ir_mode_arithmetic(skip_typeref(expression->base.type)); - return tarval_convert_to(tv, mode); + if (!is_Const(cnst)) + panic("couldn't fold constant"); + return get_Const_tarval(cnst); } /* this function is only used in parser.c, but it relies on libfirm functionality */ @@ -2890,58 +2775,47 @@ 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); + 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 = expression_to_control_flow(expression->condition, &true_target, &false_target); + + ir_node *val = NULL; + jump_target exit_target; + init_jump_target(&exit_target, NULL); + + if (enter_jump_target(&true_target)) { + if (expression->true_expression) { + val = expression_to_value(expression->true_expression); + } else if (cond_expr) { + 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); + } - /* first try to fold a constant condition */ - if (is_constant_expression(expression->condition) == EXPR_CLASS_CONSTANT) { - bool val = fold_constant_to_bool(expression->condition); + if (enter_jump_target(&false_target)) { + ir_node *const false_val = expression_to_value(expression->false_expression); + jump_to_target(&exit_target); if (val) { - expression_t *true_expression = expression->true_expression; - if (true_expression == NULL) - true_expression = expression->condition; - return expression_to_firm(true_expression); + 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 { - return expression_to_firm(expression->false_expression); + val = false_val; } } - 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)); + 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)); } - 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); - - /* 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); - - /* TODO improve static semantics, so either both or no values are NULL */ - if (true_val == NULL || false_val == NULL) - return NULL; - - 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); - return val; } @@ -2950,11 +2824,11 @@ 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); - ir_node *compound_addr = expression_to_firm(expression->compound); + ir_node *compound_addr = expression_to_value(expression->compound); entity_t *entry = expression->compound_entry; assert(entry->kind == ENTITY_COMPOUND_MEMBER); @@ -2974,7 +2848,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); @@ -3055,7 +2929,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; @@ -3078,11 +2952,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); @@ -3096,18 +2970,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; @@ -3136,11 +3010,11 @@ 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); - set_value_for_expression(expr->ap, arg_sel); + set_value_for_expression_addr(expr->ap, arg_sel, NULL); return NULL; } @@ -3151,7 +3025,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); @@ -3172,15 +3046,15 @@ static ir_node *va_arg_expression_to_firm(const va_arg_expression_t *const expr) */ static ir_node *va_copy_expression_to_firm(const va_copy_expression_t *const expr) { - ir_node *const src = expression_to_firm(expr->src); - set_value_for_expression(expr->dst, src); + ir_node *const src = expression_to_value(expr->src); + set_value_for_expression_addr(expr->dst, src, NULL); return NULL; } static ir_node *dereference_addr(const unary_expression_t *const expression) { assert(expression->base.kind == EXPR_UNARY_DEREFERENCE); - return expression_to_firm(expression->value); + return expression_to_value(expression->value); } /** @@ -3191,8 +3065,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: @@ -3225,24 +3097,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); + } } /** @@ -3251,21 +3113,19 @@ 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); } -/** - * creates firm nodes for an expression. The difference between this function - * and expression_to_firm is, that this version might produce mode_b nodes - * instead of mode_Is. - */ -static ir_node *_expression_to_firm(expression_t const *const expr) +static ir_node *expression_to_value(expression_t const *const expr) { #ifndef NDEBUG if (!constant_folding) { @@ -3275,63 +3135,148 @@ static ir_node *_expression_to_firm(expression_t const *const expr) #endif switch (expr->kind) { + case EXPR_UNARY_CAST: + if (is_type_atomic(skip_typeref(expr->base.type), ATOMIC_TYPE_BOOL)) { + case EXPR_BINARY_EQUAL: + case EXPR_BINARY_GREATER: + case EXPR_BINARY_GREATEREQUAL: + case EXPR_BINARY_ISGREATER: + case EXPR_BINARY_ISGREATEREQUAL: + case EXPR_BINARY_ISLESS: + case EXPR_BINARY_ISLESSEQUAL: + case EXPR_BINARY_ISLESSGREATER: + case EXPR_BINARY_ISUNORDERED: + case EXPR_BINARY_LESS: + case EXPR_BINARY_LESSEQUAL: + case EXPR_BINARY_LOGICAL_AND: + case EXPR_BINARY_LOGICAL_OR: + case EXPR_BINARY_NOTEQUAL: + case EXPR_UNARY_NOT:; + jump_target true_target; + jump_target false_target; + init_jump_target(&true_target, NULL); + init_jump_target(&false_target, NULL); + expression_to_control_flow(expr, &true_target, &false_target); + return control_flow_to_1_0(expr, &true_target, &false_target); + } else { + return create_cast(&expr->unary); + } + + case EXPR_BINARY_ADD: + case EXPR_BINARY_BITWISE_AND: + case EXPR_BINARY_BITWISE_OR: + case EXPR_BINARY_BITWISE_XOR: + case EXPR_BINARY_DIV: + case EXPR_BINARY_MOD: + case EXPR_BINARY_MUL: + case EXPR_BINARY_SHIFTLEFT: + case EXPR_BINARY_SHIFTRIGHT: + case EXPR_BINARY_SUB: + return binop_to_firm(&expr->binary); + + case EXPR_BINARY_ADD_ASSIGN: + case EXPR_BINARY_BITWISE_AND_ASSIGN: + case EXPR_BINARY_BITWISE_OR_ASSIGN: + case EXPR_BINARY_BITWISE_XOR_ASSIGN: + case EXPR_BINARY_DIV_ASSIGN: + case EXPR_BINARY_MOD_ASSIGN: + case EXPR_BINARY_MUL_ASSIGN: + case EXPR_BINARY_SHIFTLEFT_ASSIGN: + case EXPR_BINARY_SHIFTRIGHT_ASSIGN: + case EXPR_BINARY_SUB_ASSIGN: + return binop_assign_to_firm(&expr->binary); + + { + 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 incdec_to_firm(&expr->unary, inc, pre); + } + case EXPR_ALIGNOF: return alignof_to_firm( &expr->typeprop); case EXPR_ARRAY_ACCESS: return array_access_to_firm( &expr->array_access); - case EXPR_BINARY_CASES: return binary_expression_to_firm( &expr->binary); + case EXPR_BINARY_ASSIGN: return assign_expression_to_firm( &expr->binary); + case EXPR_BINARY_COMMA: return comma_expression_to_firm( &expr->binary); case EXPR_BUILTIN_CONSTANT_P: return builtin_constant_to_firm( &expr->builtin_constant); case EXPR_BUILTIN_TYPES_COMPATIBLE_P: return builtin_types_compatible_to_firm(&expr->builtin_types_compatible); case EXPR_CALL: return call_expression_to_firm( &expr->call); case EXPR_CLASSIFY_TYPE: return classify_type_to_firm( &expr->classify_type); case EXPR_COMPOUND_LITERAL: return compound_literal_to_firm( &expr->compound_literal); case EXPR_CONDITIONAL: return conditional_to_firm( &expr->conditional); + case EXPR_ENUM_CONSTANT: return enum_constant_to_firm( &expr->reference); case EXPR_FUNCNAME: return function_name_to_firm( &expr->funcname); case EXPR_LABEL_ADDRESS: return label_address_to_firm( &expr->label_address); case EXPR_LITERAL_CASES: return literal_to_firm( &expr->literal); case EXPR_LITERAL_CHARACTER: return char_literal_to_firm( &expr->string_literal); case EXPR_OFFSETOF: return offsetof_to_firm( &expr->offsetofe); case EXPR_REFERENCE: return reference_expression_to_firm( &expr->reference); - case EXPR_ENUM_CONSTANT: return enum_constant_to_firm( &expr->reference); case EXPR_SELECT: return select_to_firm( &expr->select); case EXPR_SIZEOF: return sizeof_to_firm( &expr->typeprop); case EXPR_STATEMENT: return statement_expression_to_firm( &expr->statement); - case EXPR_UNARY_CASES: return unary_expression_to_firm( &expr->unary); + case EXPR_STRING_LITERAL: return string_to_firm( &expr->base.pos, "str.%u", &expr->string_literal.value); + case EXPR_UNARY_ASSUME: return handle_assume( expr->unary.value); + case EXPR_UNARY_BITWISE_NEGATE: return complement_to_firm( &expr->unary); + case EXPR_UNARY_DEREFERENCE: return dereference_to_firm( &expr->unary); + case EXPR_UNARY_NEGATE: return negate_to_firm( &expr->unary); + case EXPR_UNARY_PLUS: return expression_to_value( expr->unary.value); + case EXPR_UNARY_TAKE_ADDRESS: return expression_to_addr( expr->unary.value); case EXPR_VA_ARG: return va_arg_expression_to_firm( &expr->va_arge); case EXPR_VA_COPY: return va_copy_expression_to_firm( &expr->va_copye); case EXPR_VA_START: return va_start_expression_to_firm( &expr->va_starte); - case EXPR_STRING_LITERAL: return string_to_firm(&expr->base.source_position, "str.%u", &expr->string_literal.value); + case EXPR_UNARY_DELETE: + case EXPR_UNARY_DELETE_ARRAY: + case EXPR_UNARY_THROW: + panic("expression not implemented"); - case EXPR_ERROR: break; + case EXPR_ERROR: + break; } - panic("invalid expression found"); + panic("invalid expression"); } /** - * Check if a given expression is a GNU __builtin_expect() call. + * create a short-circuit expression evaluation that tries to construct + * efficient control flow structures for &&, || and ! expressions */ -static bool is_builtin_expect(const expression_t *expression) +static ir_node *expression_to_control_flow(expression_t const *const expr, jump_target *const true_target, jump_target *const false_target) { - if (expression->kind != EXPR_CALL) - return false; + switch (expr->kind) { + case EXPR_UNARY_NOT: + expression_to_control_flow(expr->unary.value, false_target, true_target); + return NULL; - expression_t *function = expression->call.function; - if (function->kind != EXPR_REFERENCE) - return false; - reference_expression_t *ref = &function->reference; - if (ref->entity->kind != ENTITY_FUNCTION || - ref->entity->function.btk != BUILTIN_EXPECT) - return false; + case EXPR_BINARY_LOGICAL_AND: { + jump_target extra_target; + init_jump_target(&extra_target, NULL); + expression_to_control_flow(expr->binary.left, &extra_target, false_target); + if (enter_jump_target(&extra_target)) + expression_to_control_flow(expr->binary.right, true_target, false_target); + return NULL; + } - return true; -} + case EXPR_BINARY_LOGICAL_OR: { + jump_target extra_target; + init_jump_target(&extra_target, NULL); + expression_to_control_flow(expr->binary.left, true_target, &extra_target); + if (enter_jump_target(&extra_target)) + expression_to_control_flow(expr->binary.right, true_target, false_target); + return NULL; + } -static bool produces_mode_b(const expression_t *expression) -{ - switch (expression->kind) { + case EXPR_BINARY_COMMA: + expression_to_value(expr->binary.left); + return expression_to_control_flow(expr->binary.right, true_target, false_target); + + ir_node *val; + ir_node *left; + ir_node *right; + ir_relation relation; case EXPR_BINARY_EQUAL: - case EXPR_BINARY_NOTEQUAL: - case EXPR_BINARY_LESS: - case EXPR_BINARY_LESSEQUAL: case EXPR_BINARY_GREATER: case EXPR_BINARY_GREATEREQUAL: case EXPR_BINARY_ISGREATER: @@ -3340,106 +3285,30 @@ static bool produces_mode_b(const expression_t *expression) case EXPR_BINARY_ISLESSEQUAL: case EXPR_BINARY_ISLESSGREATER: case EXPR_BINARY_ISUNORDERED: - case EXPR_UNARY_NOT: - return true; - - case EXPR_CALL: - if (is_builtin_expect(expression)) { - expression_t *argument = expression->call.arguments->expression; - return produces_mode_b(argument); - } - return false; - case EXPR_BINARY_COMMA: - return produces_mode_b(expression->binary.right); - - default: - return false; - } -} - -static ir_node *expression_to_firm(const expression_t *expression) -{ - if (!produces_mode_b(expression)) { - ir_node *res = _expression_to_firm(expression); - assert(res == NULL || get_irn_mode(res) != mode_b); - return res; - } - - if (is_constant_expression(expression) == EXPR_CLASS_CONSTANT) { - return new_Const(fold_constant_to_tarval(expression)); - } - - /* we have to produce a 0/1 from the mode_b expression */ - dbg_info *dbgi = get_dbg_info(&expression->base.source_position); - ir_mode *mode = get_ir_mode_arithmetic(expression->base.type); - return produce_condition_result(expression, mode, dbgi); -} - -/** - * 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) -{ - 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); - 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); - 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); - return NULL; - } + case EXPR_BINARY_LESS: + case EXPR_BINARY_LESSEQUAL: + case EXPR_BINARY_NOTEQUAL: + val = NULL; + left = expression_to_value(expr->binary.left); + right = expression_to_value(expr->binary.right); + relation = get_relation(expr->kind); + goto make_cmp; + + case EXPR_UNARY_CAST: + if (is_type_atomic(skip_typeref(expr->base.type), ATOMIC_TYPE_BOOL)) { + expression_to_control_flow(expr->unary.value, true_target, false_target); + return NULL; + } else { 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); + val = expression_to_value(expr); + left = val; + right = new_Const(get_mode_null(get_irn_mode(val))); + relation = ir_relation_unordered_less_greater; +make_cmp: + compare_to_control_flow(expr, left, right, relation, true_target, false_target); + return val; } } - - add_immBlock_pred(true_block, true_proj); - add_immBlock_pred(false_block, false_proj); - - set_unreachable_now(); - return cond_expr; } static void create_variable_entity(entity_t *variable, @@ -3451,7 +3320,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; @@ -3679,7 +3548,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); @@ -3724,18 +3593,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; - ir_node *value = expression_to_firm(expr); - ir_mode *mode = get_ir_mode_storage(type); - value = create_conv(NULL, value, mode); + 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_value(expr); + 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)) @@ -3764,13 +3642,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); } @@ -3821,6 +3700,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); @@ -3829,6 +3709,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; @@ -3856,7 +3738,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"); } @@ -3935,11 +3817,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: { @@ -4005,7 +3893,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, @@ -4029,7 +3917,7 @@ static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi, if (initializer->kind == INITIALIZER_VALUE) { initializer_value_t *initializer_value = &initializer->value; - ir_node *value = expression_to_firm(initializer_value->value); + ir_node *value = expression_to_value(initializer_value->value); type = skip_typeref(type); assign_value(dbgi, addr, type, value); return; @@ -4058,7 +3946,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; @@ -4087,20 +3975,15 @@ static void create_variable_initializer(entity_t *entity) type_t *const init_type = skip_typeref(value->base.type); if (!is_type_scalar(init_type)) { - /* skip convs */ - while (value->kind == EXPR_UNARY_CAST) - value = value->unary.value; - if (value->kind != EXPR_COMPOUND_LITERAL) panic("expected non-scalar initializer to be a compound literal"); initializer = value->compound_literal.initializer; goto have_initializer; } - 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); + ir_node * node = expression_to_value(value); + 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); @@ -4149,7 +4032,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); @@ -4211,7 +4094,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")]; @@ -4234,13 +4117,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(); } @@ -4250,17 +4129,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; + ir_node * res = statement->value ? expression_to_value(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 { @@ -4283,7 +4161,7 @@ static ir_node *expression_statement_to_firm(expression_statement_t *statement) if (!currently_reachable()) return NULL; - return expression_to_firm(statement->expression); + return expression_to_value(statement->expression); } static void create_local_declarations(entity_t*); @@ -4389,7 +4267,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) @@ -4466,109 +4344,59 @@ 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()) + expression_to_control_flow(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); - set_cur_block(target_block); -} - -/** - * 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 *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(); - PUSH_BREAK(NULL); - PUSH_CONTINUE(header_block); + PUSH_CONTINUE(NULL); - /* The loop body. */ - ir_node *body_block = NULL; - expression_t *const cond = statement->condition; + expression_t *const cond = statement->condition; /* Avoid an explicit body block in case of do ... while (0);. */ - if (is_constant_expression(cond) != EXPR_CLASS_CONSTANT || fold_constant_to_bool(cond)) { - /* Not do ... while (0);. */ - body_block = new_immBlock(); - jump_to(body_block); - } - statement_to_firm(statement->body); - - /* create the condition */ - jump_if_reachable(header_block); - mature_immBlock(header_block); - set_cur_block(header_block); - ir_node *const false_block = get_break_label(); - if (body_block) { - create_condition_evaluation(statement->condition, body_block, false_block); - mature_immBlock(body_block); + 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 { - jump_if_reachable(false_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)) + expression_to_control_flow(statement->condition, &body_target, &break_target); + enter_jump_target(&body_target); + } + enter_jump_target(&break_target); POP_CONTINUE(); POP_BREAK(); @@ -4589,80 +4417,48 @@ static ir_node *for_statement_to_firm(for_statement_t *statement) } if (statement->initialisation != NULL) { - expression_to_firm(statement->initialisation); + expression_to_value(statement->initialisation); } } /* Create the header block */ - ir_node *const header_block = new_immBlock(); - jump_to(header_block); + jump_target header_target; + 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); + PUSH_CONTINUE(step ? NULL : header_target.block); /* Create the condition. */ - ir_node *false_block; expression_t *const cond = statement->condition; if (cond && (is_constant_expression(cond) != EXPR_CLASS_CONSTANT || !fold_constant_to_bool(cond))) { - false_block = new_immBlock(); - - ir_node *const body_block = new_immBlock(); - create_condition_evaluation(cond, body_block, false_block); - mature_immBlock(body_block); - set_cur_block(body_block); - } else { - /* for-ever. */ - false_block = NULL; - - keep_alive(header_block); - keep_all_memory(header_block); + jump_target body_target; + init_jump_target(&body_target, NULL); + expression_to_control_flow(cond, &body_target, &break_target); + enter_jump_target(&body_target); } - /* 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(); - } - - PUSH_BREAK(false_block); - PUSH_CONTINUE(step_block); - /* Create the loop body. */ 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); - expression_to_firm(step); - jump_if_reachable(header_block); + if (step && enter_jump_target(&continue_target)) { + expression_to_value(step); + jump_to_target(&header_target); } - 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); + enter_jump_target(&header_target); + enter_jump_target(&break_target); POP_CONTINUE(); POP_BREAK(); 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 */ @@ -4687,11 +4483,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; } @@ -4700,11 +4494,11 @@ 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()) { - ir_node *expression = expression_to_firm(statement->expression); + ir_node *expression = expression_to_value(statement->expression); ir_switch_table *table = create_switch_table(statement); unsigned n_outs = (unsigned)ir_switch_table_get_n_entries(table) + 1; @@ -4720,20 +4514,14 @@ static ir_node *switch_statement_to_firm(switch_statement_t *statement) current_switch = switch_node; 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; @@ -4744,21 +4532,19 @@ static ir_node *switch_statement_to_firm(switch_statement_t *statement) 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); @@ -4766,31 +4552,41 @@ 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); - - 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 *computed_goto_to_firm(computed_goto_statement_t const *const statement) +{ + if (currently_reachable()) { + ir_node *const op = expression_to_value(statement->expression); + ARR_APP1(ir_node*, ijmp_ops, op); + jump_to_target(&ijmp_target); + set_unreachable_now(); + } + return NULL; +} + static ir_node *asm_statement_to_firm(const asm_statement_t *statement) { bool needs_memory = statement->is_volatile; @@ -4800,7 +4596,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; } @@ -4847,7 +4643,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); } @@ -4908,7 +4704,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; @@ -4936,17 +4732,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; @@ -4956,7 +4752,7 @@ static ir_node *asm_statement_to_firm(const asm_statement_t *statement) if ( (asm_flags & ASM_CONSTRAINT_FLAG_SUPPORTS_IMMEDIATE) || (asm_flags & ASM_CONSTRAINT_FLAG_SUPPORTS_REGISTER) ) { /* we can treat this as "normal" input */ - input = expression_to_firm(argument->expression); + input = expression_to_value(argument->expression); } else if (asm_flags & ASM_CONSTRAINT_FLAG_SUPPORTS_MEMOP) { /* pure memory ops need no input (but we have to make sure we * attach to the memory) */ @@ -4966,7 +4762,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; @@ -4987,7 +4783,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); @@ -5024,14 +4820,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; } @@ -5055,6 +4851,7 @@ 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); @@ -5062,11 +4859,17 @@ static ir_node *statement_to_firm(statement_t *const stmt) case STATEMENT_RETURN: return return_statement_to_firm( &stmt->returns); case STATEMENT_SWITCH: return switch_statement_to_firm( &stmt->switchs); - 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"); } @@ -5154,7 +4957,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); @@ -5168,9 +4971,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; @@ -5182,32 +4983,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) { @@ -5231,17 +5006,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. * @@ -5271,9 +5035,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); @@ -5286,15 +5052,9 @@ 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; @@ -5327,16 +5087,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); @@ -5454,8 +5220,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; @@ -5511,8 +5276,8 @@ void translation_unit_to_firm(translation_unit_t *unit) 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;