X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast2firm.c;h=390c53b4c90eed83548e595457c5361110e5fa69;hb=43f6b44f389409af5b6162d831fe7c5c79f2ccb3;hp=035b793f75ce41615881bc2e985f982aa57d31bc;hpb=869fdffd7484523e431a8959b68eb5fce05f55ee;p=cparser diff --git a/ast2firm.c b/ast2firm.c index 035b793..390c53b 100644 --- a/ast2firm.c +++ b/ast2firm.c @@ -58,7 +58,7 @@ static ir_node *continue_label; static ir_node *break_label; static ir_node *current_switch_cond; static bool saw_default_label; -static ir_node **imature_blocks; +static ir_node **immature_blocks; static bool constant_folding; static const declaration_t *current_function_decl; @@ -1566,17 +1566,17 @@ static ir_node *call_expression_to_firm(const call_expression_t *call) if (declaration->v.entity == rts_entities[rts_alloca]) { /* handle alloca() call */ expression_t *argument = call->arguments->expression; - ir_node *size = expression_to_firm(argument); + ir_node *size = expression_to_firm(argument); - size = create_conv(dbgi, size, get_ir_mode(type_size_t)); + size = create_conv(dbgi, size, get_ir_mode(type_size_t)); - ir_node *store = get_store(); - dbg_info *dbgi = get_dbg_info(&call->base.source_position); - ir_node *alloca = new_d_Alloc(dbgi, store, size, firm_unknown_type, - stack_alloc); - ir_node *proj_m = new_Proj(alloca, mode_M, pn_Alloc_M); + ir_node *store = get_store(); + dbg_info *dbgi = get_dbg_info(&call->base.source_position); + ir_node *alloca = new_d_Alloc(dbgi, store, size, firm_unknown_type, + stack_alloc); + ir_node *proj_m = new_Proj(alloca, mode_M, pn_Alloc_M); set_store(proj_m); - ir_node *res = new_Proj(alloca, mode_P_data, pn_Alloc_res); + ir_node *res = new_Proj(alloca, mode_P_data, pn_Alloc_res); return res; } @@ -1662,6 +1662,15 @@ static ir_node *call_expression_to_firm(const call_expression_t *call) result = new_d_Proj(dbgi, resproj, mode, 0); } + if (function->kind == EXPR_REFERENCE && + function->reference.declaration->modifiers & DM_NORETURN) { + /* A dead end: Keep the Call and the Block. Also place all further + * nodes into a new and unreachable block. */ + keep_alive(node); + keep_alive(get_cur_block()); + new_Block(0, NULL); + } + return result; } @@ -2131,10 +2140,8 @@ static ir_node *produce_condition_result(const expression_t *expression, mature_immBlock(one_block); mature_immBlock(zero_block); - ir_node *common_block = new_immBlock(); - add_immBlock_pred(common_block, jmp_one); - add_immBlock_pred(common_block, jmp_zero); - mature_immBlock(common_block); + ir_node *in_cf[2] = { jmp_one, jmp_zero }; + new_Block(2, in_cf); ir_node *in[2] = { one, zero }; ir_node *val = new_d_Phi(dbgi, 2, in, mode); @@ -2311,9 +2318,9 @@ static ir_node *create_assign_binop(const binary_expression_t *expression) dbg_info *const dbgi = get_dbg_info(&expression->base.source_position); const expression_t *left_expr = expression->left; ir_mode *left_mode = get_ir_mode(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 *right = expression_to_firm(expression->right); ir_node *result = create_op(dbgi, expression, left, right); result = create_conv(dbgi, result, left_mode); @@ -2652,10 +2659,8 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression) mature_immBlock(false_block); /* create the common block */ - ir_node *common_block = new_immBlock(); - add_immBlock_pred(common_block, true_jmp); - add_immBlock_pred(common_block, false_jmp); - mature_immBlock(common_block); + ir_node *in_cf[2] = { true_jmp, false_jmp }; + new_Block(2, in_cf); /* TODO improve static semantics, so either both or no values are NULL */ if (true_val == NULL || false_val == NULL) @@ -4226,6 +4231,8 @@ static void while_statement_to_firm(while_statement_t *statement) add_immBlock_pred(body_block, header_jmp); keep_alive(body_block); + set_cur_block(body_block); + keep_alive(get_store()); } else { if (false_block == NULL) { false_block = new_immBlock(); @@ -4369,6 +4376,7 @@ static void for_statement_to_firm(for_statement_t *statement) false_block); } else { keep_alive(header_block); + keep_alive(get_store()); jmp = new_Jmp(); add_immBlock_pred(body_block, jmp); } @@ -4558,7 +4566,7 @@ static ir_node *get_label_block(declaration_t *label) label->declaration_kind = DECLARATION_KIND_LABEL_BLOCK; label->v.block = block; - ARR_APP1(ir_node *, imature_blocks, block); + ARR_APP1(ir_node *, immature_blocks, block); return block; } @@ -4573,6 +4581,7 @@ static void label_to_firm(const label_statement_t *statement) } set_cur_block(block); + keep_alive(get_store()); keep_alive(block); if (statement->statement != NULL) { @@ -5281,8 +5290,8 @@ static void create_function(declaration_t *declaration) current_function_name = NULL; current_funcsig = NULL; - assert(imature_blocks == NULL); - imature_blocks = NEW_ARR_F(ir_node*, 0); + assert(immature_blocks == NULL); + immature_blocks = NEW_ARR_F(ir_node*, 0); int n_local_vars = get_function_n_local_vars(declaration); ir_graph *irg = new_ir_graph(function_entity, n_local_vars); @@ -5336,11 +5345,11 @@ static void create_function(declaration_t *declaration) add_immBlock_pred(end_block, ret); } - for(int i = 0; i < ARR_LEN(imature_blocks); ++i) { - mature_immBlock(imature_blocks[i]); + for(int i = 0; i < ARR_LEN(immature_blocks); ++i) { + mature_immBlock(immature_blocks[i]); } - DEL_ARR_F(imature_blocks); - imature_blocks = NULL; + DEL_ARR_F(immature_blocks); + immature_blocks = NULL; mature_immBlock(first_block); mature_immBlock(end_block); @@ -5507,4 +5516,6 @@ void translation_unit_to_firm(translation_unit_t *unit) scope_to_firm(&unit->scope); global_asm_to_firm(unit->global_asm); + + current_ir_graph = NULL; }