X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast2firm.c;h=accf196247edaeeb0a61f68098a4c81aae450c18;hb=e4b42fc6e06d3eaf4b8cf2f9d506030fd9b4e404;hp=a402ec98aaf190dd54f9acbc7d023cc98dd6e513;hpb=866855867e84502da68057eafa89b2fa5b9a6bb9;p=cparser diff --git a/ast2firm.c b/ast2firm.c index a402ec9..accf196 100644 --- a/ast2firm.c +++ b/ast2firm.c @@ -50,6 +50,15 @@ #include "driver/firm_opt.h" #include "driver/firm_cmdline.h" +typedef struct trampoline_region trampoline_region; +struct trampoline_region { + ir_entity *function; /**< The function that is called by this trampoline */ + ir_entity *region; /**< created region for the trampoline */ +}; + +static const backend_params *be_params; + +static ir_type *ir_type_char; static ir_type *ir_type_const_char; static ir_type *ir_type_wchar_t; static ir_type *ir_type_void; @@ -79,6 +88,10 @@ static ir_node *current_funcsig; static switch_statement_t *current_switch; static ir_graph *current_function; static translation_unit_t *current_translation_unit; +static trampoline_region *current_trampolines; +static ir_type *current_outer_frame; +static ir_type *current_outer_value_type; +static ir_node *current_static_link; static entitymap_t entitymap; @@ -109,21 +122,11 @@ static ir_type *get_ir_type_incomplete(type_t *type); static void enqueue_inner_function(entity_t *entity) { + if (inner_functions == NULL) + inner_functions = NEW_ARR_F(entity_t *, 0); ARR_APP1(entity_t*, inner_functions, entity); } -static entity_t *next_inner_function(void) -{ - int len = ARR_LEN(inner_functions); - if (len == 0) - return NULL; - - entity_t *entity = inner_functions[len-1]; - ARR_SHRINKLEN(inner_functions, len-1); - - return entity; -} - ir_node *uninitialized_local_var(ir_graph *irg, ir_mode *mode, int pos) { const entity_t *entity = get_irg_loc_description(irg, pos); @@ -257,13 +260,13 @@ static ir_node *get_vla_size(array_type_t *const type) /** * Return a node representing the size of a type. */ -static ir_node *get_type_size(type_t *type) +static ir_node *get_type_size_node(type_t *type) { type = skip_typeref(type); if (is_type_array(type) && type->array.is_vla) { ir_node *size_node = get_vla_size(&type->array); - ir_node *elem_size = get_type_size(type->array.element_type); + ir_node *elem_size = get_type_size_node(type->array.element_type); ir_mode *mode = get_irn_mode(size_node); ir_node *real_size = new_d_Mul(NULL, size_node, elem_size, mode); return real_size; @@ -287,28 +290,15 @@ static unsigned count_parameters(const function_type_t *function_type) return count; } -static type_t *get_aligned_type(type_t *type, int alignment) -{ - if (alignment == 0) - return type; - - type = skip_typeref(type); - if (alignment > type->base.alignment) { - type_t *copy = duplicate_type(type); - copy->base.alignment = alignment; - type = identify_new_type(copy); - } - return type; -} - /** * Creates a Firm type for an atomic type */ -static ir_type *create_atomic_type(atomic_type_kind_t akind, int alignment) +static ir_type *create_atomic_type(atomic_type_kind_t akind) { - ir_mode *mode = atomic_modes[akind]; - ident *id = get_mode_ident(mode); - ir_type *irtype = new_type_primitive(id, mode); + ir_mode *mode = atomic_modes[akind]; + ident *id = get_mode_ident(mode); + ir_type *irtype = new_type_primitive(id, mode); + il_alignment_t alignment = get_atomic_type_alignment(akind); set_type_alignment_bytes(irtype, alignment); @@ -333,14 +323,15 @@ static ir_type *create_complex_type(const complex_type_t *type) /** * Creates a Firm type for an imaginary type */ -static ir_type *create_imaginary_type(const imaginary_type_t *type) +static ir_type *create_imaginary_type(imaginary_type_t *type) { atomic_type_kind_t kind = type->akind; ir_mode *mode = atomic_modes[kind]; ident *id = get_mode_ident(mode); ir_type *irtype = new_type_primitive(id, mode); + il_alignment_t alignment = get_type_alignment((type_t*) type); - set_type_alignment_bytes(irtype, type->base.alignment); + set_type_alignment_bytes(irtype, alignment); return irtype; } @@ -349,10 +340,11 @@ static ir_type *create_imaginary_type(const imaginary_type_t *type) * return type of a parameter (and take transparent union gnu extension into * account) */ -static type_t *get_parameter_type(type_t *type) +static type_t *get_parameter_type(type_t *orig_type) { - type = skip_typeref(type); - if (type->base.modifiers & TYPE_MODIFIER_TRANSPARENT_UNION) { + type_t *type = skip_typeref(orig_type); + if (is_type_union(type) + && get_type_modifiers(orig_type) & DM_TRANSPARENT_UNION) { compound_t *compound = type->compound.compound; type = compound->members.entities->declaration.type; } @@ -360,12 +352,12 @@ static type_t *get_parameter_type(type_t *type) return type; } -static ir_type *create_method_type(const function_type_t *function_type) +static ir_type *create_method_type(const function_type_t *function_type, bool for_closure) { type_t *return_type = skip_typeref(function_type->return_type); ident *id = id_unique("functiontype.%u"); - int n_parameters = count_parameters(function_type); + int n_parameters = count_parameters(function_type) + (for_closure ? 1 : 0); int n_results = return_type == type_void ? 0 : 1; ir_type *irtype = new_type_method(id, n_parameters, n_results); @@ -376,6 +368,11 @@ static ir_type *create_method_type(const function_type_t *function_type) function_parameter_t *parameter = function_type->parameters; int n = 0; + if (for_closure) { + ir_type *p_irtype = get_ir_type(type_void_ptr); + set_method_param_type(irtype, n, p_irtype); + ++n; + } for ( ; parameter != NULL; parameter = parameter->next) { type_t *type = get_parameter_type(parameter->type); ir_type *p_irtype = get_ir_type(type); @@ -415,6 +412,9 @@ is_cdecl: break; } + if (for_closure) + set_method_calling_convention(irtype, get_method_calling_convention(irtype) | cc_this_call); + return irtype; } @@ -563,13 +563,8 @@ enum { /** * Construct firm type from ast struct type. - * - * As anonymous inner structs get flattened to a single firm type, we might get - * irtype, outer_offset and out_align passed (they represent the position of - * the anonymous inner struct inside the resulting firm struct) */ -static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype, - size_t *outer_offset, size_t *outer_align, +static ir_type *create_compound_type(compound_type_t *type, bool incomplete, bool is_union) { compound_t *compound = type->compound; @@ -578,41 +573,38 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype, return compound->irtype; } - size_t align_all = 1; - size_t offset = 0; - size_t bit_offset = 0; - size_t size = 0; - - if (irtype == NULL) { - symbol_t *symbol = compound->base.symbol; - ident *id; - if (symbol != NULL) { - id = new_id_from_str(symbol->string); - } else { - if (is_union) { - id = id_unique("__anonymous_union.%u"); - } else { - id = id_unique("__anonymous_struct.%u"); - } - } - dbg_info *dbgi = get_dbg_info(&compound->base.source_position); - + symbol_t *symbol = compound->base.symbol; + ident *id; + if (symbol != NULL) { + id = new_id_from_str(symbol->string); + } else { if (is_union) { - irtype = new_d_type_union(id, dbgi); + id = id_unique("__anonymous_union.%u"); } else { - irtype = new_d_type_struct(id, dbgi); + id = id_unique("__anonymous_struct.%u"); } + } + dbg_info *dbgi = get_dbg_info(&compound->base.source_position); - compound->irtype_complete = false; - compound->irtype = irtype; + ir_type *irtype; + if (is_union) { + irtype = new_d_type_union(id, dbgi); } else { - offset = *outer_offset; - align_all = *outer_align; + irtype = new_d_type_struct(id, dbgi); } + compound->irtype_complete = false; + compound->irtype = irtype; + if (incomplete) return irtype; + if (is_union) { + layout_union_type(type); + } else { + layout_struct_type(type); + } + compound->irtype_complete = true; entity_t *entry = compound->members.entities; @@ -620,130 +612,37 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype, if (entry->kind != ENTITY_COMPOUND_MEMBER) continue; - size_t prev_offset = offset; - symbol_t *symbol = entry->base.symbol; - type_t *entry_type = skip_typeref(entry->declaration.type); - entry_type - = get_aligned_type(entry_type, entry->compound_member.alignment); - dbg_info *dbgi = get_dbg_info(&entry->base.source_position); - + type_t *entry_type = entry->declaration.type; ident *ident; - if (symbol != NULL) { - ident = new_id_from_str(symbol->string); - } else { - if (entry_type->kind == TYPE_COMPOUND_STRUCT) { - create_compound_type(&entry_type->compound, irtype, &offset, - &align_all, false, COMPOUND_IS_STRUCT); - goto finished_member; - } else if (entry_type->kind == TYPE_COMPOUND_UNION) { - create_compound_type(&entry_type->compound, irtype, &offset, - &align_all, false, COMPOUND_IS_UNION); - goto finished_member; - } else { - assert(entry_type->kind == TYPE_BITFIELD); - } + if (symbol == NULL) { + /* anonymous bitfield member, skip */ + if (entry_type->kind == TYPE_BITFIELD) + continue; + assert(entry_type->kind == TYPE_COMPOUND_STRUCT + || entry_type->kind == TYPE_COMPOUND_UNION); ident = id_unique("anon.%u"); - } - - ir_type *base_irtype; - if (entry_type->kind == TYPE_BITFIELD) { - base_irtype = get_ir_type(entry_type->bitfield.base_type); } else { - base_irtype = get_ir_type(entry_type); + ident = new_id_from_str(symbol->string); } - size_t entry_alignment = get_type_alignment_bytes(base_irtype); - size_t misalign = offset % entry_alignment; + dbg_info *dbgi = get_dbg_info(&entry->base.source_position); ir_type *entry_irtype = get_ir_type(entry_type); ir_entity *entity = new_d_entity(irtype, ident, entry_irtype, dbgi); - size_t base; - size_t bits_remainder; - if (entry_type->kind == TYPE_BITFIELD) { - 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) { - /* start a new bucket */ - offset += entry_alignment - misalign; - bit_offset = 0; - - base = offset; - bits_remainder = 0; - } else { - /* put into current bucket */ - base = offset - misalign; - bits_remainder = misalign * 8 + bit_offset; - } - - offset += size_bits / 8; - bit_offset = bit_offset + (size_bits % 8); - } else { - size_t entry_size = get_type_size_bytes(base_irtype); - if (misalign > 0 || bit_offset > 0) - offset += entry_alignment - misalign; - - base = offset; - bits_remainder = 0; - offset += entry_size; - bit_offset = 0; - } - - if (entry_alignment > align_all) { - if (entry_alignment % align_all != 0) { - panic("uneven alignments not supported yet"); - } - align_all = entry_alignment; - } - - set_entity_offset(entity, base); + set_entity_offset(entity, entry->compound_member.offset); set_entity_offset_bits_remainder(entity, - (unsigned char) bits_remainder); - //add_struct_member(irtype, entity); - entry->declaration.kind = DECLARATION_KIND_COMPOUND_MEMBER; - assert(entry->compound_member.entity == NULL); - entry->compound_member.entity = entity; + entry->compound_member.bit_offset); -finished_member: - if (is_union) { - size_t entry_size = offset - prev_offset; - if (entry_size > size) { - size = entry_size; - } - offset = 0; - bit_offset = 0; - } - } - - if (!is_union) { - size = offset; - } - - size_t misalign = offset % align_all; - if (misalign > 0 || bit_offset > 0) { - size += align_all - misalign; + assert(entry->declaration.kind == DECLARATION_KIND_UNKNOWN); + entry->declaration.kind = DECLARATION_KIND_COMPOUND_MEMBER; + entry->compound_member.entity = entity; } - if (outer_offset != NULL) { - if (!is_union) { - *outer_offset = offset; - } else { - *outer_offset += size; - } - - if (align_all > *outer_align) { - if (align_all % *outer_align != 0) { - panic("uneven alignments not supported yet"); - } - *outer_align = align_all; - } - } else { - set_type_alignment_bytes(irtype, align_all); - set_type_size_bytes(irtype, size); - set_type_state(irtype, layout_fixed); - } + set_type_alignment_bytes(irtype, compound->alignment); + set_type_size_bytes(irtype, compound->size); + set_type_state(irtype, layout_fixed); return irtype; } @@ -779,7 +678,7 @@ static ir_type *create_enum_type(enum_type_t *const type) constant_folding = constant_folding_old; - return create_atomic_type(type->akind, type->base.alignment); + return create_atomic_type(type->akind); } static ir_type *get_ir_type_incomplete(type_t *type) @@ -794,11 +693,9 @@ static ir_type *get_ir_type_incomplete(type_t *type) switch (type->kind) { case TYPE_COMPOUND_STRUCT: - return create_compound_type(&type->compound, NULL, NULL, NULL, - true, COMPOUND_IS_STRUCT); + return create_compound_type(&type->compound, true, COMPOUND_IS_STRUCT); case TYPE_COMPOUND_UNION: - return create_compound_type(&type->compound, NULL, NULL, NULL, - true, COMPOUND_IS_UNION); + return create_compound_type(&type->compound, true, COMPOUND_IS_UNION); default: return get_ir_type(type); } @@ -819,11 +716,10 @@ ir_type *get_ir_type(type_t *type) switch (type->kind) { case TYPE_ERROR: /* Happens while constant folding, when there was an error */ - return create_atomic_type(ATOMIC_TYPE_VOID, 0); + return create_atomic_type(ATOMIC_TYPE_VOID); case TYPE_ATOMIC: - firm_type = create_atomic_type(type->atomic.akind, - type->base.alignment); + firm_type = create_atomic_type(type->atomic.akind); break; case TYPE_COMPLEX: firm_type = create_complex_type(&type->complex); @@ -832,7 +728,7 @@ ir_type *get_ir_type(type_t *type) firm_type = create_imaginary_type(&type->imaginary); break; case TYPE_FUNCTION: - firm_type = create_method_type(&type->function); + firm_type = create_method_type(&type->function, false); break; case TYPE_POINTER: firm_type = create_pointer_type(&type->pointer); @@ -844,12 +740,10 @@ ir_type *get_ir_type(type_t *type) firm_type = create_array_type(&type->array); break; case TYPE_COMPOUND_STRUCT: - firm_type = create_compound_type(&type->compound, NULL, NULL, NULL, - false, COMPOUND_IS_STRUCT); + firm_type = create_compound_type(&type->compound, false, COMPOUND_IS_STRUCT); break; case TYPE_COMPOUND_UNION: - firm_type = create_compound_type(&type->compound, NULL, NULL, NULL, - false, COMPOUND_IS_UNION); + firm_type = create_compound_type(&type->compound, false, COMPOUND_IS_UNION); break; case TYPE_ENUM: firm_type = create_enum_type(&type->enumt); @@ -994,7 +888,7 @@ static ident* (*create_ld_ident)(entity_t*) = create_name_linux_elf; * @param ent the entity * @param decl the routine declaration */ -static void handle_gnu_attributes_ent(ir_entity *irentity, entity_t *entity) +static void handle_decl_modifiers(ir_entity *irentity, entity_t *entity) { assert(is_declaration(entity)); decl_modifiers_t modifiers = entity->declaration.modifiers; @@ -1034,12 +928,14 @@ static bool is_main(entity_t *entity) * Creates an entity representing a function. * * @param declaration the function declaration + * @param owner_type the owner type of this function, NULL + * for global functions */ -static ir_entity *get_function_entity(entity_t *entity) +static ir_entity *get_function_entity(entity_t *entity, ir_type *owner_type) { assert(entity->kind == ENTITY_FUNCTION); - if (entity->function.entity != NULL) { - return entity->function.entity; + if (entity->function.irentity != NULL) { + return entity->function.irentity; } if (is_main(entity)) { @@ -1057,12 +953,10 @@ static ir_entity *get_function_entity(entity_t *entity) symbol_t *symbol = entity->base.symbol; ident *id = new_id_from_str(symbol->string); - ir_type *global_type = get_glob_type(); - ir_type *ir_type_method = get_ir_type(entity->declaration.type); - bool const has_body = entity->function.statement != NULL; /* already an entity defined? */ ir_entity *irentity = entitymap_get(&entitymap, symbol); + bool const has_body = entity->function.statement != NULL; if (irentity != NULL) { if (get_entity_visibility(irentity) == visibility_external_allocated && has_body) { @@ -1071,38 +965,62 @@ static ir_entity *get_function_entity(entity_t *entity) goto entity_created; } + ir_type *ir_type_method; + if (entity->function.need_closure) + ir_type_method = create_method_type(&entity->declaration.type->function, true); + else + ir_type_method = get_ir_type(entity->declaration.type); + + bool nested_function = false; + if (owner_type == NULL) + owner_type = get_glob_type(); + else + nested_function = true; + dbg_info *const dbgi = get_dbg_info(&entity->base.source_position); - irentity = new_d_entity(global_type, id, ir_type_method, dbgi); - set_entity_ld_ident(irentity, create_ld_ident(entity)); - - handle_gnu_attributes_ent(irentity, entity); - - /* 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) entity->declaration.storage_class; - bool const is_inline = entity->function.is_inline; - if (is_inline && storage_class == STORAGE_CLASS_NONE && has_body) { - set_entity_visibility(irentity, 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(irentity, peculiarity_description); + irentity = new_d_entity(owner_type, id, ir_type_method, dbgi); + + ident *ld_id; + if (nested_function) + ld_id = id_unique("inner.%u"); + else + ld_id = create_ld_ident(entity); + set_entity_ld_ident(irentity, ld_id); + + handle_decl_modifiers(irentity, entity); + + if (! nested_function) { + /* 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) entity->declaration.storage_class; + bool const is_inline = entity->function.is_inline; + + if (is_inline && storage_class == STORAGE_CLASS_NONE && has_body) { + set_entity_visibility(irentity, 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(irentity, peculiarity_description); + } + set_entity_visibility(irentity, visibility_local); + } else if (has_body) { + set_entity_visibility(irentity, visibility_external_visible); + } else { + set_entity_visibility(irentity, visibility_external_allocated); } - set_entity_visibility(irentity, visibility_local); - } else if (has_body) { - set_entity_visibility(irentity, visibility_external_visible); } else { - set_entity_visibility(irentity, visibility_external_allocated); + /* nested functions are always local */ + set_entity_visibility(irentity, visibility_local); } set_entity_allocation(irentity, allocation_static); /* We should check for file scope here, but as long as we compile C only this is not needed. */ - if (! firm_opt.freestanding) { + if (! firm_opt.freestanding && !has_body) { /* check for a known runtime function */ for (size_t i = 0; i < lengthof(rts_data); ++i) { if (id != rts_idents[i]) @@ -1119,8 +1037,8 @@ static ir_entity *get_function_entity(entity_t *entity) entitymap_insert(&entitymap, symbol, irentity); entity_created: - entity->declaration.kind = DECLARATION_KIND_FUNCTION; - entity->function.entity = irentity; + entity->declaration.kind = DECLARATION_KIND_FUNCTION; + entity->function.irentity = irentity; return irentity; } @@ -1213,6 +1131,68 @@ static ir_node *wide_character_constant_to_firm(const const_expression_t *cnst) return new_d_Const(dbgi, tv); } +/* + * Allocate an area of size bytes aligned at alignment + * at a frame type. + */ +static ir_entity *alloc_trampoline(ir_type *frame_type, int size, unsigned alignment) { + static unsigned area_cnt = 0; + char buf[32]; + + snprintf(buf, sizeof(buf), "trampolin%u", area_cnt++); + ident *name = new_id_from_str(buf); + + ir_type *tp = new_type_array(id_mangle_u(get_type_ident(frame_type), name), 1, ir_type_char); + set_array_bounds_int(tp, 0, 0, size); + set_type_alignment_bytes(tp, alignment); + + ir_entity *area = new_entity(frame_type, name, tp); + + /* mark this entity as compiler generated */ + set_entity_compiler_generated(area, 1); + return area; +} + +/** + * Return a node representing a trampoline reagion + * for a given entity. + * + * @param dbgi debug info + * @param entity the entity + */ +static ir_node *get_trampoline_region(dbg_info *dbgi, ir_entity *entity) +{ + ir_entity *region = NULL; + int i; + + if (current_trampolines != NULL) { + for (i = ARR_LEN(current_trampolines) - 1; i >= 0; --i) { + if (current_trampolines[i].function == entity) { + region = current_trampolines[i].region; + break; + } + } + } else { + current_trampolines = NEW_ARR_F(trampoline_region, 0); + } + ir_graph *irg = current_ir_graph; + if (region == NULL) { + /* create a new region */ + ir_type *frame_tp = get_irg_frame_type(irg); + trampoline_region reg; + reg.function = entity; + + reg.region = alloc_trampoline(frame_tp, + be_params->trampoline_size, + be_params->trampoline_align); + ARR_APP1(trampoline_region, current_trampolines, reg); + region = reg.region; + } + return new_d_simpleSel(dbgi, get_irg_no_mem(irg), get_irg_frame(irg), + region); +} + + /** * Creates a SymConst for a given entity. * @@ -1221,7 +1201,7 @@ static ir_node *wide_character_constant_to_firm(const const_expression_t *cnst) * @param entity the entity */ static ir_node *create_symconst(dbg_info *dbgi, ir_mode *mode, - ir_entity *entity) + ir_entity *entity) { assert(entity != NULL); union symconst_symbol sym; @@ -1229,6 +1209,27 @@ static ir_node *create_symconst(dbg_info *dbgi, ir_mode *mode, return new_d_SymConst(dbgi, mode, sym, symconst_addr_ent); } +/** + * Creates a SymConst for a given trampoline of an entity. + * + * @param dbgi debug info + * @param mode the (reference) mode for the SymConst + * @param entity the entity + */ +static ir_node *create_trampoline(dbg_info *dbgi, ir_mode *mode, + ir_entity *entity) +{ + assert(entity != NULL); + ir_node *in[3]; + in[0] = get_trampoline_region(dbgi, entity); + in[1] = create_symconst(dbgi, mode, entity); + in[2] = get_irg_frame(current_ir_graph); + + ir_node *irn = new_d_Builtin(dbgi, get_store(), ir_bk_inner_trampoline, 3, in, get_unknown_type()); + set_store(new_Proj(irn, mode_M, pn_Builtin_M)); + return new_Proj(irn, mode, pn_Builtin_1_result); +} + /** * Creates a SymConst node representing a string constant. * @@ -1250,6 +1251,7 @@ static ir_node *string_to_firm(const source_position_t *const src_pos, set_entity_ld_ident(entity, id); set_entity_variability(entity, variability_constant); set_entity_allocation(entity, allocation_static); + set_entity_visibility(entity, visibility_local); ir_type *const elem_type = ir_type_const_char; ir_mode *const mode = get_type_mode(elem_type); @@ -1405,18 +1407,16 @@ static ir_node *get_global_var_address(dbg_info *const dbgi, /** * Returns the correct base address depending on whether it is a parameter or a * normal local variable. - * - * @param ent an entity representing a variable */ static ir_node *get_local_frame(ir_entity *const ent) { ir_graph *const irg = current_ir_graph; const ir_type *const owner = get_entity_owner(ent); - if (owner == get_irg_frame_type(irg)) { - return get_irg_frame(irg); + if (owner == current_outer_frame || owner == current_outer_value_type) { + assert(current_static_link != NULL); + return current_static_link; } else { - assert(owner == get_method_value_param_type(get_entity_type(get_irg_entity(irg)))); - return get_irg_value_param_base(irg); + return get_irg_frame(irg); } } @@ -1485,17 +1485,16 @@ static ir_node *reference_expression_to_firm(const reference_expression_t *ref) return res; } - return create_symconst(dbgi, mode, entity->function.entity); + return create_symconst(dbgi, mode, entity->function.irentity); } case DECLARATION_KIND_INNER_FUNCTION: { ir_mode *const mode = get_ir_mode_storage(type); if (!entity->function.goto_to_outer && !entity->function.need_closure) { /* inner function not using the closure */ - return create_symconst(dbgi, mode, entity->function.entity); + return create_symconst(dbgi, mode, entity->function.irentity); } else { - /* TODO: need trampoline here */ - panic("Trampoline code not implemented"); - return create_symconst(dbgi, mode, entity->function.entity); + /* need trampoline here */ + return create_trampoline(dbgi, mode, entity->function.irentity); } } case DECLARATION_KIND_GLOBAL_VARIABLE: { @@ -1566,10 +1565,21 @@ static ir_node *reference_addr(const reference_expression_t *ref) case DECLARATION_KIND_FUNCTION: { type_t *const type = skip_typeref(entity->declaration.type); ir_mode *const mode = get_ir_mode_storage(type); - return create_symconst(dbgi, mode, entity->function.entity); + return create_symconst(dbgi, mode, entity->function.irentity); + } + + case DECLARATION_KIND_INNER_FUNCTION: { + type_t *const type = skip_typeref(entity->declaration.type); + ir_mode *const mode = get_ir_mode_storage(type); + if (!entity->function.goto_to_outer && !entity->function.need_closure) { + /* inner function not using the closure */ + return create_symconst(dbgi, mode, entity->function.irentity); + } else { + /* need trampoline here */ + return create_trampoline(dbgi, mode, entity->function.irentity); + } } - case DECLARATION_KIND_INNER_FUNCTION: case DECLARATION_KIND_COMPOUND_MEMBER: panic("not implemented reference type"); } @@ -1706,8 +1716,8 @@ static ir_node *process_builtin_call(const call_expression_t *call) return NULL; case bk_gnu_builtin_frame_address: { expression_t *const expression = call->arguments->expression; - long val = fold_constant(expression); - if (val == 0) { + bool val = fold_constant_to_bool(expression); + if (!val) { /* the nice case */ return get_irg_frame(current_ir_graph); } else { @@ -1722,6 +1732,7 @@ static ir_node *process_builtin_call(const call_expression_t *call) } } case bk_gnu_builtin_return_address: { + expression_t *const expression = call->arguments->expression; ir_node *in[2]; @@ -1843,28 +1854,32 @@ static ir_node *call_expression_to_firm(const call_expression_t *const call) const reference_expression_t *ref = &function->reference; entity_t *entity = ref->entity; - if (ref->entity->kind == ENTITY_FUNCTION && - ref->entity->function.btk != bk_none) { - return process_builtin_call(call); - } + if (entity->kind == ENTITY_FUNCTION) { + if (entity->function.btk != bk_none) { + return process_builtin_call(call); + } - if (entity->kind == ENTITY_FUNCTION - && entity->function.entity == rts_entities[rts_alloca]) { - /* handle alloca() call */ - expression_t *argument = call->arguments->expression; - ir_node *size = expression_to_firm(argument); - ir_mode *mode = get_ir_mode_arithmetic(type_size_t); + ir_entity *irentity = entity->function.irentity; + if (irentity == NULL) + irentity = get_function_entity(entity, NULL); - size = create_conv(dbgi, size, mode); + if (irentity == rts_entities[rts_alloca]) { + /* handle alloca() call */ + expression_t *argument = call->arguments->expression; + ir_node *size = expression_to_firm(argument); + ir_mode *mode = get_ir_mode_arithmetic(type_size_t); - ir_node *store = get_store(); - 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); + size = create_conv(dbgi, size, mode); - return res; + ir_node *store = get_store(); + 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); + + return res; + } } } ir_node *callee = expression_to_firm(function); @@ -2229,7 +2244,7 @@ static ir_node *create_incdec(const unary_expression_t *expression) ir_node *offset; if (is_type_pointer(type)) { pointer_type_t *pointer_type = &type->pointer; - offset = get_type_size(pointer_type->points_to); + offset = get_type_size_node(pointer_type->points_to); } else { assert(is_type_arithmetic(type)); offset = new_Const(get_mode_one(mode)); @@ -2435,7 +2450,7 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression) ir_node *value_node = expression_to_firm(value); if (is_type_scalar(type)) { ir_mode *mode = get_ir_mode_storage(type); - type_t *from_type = value->base.type; + type_t *from_type = skip_typeref(value->base.type); /* check for conversion from / to __based types */ if (is_type_pointer(type) && is_type_pointer(from_type)) { const variable_t *from_var = from_type->pointer.base_variable; @@ -2527,7 +2542,7 @@ static ir_node *adjust_for_pointer_arithmetic(dbg_info *dbgi, assert(is_type_pointer(type)); pointer_type_t *const pointer_type = &type->pointer; type_t *const points_to = skip_typeref(pointer_type->points_to); - ir_node * elem_size = get_type_size(points_to); + ir_node * elem_size = get_type_size_node(points_to); elem_size = create_conv(dbgi, elem_size, mode); value = create_conv(dbgi, value, mode); ir_node *const mul = new_d_Mul(dbgi, value, elem_size, mode); @@ -2557,7 +2572,7 @@ static ir_node *create_op(dbg_info *dbgi, const binary_expression_t *expression, const pointer_type_t *const ptr_type = &type_left->pointer; mode = get_ir_mode_arithmetic(expression->base.type); - ir_node *const elem_size = get_type_size(ptr_type->points_to); + ir_node *const elem_size = get_type_size_node(ptr_type->points_to); ir_node *const conv_size = new_d_Conv(dbgi, elem_size, mode); ir_node *const sub = new_d_Sub(dbgi, left, right, mode); ir_node *const no_mem = new_NoMem(); @@ -2658,22 +2673,22 @@ static ir_node *create_lazy_op(const binary_expression_t *expression) ir_mode *mode = get_ir_mode_arithmetic(type); if (is_constant_expression(expression->left)) { - long val = fold_constant(expression->left); + bool val = fold_constant_to_bool(expression->left); expression_kind_t ekind = expression->base.kind; assert(ekind == EXPR_BINARY_LOGICAL_AND || ekind == EXPR_BINARY_LOGICAL_OR); if (ekind == EXPR_BINARY_LOGICAL_AND) { - if (val == 0) { + if (!val) { return new_Const(get_mode_null(mode)); } } else { - if (val != 0) { + if (val) { return new_Const(get_mode_one(mode)); } } if (is_constant_expression(expression->right)) { - long const valr = fold_constant(expression->right); - return valr != 0 ? + bool valr = fold_constant_to_bool(expression->right); + return valr ? new_Const(get_mode_one(mode)) : new_Const(get_mode_null(mode)); } @@ -2847,7 +2862,7 @@ static long get_offsetof_offset(const offsetof_expression_t *expression) assert(designator->array_index != NULL); assert(is_type_array(type)); - long index = fold_constant(array_index); + long index = fold_constant_to_int(array_index); ir_type *arr_type = get_ir_type(type); ir_type *elem_type = get_array_element_type(arr_type); long elem_size = get_type_size_bytes(elem_type); @@ -2895,7 +2910,7 @@ static ir_node *compound_literal_to_firm( create_local_initializer(initializer, dbgi, entity, type); /* create a sel for the compound literal address */ - ir_node *frame = get_local_frame(entity); + ir_node *frame = get_irg_frame(current_ir_graph); ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, entity); return sel; } @@ -2918,7 +2933,7 @@ static ir_node *sizeof_to_firm(const typeprop_expression_t *expression) expression_to_firm(expression->tp_expression); } - return get_type_size(type); + return get_type_size_node(type); } static entity_t *get_expression_entity(const expression_t *expression) @@ -2929,59 +2944,51 @@ static entity_t *get_expression_entity(const expression_t *expression) return expression->reference.entity; } +static unsigned get_cparser_entity_alignment(const entity_t *entity) +{ + switch(entity->kind) { + DECLARATION_KIND_CASES + return entity->declaration.alignment; + case ENTITY_STRUCT: + case ENTITY_UNION: + return entity->compound.alignment; + case ENTITY_TYPEDEF: + return entity->typedefe.alignment; + default: + break; + } + return 0; +} + /** * Transform an alignof expression into Firm code. */ static ir_node *alignof_to_firm(const typeprop_expression_t *expression) { - ir_entity *irentity = NULL; + unsigned alignment = 0; const expression_t *tp_expression = expression->tp_expression; if (tp_expression != NULL) { entity_t *entity = get_expression_entity(tp_expression); - if (entity != NULL && is_declaration(entity)) { - switch (entity->declaration.kind) { - case DECLARATION_KIND_UNKNOWN: - panic("unknown entity reference found"); - case DECLARATION_KIND_COMPOUND_MEMBER: - irentity = entity->compound_member.entity; - break; - case DECLARATION_KIND_GLOBAL_VARIABLE: - case DECLARATION_KIND_LOCAL_VARIABLE_ENTITY: - irentity = entity->variable.v.entity; - break; - case DECLARATION_KIND_PARAMETER_ENTITY: - irentity = entity->parameter.v.entity; - break; - case DECLARATION_KIND_FUNCTION: - case DECLARATION_KIND_INNER_FUNCTION: - irentity = entity->function.entity; - break; - case DECLARATION_KIND_PARAMETER: - case DECLARATION_KIND_LOCAL_VARIABLE: - case DECLARATION_KIND_VARIABLE_LENGTH_ARRAY: - break; - } + if (entity != NULL) { + alignment = get_cparser_entity_alignment(entity); } } - ir_type *irtype; - if (irentity != NULL) { - irtype = get_entity_type(irentity); - } else { + if (alignment == 0) { type_t *type = expression->type; - irtype = get_ir_type(type); + alignment = get_type_alignment(type); } - ir_mode *const mode = get_ir_mode_arithmetic(expression->base.type); - symconst_symbol sym; - sym.type_p = irtype; - return new_SymConst(mode, sym, symconst_type_align); + dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + ir_mode *mode = get_ir_mode_arithmetic(expression->base.type); + tarval *tv = new_tarval_from_long(alignment, mode); + return new_d_Const(dbgi, tv); } static void init_ir_types(void); -long fold_constant(const expression_t *expression) +static tarval *fold_constant_to_tarval(const expression_t *expression) { assert(is_type_valid(skip_typeref(expression->base.type))); @@ -3002,23 +3009,40 @@ long fold_constant(const expression_t *expression) panic("couldn't fold constant"); } + constant_folding = constant_folding_old; + tarval *tv = get_Const_tarval(cnst); + return tv; +} + +long fold_constant_to_int(const expression_t *expression) +{ + if (expression->kind == EXPR_INVALID) + return 0; + + tarval *tv = fold_constant_to_tarval(expression); if (!tarval_is_long(tv)) { panic("result of constant folding is not integer"); } - constant_folding = constant_folding_old; - return get_tarval_long(tv); } +bool fold_constant_to_bool(const expression_t *expression) +{ + if (expression->kind == EXPR_INVALID) + return false; + tarval *tv = fold_constant_to_tarval(expression); + return !tarval_is_null(tv); +} + static ir_node *conditional_to_firm(const conditional_expression_t *expression) { dbg_info *const dbgi = get_dbg_info(&expression->base.source_position); /* first try to fold a constant condition */ if (is_constant_expression(expression->condition)) { - long val = fold_constant(expression->condition); + bool val = fold_constant_to_bool(expression->condition); if (val) { expression_t *true_expression = expression->true_expression; if (true_expression == NULL) @@ -3270,13 +3294,14 @@ static ir_node *va_start_expression_to_firm( ir_type *const method_type = get_ir_type(type); int const n = get_method_n_params(method_type) - 1; ir_entity *const parm_ent = get_method_value_param_ent(method_type, n); - ir_node *const arg_base = get_irg_value_param_base(current_ir_graph); + ir_node *const frame = get_irg_frame(current_ir_graph); dbg_info *const dbgi = get_dbg_info(&expr->base.source_position); ir_node *const no_mem = new_NoMem(); ir_node *const arg_sel = - new_d_simpleSel(dbgi, no_mem, arg_base, parm_ent); + new_d_simpleSel(dbgi, no_mem, frame, parm_ent); - ir_node *const cnst = get_type_size(expr->parameter->base.type); + type_t *const param_type = expr->parameter->base.type; + ir_node *const cnst = get_type_size_node(param_type); ir_mode *const mode = get_irn_mode(cnst); ir_node *const c1 = new_Const_long(mode, stack_param_align - 1); ir_node *const c2 = new_d_Add(dbgi, cnst, c1, mode); @@ -3297,7 +3322,7 @@ static ir_node *va_arg_expression_to_firm(const va_arg_expression_t *const expr) dbg_info *const dbgi = get_dbg_info(&expr->base.source_position); ir_node *const res = deref_address(dbgi, type, ap); - ir_node *const cnst = get_type_size(expr->base.type); + ir_node *const cnst = get_type_size_node(expr->base.type); ir_mode *const mode = get_irn_mode(cnst); ir_node *const c1 = new_Const_long(mode, stack_param_align - 1); ir_node *const c2 = new_d_Add(dbgi, cnst, c1, mode); @@ -3618,10 +3643,10 @@ static ir_node *create_condition_evaluation(const expression_t *expression, if (is_builtin_expect(expression) && is_Cond(cond)) { call_argument_t *argument = expression->call.arguments->next; if (is_constant_expression(argument->expression)) { - long cnst = fold_constant(argument->expression); + bool cnst = fold_constant_to_bool(argument->expression); cond_jmp_predicate pred; - if (cnst == 0) { + if (cnst == false) { pred = COND_JMP_PRED_FALSE; } else { pred = COND_JMP_PRED_TRUE; @@ -3637,22 +3662,22 @@ static ir_node *create_condition_evaluation(const expression_t *expression, return cond_expr; } - static void create_variable_entity(entity_t *variable, declaration_kind_t declaration_kind, ir_type *parent_type) { assert(variable->kind == ENTITY_VARIABLE); type_t *type = skip_typeref(variable->declaration.type); - type = get_aligned_type(type, variable->variable.alignment); - ident *const id = new_id_from_str(variable->base.symbol->string); - ir_type *const irtype = get_ir_type(type); - dbg_info *const dbgi = get_dbg_info(&variable->base.source_position); + ident *const id = new_id_from_str(variable->base.symbol->string); + ir_type *const irtype = get_ir_type(type); + dbg_info *const dbgi = get_dbg_info(&variable->base.source_position); + ir_entity *const irentity = new_d_entity(parent_type, id, irtype, dbgi); + unsigned alignment = variable->declaration.alignment; - ir_entity *const irentity = new_d_entity(parent_type, id, irtype, dbgi); + set_entity_alignment(irentity, alignment); - handle_gnu_attributes_ent(irentity, variable); + handle_decl_modifiers(irentity, variable); variable->declaration.kind = (unsigned char) declaration_kind; variable->variable.v.entity = irentity; @@ -3844,7 +3869,7 @@ static void walk_designator(type_path_t *path, const designator_t *designator) assert(designator->array_index != NULL); assert(is_type_array(type)); - long index = fold_constant(array_index); + long index = fold_constant_to_int(array_index); assert(index >= 0); #ifndef NDEBUG if (type->array.size_constant) { @@ -4225,7 +4250,7 @@ static void create_dynamic_initializer_sub(ir_initializer_t *initializer, static void create_dynamic_initializer(ir_initializer_t *initializer, dbg_info *dbgi, ir_entity *entity) { - ir_node *frame = get_local_frame(entity); + ir_node *frame = get_irg_frame(current_ir_graph); ir_node *base_addr = new_d_simpleSel(dbgi, new_NoMem(), frame, entity); ir_type *type = get_entity_type(entity); @@ -4294,7 +4319,6 @@ static void create_initializer_local_variable_entity(entity_t *entity) ir_entity *irentity = entity->variable.v.entity; type_t *type = entity->declaration.type; - type = get_aligned_type(type, entity->variable.alignment); create_local_initializer(initializer, dbgi, irentity, type); } @@ -4380,7 +4404,7 @@ static void allocate_variable_length_array(entity_t *entity) ir_type *el_type = get_ir_type(type->array.element_type); /* make sure size_node is calculated */ - get_type_size(type); + get_type_size_node(type); ir_node *elems = type->array.size_node; ir_node *mem = get_store(); ir_node *alloc = new_d_Alloc(dbgi, mem, elems, el_type, stack_alloc); @@ -4433,13 +4457,11 @@ static void create_local_static_variable(entity_t *entity) assert(entity->kind == ENTITY_VARIABLE); assert(entity->declaration.kind == DECLARATION_KIND_UNKNOWN); - type_t *type = skip_typeref(entity->declaration.type); - type = get_aligned_type(type, entity->variable.alignment); - - ir_type *const var_type = entity->variable.thread_local ? + type_t *type = skip_typeref(entity->declaration.type); + ir_type *const var_type = entity->variable.thread_local ? get_tls_type() : get_glob_type(); - ir_type *const irtype = get_ir_type(type); - dbg_info *const dbgi = get_dbg_info(&entity->base.source_position); + ir_type *const irtype = get_ir_type(type); + dbg_info *const dbgi = get_dbg_info(&entity->base.source_position); size_t l = strlen(entity->base.symbol->string); char buf[l + sizeof(".%u")]; @@ -4593,7 +4615,7 @@ static void create_local_declaration(entity_t *entity) case STORAGE_CLASS_EXTERN: if (entity->kind == ENTITY_FUNCTION) { assert(entity->function.statement == NULL); - get_function_entity(entity); + (void)get_function_entity(entity, NULL); } else { create_global_variable(entity); create_variable_initializer(entity); @@ -4604,11 +4626,12 @@ static void create_local_declaration(entity_t *entity) case STORAGE_CLASS_REGISTER: if (entity->kind == ENTITY_FUNCTION) { if (entity->function.statement != NULL) { - get_function_entity(entity); + ir_type *owner = get_irg_frame_type(current_ir_graph); + (void)get_function_entity(entity, owner); entity->declaration.kind = DECLARATION_KIND_INNER_FUNCTION; enqueue_inner_function(entity); } else { - get_function_entity(entity); + (void)get_function_entity(entity, NULL); } } else { create_local_variable(entity); @@ -4625,6 +4648,11 @@ static void initialize_local_declaration(entity_t *entity) if (entity->base.symbol == NULL) return; + // no need to emit code in dead blocks + if (entity->declaration.storage_class != STORAGE_CLASS_STATIC + && get_cur_block() == NULL) + return; + switch ((declaration_kind_t) entity->declaration.kind) { case DECLARATION_KIND_LOCAL_VARIABLE: case DECLARATION_KIND_LOCAL_VARIABLE_ENTITY: @@ -4662,6 +4690,9 @@ static void declaration_statement_to_firm(declaration_statement_t *statement) if (is_declaration(entity)) { initialize_local_declaration(entity); } else if (entity->kind == ENTITY_TYPEDEF) { + /* §6.7.7:3 Any array size expressions associated with variable length + * array declarators are evaluated each time the declaration of the + * typedef name is reached in the order of execution. */ type_t *const type = skip_typeref(entity->typedefe.type); if (is_type_array(type) && type->array.is_vla) get_vla_size(&type->array); @@ -4768,7 +4799,7 @@ static void while_statement_to_firm(while_statement_t *statement) /* shortcut for while(true) */ if (is_constant_expression(statement->condition) - && fold_constant(statement->condition) != 0) { + && fold_constant_to_bool(statement->condition) != 0) { set_cur_block(header_block); ir_node *header_jmp = new_Jmp(); add_immBlock_pred(body_block, header_jmp); @@ -4996,7 +5027,7 @@ static void switch_statement_to_firm(switch_statement_t *statement) } if (def_nr == INT_MAX) { - /* Bad: an overflow will occurr, we cannot be sure that the + /* Bad: an overflow will occur, we cannot be sure that the * maximum + 1 is a free number. Scan the values a second * time to find a free number. */ @@ -5018,8 +5049,8 @@ static void switch_statement_to_firm(switch_statement_t *statement) } } /* 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 + * Either they are dense, so we took the last (num_cases) + * one, or they are not dense, so we will find one free * there... */ unsigned long i; @@ -5083,7 +5114,7 @@ static void case_label_to_firm(const case_label_statement_t *statement) do { proj = new_d_Proj(dbgi, current_switch_cond, mode_X, pn); add_immBlock_pred(block, proj); - } while(pn++ < end_pn); + } while (pn++ < end_pn); } else { saw_default_label = true; proj = new_d_defaultProj(dbgi, current_switch_cond, @@ -5512,19 +5543,25 @@ static void count_local_variables_in_stmt(statement_t *stmt, void *const env) } } +/** + * Return the number of local (alias free) variables used by a function. + */ static int get_function_n_local_vars(entity_t *entity) { + const function_t *function = &entity->function; int count = 0; /* count parameters */ - count += count_local_variables(entity->function.parameters.entities, NULL); + count += count_local_variables(function->parameters.entities, NULL); /* count local variables declared in body */ - walk_statements(entity->function.statement, count_local_variables_in_stmt, - &count); + walk_statements(function->statement, count_local_variables_in_stmt, &count); return count; } +/** + * Build Firm code for the parameters of a function. + */ static void initialize_function_parameters(entity_t *entity) { assert(entity->kind == ENTITY_FUNCTION); @@ -5532,6 +5569,13 @@ static void initialize_function_parameters(entity_t *entity) ir_node *args = get_irg_args(irg); ir_node *start_block = get_irg_start_block(irg); ir_type *function_irtype = get_ir_type(entity->declaration.type); + int first_param_nr = 0; + + if (entity->function.need_closure) { + /* add an extra parameter for the static link */ + entity->function.static_link = new_r_Proj(irg, start_block, args, mode_P_data, 0); + ++first_param_nr; + } int n = 0; entity_t *parameter = entity->function.parameters.entities; @@ -5562,7 +5606,7 @@ static void initialize_function_parameters(entity_t *entity) ir_type *param_irtype = get_method_param_type(function_irtype, n); ir_mode *param_mode = get_type_mode(param_irtype); - long pn = n; + long pn = n + first_param_nr; ir_node *value = new_r_Proj(irg, start_block, args, param_mode, pn); ir_mode *mode = get_ir_mode_storage(type); @@ -5585,7 +5629,8 @@ 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, decl_modifiers_t decl_modifiers) +static void handle_decl_modifier_irg(ir_graph_ptr irg, + decl_modifiers_t decl_modifiers) { if (decl_modifiers & DM_RETURNS_TWICE) { /* TRUE if the declaration includes __attribute__((returns_twice)) */ @@ -5648,16 +5693,25 @@ static void gen_ijmp_branches(ir_node *block) } /** - * Create code for a function. + * Create code for a function and all inner functions. + * + * @param entity the function entity */ static void create_function(entity_t *entity) { assert(entity->kind == ENTITY_FUNCTION); - ir_entity *function_entity = get_function_entity(entity); + ir_entity *function_entity = get_function_entity(entity, current_outer_frame); if (entity->function.statement == NULL) return; + if (is_main(entity) && firm_opt.os_support == OS_SUPPORT_MINGW) { + prepare_main_collect2(entity); + } + + inner_functions = NULL; + current_trampolines = NULL; + if (entity->declaration.modifiers & DM_CONSTRUCTOR) { ir_type *segment = get_segment_type(IR_SEGMENT_CONSTRUCTORS); add_function_pointer(segment, function_entity, "constructor_ptr.%u"); @@ -5694,6 +5748,7 @@ static void create_function(entity_t *entity) next_value_number_function = 0; initialize_function_parameters(entity); + current_static_link = entity->function.static_link; statement_to_firm(entity->function.statement); @@ -5786,11 +5841,25 @@ static void create_function(entity_t *entity) irg_vrfy(irg); current_function = old_current_function; - /* create inner functions */ - entity_t *inner; - for (inner = next_inner_function(); inner != NULL; - inner = next_inner_function()) { - create_function(inner); + if (current_trampolines != NULL) { + DEL_ARR_F(current_trampolines); + current_trampolines = NULL; + } + + /* create inner functions if any */ + entity_t **inner = inner_functions; + if (inner != NULL) { + ir_type *rem_outer_frame = current_outer_frame; + current_outer_frame = get_irg_frame_type(current_ir_graph); + ir_type *rem_outer_value_type = current_outer_value_type; + current_outer_value_type = get_irg_value_param_type(current_ir_graph); + for (int i = ARR_LEN(inner) - 1; i >= 0; --i) { + create_function(inner[i]); + } + DEL_ARR_F(inner); + + current_outer_value_type = rem_outer_value_type; + current_outer_frame = rem_outer_frame; } } @@ -5807,7 +5876,7 @@ static void scope_to_firm(scope_t *scope) /* builtins have no representation */ continue; } - get_function_entity(entity); + (void)get_function_entity(entity, NULL); } else if (entity->kind == ENTITY_VARIABLE) { create_global_variable(entity); } @@ -5870,14 +5939,15 @@ static void init_ir_types(void) ir_types_initialized = 1; ir_type_int = get_ir_type(type_int); + ir_type_char = get_ir_type(type_char); ir_type_const_char = get_ir_type(type_const_char); ir_type_wchar_t = get_ir_type(type_wchar_t); ir_type_void = get_ir_type(type_void); - const backend_params *be_params = be_get_backend_param(); + be_params = be_get_backend_param(); mode_float_arithmetic = be_params->mode_float_arithmetic; - stack_param_align = be_params->stack_param_align; + stack_param_align = be_params->stack_param_align; } void exit_ast2firm(void) @@ -5912,14 +5982,10 @@ void translation_unit_to_firm(translation_unit_t *unit) current_translation_unit = unit; init_ir_types(); - inner_functions = NEW_ARR_F(entity_t *, 0); scope_to_firm(&unit->scope); global_asm_to_firm(unit->global_asm); - DEL_ARR_F(inner_functions); - inner_functions = NULL; - current_ir_graph = NULL; current_translation_unit = NULL; }