X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast2firm.c;h=390c53b4c90eed83548e595457c5361110e5fa69;hb=2e89f72ef82f9bf281d9fd62c076e5681dd9643b;hp=7d13325b4e11762a1a088dc019d3d949dcb25d6a;hpb=78125bf353eef8b6d3849add947e81234ac971d4;p=cparser diff --git a/ast2firm.c b/ast2firm.c index 7d13325..390c53b 100644 --- a/ast2firm.c +++ b/ast2firm.c @@ -44,8 +44,6 @@ #include "driver/firm_opt.h" #include "driver/firm_cmdline.h" -#define MAGIC_DEFAULT_PN_NUMBER (long) -314159265 - /* some idents needed for name mangling */ static ident *id_underscore; static ident *id_imp; @@ -55,19 +53,18 @@ static ir_type *ir_type_wchar_t; static ir_type *ir_type_void; static ir_type *ir_type_int; -static type_t *type_const_char; - static int next_value_number_function; 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; static ir_node *current_function_name; static ir_node *current_funcsig; +static switch_statement_t *current_switch; static entitymap_t entitymap; @@ -384,28 +381,25 @@ static ir_type *create_method_type(const function_type_t *function_type) unsigned cc = get_method_calling_convention(irtype); switch (function_type->calling_convention) { - case CC_DEFAULT: /* unspecified calling convention, equal to one of the other, typical cdecl */ + case CC_DEFAULT: /* unspecified calling convention, equal to one of the other, typically cdecl */ + case CC_CDECL: is_cdecl: set_method_calling_convention(irtype, SET_CDECL(cc)); break; - case CC_CDECL: - set_method_calling_convention(irtype, cc_fixed | SET_CDECL(cc)); - break; - case CC_STDCALL: if (function_type->variadic || function_type->unspecified_parameters) goto is_cdecl; /* only non-variadic function can use stdcall, else use cdecl */ - set_method_calling_convention(irtype, cc_fixed | SET_STDCALL(cc)); + set_method_calling_convention(irtype, SET_STDCALL(cc)); break; case CC_FASTCALL: if (function_type->variadic || function_type->unspecified_parameters) goto is_cdecl; /* only non-variadic function can use fastcall, else use cdecl */ - set_method_calling_convention(irtype, cc_fixed | SET_FASTCALL(cc)); + set_method_calling_convention(irtype, SET_FASTCALL(cc)); break; case CC_THISCALL: @@ -1071,7 +1065,7 @@ static ir_entity *get_function_entity(declaration_t *declaration) * extern inline => local * inline without definition => local * inline with definition => external_visible */ - storage_class_tag_t const storage_class = declaration->storage_class; + storage_class_tag_t const storage_class = (storage_class_tag_t)declaration->storage_class; bool const is_inline = declaration->is_inline; bool const has_body = declaration->init.statement != NULL; if (is_inline && storage_class == STORAGE_CLASS_NONE && has_body) { @@ -1572,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; } @@ -1668,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; } @@ -1675,9 +1678,9 @@ static void 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 void create_condition_evaluation(const expression_t *expression, - ir_node *true_block, - ir_node *false_block); +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) @@ -1705,7 +1708,8 @@ static tarval *create_bitfield_mask(ir_mode *mode, int offset, int size) tarval *all_one = get_mode_all_one(mode); int mode_size = get_mode_size_bits(mode); - assert(offset >= 0 && size >= 0); + assert(offset >= 0); + assert(size >= 0); assert(offset + size <= mode_size); if (size == mode_size) { return all_one; @@ -2136,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); @@ -2154,8 +2156,9 @@ static ir_node *adjust_for_pointer_arithmetic(dbg_info *dbgi, type_t *const points_to = skip_typeref(pointer_type->points_to); unsigned elem_size = get_type_size_const(points_to); - /* gcc extension */ - if (elem_size == 0 && is_type_atomic(points_to, ATOMIC_TYPE_VOID)) { + /* gcc extension: allow arithmetic with void * and function * */ + if ((elem_size == 0 && is_type_atomic(points_to, ATOMIC_TYPE_VOID)) || + is_type_function(points_to)) { elem_size = 1; } @@ -2295,12 +2298,11 @@ static ir_node *create_lazy_op(const binary_expression_t *expression) if (is_constant_expression(expression->left)) { long val = fold_constant(expression->left); expression_kind_t ekind = expression->base.kind; - if ((ekind == EXPR_BINARY_LOGICAL_AND && val != 0) - || (ekind == EXPR_BINARY_LOGICAL_OR && val == 0)) { + assert(ekind == EXPR_BINARY_LOGICAL_AND || ekind == EXPR_BINARY_LOGICAL_OR); + if ((ekind == EXPR_BINARY_LOGICAL_AND && val != 0) || + (ekind == EXPR_BINARY_LOGICAL_OR && val == 0)) { return expression_to_firm(expression->right); } else { - assert((ekind == EXPR_BINARY_LOGICAL_AND && val == 0) - || (ekind == EXPR_BINARY_LOGICAL_OR && val != 0)); return new_Const(mode, get_mode_one(mode)); } } @@ -2316,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); @@ -2576,6 +2578,7 @@ static ir_node *alignof_to_firm(const typeprop_expression_t *expression) } static void init_ir_types(void); + long fold_constant(const expression_t *expression) { bool constant_folding_old = constant_folding; @@ -2615,7 +2618,10 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression) if (is_constant_expression(expression->condition)) { long val = fold_constant(expression->condition); if (val) { - return expression_to_firm(expression->true_expression); + expression_t *true_expression = expression->true_expression; + if (true_expression == NULL) + true_expression = expression->condition; + return expression_to_firm(true_expression); } else { return expression_to_firm(expression->false_expression); } @@ -2626,7 +2632,8 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression) /* create the true block */ ir_node *true_block = new_immBlock(); - ir_node *true_val = expression_to_firm(expression->true_expression); + ir_node *true_val = expression->true_expression != NULL ? + expression_to_firm(expression->true_expression) : NULL; ir_node *true_jmp = new_Jmp(); /* create the false block */ @@ -2637,15 +2644,23 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression) /* create the condition evaluation */ set_cur_block(cur_block); - create_condition_evaluation(expression->condition, true_block, false_block); + ir_node *const cond_expr = create_condition_evaluation(expression->condition, true_block, false_block); + if (expression->true_expression == NULL) { + if (cond_expr != NULL) { + true_val = cond_expr; + } else { + /* Condition ended with a short circuit (&&, ||, !) operation. + * Generate a "1" as value for the true branch. */ + ir_mode *const mode = mode_Is; + true_val = new_Const(mode, get_mode_one(mode)); + } + } mature_immBlock(true_block); 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) @@ -3048,28 +3063,20 @@ static ir_node *expression_to_firm(const expression_t *expression) return produce_condition_result(expression, dbgi); } -static ir_node *expression_to_modeb(const expression_t *expression) -{ - ir_node *res = _expression_to_firm(expression); - res = create_conv(NULL, res, mode_b); - - return res; -} - /** * create a short-circuit expression evaluation that tries to construct * efficient control flow structures for &&, || and ! expressions */ -static void create_condition_evaluation(const expression_t *expression, - ir_node *true_block, - ir_node *false_block) +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; + return NULL; } case EXPR_BINARY_LOGICAL_AND: { const binary_expression_t *binary_expression = &expression->binary; @@ -3083,7 +3090,7 @@ static void create_condition_evaluation(const expression_t *expression, set_cur_block(extra_block); create_condition_evaluation(binary_expression->right, true_block, false_block); - return; + return NULL; } case EXPR_BINARY_LOGICAL_OR: { const binary_expression_t *binary_expression = &expression->binary; @@ -3097,14 +3104,15 @@ static void create_condition_evaluation(const expression_t *expression, set_cur_block(extra_block); create_condition_evaluation(binary_expression->right, true_block, false_block); - return; + return NULL; } default: break; } dbg_info *dbgi = get_dbg_info(&expression->base.source_position); - ir_node *condition = expression_to_modeb(expression); + ir_node *cond_expr = _expression_to_firm(expression); + ir_node *condition = create_conv(NULL, 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); @@ -3128,6 +3136,7 @@ static void create_condition_evaluation(const expression_t *expression, } set_cur_block(NULL); + return cond_expr; } @@ -3473,7 +3482,8 @@ static ir_initializer_t *create_ir_initializer_string( type = skip_typeref(type); size_t string_len = initializer->string.size; - assert(type->kind == TYPE_ARRAY && type->array.size_constant); + assert(type->kind == TYPE_ARRAY); + assert(type->array.size_constant); size_t len = type->array.size; ir_initializer_t *irinitializer = create_initializer_compound(len); @@ -3498,7 +3508,8 @@ static ir_initializer_t *create_ir_initializer_wide_string( const initializer_wide_string_t *initializer, type_t *type) { size_t string_len = initializer->string.size; - assert(type->kind == TYPE_ARRAY && type->array.size_constant); + assert(type->kind == TYPE_ARRAY); + assert(type->array.size_constant); size_t len = type->array.size; ir_initializer_t *irinitializer = create_initializer_compound(len); @@ -4170,7 +4181,7 @@ static void if_statement_to_firm(if_statement_t *statement) } mature_immBlock(true_block); - if (false_block != fallthrough_block) { + if (false_block != fallthrough_block && false_block != NULL) { mature_immBlock(false_block); } if (fallthrough_block != NULL) { @@ -4220,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(); @@ -4363,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); } @@ -4399,7 +4413,7 @@ static ir_node *get_break_label(void) return break_label; } -static void switch_statement_to_firm(const switch_statement_t *statement) +static void switch_statement_to_firm(switch_statement_t *statement) { dbg_info *dbgi = get_dbg_info(&statement->base.source_position); @@ -4414,6 +4428,57 @@ static void switch_statement_to_firm(const switch_statement_t *statement) saw_default_label = false; current_switch_cond = cond; break_label = NULL; + switch_statement_t *const old_switch = current_switch; + current_switch = statement; + + /* determine a free number for the default label */ + unsigned long num_cases = 0; + long def_nr = 0; + for (case_label_statement_t *l = statement->first_case; l != NULL; l = l->next) { + if (l->expression == NULL) { + /* default case */ + continue; + } + if (l->last_case >= l->first_case) + num_cases += l->last_case - l->first_case; + if (l->last_case > def_nr) + def_nr = l->last_case; + } + + if (def_nr + 1 < 0) { + /* Bad: an overflow occurred, we cannot be sure that the + * maximum + 1 is a free number. Scan the values a second + * time to find a free number. + */ + unsigned char *bits = xmalloc((num_cases + 7) >> 3); + unsigned long i; + + memset(bits, 0, (num_cases + 7) >> 3); + for (case_label_statement_t *l = statement->first_case; l != NULL; l = l->next) { + if (l->expression == NULL) { + /* default case */ + continue; + } + for (long cns = l->first_case; cns <= l->last_case; ++cns) { + if (cns >= 0 && (unsigned long)cns < num_cases) + bits[cns >> 3] |= (1 << (cns & 7)); + } + } + /* We look at the first num_cases constants: + * Either they are densed, so we took the last (num_cases) + * one, or they are non densed, so we will find one free + * there... + */ + for (i = 0; i < num_cases; ++i) + if ((bits[i >> 3] & (i & 7)) == 0) + break; + + free(bits); + def_nr = i; + } else { + ++def_nr; + } + statement->default_proj_nr = def_nr; if (statement->body != NULL) { statement_to_firm(statement->body); @@ -4427,7 +4492,7 @@ static void switch_statement_to_firm(const switch_statement_t *statement) if (!saw_default_label) { set_cur_block(get_nodes_block(cond)); ir_node *const proj = new_d_defaultProj(dbgi, cond, - MAGIC_DEFAULT_PN_NUMBER); + statement->default_proj_nr); add_immBlock_pred(get_break_label(), proj); } @@ -4437,6 +4502,7 @@ static void switch_statement_to_firm(const switch_statement_t *statement) set_cur_block(break_label); assert(current_switch_cond == cond); + current_switch = old_switch; current_switch_cond = old_switch_cond; break_label = old_break_label; saw_default_label = old_saw_default_label; @@ -4444,37 +4510,31 @@ static void switch_statement_to_firm(const switch_statement_t *statement) static void case_label_to_firm(const case_label_statement_t *statement) { + if (statement->is_empty) + return; + dbg_info *dbgi = get_dbg_info(&statement->base.source_position); ir_node *const fallthrough = (get_cur_block() == NULL ? NULL : new_Jmp()); - /* let's create a node and hope firm constant folding creates a Const - * node... */ ir_node *proj; ir_node *old_block = get_nodes_block(current_switch_cond); ir_node *block = new_immBlock(); set_cur_block(old_block); if (statement->expression != NULL) { - long start_pn = fold_constant(statement->expression); - long end_pn = start_pn; - if (statement->end_range != NULL) { - end_pn = fold_constant(statement->end_range); - } - assert(start_pn <= end_pn); + long pn = statement->first_case; + long end_pn = statement->last_case; + assert(pn <= end_pn); /* create jumps for all cases in the given range */ - for (long pn = start_pn; pn <= end_pn; ++pn) { - if (pn == MAGIC_DEFAULT_PN_NUMBER) { - /* oops someone detected our cheating... */ - panic("magic default pn used"); - } + do { proj = new_d_Proj(dbgi, current_switch_cond, mode_X, pn); add_immBlock_pred(block, proj); - } + } while(pn++ < end_pn); } else { saw_default_label = true; proj = new_d_defaultProj(dbgi, current_switch_cond, - MAGIC_DEFAULT_PN_NUMBER); + current_switch->default_proj_nr); add_immBlock_pred(block, proj); } @@ -4506,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; } @@ -4521,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) { @@ -4588,8 +4649,7 @@ static void asm_statement_to_firm(const asm_statement_t *statement) ir_node *ins[n_inputs + n_outputs + 1]; size_t in_size = 0; - ir_asm_constraint *tmp_in_constraints - = xmalloc(n_outputs * sizeof(tmp_in_constraints[0])); + ir_asm_constraint tmp_in_constraints[n_outputs]; const expression_t *out_exprs[n_outputs]; ir_node *out_addrs[n_outputs]; @@ -4685,7 +4745,6 @@ static void asm_statement_to_firm(const asm_statement_t *statement) obstack_grow(&asm_obst, tmp_in_constraints, in_size * sizeof(tmp_in_constraints[0])); - free(tmp_in_constraints); /* find and count input and output arguments */ argument = statement->inputs; for( ; argument != NULL; argument = argument->next) { @@ -5231,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); @@ -5280,22 +5339,17 @@ static void create_function(declaration_t *declaration) in[0] = new_Const(mode, get_mode_null(mode)); } else { in[0] = new_Unknown(mode); - if (warning.return_type) { - warningf(&declaration->source_position, - "missing return statement at end of non-void function '%Y'", - declaration->symbol); - } } ret = new_Return(get_store(), 1, in); } 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); @@ -5375,6 +5429,12 @@ static void scope_to_firm(scope_t *scope) } } +static void set_be_option(const char *option) +{ + int res = firm_be_option(option); + assert(res); +} + void init_ast2firm(void) { obstack_init(&asm_obst); @@ -5384,24 +5444,22 @@ void init_ast2firm(void) id_imp = new_id_from_chars("__imp_", 6); /* OS option must be set to the backend */ - const char *s = "ia32-gasmode=linux"; switch (firm_opt.os_support) { case OS_SUPPORT_MINGW: create_ld_ident = create_ld_ident_win32; - s = "ia32-gasmode=mingw"; + set_be_option("ia32-gasmode=mingw"); break; case OS_SUPPORT_LINUX: create_ld_ident = create_ld_ident_linux_elf; - s = "ia32-gasmode=elf"; + set_be_option("ia32-gasmode=elf"); break; case OS_SUPPORT_MACHO: create_ld_ident = create_ld_ident_macho; - s = "ia32-gasmode=macho"; + set_be_option("ia32-gasmode=macho"); + set_be_option("ia32-stackalign=4"); + set_be_option("pic"); break; } - int res = firm_be_option(s); - (void) res; - assert(res); /* create idents for all known runtime functions */ for (size_t i = 0; i < sizeof(rts_data) / sizeof(rts_data[0]); ++i) { @@ -5418,10 +5476,6 @@ static void init_ir_types(void) return; ir_types_initialized = 1; - type_const_char = make_atomic_type(ATOMIC_TYPE_CHAR, TYPE_QUALIFIER_CONST); - type_void = make_atomic_type(ATOMIC_TYPE_VOID, TYPE_QUALIFIER_NONE); - type_int = make_atomic_type(ATOMIC_TYPE_INT, TYPE_QUALIFIER_NONE); - ir_type_int = get_ir_type(type_int); ir_type_const_char = get_ir_type(type_const_char); ir_type_wchar_t = get_ir_type(type_wchar_t); @@ -5462,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; }