X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast2firm.c;h=f1dc45c249627587767588ec20dea5a2e6537c86;hb=31726745410990250b4f678f360ac312779d9cec;hp=0a25f290f75b016f48d7224ba50042014523e871;hpb=42094391774f80a5d37a69710b4c6a222202914d;p=cparser diff --git a/ast2firm.c b/ast2firm.c index 0a25f29..f1dc45c 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,20 @@ 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 bool constant_folding; +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 declaration_t **all_labels; +static ir_node *ijmp_list; +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 ir_graph *current_function; static entitymap_t entitymap; @@ -96,9 +95,11 @@ ir_node *uninitialized_local_var(ir_graph *irg, ir_mode *mode, int pos) { const declaration_t *declaration = get_irg_loc_description(irg, pos); - warningf(&declaration->source_position, - "variable '%#T' might be used uninitialized", - declaration->type, declaration->symbol); + if (declaration != NULL) { + warningf(&declaration->source_position, + "variable '%#T' might be used uninitialized", + declaration->type, declaration->symbol); + } return new_r_Unknown(irg, mode); } @@ -219,8 +220,6 @@ static unsigned get_array_type_size(array_type_t *type) static unsigned get_type_size_const(type_t *type) { - type = skip_typeref(type); - switch(type->kind) { case TYPE_ERROR: panic("error type occurred"); @@ -339,6 +338,21 @@ static ir_type *create_imaginary_type(const imaginary_type_t *type) return irtype; } +/** + * return type of a parameter (and take transparent union gnu extension into + * account) + */ +static type_t *get_parameter_type(type_t *type) +{ + type = skip_typeref(type); + if (type->base.modifiers & TYPE_MODIFIER_TRANSPARENT_UNION) { + declaration_t *decl = type->compound.declaration; + type = decl->scope.declarations->type; + } + + return type; +} + static ir_type *create_method_type(const function_type_t *function_type) { type_t *return_type = function_type->return_type; @@ -357,7 +371,8 @@ static ir_type *create_method_type(const function_type_t *function_type) function_parameter_t *parameter = function_type->parameters; int n = 0; for ( ; parameter != NULL; parameter = parameter->next) { - ir_type *p_irtype = get_ir_type(parameter->type); + type_t *type = get_parameter_type(parameter->type); + ir_type *p_irtype = get_ir_type(type); set_method_param_type(irtype, n, p_irtype); ++n; } @@ -366,6 +381,34 @@ static ir_type *create_method_type(const function_type_t *function_type) set_method_variadicity(irtype, variadicity_variadic); } + unsigned cc = get_method_calling_convention(irtype); + switch (function_type->calling_convention) { + 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_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, 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, SET_FASTCALL(cc)); + break; + + case CC_THISCALL: + /* Hmm, leave default, not accepted by the parser yet. */ + warningf(&function_type->base.source_position, "THISCALL calling convention not supported yet"); + break; + } return irtype; } @@ -484,10 +527,10 @@ static ir_type *get_unsigned_int_type_for_bit_size(ir_type *base_tp, static ir_type *create_bitfield_type(bitfield_type_t *const type) { type_t *base = skip_typeref(type->base_type); - assert(base->kind == TYPE_ATOMIC); + assert(base->kind == TYPE_ATOMIC || base->kind == TYPE_ENUM); ir_type *irbase = get_ir_type(base); - unsigned size = fold_constant(type->size); + unsigned size = type->bit_size; assert(!is_type_float(base)); if (is_type_signed(base)) { @@ -607,7 +650,7 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype, size_t base; size_t bits_remainder; if (entry_type->kind == TYPE_BITFIELD) { - size_t size_bits = fold_constant(entry_type->bitfield.size); + size_t size_bits = entry_type->bitfield.bit_size; size_t rest_size_bits = (entry_alignment - misalign)*8 - bit_offset; if (size_bits > rest_size_bits) { @@ -764,7 +807,9 @@ static ir_type *get_ir_type(type_t *type) ir_type *firm_type = NULL; switch (type->kind) { case TYPE_ERROR: - panic("error type occurred"); + /* Happens while constant folding, when there was an error */ + return create_atomic_type(&type_void->atomic); + case TYPE_ATOMIC: firm_type = create_atomic_type(&type->atomic); break; @@ -928,7 +973,7 @@ static ident *create_ld_ident_win32(ir_entity *ent, declaration_t *declaration) id = mangle(id_underscore, get_entity_ident(ent)); } - decl_modifiers_t decl_modifiers = declaration->decl_modifiers; + decl_modifiers_t decl_modifiers = declaration->modifiers; if (decl_modifiers & DM_DLLIMPORT) { /* add prefix for imported symbols */ id = mangle(id_imp, id); @@ -966,6 +1011,26 @@ typedef ident* (*create_ld_ident_func)(ir_entity *entity, declaration_t *declaration); create_ld_ident_func create_ld_ident = create_ld_ident_linux_elf; +/** + * Handle GNU attributes for entities + * + * @param ent the entity + * @param decl the routine declaration + */ +static void handle_gnu_attributes_ent(ir_entity *ent, declaration_t *decl) +{ + if (decl->modifiers & DM_PURE) { + /* TRUE if the declaration includes the GNU + __attribute__((pure)) specifier. */ + set_entity_additional_property(ent, mtp_property_pure); + } + if (decl->modifiers & DM_USED) { + /* TRUE if the declaration includes the GNU + __attribute__((used)) specifier. */ + set_entity_stickyness(ent, stickyness_sticky); + } +} + /** * Creates an entity representing a function. * @@ -997,15 +1062,26 @@ static ir_entity *get_function_entity(declaration_t *declaration) dbg_info *const dbgi = get_dbg_info(&declaration->source_position); entity = new_d_entity(global_type, id, ir_type_method, dbgi); set_entity_ld_ident(entity, create_ld_ident(entity, declaration)); - if (declaration->storage_class == STORAGE_CLASS_STATIC && - declaration->init.statement == NULL) { - /* this entity was declared, but never defined */ - set_entity_peculiarity(entity, peculiarity_description); - } - if (declaration->storage_class == STORAGE_CLASS_STATIC - || declaration->is_inline) { + + handle_gnu_attributes_ent(entity, declaration); + + /* static inline => local + * extern inline => local + * inline without definition => local + * inline with definition => external_visible */ + 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) { + set_entity_visibility(entity, visibility_external_visible); + } else if (storage_class == STORAGE_CLASS_STATIC || + (is_inline && has_body)) { + if (!has_body) { + /* this entity was declared, but is defined nowhere */ + set_entity_peculiarity(entity, peculiarity_description); + } set_entity_visibility(entity, visibility_local); - } else if (declaration->init.statement != NULL) { + } else if (has_body) { set_entity_visibility(entity, visibility_external_visible); } else { set_entity_visibility(entity, visibility_external_allocated); @@ -1316,6 +1392,18 @@ static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode) return new_d_Conv(dbgi, value, dest_mode); } +/** + * Keep all memory edges of the given block. + */ +static void keep_all_memory(ir_node *block) { + ir_node *old = get_cur_block(); + + set_cur_block(block); + keep_alive(get_store()); + /* TODO: keep all memory edges from restricted pointers */ + set_cur_block(old); +} + static ir_node *reference_expression_to_firm(const reference_expression_t *ref) { dbg_info *dbgi = get_dbg_info(&ref->base.source_position); @@ -1325,7 +1413,7 @@ static ir_node *reference_expression_to_firm(const reference_expression_t *ref) /* make sure the type is constructed */ (void) get_ir_type(type); - switch((declaration_kind_t) declaration->declaration_kind) { + switch ((declaration_kind_t)declaration->declaration_kind) { case DECLARATION_KIND_TYPE: case DECLARATION_KIND_UNKNOWN: break; @@ -1472,9 +1560,10 @@ static ir_node *process_builtin_call(const call_expression_t *call) /** * Transform a call expression. - * Handles some special cases, like alloca() calls, which must be resolved BEFORE the inlines runs. - * Inlining routines calling alloca() is dangerous, 176.gcc for instance might allocate 2GB instead of - * 256 MB if alloca is not handled right... + * Handles some special cases, like alloca() calls, which must be resolved + * BEFORE the inlines runs. Inlining routines calling alloca() is dangerous, + * 176.gcc for instance might allocate 2GB instead of 256 MB if alloca is not + * handled right... */ static ir_node *call_expression_to_firm(const call_expression_t *call) { @@ -1493,17 +1582,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; } @@ -1589,6 +1678,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; } @@ -1596,9 +1694,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) @@ -1626,7 +1724,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; @@ -2057,10 +2156,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); @@ -2072,8 +2169,14 @@ static ir_node *adjust_for_pointer_arithmetic(dbg_info *dbgi, ir_node *value, type_t *type) { pointer_type_t *const pointer_type = &type->pointer; - type_t *const points_to = pointer_type->points_to; - const unsigned elem_size = get_type_size_const(points_to); + type_t *const points_to = skip_typeref(pointer_type->points_to); + unsigned elem_size = get_type_size_const(points_to); + + /* 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; + } assert(elem_size >= 1); if (elem_size == 1) @@ -2211,12 +2314,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)); } } @@ -2232,9 +2334,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); @@ -2492,6 +2594,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; @@ -2531,7 +2634,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); } @@ -2542,7 +2648,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 */ @@ -2553,15 +2660,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) @@ -2841,6 +2956,52 @@ static ir_node *builtin_prefetch_to_firm( return NULL; } +static ir_node *get_label_block(declaration_t *label) +{ + assert(label->namespc == NAMESPACE_LABEL || label->namespc == NAMESPACE_LOCAL_LABEL); + + if (label->declaration_kind == DECLARATION_KIND_LABEL_BLOCK) { + return label->v.block; + } + assert(label->declaration_kind == DECLARATION_KIND_UNKNOWN); + + /* 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 *old_cur_block = get_cur_block(); + ir_node *block = new_immBlock(); + set_cur_block(old_cur_block); + + label->declaration_kind = DECLARATION_KIND_LABEL_BLOCK; + label->v.block = block; + + ARR_APP1(declaration_t *, all_labels, label); + + current_ir_graph = rem; + return block; +} + +/** + * Pointer to a label. This is used for the + * GNU address-of-label extension. + */ +static ir_node *label_address_to_firm( + const label_address_expression_t *label) +{ + ir_node *block = get_label_block(label->declaration); + ir_label_t nr = get_Block_label(block); + + if (nr == 0) { + nr = get_irp_next_label_nr(); + set_Block_label(block, nr); + } + symconst_symbol value; + value.label = nr; + return new_SymConst(mode_P_code, value, symconst_label); +} + /** * creates firm nodes for an expression. The difference between this function * and expression_to_firm is, that this version might produce mode_b nodes @@ -2855,7 +3016,7 @@ static ir_node *_expression_to_firm(const expression_t *expression) } #endif - switch(expression->kind) { + switch (expression->kind) { case EXPR_CHARACTER_CONSTANT: return character_constant_to_firm(&expression->conste); case EXPR_WIDE_CHARACTER_CONSTANT: @@ -2904,6 +3065,8 @@ static ir_node *_expression_to_firm(const expression_t *expression) 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_UNKNOWN: case EXPR_INVALID: @@ -2964,28 +3127,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; @@ -2999,7 +3154,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; @@ -3013,14 +3168,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); @@ -3044,6 +3200,7 @@ static void create_condition_evaluation(const expression_t *expression, } set_cur_block(NULL); + return cond_expr; } @@ -3389,12 +3546,13 @@ 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); const char *string = initializer->string.begin; - ir_mode *mode = get_type_mode(ir_type_const_char); + ir_mode *mode = get_ir_mode(type->array.element_type); for(size_t i = 0; i < len; ++i) { char c = 0; @@ -3414,7 +3572,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); @@ -3666,6 +3825,8 @@ static void create_declaration_initializer(declaration_t *declaration) return; } + type_t *type = skip_typeref(declaration->type); + if (initializer->kind == INITIALIZER_VALUE) { initializer_value_t *initializer_value = &initializer->value; dbg_info *dbgi @@ -3681,7 +3842,11 @@ static void create_declaration_initializer(declaration_t *declaration) ir_entity *entity = declaration->v.entity; - set_entity_variability(entity, variability_initialized); + if (type->base.qualifiers & TYPE_QUALIFIER_CONST) { + set_entity_variability(entity, variability_constant); + } else { + set_entity_variability(entity, variability_initialized); + } set_atomic_ent_value(entity, value); } } else { @@ -3690,9 +3855,13 @@ static void create_declaration_initializer(declaration_t *declaration) ir_entity *entity = declaration->v.entity; ir_initializer_t *irinitializer - = create_ir_initializer(initializer, declaration->type); + = create_ir_initializer(initializer, type); - set_entity_variability(entity, variability_initialized); + if (type->base.qualifiers & TYPE_QUALIFIER_CONST) { + set_entity_variability(entity, variability_constant); + } else { + set_entity_variability(entity, variability_initialized); + } set_entity_initializer(entity, irinitializer); } } @@ -4076,7 +4245,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) { @@ -4126,6 +4295,8 @@ static void while_statement_to_firm(while_statement_t *statement) add_immBlock_pred(body_block, header_jmp); keep_alive(body_block); + keep_all_memory(body_block); + set_cur_block(body_block); } else { if (false_block == NULL) { false_block = new_immBlock(); @@ -4207,12 +4378,13 @@ static void for_statement_to_firm(for_statement_t *statement) for( ; declaration != NULL; declaration = declaration->next) { create_local_declaration(declaration); } - declaration = statement->scope.declarations; - for( ; declaration != NULL; declaration = declaration->next) { - initialize_local_declaration(declaration); - } if (get_cur_block() != NULL) { + declaration = statement->scope.declarations; + for( ; declaration != NULL; declaration = declaration->next) { + initialize_local_declaration(declaration); + } + if (statement->initialisation != NULL) { expression_to_firm(statement->initialisation); } @@ -4269,6 +4441,7 @@ static void for_statement_to_firm(for_statement_t *statement) false_block); } else { keep_alive(header_block); + keep_all_memory(header_block); jmp = new_Jmp(); add_immBlock_pred(body_block, jmp); } @@ -4305,7 +4478,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); @@ -4320,6 +4493,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); @@ -4333,7 +4557,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); } @@ -4343,6 +4567,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; @@ -4350,37 +4575,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_range) + 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); } @@ -4396,27 +4615,6 @@ static void case_label_to_firm(const case_label_statement_t *statement) } } -static ir_node *get_label_block(declaration_t *label) -{ - assert(label->namespc == NAMESPACE_LABEL); - - if (label->declaration_kind == DECLARATION_KIND_LABEL_BLOCK) { - return label->v.block; - } - assert(label->declaration_kind == DECLARATION_KIND_UNKNOWN); - - ir_node *old_cur_block = get_cur_block(); - ir_node *block = new_immBlock(); - set_cur_block(old_cur_block); - - label->declaration_kind = DECLARATION_KIND_LABEL_BLOCK; - label->v.block = block; - - ARR_APP1(ir_node *, imature_blocks, block); - - return block; -} - static void label_to_firm(const label_statement_t *statement) { ir_node *block = get_label_block(statement->label); @@ -4428,6 +4626,7 @@ static void label_to_firm(const label_statement_t *statement) set_cur_block(block); keep_alive(block); + keep_all_memory(block); if (statement->statement != NULL) { statement_to_firm(statement->statement); @@ -4439,10 +4638,18 @@ static void goto_to_firm(const goto_statement_t *statement) if (get_cur_block() == NULL) return; - ir_node *block = get_label_block(statement->label); - ir_node *jmp = new_Jmp(); - add_immBlock_pred(block, jmp); + 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); + 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_cur_block(NULL); } @@ -4494,8 +4701,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]; @@ -4529,12 +4735,17 @@ static void asm_statement_to_firm(const asm_statement_t *statement) || (asm_flags & ASM_CONSTRAINT_FLAG_SUPPORTS_REGISTER) ) { expression_t *expr = argument->expression; ir_node *addr = expression_to_addr(expr); + /* in+output, construct an artifical same_as constraint on the + * input */ if (asm_flags & ASM_CONSTRAINT_FLAG_MODIFIER_READ) { + char buf[64]; ir_node *value = get_value_from_lvalue(expr, addr); + snprintf(buf, sizeof(buf), "%d", pos); + ir_asm_constraint constraint; constraint.pos = pos; - constraint.constraint = new_id_from_str(constraints); + constraint.constraint = new_id_from_str(buf); constraint.mode = get_ir_mode(expr->base.type); tmp_in_constraints[in_size] = constraint; ins[in_size] = value; @@ -4586,7 +4797,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) { @@ -4670,6 +4880,11 @@ static void asm_statement_to_firm(const asm_statement_t *statement) } /* create output projs & connect them */ + if (needs_memory) { + ir_node *projm = new_Proj(node, mode_M, out_size+1); + set_store(projm); + } + size_t i; for (i = 0; i < out_size; ++i) { const expression_t *out_expr = out_exprs[i]; @@ -4680,10 +4895,6 @@ static void asm_statement_to_firm(const asm_statement_t *statement) set_value_for_expression_addr(out_expr, proj, addr); } - if (needs_memory) { - ir_node *projm = new_Proj(node, mode_M, i); - set_store(projm); - } } static void ms_try_statement_to_firm(ms_try_statement_t *statement) { @@ -4776,7 +4987,8 @@ static int count_local_declarations(const declaration_t * decl, for (; decl != end; decl = decl->next) { if (decl->namespc != NAMESPACE_NORMAL) continue; - const type_t *type = skip_typeref(decl->type); + type_t *type = skip_typeref(decl->type); + if (!decl->address_taken && is_type_scalar(type)) ++count; const initializer_t *initializer = decl->init.initializer; @@ -4869,6 +5081,7 @@ static int count_decls_in_expression(const expression_t *expression) { case EXPR_BUILTIN_SYMBOL: case EXPR_VA_START: case EXPR_VA_ARG: + case EXPR_LABEL_ADDRESS: break; } @@ -5041,7 +5254,7 @@ static void initialize_function_parameters(declaration_t *declaration) long pn = n; ir_node *value = new_r_Proj(irg, start_block, args, param_mode, pn); - ir_mode *mode = get_ir_mode(parameter->type); + ir_mode *mode = get_ir_mode(type); value = create_conv(NULL, value, mode); value = do_strict_conv(NULL, value); @@ -5089,6 +5302,34 @@ static void handle_decl_modifier_irg(ir_graph_ptr irg, decl_modifiers_t decl_mod } } +static void add_function_pointer(ir_type *segment, ir_entity *method, + const char *unique_template) +{ + ir_type *method_type = get_entity_type(method); + ident *id = id_unique(unique_template); + ir_type *ptr_type = new_type_pointer(id, method_type, mode_P_code); + + ident *ide = id_unique(unique_template); + ir_entity *ptr = new_entity(segment, ide, ptr_type); + ir_graph *irg = get_const_code_irg(); + ir_node *val = new_rd_SymConst_addr_ent(NULL, irg, mode_P_code, + method, NULL); + + set_entity_compiler_generated(ptr, 1); + set_entity_variability(ptr, variability_constant); + 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. */ @@ -5099,16 +5340,29 @@ static void create_function(declaration_t *declaration) if (declaration->init.statement == NULL) return; + if (declaration->modifiers & DM_CONSTRUCTOR) { + ir_type *segment = get_segment_type(IR_SEGMENT_CONSTRUCTORS); + add_function_pointer(segment, function_entity, "constructor_ptr.%u"); + } + if (declaration->modifiers & DM_DESTRUCTOR) { + ir_type *segment = get_segment_type(IR_SEGMENT_DESTRUCTORS); + add_function_pointer(segment, function_entity, "destructor_ptr.%u"); + } + current_function_decl = declaration; current_function_name = NULL; current_funcsig = NULL; - assert(imature_blocks == NULL); - imature_blocks = NEW_ARR_F(ir_node*, 0); + assert(all_labels == NULL); + all_labels = NEW_ARR_F(declaration_t *, 0); + ijmp_list = NULL; int n_local_vars = get_function_n_local_vars(declaration); ir_graph *irg = new_ir_graph(function_entity, n_local_vars); + ir_graph *old_current_function = current_function; + current_function = irg; + set_irg_fp_model(irg, firm_opt.fp_model); tarval_enable_fp_ops((firm_opt.fp_model & fp_strict_algebraic) == 0); set_irn_dbg_info(get_irg_start_block(irg), get_entity_dbg_info(function_entity)); @@ -5118,7 +5372,7 @@ static void create_function(declaration_t *declaration) /* set inline flags */ if (declaration->is_inline) set_irg_inline_property(irg, irg_inline_recomended); - handle_decl_modifier_irg(irg, declaration->decl_modifiers); + handle_decl_modifier_irg(irg, declaration->modifiers); next_value_number_function = 0; initialize_function_parameters(declaration); @@ -5152,22 +5406,33 @@ 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]); + bool has_computed_gotos = false; + for (int i = ARR_LEN(all_labels) - 1; i >= 0; --i) { + declaration_t *label = all_labels[i]; + if (label->address_taken) { + gen_ijmp_branches(label->v.block); + has_computed_gotos = true; + } + mature_immBlock(label->v.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) { + warningf(&declaration->source_position, + "function '%Y' can never be inlined because it contains a computed goto", + declaration->symbol); + } + set_irg_inline_property(irg, irg_inline_forbidden); } - DEL_ARR_F(imature_blocks); - imature_blocks = NULL; + + DEL_ARR_F(all_labels); + all_labels = NULL; mature_immBlock(first_block); mature_immBlock(end_block); @@ -5201,6 +5466,7 @@ static void create_function(declaration_t *declaration) set_type_alignment_bytes(frame_type, align_all); irg_vrfy(irg); + current_function = old_current_function; } static void scope_to_firm(scope_t *scope) @@ -5247,6 +5513,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); @@ -5256,24 +5528,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) { @@ -5290,10 +5560,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); @@ -5306,6 +5572,23 @@ void exit_ast2firm(void) obstack_free(&asm_obst, NULL); } +static void global_asm_to_firm(statement_t *s) +{ + for (; s != NULL; s = s->base.next) { + assert(s->kind == STATEMENT_ASM); + + char const *const text = s->asms.asm_text.begin; + size_t size = s->asms.asm_text.size; + + /* skip the last \0 */ + if (text[size - 1] == '\0') + --size; + + ident *const id = new_id_from_chars(text, size); + add_irp_asm(id); + } +} + void translation_unit_to_firm(translation_unit_t *unit) { /* just to be sure */ @@ -5316,4 +5599,7 @@ void translation_unit_to_firm(translation_unit_t *unit) init_ir_types(); scope_to_firm(&unit->scope); + global_asm_to_firm(unit->global_asm); + + current_ir_graph = NULL; }