X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast2firm.c;h=a81992e159ec6cee2612691bdf6955c81e6c9b35;hb=aa834d2e8cf1f629e00744b5c5a07daa16ffdb13;hp=a24c47a05088a160bbc158801993dcd1cbb1fac7;hpb=e61e25e3fbef7b8894e58532b72ea1069f828561;p=cparser diff --git a/ast2firm.c b/ast2firm.c index a24c47a..a81992e 100644 --- a/ast2firm.c +++ b/ast2firm.c @@ -521,7 +521,7 @@ static ir_type *create_bitfield_type(const entity_t *entity) } } -#define INVALID_TYPE ((ir_type_ptr)-1) +#define INVALID_TYPE ((ir_type*)-1) enum { COMPOUND_IS_STRUCT = false, @@ -618,15 +618,14 @@ static ir_type *create_compound_type(compound_type_t *type, return irtype; } +static ir_tarval *fold_constant_to_tarval(expression_t const *); + static void determine_enum_values(enum_type_t *const type) { ir_mode *const mode = atomic_modes[type->base.akind]; ir_tarval *const one = get_mode_one(mode); ir_tarval * tv_next = get_mode_null(mode); - bool constant_folding_old = constant_folding; - constant_folding = true; - enum_t *enume = type->enume; entity_t *entry = enume->base.next; for (; entry != NULL; entry = entry->base.next) { @@ -635,18 +634,12 @@ static void determine_enum_values(enum_type_t *const type) expression_t *const init = entry->enum_value.value; if (init != NULL) { - ir_node *const cnst = expression_to_firm(init); - if (!is_Const(cnst)) { - panic("couldn't fold constant"); - } - tv_next = get_Const_tarval(cnst); + tv_next = fold_constant_to_tarval(init); } assert(entry->enum_value.tv == NULL || entry->enum_value.tv == tv_next); entry->enum_value.tv = tv_next; tv_next = tarval_add(tv_next, one); } - - constant_folding = constant_folding_old; } static ir_type *create_enum_type(enum_type_t *const type) @@ -687,10 +680,6 @@ ir_type *get_ir_type(type_t *type) ir_type *firm_type = NULL; switch (type->kind) { - case TYPE_ERROR: - /* Happens while constant folding, when there was an error */ - return create_atomic_type(ATOMIC_TYPE_VOID, NULL); - case TYPE_ATOMIC: firm_type = create_atomic_type(type->atomic.akind, type); break; @@ -722,6 +711,7 @@ ir_type *get_ir_type(type_t *type) firm_type = create_enum_type(&type->enumt); break; + case TYPE_ERROR: case TYPE_TYPEOF: case TYPE_TYPEDEF: break; @@ -1072,6 +1062,38 @@ static ir_node *create_symconst(dbg_info *dbgi, ir_entity *entity) return new_d_SymConst(dbgi, mode_P, sym, symconst_addr_ent); } +static ir_node *create_Const_from_bool(ir_mode *const mode, bool const v) +{ + return new_Const((v ? get_mode_one : get_mode_null)(mode)); +} + +static ir_node *create_conv_from_b(dbg_info *dbgi, ir_node *value, + ir_mode *dest_mode) +{ + if (is_Const(value)) { + return create_Const_from_bool(dest_mode, !is_Const_null(value)); + } + + ir_node *cond = new_d_Cond(dbgi, value); + ir_node *proj_true = new_Proj(cond, mode_X, pn_Cond_true); + ir_node *proj_false = new_Proj(cond, mode_X, pn_Cond_false); + ir_node *tblock = new_Block(1, &proj_true); + ir_node *fblock = new_Block(1, &proj_false); + set_cur_block(tblock); + ir_node *const1 = new_Const(get_mode_one(dest_mode)); + ir_node *tjump = new_Jmp(); + set_cur_block(fblock); + ir_node *const0 = new_Const(get_mode_null(dest_mode)); + ir_node *fjump = new_Jmp(); + + ir_node *in[2] = { tjump, fjump }; + ir_node *mergeblock = new_Block(2, in); + set_cur_block(mergeblock); + ir_node *phi_in[2] = { const1, const0 }; + ir_node *phi = new_Phi(2, phi_in, dest_mode); + return phi; +} + static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode) { ir_mode *value_mode = get_irn_mode(value); @@ -1081,18 +1103,15 @@ static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode) if (dest_mode == mode_b) { ir_node *zero = new_Const(get_mode_null(value_mode)); - ir_node *cmp = new_d_Cmp(dbgi, value, zero, ir_relation_less_greater); + ir_node *cmp = new_d_Cmp(dbgi, value, zero, ir_relation_unordered_less_greater); return cmp; + } else if (value_mode == mode_b) { + return create_conv_from_b(dbgi, value, dest_mode); } return new_d_Conv(dbgi, value, dest_mode); } -static ir_node *create_Const_from_bool(ir_mode *const mode, bool const v) -{ - return new_Const((v ? get_mode_one : get_mode_null)(mode)); -} - /** * Creates a SymConst node representing a wide string literal. * @@ -1514,8 +1533,7 @@ static void keep_all_memory(ir_node *block) set_cur_block(old); } -static ir_node *reference_expression_enum_value_to_firm( - const reference_expression_t *ref) +static ir_node *enum_constant_to_firm(reference_expression_t const *const ref) { entity_t *entity = ref->entity; if (entity->enum_value.tv == NULL) { @@ -1693,7 +1711,7 @@ static ir_node *process_builtin_call(const call_expression_t *call) ir_node *size = expression_to_firm(argument); ir_node *store = get_store(); - ir_node *alloca = new_d_Alloc(dbgi, store, size, firm_unknown_type, + ir_node *alloca = new_d_Alloc(dbgi, store, size, get_unknown_type(), stack_alloc); ir_node *proj_m = new_Proj(alloca, mode_M, pn_Alloc_M); set_store(proj_m); @@ -1917,7 +1935,7 @@ static ir_node *call_expression_to_firm(const call_expression_t *const call) return result; } -static void statement_to_firm(statement_t *statement); +static ir_node *statement_to_firm(statement_t *statement); static ir_node *compound_statement_to_firm(compound_statement_t *compound); static ir_node *expression_to_addr(const expression_t *expression); @@ -2406,12 +2424,12 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression) dbg_info *dbgi = get_dbg_info(&expression->base.source_position); type_t *type = skip_typeref(expression->base.type); - if (expression->base.kind == EXPR_UNARY_TAKE_ADDRESS) - return expression_to_addr(expression->value); - const expression_t *value = expression->value; switch(expression->base.kind) { + case EXPR_UNARY_TAKE_ADDRESS: + return expression_to_addr(value); + case EXPR_UNARY_NEGATE: { ir_node *value_node = expression_to_firm(value); ir_mode *mode = get_ir_mode_arithmetic(type); @@ -2833,29 +2851,67 @@ static ir_node *offsetof_to_firm(const offsetof_expression_t *expression) static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi, ir_entity *entity, type_t *type); +static ir_initializer_t *create_ir_initializer( + const initializer_t *initializer, type_t *type); -static ir_node *compound_literal_to_firm( - const compound_literal_expression_t *expression) +static ir_entity *create_initializer_entity(dbg_info *dbgi, + initializer_t *initializer, + type_t *type) { - type_t *type = expression->type; + /* create the ir_initializer */ + ir_graph *const old_current_ir_graph = current_ir_graph; + current_ir_graph = get_const_code_irg(); - /* create an entity on the stack */ - ir_type *frame_type = get_irg_frame_type(current_ir_graph); + ir_initializer_t *irinitializer = create_ir_initializer(initializer, type); + + assert(current_ir_graph == get_const_code_irg()); + current_ir_graph = old_current_ir_graph; - ident *const id = id_unique("CompLit.%u"); - ir_type *const irtype = get_ir_type(type); - dbg_info *const dbgi = get_dbg_info(&expression->base.source_position); - ir_entity *const entity = new_d_entity(frame_type, id, irtype, dbgi); + ident *const id = id_unique("initializer.%u"); + ir_type *const irtype = get_ir_type(type); + ir_type *const global_type = get_glob_type(); + ir_entity *const entity = new_d_entity(global_type, id, irtype, dbgi); set_entity_ld_ident(entity, id); + set_entity_visibility(entity, ir_visibility_private); + add_entity_linkage(entity, IR_LINKAGE_CONSTANT); + set_entity_initializer(entity, irinitializer); + return entity; +} - /* create initialisation code */ +static ir_node *compound_literal_addr(compound_literal_expression_t const *const expression) +{ + dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + type_t *type = expression->type; initializer_t *initializer = expression->initializer; - create_local_initializer(initializer, dbgi, entity, type); - /* create a sel for the compound literal address */ - ir_node *frame = get_irg_frame(current_ir_graph); - ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, entity); - return sel; + if (is_constant_initializer(initializer) == EXPR_CLASS_CONSTANT) { + ir_entity *entity = create_initializer_entity(dbgi, initializer, type); + return create_symconst(dbgi, entity); + } else { + /* create an entity on the stack */ + ident *const id = id_unique("CompLit.%u"); + ir_type *const irtype = get_ir_type(type); + ir_type *frame_type = get_irg_frame_type(current_ir_graph); + + ir_entity *const entity = new_d_entity(frame_type, id, irtype, dbgi); + set_entity_ld_ident(entity, id); + + /* create initialisation code */ + create_local_initializer(initializer, dbgi, entity, type); + + /* create a sel for the compound literal address */ + ir_node *frame = get_irg_frame(current_ir_graph); + ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, entity); + return sel; + } +} + +static ir_node *compound_literal_to_firm(compound_literal_expression_t const* const expr) +{ + dbg_info *const dbgi = get_dbg_info(&expr->base.source_position); + type_t *const type = expr->type; + ir_node *const addr = compound_literal_addr(expr); + return deref_address(dbgi, type, addr); } /** @@ -2889,7 +2945,7 @@ static entity_t *get_expression_entity(const expression_t *expression) static unsigned get_cparser_entity_alignment(const entity_t *entity) { switch(entity->kind) { - DECLARATION_KIND_CASES + case DECLARATION_KIND_CASES: return entity->declaration.alignment; case ENTITY_STRUCT: case ENTITY_UNION: @@ -2937,20 +2993,24 @@ static void init_ir_types(void); static ir_tarval *fold_constant_to_tarval(const expression_t *expression) { - assert(is_type_valid(skip_typeref(expression->base.type))); + assert(is_constant_expression(expression) == EXPR_CLASS_CONSTANT); bool constant_folding_old = constant_folding; constant_folding = true; + int old_optimize = get_optimize(); + int old_constant_folding = get_opt_constant_folding(); + set_optimize(1); + set_opt_constant_folding(1); init_ir_types(); - assert(is_constant_expression(expression) == EXPR_CLASS_CONSTANT); - ir_graph *old_current_ir_graph = current_ir_graph; current_ir_graph = get_const_code_irg(); ir_node *cnst = expression_to_firm(expression); current_ir_graph = old_current_ir_graph; + set_optimize(old_optimize); + set_opt_constant_folding(old_constant_folding); if (!is_Const(cnst)) { panic("couldn't fold constant"); @@ -2964,16 +3024,12 @@ static ir_tarval *fold_constant_to_tarval(const expression_t *expression) /* this function is only used in parser.c, but it relies on libfirm functionality */ bool constant_is_negative(const expression_t *expression) { - assert(is_constant_expression(expression) == EXPR_CLASS_CONSTANT); ir_tarval *tv = fold_constant_to_tarval(expression); return tarval_is_negative(tv); } long fold_constant_to_int(const expression_t *expression) { - if (expression->kind == EXPR_ERROR) - return 0; - ir_tarval *tv = fold_constant_to_tarval(expression); if (!tarval_is_long(tv)) { panic("result of constant folding is not integer"); @@ -2984,8 +3040,6 @@ long fold_constant_to_int(const expression_t *expression) bool fold_constant_to_bool(const expression_t *expression) { - if (expression->kind == EXPR_ERROR) - return false; ir_tarval *tv = fold_constant_to_tarval(expression); return !tarval_is_null(tv); } @@ -3306,7 +3360,7 @@ static ir_node *expression_to_addr(const expression_t *expression) case EXPR_CALL: return call_expression_to_firm(&expression->call); case EXPR_COMPOUND_LITERAL: - return compound_literal_to_firm(&expression->compound_literal); + return compound_literal_addr(&expression->compound_literal); case EXPR_REFERENCE: return reference_addr(&expression->reference); case EXPR_SELECT: @@ -3372,79 +3426,48 @@ static ir_node *label_address_to_firm(const label_address_expression_t *label) return new_d_SymConst(dbgi, mode_P_code, value, symconst_addr_ent); } -static ir_node *error_to_firm(const expression_t *expression) -{ - ir_mode *mode = get_ir_mode_arithmetic(expression->base.type); - return new_Bad(mode); -} - /** * creates firm nodes for an expression. The difference between this function * and expression_to_firm is, that this version might produce mode_b nodes * instead of mode_Is. */ -static ir_node *_expression_to_firm(const expression_t *expression) +static ir_node *_expression_to_firm(expression_t const *const expr) { #ifndef NDEBUG if (!constant_folding) { - assert(!expression->base.transformed); - ((expression_t*) expression)->base.transformed = true; + assert(!expr->base.transformed); + ((expression_t*)expr)->base.transformed = true; } #endif - switch (expression->kind) { - EXPR_LITERAL_CASES - return literal_to_firm(&expression->literal); - case EXPR_STRING_LITERAL: - return string_to_firm(&expression->base.source_position, "str.%u", - &expression->literal.value); - case EXPR_WIDE_STRING_LITERAL: - return wide_string_literal_to_firm(&expression->string_literal); - case EXPR_REFERENCE: - return reference_expression_to_firm(&expression->reference); - case EXPR_REFERENCE_ENUM_VALUE: - return reference_expression_enum_value_to_firm(&expression->reference); - case EXPR_CALL: - return call_expression_to_firm(&expression->call); - EXPR_UNARY_CASES - return unary_expression_to_firm(&expression->unary); - EXPR_BINARY_CASES - return binary_expression_to_firm(&expression->binary); - case EXPR_ARRAY_ACCESS: - return array_access_to_firm(&expression->array_access); - case EXPR_SIZEOF: - return sizeof_to_firm(&expression->typeprop); - case EXPR_ALIGNOF: - return alignof_to_firm(&expression->typeprop); - case EXPR_CONDITIONAL: - return conditional_to_firm(&expression->conditional); - case EXPR_SELECT: - return select_to_firm(&expression->select); - case EXPR_CLASSIFY_TYPE: - return classify_type_to_firm(&expression->classify_type); - case EXPR_FUNCNAME: - return function_name_to_firm(&expression->funcname); - case EXPR_STATEMENT: - return statement_expression_to_firm(&expression->statement); - case EXPR_VA_START: - return va_start_expression_to_firm(&expression->va_starte); - case EXPR_VA_ARG: - return va_arg_expression_to_firm(&expression->va_arge); - case EXPR_VA_COPY: - return va_copy_expression_to_firm(&expression->va_copye); - case EXPR_BUILTIN_CONSTANT_P: - return builtin_constant_to_firm(&expression->builtin_constant); - case EXPR_BUILTIN_TYPES_COMPATIBLE_P: - return builtin_types_compatible_to_firm(&expression->builtin_types_compatible); - case EXPR_OFFSETOF: - return offsetof_to_firm(&expression->offsetofe); - case EXPR_COMPOUND_LITERAL: - return compound_literal_to_firm(&expression->compound_literal); - case EXPR_LABEL_ADDRESS: - return label_address_to_firm(&expression->label_address); - - case EXPR_ERROR: - return error_to_firm(expression); + switch (expr->kind) { + case EXPR_ALIGNOF: return alignof_to_firm( &expr->typeprop); + case EXPR_ARRAY_ACCESS: return array_access_to_firm( &expr->array_access); + case EXPR_BINARY_CASES: return binary_expression_to_firm( &expr->binary); + case EXPR_BUILTIN_CONSTANT_P: return builtin_constant_to_firm( &expr->builtin_constant); + case EXPR_BUILTIN_TYPES_COMPATIBLE_P: return builtin_types_compatible_to_firm(&expr->builtin_types_compatible); + case EXPR_CALL: return call_expression_to_firm( &expr->call); + case EXPR_CLASSIFY_TYPE: return classify_type_to_firm( &expr->classify_type); + case EXPR_COMPOUND_LITERAL: return compound_literal_to_firm( &expr->compound_literal); + case EXPR_CONDITIONAL: return conditional_to_firm( &expr->conditional); + case EXPR_FUNCNAME: return function_name_to_firm( &expr->funcname); + case EXPR_LABEL_ADDRESS: return label_address_to_firm( &expr->label_address); + case EXPR_LITERAL_CASES: return literal_to_firm( &expr->literal); + case EXPR_OFFSETOF: return offsetof_to_firm( &expr->offsetofe); + case EXPR_REFERENCE: return reference_expression_to_firm( &expr->reference); + case EXPR_ENUM_CONSTANT: return enum_constant_to_firm( &expr->reference); + case EXPR_SELECT: return select_to_firm( &expr->select); + case EXPR_SIZEOF: return sizeof_to_firm( &expr->typeprop); + case EXPR_STATEMENT: return statement_expression_to_firm( &expr->statement); + case EXPR_UNARY_CASES: return unary_expression_to_firm( &expr->unary); + case EXPR_VA_ARG: return va_arg_expression_to_firm( &expr->va_arge); + case EXPR_VA_COPY: return va_copy_expression_to_firm( &expr->va_copye); + case EXPR_VA_START: return va_start_expression_to_firm( &expr->va_starte); + case EXPR_WIDE_STRING_LITERAL: return wide_string_literal_to_firm( &expr->string_literal); + + case EXPR_STRING_LITERAL: return string_to_firm(&expr->base.source_position, "str.%u", &expr->literal.value); + + case EXPR_ERROR: break; } panic("invalid expression found"); } @@ -3882,9 +3905,6 @@ static void advance_current_object(type_path_t *path) } -static ir_initializer_t *create_ir_initializer( - const initializer_t *initializer, type_t *type); - static ir_initializer_t *create_ir_initializer_value( const initializer_value_t *initializer) { @@ -4236,28 +4256,11 @@ static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi, return; } - /* create the ir_initializer */ - ir_graph *const old_current_ir_graph = current_ir_graph; - current_ir_graph = get_const_code_irg(); - - ir_initializer_t *irinitializer = create_ir_initializer(initializer, type); - - assert(current_ir_graph == get_const_code_irg()); - current_ir_graph = old_current_ir_graph; - /* create a "template" entity which is copied to the entity on the stack */ - ident *const id = id_unique("initializer.%u"); - ir_type *const irtype = get_ir_type(type); - ir_type *const global_type = get_glob_type(); - ir_entity *const init_entity = new_d_entity(global_type, id, irtype, dbgi); - set_entity_ld_ident(init_entity, id); - - set_entity_visibility(init_entity, ir_visibility_private); - add_entity_linkage(init_entity, IR_LINKAGE_CONSTANT); - - set_entity_initializer(init_entity, irinitializer); - + ir_entity *const init_entity + = create_initializer_entity(dbgi, initializer, type); ir_node *const src_addr = create_symconst(dbgi, init_entity); + ir_type *const irtype = get_ir_type(type); ir_node *const copyb = new_d_CopyB(dbgi, memory, addr, src_addr, irtype); ir_node *const copyb_mem = new_Proj(copyb, mode_M, pn_CopyB_M); @@ -4295,16 +4298,29 @@ static void create_variable_initializer(entity_t *entity) if (initializer->kind == INITIALIZER_VALUE) { initializer_value_t *initializer_value = &initializer->value; dbg_info *dbgi = get_dbg_info(&entity->base.source_position); + expression_t *value = initializer_value->value; + type_t *init_type = value->base.type; + type_t *skipped = skip_typeref(init_type); + + if (!is_type_scalar(skipped)) { + /* 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 *value = expression_to_firm(initializer_value->value); + ir_node *node = expression_to_firm(initializer_value->value); - type_t *init_type = initializer_value->value->base.type; ir_mode *mode = get_ir_mode_storage(init_type); - value = create_conv(dbgi, value, mode); - value = do_strict_conv(dbgi, value); + node = create_conv(dbgi, node, mode); + node = do_strict_conv(dbgi, node); if (declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE) { - set_value(entity->variable.v.value_number, value); + set_value(entity->variable.v.value_number, node); } else { assert(declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE); @@ -4314,9 +4330,10 @@ static void create_variable_initializer(entity_t *entity) && get_entity_owner(irentity) != get_tls_type()) { add_entity_linkage(irentity, IR_LINKAGE_CONSTANT); } - set_atomic_ent_value(irentity, value); + set_atomic_ent_value(irentity, node); } } else { +have_initializer: assert(declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE_ENTITY || declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE); @@ -4440,10 +4457,10 @@ static void create_local_static_variable(entity_t *entity) -static void return_statement_to_firm(return_statement_t *statement) +static ir_node *return_statement_to_firm(return_statement_t *statement) { if (!currently_reachable()) - return; + return NULL; dbg_info *dbgi = get_dbg_info(&statement->base.source_position); type_t *type = current_function_entity->declaration.type; @@ -4488,6 +4505,7 @@ static void return_statement_to_firm(return_statement_t *statement) add_immBlock_pred(end_block, ret); set_unreachable_now(); + return NULL; } static ir_node *expression_statement_to_firm(expression_statement_t *statement) @@ -4511,13 +4529,7 @@ static ir_node *compound_statement_to_firm(compound_statement_t *compound) ir_node *result = NULL; statement_t *statement = compound->statements; for ( ; statement != NULL; statement = statement->base.next) { - if (statement->base.next == NULL - && statement->kind == STATEMENT_EXPRESSION) { - result = expression_statement_to_firm( - &statement->expression); - break; - } - statement_to_firm(statement); + result = statement_to_firm(statement); } return result; @@ -4642,11 +4654,11 @@ static void initialize_local_declaration(entity_t *entity) panic("invalid declaration kind"); } -static void declaration_statement_to_firm(declaration_statement_t *statement) +static ir_node *declaration_statement_to_firm(declaration_statement_t *statement) { entity_t *entity = statement->declarations_begin; if (entity == NULL) - return; + return NULL; entity_t *const last = statement->declarations_end; for ( ;; entity = entity->base.next) { @@ -4663,9 +4675,11 @@ static void declaration_statement_to_firm(declaration_statement_t *statement) if (entity == last) break; } + + return NULL; } -static void if_statement_to_firm(if_statement_t *statement) +static ir_node *if_statement_to_firm(if_statement_t *statement) { /* Create the condition. */ ir_node *true_block = NULL; @@ -4675,41 +4689,35 @@ static void if_statement_to_firm(if_statement_t *statement) false_block = new_immBlock(); create_condition_evaluation(statement->condition, true_block, false_block); mature_immBlock(true_block); + mature_immBlock(false_block); } - /* Create the false statement. - * Handle false before true, so if no false statement is present, then the - * empty false block is reused as fallthrough block. */ - ir_node *fallthrough_block = NULL; + /* Create the true statement. */ + set_cur_block(true_block); + statement_to_firm(statement->true_statement); + ir_node *fallthrough_block = get_cur_block(); + + /* Create the false statement. */ + set_cur_block(false_block); if (statement->false_statement != NULL) { - if (false_block != NULL) { - mature_immBlock(false_block); - } - set_cur_block(false_block); statement_to_firm(statement->false_statement); - if (currently_reachable()) { - fallthrough_block = new_immBlock(); - add_immBlock_pred(fallthrough_block, new_Jmp()); - } - } else { - fallthrough_block = false_block; } - /* Create the true statement. */ - set_cur_block(true_block); - statement_to_firm(statement->true_statement); - if (currently_reachable()) { - if (fallthrough_block == NULL) { - fallthrough_block = new_immBlock(); + /* Handle the block after the if-statement. Minor simplification and + * optimisation: Reuse the false/true block as fallthrough block, if the + * true/false statement does not pass control to the fallthrough block, e.g. + * in the typical if (x) return; pattern. */ + if (fallthrough_block) { + if (currently_reachable()) { + ir_node *const t_jump = new_r_Jmp(fallthrough_block); + ir_node *const f_jump = new_Jmp(); + ir_node *const in[] = { t_jump, f_jump }; + fallthrough_block = new_Block(2, in); } - add_immBlock_pred(fallthrough_block, new_Jmp()); + set_cur_block(fallthrough_block); } - /* Handle the block after the if-statement. */ - if (fallthrough_block != NULL) { - mature_immBlock(fallthrough_block); - } - set_cur_block(fallthrough_block); + return NULL; } /* Create a jump node which jumps into target_block, if the current block is @@ -4720,7 +4728,7 @@ static void jump_if_reachable(ir_node *const target_block) add_immBlock_pred(target_block, pred); } -static void while_statement_to_firm(while_statement_t *statement) +static ir_node *while_statement_to_firm(while_statement_t *statement) { /* Create the header block */ ir_node *const header_block = new_immBlock(); @@ -4768,6 +4776,7 @@ static void while_statement_to_firm(while_statement_t *statement) assert(continue_label == header_block); continue_label = old_continue_label; break_label = old_break_label; + return NULL; } static ir_node *get_break_label(void) @@ -4778,7 +4787,7 @@ static ir_node *get_break_label(void) return break_label; } -static void do_while_statement_to_firm(do_while_statement_t *statement) +static ir_node *do_while_statement_to_firm(do_while_statement_t *statement) { /* create the header block */ ir_node *header_block = new_immBlock(); @@ -4811,9 +4820,10 @@ static void do_while_statement_to_firm(do_while_statement_t *statement) mature_immBlock(false_block); set_cur_block(false_block); + return NULL; } -static void for_statement_to_firm(for_statement_t *statement) +static ir_node *for_statement_to_firm(for_statement_t *statement) { /* create declarations */ entity_t *entity = statement->scope.entities; @@ -4897,19 +4907,20 @@ static void for_statement_to_firm(for_statement_t *statement) assert(continue_label == step_block); continue_label = old_continue_label; break_label = old_break_label; + return NULL; } -static void create_jump_statement(const statement_t *statement, - ir_node *target_block) +static ir_node *create_jump_statement(const statement_t *statement, ir_node *target_block) { if (!currently_reachable()) - return; + return NULL; dbg_info *dbgi = get_dbg_info(&statement->base.source_position); ir_node *jump = new_d_Jmp(dbgi); add_immBlock_pred(target_block, jump); set_unreachable_now(); + return NULL; } static ir_switch_table *create_switch_table(const switch_statement_t *statement) @@ -4947,7 +4958,7 @@ static ir_switch_table *create_switch_table(const switch_statement_t *statement) return res; } -static void switch_statement_to_firm(switch_statement_t *statement) +static ir_node *switch_statement_to_firm(switch_statement_t *statement) { ir_node *first_block = NULL; dbg_info *dbgi = get_dbg_info(&statement->base.source_position); @@ -4990,12 +5001,13 @@ static void switch_statement_to_firm(switch_statement_t *statement) current_switch = old_switch; break_label = old_break_label; saw_default_label = old_saw_default_label; + return NULL; } -static void case_label_to_firm(const case_label_statement_t *statement) +static ir_node *case_label_to_firm(const case_label_statement_t *statement) { if (statement->is_empty_range) - return; + return NULL; if (current_switch != NULL) { ir_node *block = new_immBlock(); @@ -5011,10 +5023,10 @@ static void case_label_to_firm(const case_label_statement_t *statement) set_cur_block(block); } - statement_to_firm(statement->statement); + return statement_to_firm(statement->statement); } -static void label_to_firm(const label_statement_t *statement) +static ir_node *label_to_firm(const label_statement_t *statement) { ir_node *block = get_label_block(statement->label); jump_if_reachable(block); @@ -5023,30 +5035,26 @@ static void label_to_firm(const label_statement_t *statement) keep_alive(block); keep_all_memory(block); - statement_to_firm(statement->statement); + return statement_to_firm(statement->statement); } -static void goto_to_firm(const goto_statement_t *statement) +static ir_node *computed_goto_to_firm(computed_goto_statement_t const *const statement) { if (!currently_reachable()) - return; + return NULL; - if (statement->expression) { - ir_node *irn = expression_to_firm(statement->expression); - dbg_info *dbgi = get_dbg_info(&statement->base.source_position); - ir_node *ijmp = new_d_IJmp(dbgi, irn); + ir_node *const irn = expression_to_firm(statement->expression); + dbg_info *const dbgi = get_dbg_info(&statement->base.source_position); + ir_node *const ijmp = new_d_IJmp(dbgi, irn); + + set_irn_link(ijmp, ijmp_list); + ijmp_list = ijmp; - set_irn_link(ijmp, ijmp_list); - ijmp_list = ijmp; - } else { - ir_node *block = get_label_block(statement->label); - ir_node *jmp = new_Jmp(); - add_immBlock_pred(block, jmp); - } set_unreachable_now(); + return NULL; } -static void asm_statement_to_firm(const asm_statement_t *statement) +static ir_node *asm_statement_to_firm(const asm_statement_t *statement) { bool needs_memory = false; @@ -5161,7 +5169,7 @@ static void asm_statement_to_firm(const asm_statement_t *statement) ir_asm_constraint constraint; constraint.pos = pos; constraint.constraint = new_id_from_str(constraints); - constraint.mode = NULL; + constraint.mode = mode_M; tmp_in_constraints[in_size] = constraint; ins[in_size] = expression_to_addr(expr); @@ -5286,87 +5294,57 @@ static void asm_statement_to_firm(const asm_statement_t *statement) set_value_for_expression_addr(out_expr, proj, addr); } + + return NULL; } -static void ms_try_statement_to_firm(ms_try_statement_t *statement) +static ir_node *ms_try_statement_to_firm(ms_try_statement_t *statement) { statement_to_firm(statement->try_statement); source_position_t const *const pos = &statement->base.source_position; warningf(WARN_OTHER, pos, "structured exception handling ignored"); + return NULL; } -static void leave_statement_to_firm(leave_statement_t *statement) +static ir_node *leave_statement_to_firm(leave_statement_t *statement) { errorf(&statement->base.source_position, "__leave not supported yet"); + return NULL; } /** * Transform a statement. */ -static void statement_to_firm(statement_t *statement) +static ir_node *statement_to_firm(statement_t *const stmt) { #ifndef NDEBUG - assert(!statement->base.transformed); - statement->base.transformed = true; + assert(!stmt->base.transformed); + stmt->base.transformed = true; #endif - switch (statement->kind) { - case STATEMENT_ERROR: - panic("error statement found"); - case STATEMENT_EMPTY: - /* nothing */ - return; - case STATEMENT_COMPOUND: - compound_statement_to_firm(&statement->compound); - return; - case STATEMENT_RETURN: - return_statement_to_firm(&statement->returns); - return; - case STATEMENT_EXPRESSION: - expression_statement_to_firm(&statement->expression); - return; - case STATEMENT_IF: - if_statement_to_firm(&statement->ifs); - return; - case STATEMENT_WHILE: - while_statement_to_firm(&statement->whiles); - return; - case STATEMENT_DO_WHILE: - do_while_statement_to_firm(&statement->do_while); - return; - case STATEMENT_DECLARATION: - declaration_statement_to_firm(&statement->declaration); - return; - case STATEMENT_BREAK: - create_jump_statement(statement, get_break_label()); - return; - case STATEMENT_CONTINUE: - create_jump_statement(statement, continue_label); - return; - case STATEMENT_SWITCH: - switch_statement_to_firm(&statement->switchs); - return; - case STATEMENT_CASE_LABEL: - case_label_to_firm(&statement->case_label); - return; - case STATEMENT_FOR: - for_statement_to_firm(&statement->fors); - return; - case STATEMENT_LABEL: - label_to_firm(&statement->label); - return; - case STATEMENT_GOTO: - goto_to_firm(&statement->gotos); - return; - case STATEMENT_ASM: - asm_statement_to_firm(&statement->asms); - return; - case STATEMENT_MS_TRY: - ms_try_statement_to_firm(&statement->ms_try); - return; - case STATEMENT_LEAVE: - leave_statement_to_firm(&statement->leave); - return; + switch (stmt->kind) { + case STATEMENT_ASM: return asm_statement_to_firm( &stmt->asms); + case STATEMENT_CASE_LABEL: return case_label_to_firm( &stmt->case_label); + case STATEMENT_COMPOUND: return compound_statement_to_firm( &stmt->compound); + case STATEMENT_COMPUTED_GOTO: return computed_goto_to_firm( &stmt->computed_goto); + case STATEMENT_DECLARATION: return declaration_statement_to_firm(&stmt->declaration); + case STATEMENT_DO_WHILE: return do_while_statement_to_firm( &stmt->do_while); + case STATEMENT_EMPTY: return NULL; /* nothing */ + case STATEMENT_EXPRESSION: return expression_statement_to_firm( &stmt->expression); + case STATEMENT_FOR: return for_statement_to_firm( &stmt->fors); + case STATEMENT_IF: return if_statement_to_firm( &stmt->ifs); + case STATEMENT_LABEL: return label_to_firm( &stmt->label); + case STATEMENT_LEAVE: return leave_statement_to_firm( &stmt->leave); + case STATEMENT_MS_TRY: return ms_try_statement_to_firm( &stmt->ms_try); + case STATEMENT_RETURN: return return_statement_to_firm( &stmt->returns); + case STATEMENT_SWITCH: return switch_statement_to_firm( &stmt->switchs); + case STATEMENT_WHILE: return while_statement_to_firm( &stmt->whiles); + + case STATEMENT_BREAK: return create_jump_statement(stmt, get_break_label()); + case STATEMENT_CONTINUE: return create_jump_statement(stmt, continue_label); + case STATEMENT_GOTO: return create_jump_statement(stmt, get_label_block(stmt->gotos.label)); + + case STATEMENT_ERROR: panic("error statement found"); } panic("statement not implemented"); } @@ -5507,7 +5485,7 @@ static void initialize_function_parameters(entity_t *entity) * @param irg the IR-graph * @param dec_modifiers additional modifiers */ -static void handle_decl_modifier_irg(ir_graph_ptr irg, +static void handle_decl_modifier_irg(ir_graph *irg, decl_modifiers_t decl_modifiers) { if (decl_modifiers & DM_NAKED) { @@ -5609,8 +5587,6 @@ static void create_function(entity_t *entity) set_irn_dbg_info(get_irg_start_block(irg), get_entity_dbg_info(function_entity)); - ir_node *first_block = get_cur_block(); - /* set inline flags */ if (entity->function.is_inline) set_irg_inline_property(irg, irg_inline_recomended); @@ -5655,30 +5631,17 @@ static void create_function(entity_t *entity) add_immBlock_pred(end_block, ret); } - bool has_computed_gotos = false; for (int i = ARR_LEN(all_labels) - 1; i >= 0; --i) { label_t *label = all_labels[i]; if (label->address_taken) { gen_ijmp_branches(label->block); - has_computed_gotos = true; } mature_immBlock(label->block); } - if (has_computed_gotos) { - /* if we have computed goto's in the function, we cannot inline it */ - if (get_irg_inline_property(irg) >= irg_inline_recomended) { - source_position_t const *const pos = &entity->base.source_position; - warningf(WARN_OTHER, pos, "'%N' can never be inlined because it contains a computed goto", entity); - } - set_irg_inline_property(irg, irg_inline_forbidden); - } DEL_ARR_F(all_labels); all_labels = NULL; - mature_immBlock(first_block); - mature_immBlock(end_block); - irg_finalize_cons(irg); /* finalize the frame type */