X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast2firm.c;h=82914bde11cff044c88a38e650e6afb2afada2af;hb=0a499089dd2383e73ae8364c8eae82c068ba980b;hp=ffddd487db7ca07792a95f417f9793e81fb529af;hpb=f4ba96ac16e62370ded3eb1ee80f4ee39cdddbaa;p=cparser diff --git a/ast2firm.c b/ast2firm.c index ffddd48..82914bd 100644 --- a/ast2firm.c +++ b/ast2firm.c @@ -43,6 +43,10 @@ #define MAGIC_DEFAULT_PN_NUMBER (long) -314159265 +/* some idents needed for name mangling */ +static ident *id_underscore; +static ident *id_imp; + static ir_type *ir_type_const_char; static ir_type *ir_type_wchar_t; static ir_type *ir_type_void; @@ -72,10 +76,13 @@ typedef enum declaration_kind_t { DECLARATION_KIND_LOCAL_VARIABLE_ENTITY, DECLARATION_KIND_COMPOUND_MEMBER, DECLARATION_KIND_LABEL_BLOCK, - DECLARATION_KIND_ENUM_ENTRY + DECLARATION_KIND_ENUM_ENTRY, + DECLARATION_KIND_COMPOUND_TYPE_INCOMPLETE, + DECLARATION_KIND_COMPOUND_TYPE_COMPLETE } declaration_kind_t; static ir_type *get_ir_type(type_t *type); +static ir_type *get_ir_type_incomplete(type_t *type); static int count_decls_in_stmts(const statement_t *stmt); ir_node *uninitialized_local_var(ir_graph *irg, ir_mode *mode, int pos) @@ -112,17 +119,6 @@ static dbg_info *get_dbg_info(const source_position_t *pos) return (dbg_info*) pos; } -static unsigned unique_id = 0; - -static ident *unique_ident(const char *tag) -{ - char buf[256]; - - snprintf(buf, sizeof(buf), "%s.%u", tag, unique_id); - unique_id++; - return new_id_from_str(buf); -} - static ir_mode *_atomic_modes[ATOMIC_TYPE_LAST+1]; static ir_mode *mode_int, *mode_uint; @@ -311,6 +307,9 @@ static ir_type *create_complex_type(const complex_type_t *type) ir_mode *mode = _atomic_modes[kind]; ident *id = get_mode_ident(mode); + (void) id; + (void) dbgi; + /* FIXME: finish the array */ return NULL; } @@ -335,7 +334,7 @@ static ir_type *create_method_type(const function_type_t *function_type) { type_t *return_type = function_type->return_type; - ident *id = unique_ident("functiontype"); + ident *id = id_unique("functiontype.%u"); int n_parameters = count_parameters(function_type); int n_results = return_type == type_void ? 0 : 1; dbg_info *dbgi = get_dbg_info(&function_type->base.source_position); @@ -363,19 +362,11 @@ static ir_type *create_method_type(const function_type_t *function_type) static ir_type *create_pointer_type(pointer_type_t *type) { - type_t *points_to = type->points_to; - ir_type *ir_points_to; - /* Avoid endless recursion if the points_to type contains this poiner type - * again (might be a struct). We therefore first create a void* pointer - * and then set the real points_to type - */ - dbg_info *dbgi = get_dbg_info(&type->base.source_position); - ir_type *ir_type = new_d_type_pointer(unique_ident("pointer"), - ir_type_void, mode_P_data, dbgi); - type->base.firm_type = ir_type; - - ir_points_to = get_ir_type(points_to); - set_pointer_points_to_type(ir_type, ir_points_to); + type_t *points_to = type->points_to; + ir_type *ir_points_to = get_ir_type_incomplete(points_to); + dbg_info *dbgi = get_dbg_info(&type->base.source_position); + ir_type *ir_type = new_d_type_pointer(id_unique("pointer.%u"), + ir_points_to, mode_P_data, dbgi); return ir_type; } @@ -385,7 +376,7 @@ static ir_type *create_array_type(array_type_t *type) type_t *element_type = type->element_type; ir_type *ir_element_type = get_ir_type(element_type); - ident *id = unique_ident("array"); + ident *id = id_unique("array.%u"); dbg_info *dbgi = get_dbg_info(&type->base.source_position); ir_type *ir_type = new_d_type_array(id, 1, ir_element_type, dbgi); @@ -499,63 +490,96 @@ static ir_type *create_bitfield_type(bitfield_type_t *const type) #define INVALID_TYPE ((ir_type_ptr)-1) -static ir_type *create_union_type(compound_type_t *type, ir_type *irtype, - size_t *outer_offset, size_t *outer_align); +enum { + COMPOUND_IS_STRUCT = false, + COMPOUND_IS_UNION = true +}; -static ir_type *create_struct_type(compound_type_t *type, ir_type *irtype, - size_t *outer_offset, size_t *outer_align) +/** + * Construct firm type from ast struct tyep. + * + * 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, + bool incomplete, bool is_union) { - declaration_t *declaration = type->declaration; - if(declaration->v.irtype != NULL) { + declaration_t *declaration = type->declaration; + declaration_kind_t kind = declaration->declaration_kind; + + if(kind == DECLARATION_KIND_COMPOUND_TYPE_COMPLETE + || (kind == DECLARATION_KIND_COMPOUND_TYPE_INCOMPLETE + && incomplete)) return declaration->v.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 = declaration->symbol; ident *id; if(symbol != NULL) { - id = unique_ident(symbol->string); + id = new_id_from_str(symbol->string); } else { - id = unique_ident("__anonymous_struct"); + if (is_union) { + id = id_unique("__anonymous_union.%u"); + } else { + id = id_unique("__anonymous_struct.%u"); + } } dbg_info *dbgi = get_dbg_info(&type->base.source_position); - irtype = new_d_type_struct(id, dbgi); + if (is_union) { + irtype = new_d_type_union(id, dbgi); + } else { + irtype = new_d_type_struct(id, dbgi); + } - declaration->v.irtype = irtype; - type->base.firm_type = irtype; + declaration->declaration_kind + = DECLARATION_KIND_COMPOUND_TYPE_INCOMPLETE; + declaration->v.irtype = irtype; + //type->base.firm_type = irtype; } else { offset = *outer_offset; align_all = *outer_align; } + if(incomplete) + return irtype; + + declaration->declaration_kind = DECLARATION_KIND_COMPOUND_TYPE_COMPLETE; + declaration_t *entry = declaration->scope.declarations; for( ; entry != NULL; entry = entry->next) { if(entry->namespc != NAMESPACE_NORMAL) continue; + size_t prev_offset = offset; + symbol_t *symbol = entry->symbol; type_t *entry_type = skip_typeref(entry->type); dbg_info *dbgi = get_dbg_info(&entry->source_position); + ident *ident; if(symbol != NULL) { ident = new_id_from_str(symbol->string); } else { if(entry_type->kind == TYPE_COMPOUND_STRUCT) { - create_struct_type(&entry_type->compound, irtype, &offset, - &align_all); - continue; + 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_union_type(&entry_type->compound, irtype, &offset, - &align_all); - continue; + create_compound_type(&entry_type->compound, irtype, &offset, + &align_all, false, COMPOUND_IS_UNION); + goto finished_member; } else { assert(entry_type->kind == TYPE_BITFIELD); } - ident = unique_ident("anon"); + ident = id_unique("anon.%u"); } ir_type *base_irtype; @@ -617,122 +641,35 @@ static ir_type *create_struct_type(compound_type_t *type, ir_type *irtype, entry->declaration_kind = DECLARATION_KIND_COMPOUND_MEMBER; assert(entry->v.entity == NULL); entry->v.entity = entity; - } - - size_t misalign = offset % align_all; - if(misalign > 0 || bit_offset > 0) { - offset += align_all - misalign; - } - - if(outer_offset != NULL) { - *outer_offset = offset; - *outer_align = align_all; - } else { - set_type_alignment_bytes(irtype, align_all); - set_type_size_bytes(irtype, offset); - set_type_state(irtype, layout_fixed); - } - return irtype; -} - -static ir_type *create_union_type(compound_type_t *type, ir_type *irtype, - size_t *outer_offset, size_t *outer_align) -{ - declaration_t *declaration = type->declaration; - if(declaration->v.irtype != NULL) { - return declaration->v.irtype; - } - - size_t align_all = 1; - size_t offset = 0; - size_t size = 0; - - if(irtype == NULL) { - symbol_t *symbol = declaration->symbol; - ident *id; - if(symbol != NULL) { - id = unique_ident(symbol->string); - } else { - id = unique_ident("__anonymous_union"); - } - dbg_info *dbgi = get_dbg_info(&type->base.source_position); - - irtype = new_d_type_union(id, dbgi); - - declaration->v.irtype = irtype; - type->base.firm_type = irtype; - } else { - offset = *outer_offset; - align_all = *outer_align; - } - - type->base.firm_type = irtype; - - declaration_t *entry = declaration->scope.declarations; - for( ; entry != NULL; entry = entry->next) { - if(entry->namespc != NAMESPACE_NORMAL) - continue; - - symbol_t *symbol = entry->symbol; - type_t *entry_type = skip_typeref(entry->type); - ir_type *entry_ir_type = get_ir_type(entry_type); - - ident *ident; - if(symbol != NULL) { - ident = new_id_from_str(entry->symbol->string); - } else { - size_t offs = offset; - if(entry_type->kind == TYPE_COMPOUND_STRUCT) { - create_struct_type(&entry_type->compound, irtype, &offs, - &align_all); - continue; - } else if(entry_type->kind == TYPE_COMPOUND_UNION) { - create_union_type(&entry_type->compound, irtype, &offs, - &align_all); - continue; - } else { - panic("anonymous union member must be struct or union"); - } - size_t entry_size = offs - offset; - if(entry_size > size) { +finished_member: + if (is_union) { + size_t entry_size = offset - prev_offset; + if (entry_size > size) { size = entry_size; } - ident = unique_ident("anon"); + offset = 0; + bit_offset = 0; } + } - size_t entry_size = get_type_size_bytes(entry_ir_type); - size_t entry_alignment = get_type_alignment_bytes(entry_ir_type); - - dbg_info *const dbgi = get_dbg_info(&entry->source_position); - ir_entity *const entity = new_d_entity(irtype, ident, entry_ir_type, - dbgi); - //add_union_member(irtype, entity); - set_entity_offset(entity, 0); - entry->declaration_kind = DECLARATION_KIND_COMPOUND_MEMBER; - assert(entry->v.entity == NULL); - entry->v.entity = entity; + if (!is_union) { + size = offset; + } - if(entry_size > size) { - size = entry_size; - } - if(entry_alignment > align_all) { - if(entry_alignment % align_all != 0) { - panic("Uneven alignments not supported yet"); - } - align_all = entry_alignment; - } + size_t misalign = offset % align_all; + if(misalign > 0 || bit_offset > 0) { + size += align_all - misalign; } if(outer_offset != NULL) { - assert(*outer_offset == offset); - - size_t misalign = offset % align_all; - if (misalign != 0) - size += align_all - misalign; - *outer_offset += size; + if (!is_union) { + *outer_offset = offset; + } else { + *outer_offset += size; + } - if(align_all > *outer_align) { + if (align_all > *outer_align) { if(align_all % *outer_align != 0) { panic("uneven alignments not supported yet"); } @@ -742,7 +679,6 @@ static ir_type *create_union_type(compound_type_t *type, ir_type *irtype, set_type_alignment_bytes(irtype, align_all); set_type_size_bytes(irtype, size); set_type_state(irtype, layout_fixed); - declaration->v.irtype = irtype; } return irtype; @@ -778,19 +714,42 @@ static ir_type *create_enum_type(enum_type_t *const type) return ir_type_int; } +static ir_type *get_ir_type_incomplete(type_t *type) +{ + assert(type != NULL); + type = skip_typeref(type); + + if (type->base.firm_type != NULL) { + assert(type->base.firm_type != INVALID_TYPE); + return type->base.firm_type; + } + + switch (type->kind) { + case TYPE_COMPOUND_STRUCT: + return create_compound_type(&type->compound, NULL, NULL, NULL, + true, COMPOUND_IS_STRUCT); + break; + case TYPE_COMPOUND_UNION: + return create_compound_type(&type->compound, NULL, NULL, NULL, + true, COMPOUND_IS_UNION); + default: + return get_ir_type(type); + } +} + static ir_type *get_ir_type(type_t *type) { assert(type != NULL); type = skip_typeref(type); - if(type->base.firm_type != NULL) { + if (type->base.firm_type != NULL) { assert(type->base.firm_type != INVALID_TYPE); return type->base.firm_type; } ir_type *firm_type = NULL; - switch(type->kind) { + switch (type->kind) { case TYPE_ERROR: panic("error type occurred"); case TYPE_ATOMIC: @@ -812,10 +771,12 @@ static ir_type *get_ir_type(type_t *type) firm_type = create_array_type(&type->array); break; case TYPE_COMPOUND_STRUCT: - firm_type = create_struct_type(&type->compound, NULL, NULL, NULL); + firm_type = create_compound_type(&type->compound, NULL, NULL, NULL, + false, COMPOUND_IS_STRUCT); break; case TYPE_COMPOUND_UNION: - firm_type = create_union_type(&type->compound, NULL, NULL, NULL); + firm_type = create_compound_type(&type->compound, NULL, NULL, NULL, + false, COMPOUND_IS_UNION); break; case TYPE_ENUM: firm_type = create_enum_type(&type->enumt); @@ -939,44 +900,58 @@ static const struct { /** * Mangles an entity linker (ld) name for win32 usage. * - * @param ent the entity to be mangled - * @param decl_modifiers the set of modifiers for this entity + * @param ent the entity to be mangled + * @param declaration the declaration */ -static ir_ident_ptr decorate_win32(ir_entity_ptr ent, decl_modifiers_t decl_modifiers) { - ir_ident_ptr id; +static ident *create_ld_ident_win32(ir_entity *ent, declaration_t *declaration) +{ + ident *id; if (is_Method_type(get_entity_type(ent))) id = decorate_win32_c_fkt(ent, get_entity_ident(ent)); else { /* always add an underscore in win32 */ - id = mangle(new_id_from_chars("_", 1), get_entity_ident(ent)); + id = mangle(id_underscore, get_entity_ident(ent)); } + decl_modifiers_t decl_modifiers = declaration->decl_modifiers; if (decl_modifiers & DM_DLLIMPORT) { /* add prefix for imported symbols */ - id = mangle(new_id_from_chars("__imp_", 6), id); + id = mangle(id_imp, id); } return id; } /** - * Mangles an entity linker (ld) name from a declaration. + * Mangles an entity linker (ld) name for Linux ELF usage. * - * @param ent the entity to be mangled - * @param declaration the declaration + * @param ent the entity to be mangled + * @param declaration the declaration */ -static void mangle_ent_from_decl(ir_entity *ent, declaration_t *declaration) +static ident *create_ld_ident_linux_elf(ir_entity *entity, + declaration_t *declaration) { - ident *id; - - if (firm_opt.os_support == OS_SUPPORT_MINGW) - id = decorate_win32(ent, declaration->decl_modifiers); - else - id = get_entity_ident(ent); + (void) declaration; + return get_entity_ident(entity); +} - set_entity_ld_ident(ent, id); +/** + * Mangles an entity linker (ld) name for Mach-O usage. + * + * @param ent the entity to be mangled + * @param declaration the declaration + */ +static ident *create_ld_ident_macho(ir_entity *ent, declaration_t *declaration) +{ + (void) declaration; + ident *id = mangle(id_underscore, get_entity_ident(ent)); + return id; } +typedef ident* (*create_ld_ident_func)(ir_entity *entity, + declaration_t *declaration); +create_ld_ident_func create_ld_ident = create_ld_ident_linux_elf; + static ir_entity* get_function_entity(declaration_t *declaration) { if(declaration->declaration_kind == DECLARATION_KIND_FUNCTION) @@ -992,7 +967,7 @@ static ir_entity* get_function_entity(declaration_t *declaration) dbg_info *const dbgi = get_dbg_info(&declaration->source_position); ir_entity *const entity = new_d_entity(global_type, id, ir_type_method, dbgi); - mangle_ent_from_decl(entity, declaration); + set_entity_ld_ident(entity, create_ld_ident(entity, declaration)); if(declaration->storage_class == STORAGE_CLASS_STATIC || declaration->is_inline) { set_entity_visibility(entity, visibility_local); @@ -1087,7 +1062,7 @@ static ir_node *wide_character_constant_to_firm(const const_expression_t *cnst) } static ir_node *create_symconst(dbg_info *dbgi, ir_mode *mode, - ir_entity *entity) + ir_entity *entity) { assert(entity != NULL); union symconst_symbol sym; @@ -1101,10 +1076,10 @@ static ir_node *string_to_firm(const source_position_t *const src_pos, { ir_type *const global_type = get_glob_type(); dbg_info *const dbgi = get_dbg_info(src_pos); - ir_type *const type = new_d_type_array(unique_ident("strtype"), 1, + ir_type *const type = new_d_type_array(id_unique("strtype.%u"), 1, ir_type_const_char, dbgi); - ident *const id = unique_ident(id_prefix); + ident *const id = id_unique(id_prefix); ir_entity *const entity = new_d_entity(global_type, id, type, dbgi); set_entity_ld_ident(entity, id); set_entity_variability(entity, variability_constant); @@ -1135,7 +1110,7 @@ static ir_node *string_to_firm(const source_position_t *const src_pos, static ir_node *string_literal_to_firm( const string_literal_expression_t* literal) { - return string_to_firm(&literal->base.source_position, "Lstr", + return string_to_firm(&literal->base.source_position, "Lstr.%u", &literal->value); } @@ -1145,10 +1120,10 @@ static ir_node *wide_string_literal_to_firm( ir_type *const global_type = get_glob_type(); ir_type *const elem_type = ir_type_wchar_t; dbg_info *const dbgi = get_dbg_info(&literal->base.source_position); - ir_type *const type = new_d_type_array(unique_ident("strtype"), 1, + ir_type *const type = new_d_type_array(id_unique("strtype.%u"), 1, elem_type, dbgi); - ident *const id = unique_ident("Lstr"); + ident *const id = id_unique("Lstr.%u"); ir_entity *const entity = new_d_entity(global_type, id, type, dbgi); set_entity_ld_ident(entity, id); set_entity_variability(entity, variability_constant); @@ -1295,6 +1270,8 @@ static ir_node *reference_expression_to_firm(const reference_expression_t *ref) case DECLARATION_KIND_VARIABLE_LENGTH_ARRAY: return declaration->v.vla_base; + case DECLARATION_KIND_COMPOUND_TYPE_INCOMPLETE: + case DECLARATION_KIND_COMPOUND_TYPE_COMPLETE: case DECLARATION_KIND_COMPOUND_MEMBER: case DECLARATION_KIND_LABEL_BLOCK: panic("not implemented reference type"); @@ -1336,6 +1313,8 @@ static ir_node *reference_addr(const reference_expression_t *ref) case DECLARATION_KIND_ENUM_ENTRY: panic("trying to reference enum entry"); + case DECLARATION_KIND_COMPOUND_TYPE_INCOMPLETE: + case DECLARATION_KIND_COMPOUND_TYPE_COMPLETE: case DECLARATION_KIND_COMPOUND_MEMBER: case DECLARATION_KIND_LABEL_BLOCK: panic("not implemented reference type"); @@ -1423,12 +1402,14 @@ static ir_node *call_expression_to_firm(const call_expression_t *call) * arguments... */ int n_res = get_method_n_ress(ir_method_type); dbg_info *dbgi = get_dbg_info(&call->base.source_position); - new_method_type = new_d_type_method(unique_ident("calltype"), + new_method_type = new_d_type_method(id_unique("calltype.%u"), n_parameters, n_res, dbgi); set_method_calling_convention(new_method_type, get_method_calling_convention(ir_method_type)); set_method_additional_properties(new_method_type, get_method_additional_properties(ir_method_type)); + set_method_variadicity(new_method_type, + get_method_variadicity(ir_method_type)); for(int i = 0; i < n_res; ++i) { set_method_res_type(new_method_type, i, @@ -2369,7 +2350,7 @@ static ir_node *compound_literal_to_firm( /* create an entity on the stack */ ir_type *frame_type = get_irg_frame_type(current_ir_graph); - ident *const id = unique_ident("CompLit"); + ident *const id = id_unique("CompLit.%u"); ir_type *const irtype = get_ir_type(type); dbg_info *const dbgi = get_dbg_info(&expression->base.source_position); ir_entity *const entity = new_d_entity(frame_type, id, irtype, dbgi); @@ -2517,6 +2498,13 @@ static ir_node *select_addr(const select_expression_t *expression) ir_node *compound_addr = expression_to_firm(expression->compound); + /* make sure the type is constructed */ + type_t *type = skip_typeref(expression->compound->base.type); + if (is_type_pointer(type)) { + type = type->pointer.points_to; + } + (void) get_ir_type(type); + declaration_t *entry = expression->compound_entry; assert(entry->declaration_kind == DECLARATION_KIND_COMPOUND_MEMBER); ir_entity *entity = entry->v.entity; @@ -2648,7 +2636,7 @@ static ir_node *function_name_to_firm( const source_position_t *const src_pos = &expr->base.source_position; const char *const name = current_function_decl->symbol->string; const string_t string = { name, strlen(name) + 1 }; - current_function_name = string_to_firm(src_pos, "__func__", &string); + current_function_name = string_to_firm(src_pos, "__func__.%u", &string); } return current_function_name; case FUNCNAME_FUNCSIG: @@ -2657,7 +2645,7 @@ static ir_node *function_name_to_firm( ir_entity *ent = get_irg_entity(current_ir_graph); const char *const name = get_entity_ld_name(ent); const string_t string = { name, strlen(name) + 1 }; - current_funcsig = string_to_firm(src_pos, "__FUNCSIG__", &string); + current_funcsig = string_to_firm(src_pos, "__FUNCSIG__.%u", &string); } return current_funcsig; } @@ -2926,11 +2914,11 @@ static void create_declaration_entity(declaration_t *declaration, ir_type *const irtype = get_ir_type(type); dbg_info *const dbgi = get_dbg_info(&declaration->source_position); ir_entity *const entity = new_d_entity(parent_type, id, irtype, dbgi); - mangle_ent_from_decl(entity, declaration); declaration->declaration_kind = (unsigned char) declaration_kind; declaration->v.entity = entity; set_entity_variability(entity, variability_uninitialized); + set_entity_ld_ident(entity, create_ld_ident(entity, declaration)); if(parent_type == get_tls_type()) set_entity_allocation(entity, allocation_automatic); else if(declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE) @@ -3189,6 +3177,9 @@ static ir_initializer_t *create_ir_initializer( static ir_initializer_t *create_ir_initializer_value( const initializer_value_t *initializer) { + if (is_type_compound(initializer->value->base.type)) { + panic("initializer creation for compounds not implemented yet"); + } ir_node *value = expression_to_firm(initializer->value); return create_initializer_const(value); } @@ -3262,7 +3253,7 @@ static ir_initializer_t *create_ir_initializer_string( if(i < string_len) c = string[i]; - tarval *tv = new_tarval_from_long(string[i], mode); + tarval *tv = new_tarval_from_long(c, mode); ir_initializer_t *char_initializer = create_initializer_tarval(tv); set_initializer_compound_value(irinitializer, i, char_initializer); @@ -3287,7 +3278,7 @@ static ir_initializer_t *create_ir_initializer_wide_string( if(i < string_len) { c = string[i]; } - tarval *tv = new_tarval_from_long(string[i], mode); + tarval *tv = new_tarval_from_long(c, mode); ir_initializer_t *char_initializer = create_initializer_tarval(tv); set_initializer_compound_value(irinitializer, i, char_initializer); @@ -3320,27 +3311,9 @@ static ir_initializer_t *create_ir_initializer( } static void create_dynamic_null_initializer(ir_type *type, dbg_info *dbgi, - ir_node *base_addr) -{ - ir_mode *mode = get_type_mode(type); - tarval *zero = get_mode_null(mode); - ir_node *cnst = new_d_Const(dbgi, mode, zero); - - /* TODO: bitfields */ - ir_node *mem = get_store(); - ir_node *store = new_d_Store(dbgi, mem, base_addr, cnst); - ir_node *proj_m = new_Proj(store, mode_M, pn_Store_M); - set_store(proj_m); -} - -static void create_dynamic_initializer_sub(ir_initializer_t *initializer, - ir_type *type, dbg_info *dbgi, ir_node *base_addr) + ir_node *base_addr) { - switch(get_initializer_kind(initializer)) { - case IR_INITIALIZER_NULL: { - /* TODO: implement this for compound types... */ - assert(type != NULL); - + if (is_atomic_type(type)) { ir_mode *mode = get_type_mode(type); tarval *zero = get_mode_null(mode); ir_node *cnst = new_d_Const(dbgi, mode, zero); @@ -3350,6 +3323,45 @@ static void create_dynamic_initializer_sub(ir_initializer_t *initializer, ir_node *store = new_d_Store(dbgi, mem, base_addr, cnst); ir_node *proj_m = new_Proj(store, mode_M, pn_Store_M); set_store(proj_m); + } else { + assert(is_compound_type(type)); + + int n_members; + if(is_Array_type(type)) { + assert(has_array_upper_bound(type, 0)); + n_members = get_array_upper_bound_int(type, 0); + } else { + n_members = get_compound_n_members(type); + } + + for(int i = 0; i < n_members; ++i) { + ir_node *addr; + ir_type *irtype; + if(is_Array_type(type)) { + ir_entity *entity = get_array_element_entity(type); + tarval *index_tv = new_tarval_from_long(i, mode_uint); + ir_node *cnst = new_d_Const(dbgi, mode_uint, index_tv); + ir_node *in[1] = { cnst }; + irtype = get_array_element_type(type); + addr = new_d_Sel(dbgi, new_NoMem(), base_addr, 1, in, entity); + } else { + ir_entity *member = get_compound_member(type, i); + + irtype = get_entity_type(member); + addr = new_d_simpleSel(dbgi, new_NoMem(), base_addr, member); + } + + create_dynamic_null_initializer(irtype, dbgi, addr); + } + } +} + +static void create_dynamic_initializer_sub(ir_initializer_t *initializer, + ir_type *type, dbg_info *dbgi, ir_node *base_addr) +{ + switch(get_initializer_kind(initializer)) { + case IR_INITIALIZER_NULL: { + create_dynamic_null_initializer(type, dbgi, base_addr); return; } case IR_INITIALIZER_CONST: { @@ -3465,7 +3477,7 @@ static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi, current_ir_graph = old_current_ir_graph; /* create a "template" entity which is copied to the entity on the stack */ - ident *const id = unique_ident("initializer"); + ident *const id = id_unique("initializer.%u"); ir_type *const irtype = get_ir_type(type); ir_type *const global_type = get_glob_type(); ir_entity *const init_entity = new_d_entity(global_type, id, irtype, dbgi); @@ -3601,11 +3613,10 @@ static void create_local_static_variable(declaration_t *declaration) type_t *const type = skip_typeref(declaration->type); ir_type *const global_type = get_glob_type(); - ident *const id = unique_ident(declaration->symbol->string); + ident *const id = new_id_from_str(declaration->symbol->string); ir_type *const irtype = get_ir_type(type); dbg_info *const dbgi = get_dbg_info(&declaration->source_position); ir_entity *const entity = new_d_entity(global_type, id, irtype, dbgi); - mangle_ent_from_decl(entity, declaration); if(type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) { set_entity_volatility(entity, volatility_is_volatile); @@ -3613,6 +3624,7 @@ static void create_local_static_variable(declaration_t *declaration) declaration->declaration_kind = DECLARATION_KIND_GLOBAL_VARIABLE; declaration->v.entity = entity; + set_entity_ld_ident(entity, create_ld_ident(entity, declaration)); set_entity_variability(entity, variability_uninitialized); set_entity_visibility(entity, visibility_local); set_entity_allocation(entity, allocation_static); @@ -4691,12 +4703,17 @@ static void create_function(declaration_t *declaration) int n_local_vars = get_function_n_local_vars(declaration); ir_graph *irg = new_ir_graph(function_entity, n_local_vars); - ir_node *first_block = get_cur_block(); + + 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)); + + ir_node *first_block = get_cur_block(); /* set inline flags */ if (declaration->is_inline) - set_irg_inline_property(irg, irg_inline_recomended); - handle_decl_modifier_irg(irg, declaration->decl_modifiers); + set_irg_inline_property(irg, irg_inline_recomended); + handle_decl_modifier_irg(irg, declaration->decl_modifiers); next_value_number_function = 0; initialize_function_parameters(declaration); @@ -4825,6 +4842,27 @@ void init_ast2firm(void) obstack_init(&asm_obst); init_atomic_modes(); + id_underscore = new_id_from_chars("_", 1); + 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_WIN32: + create_ld_ident = create_ld_ident_win32; + s = "ia32-gasmode=mingw"; + break; + case OS_SUPPORT_LINUX: + create_ld_ident = create_ld_ident_linux_elf; + s = "ia32-gasmode=linux"; break; + break; + case OS_SUPPORT_MACHO: + create_ld_ident = create_ld_ident_macho; + s = "ia32-gasmode=macho"; break; + break; + } + firm_be_option(s); + /* create idents for all known runtime functions */ for (size_t i = 0; i < sizeof(rts_data) / sizeof(rts_data[0]); ++i) { predef_idents[rts_data[i].id] = new_id_from_str(rts_data[i].name);