X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast2firm.c;h=27c82207bd096c57899853b819239d44658e0d5a;hb=3cdead30b5c1d131d5c363188c26255514ea2fc8;hp=e5a38a0d2c63f4346ba2267737caec469681bd43;hpb=e620b17840a28c14c037beac8b4f438d521ef226;p=cparser diff --git a/ast2firm.c b/ast2firm.c index e5a38a0..27c8220 100644 --- a/ast2firm.c +++ b/ast2firm.c @@ -22,56 +22,63 @@ #include #include #include +#include #include #include -#include #include #include "ast2firm.h" #include "adt/error.h" #include "adt/array.h" +#include "adt/util.h" #include "symbol_t.h" #include "token_t.h" #include "type_t.h" #include "ast_t.h" +#include "entity_t.h" #include "parser.h" #include "diagnostic.h" #include "lang_features.h" #include "types.h" +#include "type_hash.h" +#include "mangle.h" +#include "walk_statements.h" #include "warning.h" #include "entitymap_t.h" #include "driver/firm_opt.h" #include "driver/firm_cmdline.h" -/* 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; static ir_type *ir_type_int; -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 declaration_t **inner_functions; -static int inner_function_idx; -static ir_node *ijmp_list; -static bool constant_folding; - -extern bool have_const_functions; - -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; +/* architecture specific floating point arithmetic mode (if any) */ +static ir_mode *mode_float_arithmetic; + +/* alignment of stack parameters */ +static unsigned stack_param_align; + +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 label_t **all_labels; +static entity_t **inner_functions; +static ir_node *ijmp_list; +static bool constant_folding; + +extern bool have_const_functions; + +static const entity_t *current_function_entity; +static ir_node *current_function_name; +static ir_node *current_funcsig; +static switch_statement_t *current_switch; +static ir_graph *current_function; +static translation_unit_t *current_translation_unit; static entitymap_t entitymap; @@ -79,52 +86,53 @@ static struct obstack asm_obst; typedef enum declaration_kind_t { DECLARATION_KIND_UNKNOWN, - DECLARATION_KIND_FUNCTION, DECLARATION_KIND_VARIABLE_LENGTH_ARRAY, DECLARATION_KIND_GLOBAL_VARIABLE, DECLARATION_KIND_LOCAL_VARIABLE, DECLARATION_KIND_LOCAL_VARIABLE_ENTITY, + DECLARATION_KIND_PARAMETER, + DECLARATION_KIND_PARAMETER_ENTITY, + DECLARATION_KIND_FUNCTION, DECLARATION_KIND_COMPOUND_MEMBER, - DECLARATION_KIND_LABEL_BLOCK, - DECLARATION_KIND_ENUM_ENTRY, - DECLARATION_KIND_COMPOUND_TYPE_INCOMPLETE, - DECLARATION_KIND_COMPOUND_TYPE_COMPLETE, - DECLARATION_KIND_TYPE, DECLARATION_KIND_INNER_FUNCTION } declaration_kind_t; -static ir_type *get_ir_type(type_t *type); +static ir_mode *get_ir_mode_storage(type_t *type); +/* + * get arithmetic mode for a type. This is different from get_ir_mode_storage, + * int that it returns bigger modes for floating point on some platforms + * (x87 internally does arithemtic with 80bits) + */ +static ir_mode *get_ir_mode_arithmetic(type_t *type); + static ir_type *get_ir_type_incomplete(type_t *type); -static int count_decls_in_stmts(const statement_t *stmt); -static void enqueue_inner_function(declaration_t *declaration) { - if (inner_functions == NULL) { - inner_functions = NEW_ARR_F(declaration_t *, 16); - inner_functions[0] = declaration; - inner_function_idx = 1; - } else { - int size = ARR_LEN(inner_functions); - if (inner_function_idx >= size) { - ARR_RESIZE(declaration_t *, inner_functions, size + 16); - } - inner_functions[inner_function_idx++] = declaration; - } +static void enqueue_inner_function(entity_t *entity) +{ + ARR_APP1(entity_t*, inner_functions, entity); } -static declaration_t *next_inner_function(void) { - if (inner_function_idx == 0) - return 0; - return inner_functions[--inner_function_idx]; +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 declaration_t *declaration = get_irg_loc_description(irg, pos); + const entity_t *entity = get_irg_loc_description(irg, pos); - if (declaration != NULL) { - warningf(&declaration->source_position, - "variable '%#T' might be used uninitialized", - declaration->type, declaration->symbol); + if (entity != NULL) { + warningf(&entity->base.source_position, + "%s '%#T' might be used uninitialized", + get_entity_kind_name(entity->kind), + entity->declaration.type, entity->base.symbol); } return new_r_Unknown(irg, mode); } @@ -153,14 +161,13 @@ static dbg_info *get_dbg_info(const source_position_t *pos) return (dbg_info*) pos; } -static ir_mode *_atomic_modes[ATOMIC_TYPE_LAST+1]; +static ir_mode *atomic_modes[ATOMIC_TYPE_LAST+1]; static ir_mode *mode_int, *mode_uint; static ir_node *_expression_to_firm(const expression_t *expression); static ir_node *expression_to_firm(const expression_t *expression); -static inline ir_mode *get_ir_mode(type_t *type); -static void create_local_declaration(declaration_t *declaration); +static void create_local_declaration(entity_t *entity); static ir_mode *init_atomic_ir_mode(atomic_type_kind_t kind) { @@ -172,18 +179,19 @@ static ir_mode *init_atomic_ir_mode(atomic_type_kind_t kind) ir_mode_sort sort; unsigned bit_size = size * 8; bool is_signed = (flags & ATOMIC_TYPE_FLAG_SIGNED) != 0; - ir_mode_arithmetic arithmetic; unsigned modulo_shift; + ir_mode_arithmetic arithmetic; if (flags & ATOMIC_TYPE_FLAG_INTEGER) { assert(! (flags & ATOMIC_TYPE_FLAG_FLOAT)); - snprintf(name, sizeof(name), "i%s%d", is_signed?"":"u", bit_size); + snprintf(name, sizeof(name), "%s%u", is_signed ? "I" : "U", + bit_size); sort = irms_int_number; arithmetic = irma_twos_complement; modulo_shift = bit_size < machine_size ? machine_size : bit_size; } else { assert(flags & ATOMIC_TYPE_FLAG_FLOAT); - snprintf(name, sizeof(name), "f%d", bit_size); + snprintf(name, sizeof(name), "F%u", bit_size); sort = irms_float_number; arithmetic = irma_ieee754; modulo_shift = 0; @@ -200,14 +208,14 @@ static ir_mode *init_atomic_ir_mode(atomic_type_kind_t kind) */ static void init_atomic_modes(void) { - for(int i = 0; i <= ATOMIC_TYPE_LAST; ++i) { - _atomic_modes[i] = init_atomic_ir_mode((atomic_type_kind_t) i); + for (int i = 0; i <= ATOMIC_TYPE_LAST; ++i) { + atomic_modes[i] = init_atomic_ir_mode((atomic_type_kind_t) i); } - mode_int = _atomic_modes[ATOMIC_TYPE_INT]; - mode_uint = _atomic_modes[ATOMIC_TYPE_UINT]; + mode_int = atomic_modes[ATOMIC_TYPE_INT]; + mode_uint = atomic_modes[ATOMIC_TYPE_UINT]; /* there's no real void type in firm */ - _atomic_modes[ATOMIC_TYPE_VOID] = mode_int; + atomic_modes[ATOMIC_TYPE_VOID] = atomic_modes[ATOMIC_TYPE_CHAR]; /* initialize pointer modes */ char name[64]; @@ -218,86 +226,50 @@ static void init_atomic_modes(void) unsigned modulo_shift = bit_size < machine_size ? machine_size : bit_size; - snprintf(name, sizeof(name), "p%d", machine_size); + snprintf(name, sizeof(name), "p%u", machine_size); ir_mode *ptr_mode = new_ir_mode(name, sort, bit_size, is_signed, arithmetic, modulo_shift); - set_reference_mode_signed_eq(ptr_mode, _atomic_modes[get_intptr_kind()]); - set_reference_mode_unsigned_eq(ptr_mode, _atomic_modes[get_uintptr_kind()]); + set_reference_mode_signed_eq(ptr_mode, atomic_modes[get_intptr_kind()]); + set_reference_mode_unsigned_eq(ptr_mode, atomic_modes[get_uintptr_kind()]); /* Hmm, pointers should be machine size */ set_modeP_data(ptr_mode); set_modeP_code(ptr_mode); } -static unsigned get_compound_type_size(compound_type_t *type) -{ - ir_type *irtype = get_ir_type((type_t*) type); - return get_type_size_bytes(irtype); -} - -static unsigned get_array_type_size(array_type_t *type) +ir_mode *get_atomic_mode(atomic_type_kind_t kind) { - assert(!type->is_vla); - ir_type *irtype = get_ir_type((type_t*) type); - return get_type_size_bytes(irtype); + assert(kind <= ATOMIC_TYPE_LAST); + return atomic_modes[kind]; } - -static unsigned get_type_size_const(type_t *type) +static ir_node *get_vla_size(array_type_t *const type) { - switch(type->kind) { - case TYPE_ERROR: - panic("error type occurred"); - case TYPE_ATOMIC: - return get_atomic_type_size(type->atomic.akind); - case TYPE_COMPLEX: - return 2 * get_atomic_type_size(type->complex.akind); - case TYPE_IMAGINARY: - return get_atomic_type_size(type->imaginary.akind); - case TYPE_ENUM: - return get_mode_size_bytes(mode_int); - case TYPE_COMPOUND_UNION: - case TYPE_COMPOUND_STRUCT: - return get_compound_type_size(&type->compound); - case TYPE_FUNCTION: - /* just a pointer to the function */ - return get_mode_size_bytes(mode_P_code); - case TYPE_POINTER: - return get_mode_size_bytes(mode_P_data); - case TYPE_ARRAY: - return get_array_type_size(&type->array); - case TYPE_BUILTIN: - return get_type_size_const(type->builtin.real_type); - case TYPE_BITFIELD: - panic("type size of bitfield request"); - case TYPE_TYPEDEF: - case TYPE_TYPEOF: - case TYPE_INVALID: - break; + ir_node *size_node = type->size_node; + if (size_node == NULL) { + size_node = expression_to_firm(type->size_expression); + type->size_node = size_node; } - panic("Trying to determine size of invalid type"); + return size_node; } +/** + * Return a node representing the size of a type. + */ static ir_node *get_type_size(type_t *type) { type = skip_typeref(type); if (is_type_array(type) && type->array.is_vla) { - ir_node *size_node = type->array.size_node; - if (size_node == NULL) { - size_node = expression_to_firm(type->array.size_expression); - assert(!is_Const(size_node)); - type->array.size_node = size_node; - } - + ir_node *size_node = get_vla_size(&type->array); ir_node *elem_size = get_type_size(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; } - ir_mode *mode = get_ir_mode(type_size_t); + ir_mode *mode = get_ir_mode_storage(type_size_t); symconst_symbol sym; sym.type_p = get_ir_type(type); return new_SymConst(mode, sym, symconst_type_size); @@ -315,18 +287,30 @@ 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(const atomic_type_t *type) +static ir_type *create_atomic_type(atomic_type_kind_t akind, int alignment) { - dbg_info *dbgi = get_dbg_info(&type->base.source_position); - atomic_type_kind_t kind = type->akind; - ir_mode *mode = _atomic_modes[kind]; - ident *id = get_mode_ident(mode); - ir_type *irtype = new_d_type_primitive(id, mode, dbgi); + ir_mode *mode = atomic_modes[akind]; + ident *id = get_mode_ident(mode); + ir_type *irtype = new_type_primitive(id, mode); - set_type_alignment_bytes(irtype, type->base.alignment); + set_type_alignment_bytes(irtype, alignment); return irtype; } @@ -336,13 +320,11 @@ static ir_type *create_atomic_type(const atomic_type_t *type) */ static ir_type *create_complex_type(const complex_type_t *type) { - dbg_info *dbgi = get_dbg_info(&type->base.source_position); - atomic_type_kind_t kind = type->akind; - ir_mode *mode = _atomic_modes[kind]; - ident *id = get_mode_ident(mode); + atomic_type_kind_t kind = type->akind; + ir_mode *mode = atomic_modes[kind]; + ident *id = get_mode_ident(mode); (void) id; - (void) dbgi; /* FIXME: finish the array */ return NULL; @@ -353,11 +335,10 @@ static ir_type *create_complex_type(const complex_type_t *type) */ static ir_type *create_imaginary_type(const imaginary_type_t *type) { - dbg_info *dbgi = get_dbg_info(&type->base.source_position); atomic_type_kind_t kind = type->akind; - ir_mode *mode = _atomic_modes[kind]; + ir_mode *mode = atomic_modes[kind]; ident *id = get_mode_ident(mode); - ir_type *irtype = new_d_type_primitive(id, mode, dbgi); + ir_type *irtype = new_type_primitive(id, mode); set_type_alignment_bytes(irtype, type->base.alignment); @@ -372,8 +353,8 @@ 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; + compound_t *compound = type->compound.compound; + type = compound->members.entities->declaration.type; } return type; @@ -381,13 +362,12 @@ static type_t *get_parameter_type(type_t *type) static ir_type *create_method_type(const function_type_t *function_type) { - type_t *return_type = function_type->return_type; + 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_results = return_type == type_void ? 0 : 1; - dbg_info *dbgi = get_dbg_info(&function_type->base.source_position); - ir_type *irtype = new_d_type_method(id, n_parameters, n_results, dbgi); + ir_type *irtype = new_type_method(id, n_parameters, n_results); if (return_type != type_void) { ir_type *restype = get_ir_type(return_type); @@ -432,9 +412,9 @@ is_cdecl: 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; } @@ -442,9 +422,18 @@ static ir_type *create_pointer_type(pointer_type_t *type) { 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); + ir_type *ir_type = new_type_pointer(id_unique("pointer.%u"), + ir_points_to, mode_P_data); + + return ir_type; +} + +static ir_type *create_reference_type(reference_type_t *type) +{ + type_t *refers_to = type->refers_to; + ir_type *ir_refers_to = get_ir_type_incomplete(refers_to); + ir_type *ir_type = new_type_pointer(id_unique("reference.%u"), + ir_refers_to, mode_P_data); return ir_type; } @@ -455,8 +444,7 @@ static ir_type *create_array_type(array_type_t *type) ir_type *ir_element_type = get_ir_type(element_type); 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); + ir_type *ir_type = new_type_array(id, 1, ir_element_type); const int align = get_type_alignment_bytes(ir_element_type); set_type_alignment_bytes(ir_type, align); @@ -508,7 +496,7 @@ static ir_type *get_signed_int_type_for_bit_size(ir_type *base_tp, snprintf(name, sizeof(name), "I%u", size); ident *id = new_id_from_str(name); dbg_info *dbgi = get_dbg_info(&builtin_source_position); - res = new_d_type_primitive(mangle_u(get_type_ident(base_tp), id), mode, dbgi); + res = new_d_type_primitive(id_mangle_u(get_type_ident(base_tp), id), mode, dbgi); set_primitive_base_type(res, base_tp); return res; @@ -544,7 +532,7 @@ static ir_type *get_unsigned_int_type_for_bit_size(ir_type *base_tp, snprintf(name, sizeof(name), "U%u", size); ident *id = new_id_from_str(name); dbg_info *dbgi = get_dbg_info(&builtin_source_position); - res = new_d_type_primitive(mangle_u(get_type_ident(base_tp), id), mode, dbgi); + res = new_d_type_primitive(id_mangle_u(get_type_ident(base_tp), id), mode, dbgi); set_primitive_base_type(res, base_tp); return res; @@ -584,13 +572,11 @@ 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; - declaration_kind_t kind = (declaration_kind_t)declaration->declaration_kind; + compound_t *compound = type->compound; - if (kind == DECLARATION_KIND_COMPOUND_TYPE_COMPLETE - || (kind == DECLARATION_KIND_COMPOUND_TYPE_INCOMPLETE - && incomplete)) - return declaration->v.irtype; + if (compound->irtype != NULL && (compound->irtype_complete || incomplete)) { + return compound->irtype; + } size_t align_all = 1; size_t offset = 0; @@ -598,7 +584,7 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype, size_t size = 0; if (irtype == NULL) { - symbol_t *symbol = declaration->symbol; + symbol_t *symbol = compound->base.symbol; ident *id; if (symbol != NULL) { id = new_id_from_str(symbol->string); @@ -609,7 +595,7 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype, id = id_unique("__anonymous_struct.%u"); } } - dbg_info *dbgi = get_dbg_info(&type->base.source_position); + dbg_info *dbgi = get_dbg_info(&compound->base.source_position); if (is_union) { irtype = new_d_type_union(id, dbgi); @@ -617,10 +603,8 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype, irtype = new_d_type_struct(id, dbgi); } - declaration->declaration_kind - = DECLARATION_KIND_COMPOUND_TYPE_INCOMPLETE; - declaration->v.irtype = irtype; - //type->base.firm_type = irtype; + compound->irtype_complete = false; + compound->irtype = irtype; } else { offset = *outer_offset; align_all = *outer_align; @@ -629,18 +613,20 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype, if (incomplete) return irtype; - declaration->declaration_kind = DECLARATION_KIND_COMPOUND_TYPE_COMPLETE; + compound->irtype_complete = true; - declaration_t *entry = declaration->scope.declarations; - for( ; entry != NULL; entry = entry->next) { - if (entry->namespc != NAMESPACE_NORMAL) + entity_t *entry = compound->members.entities; + for ( ; entry != NULL; entry = entry->base.next) { + if (entry->kind != ENTITY_COMPOUND_MEMBER) 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); + 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); ident *ident; if (symbol != NULL) { @@ -716,9 +702,9 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype, set_entity_offset_bits_remainder(entity, (unsigned char) bits_remainder); //add_struct_member(irtype, entity); - entry->declaration_kind = DECLARATION_KIND_COMPOUND_MEMBER; - assert(entry->v.entity == NULL); - entry->v.entity = entity; + entry->declaration.kind = DECLARATION_KIND_COMPOUND_MEMBER; + assert(entry->compound_member.entity == NULL); + entry->compound_member.entity = entity; finished_member: if (is_union) { @@ -773,14 +759,13 @@ static ir_type *create_enum_type(enum_type_t *const type) bool constant_folding_old = constant_folding; constant_folding = true; - declaration_t *declaration = type->declaration->next; - for (; declaration != NULL; declaration = declaration->next) { - if (declaration->storage_class != STORAGE_CLASS_ENUM_ENTRY) + enum_t *enume = type->enume; + entity_t *entry = enume->base.next; + for (; entry != NULL; entry = entry->base.next) { + if (entry->kind != ENTITY_ENUM_VALUE) break; - declaration->declaration_kind = DECLARATION_KIND_ENUM_ENTRY; - - expression_t *const init = declaration->init.enum_value; + expression_t *const init = entry->enum_value.value; if (init != NULL) { ir_node *const cnst = expression_to_firm(init); if (!is_Const(cnst)) { @@ -788,13 +773,13 @@ static ir_type *create_enum_type(enum_type_t *const type) } tv_next = get_Const_tarval(cnst); } - declaration->v.enum_val = tv_next; + entry->enum_value.tv = tv_next; tv_next = tarval_add(tv_next, one); } constant_folding = constant_folding_old; - return ir_type_int; + return create_atomic_type(type->akind, type->base.alignment); } static ir_type *get_ir_type_incomplete(type_t *type) @@ -819,7 +804,7 @@ static ir_type *get_ir_type_incomplete(type_t *type) } } -static ir_type *get_ir_type(type_t *type) +ir_type *get_ir_type(type_t *type) { assert(type != NULL); @@ -834,10 +819,11 @@ static 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(&type_void->atomic); + return create_atomic_type(ATOMIC_TYPE_VOID, 0); case TYPE_ATOMIC: - firm_type = create_atomic_type(&type->atomic); + firm_type = create_atomic_type(type->atomic.akind, + type->base.alignment); break; case TYPE_COMPLEX: firm_type = create_complex_type(&type->complex); @@ -851,6 +837,9 @@ static ir_type *get_ir_type(type_t *type) case TYPE_POINTER: firm_type = create_pointer_type(&type->pointer); break; + case TYPE_REFERENCE: + firm_type = create_reference_type(&type->reference); + break; case TYPE_ARRAY: firm_type = create_array_type(&type->array); break; @@ -884,7 +873,7 @@ static ir_type *get_ir_type(type_t *type) return firm_type; } -static inline ir_mode *get_ir_mode(type_t *type) +static ir_mode *get_ir_mode_storage(type_t *type) { ir_type *irtype = get_ir_type(type); @@ -898,6 +887,16 @@ static inline ir_mode *get_ir_mode(type_t *type) return mode; } +static ir_mode *get_ir_mode_arithmetic(type_t *type) +{ + ir_mode *mode = get_ir_mode_storage(type); + if (mode_is_float(mode) && mode_float_arithmetic != NULL) { + return mode_float_arithmetic; + } + + return mode; +} + /** Names of the runtime functions. */ static const struct { int id; /**< the rts id */ @@ -980,62 +979,9 @@ static const struct { { rts_strncmp, 1, "strncmp", 3, _C89 } }; -static ident *rts_idents[sizeof(rts_data) / sizeof(rts_data[0])]; - -/** - * Mangles an entity linker (ld) name for win32 usage. - * - * @param ent the entity to be mangled - * @param declaration the declaration - */ -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(id_underscore, get_entity_ident(ent)); - } - - decl_modifiers_t decl_modifiers = declaration->modifiers; - if (decl_modifiers & DM_DLLIMPORT) { - /* add prefix for imported symbols */ - id = mangle(id_imp, id); - } - return id; -} - -/** - * Mangles an entity linker (ld) name for Linux ELF usage. - * - * @param ent the entity to be mangled - * @param declaration the declaration - */ -static ident *create_ld_ident_linux_elf(ir_entity *entity, - declaration_t *declaration) -{ - (void) declaration; - return get_entity_ident(entity); -} - -/** - * 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; -} +static ident *rts_idents[lengthof(rts_data)]; -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 ident* (*create_ld_ident)(entity_t*) = create_name_linux_elf; /** * Handle GNU attributes for entities @@ -1043,22 +989,40 @@ create_ld_ident_func create_ld_ident = create_ld_ident_linux_elf; * @param ent the entity * @param decl the routine declaration */ -static void handle_gnu_attributes_ent(ir_entity *ent, declaration_t *decl) +static void handle_gnu_attributes_ent(ir_entity *irentity, entity_t *entity) { - if (decl->modifiers & DM_PURE) { + assert(is_declaration(entity)); + decl_modifiers_t modifiers = entity->declaration.modifiers; + if (modifiers & DM_PURE) { /* TRUE if the declaration includes the GNU __attribute__((pure)) specifier. */ - set_entity_additional_property(ent, mtp_property_pure); + set_entity_additional_property(irentity, mtp_property_pure); } - if (decl->modifiers & DM_CONST) { - set_entity_additional_property(ent, mtp_property_const); + if (modifiers & DM_CONST) { + set_entity_additional_property(irentity, mtp_property_const); have_const_functions = true; } - if (decl->modifiers & DM_USED) { + if (modifiers & DM_USED) { /* TRUE if the declaration includes the GNU __attribute__((used)) specifier. */ - set_entity_stickyness(ent, stickyness_sticky); + set_entity_stickyness(irentity, stickyness_sticky); + } +} + +static bool is_main(entity_t *entity) +{ + static symbol_t *sym_main = NULL; + if (sym_main == NULL) { + sym_main = symbol_table_insert("main"); } + + if (entity->base.symbol != sym_main) + return false; + /* must be in outermost scope */ + if (entity->base.parent_scope != ¤t_translation_unit->scope) + return false; + + return true; } /** @@ -1066,64 +1030,76 @@ static void handle_gnu_attributes_ent(ir_entity *ent, declaration_t *decl) * * @param declaration the function declaration */ -static ir_entity *get_function_entity(declaration_t *declaration) +static ir_entity *get_function_entity(entity_t *entity) { - if (declaration->declaration_kind == DECLARATION_KIND_FUNCTION || - declaration->declaration_kind == DECLARATION_KIND_INNER_FUNCTION) - return declaration->v.entity; - assert(declaration->declaration_kind == DECLARATION_KIND_UNKNOWN); + assert(entity->kind == ENTITY_FUNCTION); + if (entity->function.entity != NULL) { + return entity->function.entity; + } - symbol_t *symbol = declaration->symbol; + if (is_main(entity)) { + /* force main to C linkage */ + type_t *type = entity->declaration.type; + assert(is_type_function(type)); + if (type->function.linkage != LINKAGE_C) { + type_t *new_type = duplicate_type(type); + new_type->function.linkage = LINKAGE_C; + type = identify_new_type(new_type); + entity->declaration.type = type; + } + } + + 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(declaration->type); - assert(is_Method_type(ir_type_method)); + 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 *entity = entitymap_get(&entitymap, symbol); - if (entity != NULL) { - if (get_entity_visibility(entity) == visibility_external_allocated - && declaration->init.statement != NULL) { - set_entity_visibility(entity, visibility_external_visible); + ir_entity *irentity = entitymap_get(&entitymap, symbol); + if (irentity != NULL) { + if (get_entity_visibility(irentity) == visibility_external_allocated + && has_body) { + set_entity_visibility(irentity, visibility_external_visible); } goto entity_created; } - 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)); + 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(entity, declaration); + 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)declaration->storage_class; - bool const is_inline = declaration->is_inline; - bool const has_body = declaration->init.statement != NULL; + 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(entity, visibility_external_visible); + 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(entity, peculiarity_description); + set_entity_peculiarity(irentity, peculiarity_description); } - set_entity_visibility(entity, visibility_local); + set_entity_visibility(irentity, visibility_local); } else if (has_body) { - set_entity_visibility(entity, visibility_external_visible); + set_entity_visibility(irentity, visibility_external_visible); } else { - set_entity_visibility(entity, visibility_external_allocated); + set_entity_visibility(irentity, visibility_external_allocated); } - set_entity_allocation(entity, allocation_static); + 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) { /* check for a known runtime function */ - for (size_t i = 0; i < sizeof(rts_data) / sizeof(rts_data[0]); ++i) { + for (size_t i = 0; i < lengthof(rts_data); ++i) { if (id != rts_idents[i]) continue; @@ -1131,17 +1107,34 @@ static ir_entity *get_function_entity(declaration_t *declaration) if ((c_mode & rts_data[i].flags) == 0) continue; assert(rts_entities[rts_data[i].id] == NULL); - rts_entities[rts_data[i].id] = entity; + rts_entities[rts_data[i].id] = irentity; } } - entitymap_insert(&entitymap, symbol, entity); + entitymap_insert(&entitymap, symbol, irentity); entity_created: - declaration->declaration_kind = DECLARATION_KIND_FUNCTION; - declaration->v.entity = entity; + entity->declaration.kind = DECLARATION_KIND_FUNCTION; + entity->function.entity = irentity; - return entity; + return irentity; +} + +static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode) +{ + ir_mode *value_mode = get_irn_mode(value); + + if (value_mode == dest_mode || is_Bad(value)) + return value; + + if (dest_mode == mode_b) { + ir_node *zero = new_Const(get_mode_null(value_mode)); + ir_node *cmp = new_d_Cmp(dbgi, value, zero); + ir_node *proj = new_d_Proj(dbgi, cmp, mode_b, pn_Cmp_Lg); + return proj; + } + + return new_d_Conv(dbgi, value, dest_mode); } /** @@ -1150,7 +1143,8 @@ entity_created: static ir_node *const_to_firm(const const_expression_t *cnst) { dbg_info *dbgi = get_dbg_info(&cnst->base.source_position); - ir_mode *mode = get_ir_mode(cnst->base.type); + type_t *type = skip_typeref(cnst->base.type); + ir_mode *mode = get_ir_mode_storage(type); char buf[128]; tarval *tv; @@ -1167,7 +1161,9 @@ static ir_node *const_to_firm(const const_expression_t *cnst) tv = new_tarval_from_str(buf, len, mode); } - return new_d_Const(dbgi, mode, tv); + ir_node *res = new_d_Const(dbgi, tv); + ir_mode *mode_arith = get_ir_mode_arithmetic(type); + return create_conv(dbgi, res, mode_arith); } /** @@ -1176,13 +1172,15 @@ static ir_node *const_to_firm(const const_expression_t *cnst) static ir_node *character_constant_to_firm(const const_expression_t *cnst) { dbg_info *dbgi = get_dbg_info(&cnst->base.source_position); - ir_mode *mode = get_ir_mode(cnst->base.type); + ir_mode *mode = get_ir_mode_arithmetic(cnst->base.type); - long long int v = 0; - for (size_t i = 0; i < cnst->v.character.size; ++i) { - if (char_is_signed) { - v = (v << 8) | ((signed char)cnst->v.character.begin[i]); - } else { + long long int v; + size_t const size = cnst->v.character.size; + if (size == 1 && char_is_signed) { + v = (signed char)cnst->v.character.begin[0]; + } else { + v = 0; + for (size_t i = 0; i < size; ++i) { v = (v << 8) | ((unsigned char)cnst->v.character.begin[i]); } } @@ -1190,7 +1188,7 @@ static ir_node *character_constant_to_firm(const const_expression_t *cnst) size_t len = snprintf(buf, sizeof(buf), "%lld", v); tarval *tv = new_tarval_from_str(buf, len, mode); - return new_d_Const(dbgi, mode, tv); + return new_d_Const(dbgi, tv); } /** @@ -1199,7 +1197,7 @@ static ir_node *character_constant_to_firm(const const_expression_t *cnst) static ir_node *wide_character_constant_to_firm(const const_expression_t *cnst) { dbg_info *dbgi = get_dbg_info(&cnst->base.source_position); - ir_mode *mode = get_ir_mode(cnst->base.type); + ir_mode *mode = get_ir_mode_arithmetic(cnst->base.type); long long int v = cnst->v.wide_character.begin[0]; @@ -1207,7 +1205,7 @@ static ir_node *wide_character_constant_to_firm(const const_expression_t *cnst) size_t len = snprintf(buf, sizeof(buf), "%lld", v); tarval *tv = new_tarval_from_str(buf, len, mode); - return new_d_Const(dbgi, mode, tv); + return new_d_Const(dbgi, tv); } /** @@ -1260,7 +1258,7 @@ static ir_node *string_to_firm(const source_position_t *const src_pos, set_type_state(type, layout_fixed); tarval **const tvs = xmalloc(slen * sizeof(tvs[0])); - for(size_t i = 0; i < slen; ++i) { + for (size_t i = 0; i < slen; ++i) { tvs[i] = new_tarval_from_long(string[i], mode); } @@ -1313,7 +1311,7 @@ static ir_node *wide_string_literal_to_firm( set_type_state(type, layout_fixed); tarval **const tvs = xmalloc(slen * sizeof(tvs[0])); - for(size_t i = 0; i < slen; ++i) { + for (size_t i = 0; i < slen; ++i) { tvs[i] = new_tarval_from_long(string[i], mode); } @@ -1333,22 +1331,22 @@ static ir_node *deref_address(dbg_info *const dbgi, type_t *const type, return addr; } + ir_cons_flags flags = type->base.qualifiers & TYPE_QUALIFIER_VOLATILE + ? cons_volatile : cons_none; ir_mode *const mode = get_type_mode(irtype); ir_node *const memory = get_store(); - ir_node *const load = new_d_Load(dbgi, memory, addr, mode); + ir_node *const load = new_d_Load(dbgi, memory, addr, mode, flags); ir_node *const load_mem = new_d_Proj(dbgi, load, mode_M, pn_Load_M); ir_node *const load_res = new_d_Proj(dbgi, load, mode, pn_Load_res); - if (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) { - set_Load_volatility(load, volatility_is_volatile); - } - set_store(load_mem); - return load_res; + + ir_mode *const mode_arithmetic = get_ir_mode_arithmetic(type); + return create_conv(dbgi, load_res, mode_arithmetic); } /** - * Creates a strict Conv if neccessary. + * Creates a strict Conv if necessary. */ static ir_node *do_strict_conv(dbg_info *dbgi, ir_node *node) { @@ -1371,22 +1369,18 @@ static ir_node *do_strict_conv(dbg_info *dbgi, ir_node *node) } static ir_node *get_global_var_address(dbg_info *const dbgi, - const declaration_t *const decl) -{ - assert(decl->declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE); - - ir_entity *const entity = decl->v.entity; - switch ((storage_class_tag_t)decl->storage_class) { - case STORAGE_CLASS_THREAD: - case STORAGE_CLASS_THREAD_EXTERN: - case STORAGE_CLASS_THREAD_STATIC: { - ir_node *const no_mem = new_NoMem(); - ir_node *const tls = get_irg_tls(current_ir_graph); - return new_d_simpleSel(dbgi, no_mem, tls, entity); - } + const entity_t *const entity) +{ + assert(entity->kind == ENTITY_VARIABLE); + assert(entity->declaration.kind == DECLARATION_KIND_GLOBAL_VARIABLE); - default: - return create_symconst(dbgi, mode_P_data, entity); + ir_entity *const irentity = entity->variable.v.entity; + if (entity->variable.thread_local) { + ir_node *const no_mem = new_NoMem(); + ir_node *const tls = get_irg_tls(current_ir_graph); + return new_d_simpleSel(dbgi, no_mem, tls, irentity); + } else { + return create_symconst(dbgi, mode_P_data, irentity); } } @@ -1406,27 +1400,11 @@ static ir_node *get_local_frame(ir_entity *const ent) } } -static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode) -{ - ir_mode *value_mode = get_irn_mode(value); - - if (value_mode == dest_mode || is_Bad(value)) - return value; - - if (dest_mode == mode_b) { - ir_node *zero = new_Const(value_mode, get_mode_null(value_mode)); - ir_node *cmp = new_d_Cmp(dbgi, value, zero); - ir_node *proj = new_d_Proj(dbgi, cmp, mode_b, pn_Cmp_Lg); - return proj; - } - - return new_d_Conv(dbgi, value, dest_mode); -} - /** * Keep all memory edges of the given block. */ -static void keep_all_memory(ir_node *block) { +static void keep_all_memory(ir_node *block) +{ ir_node *old = get_cur_block(); set_cur_block(block); @@ -1435,68 +1413,93 @@ static void keep_all_memory(ir_node *block) { set_cur_block(old); } +static ir_node *reference_expression_enum_value_to_firm( + const reference_expression_t *ref) +{ + entity_t *entity = ref->entity; + type_t *type = skip_typeref(entity->enum_value.enum_type); + /* make sure the type is constructed */ + (void) get_ir_type(type); + + return new_Const(entity->enum_value.tv); +} + static ir_node *reference_expression_to_firm(const reference_expression_t *ref) { - dbg_info *dbgi = get_dbg_info(&ref->base.source_position); - declaration_t *declaration = ref->declaration; - type_t *type = skip_typeref(declaration->type); + dbg_info *dbgi = get_dbg_info(&ref->base.source_position); + entity_t *entity = ref->entity; + assert(is_declaration(entity)); + type_t *type = skip_typeref(entity->declaration.type); /* make sure the type is constructed */ (void) get_ir_type(type); - switch ((declaration_kind_t)declaration->declaration_kind) { - case DECLARATION_KIND_TYPE: + switch ((declaration_kind_t) entity->declaration.kind) { case DECLARATION_KIND_UNKNOWN: break; - case DECLARATION_KIND_ENUM_ENTRY: { - ir_mode *const mode = get_ir_mode(type); - if (ref->is_outer_ref) { - /* reference to an outer variable */ - panic("Outer variable reference not implemented"); - } else { - return new_Const(mode, declaration->v.enum_val); - } - } - case DECLARATION_KIND_LOCAL_VARIABLE: { - ir_mode *const mode = get_ir_mode(type); - return get_value(declaration->v.value_number, mode); + ir_mode *const mode = get_ir_mode_storage(type); + ir_node *const value = get_value(entity->variable.v.value_number, mode); + return create_conv(NULL, value, get_ir_mode_arithmetic(type)); + } + case DECLARATION_KIND_PARAMETER: { + ir_mode *const mode = get_ir_mode_storage(type); + ir_node *const value = get_value(entity->parameter.v.value_number,mode); + return create_conv(NULL, value, get_ir_mode_arithmetic(type)); } case DECLARATION_KIND_FUNCTION: { - ir_mode *const mode = get_ir_mode(type); - return create_symconst(dbgi, mode, declaration->v.entity); + ir_mode *const mode = get_ir_mode_storage(type); + + if (entity->function.btk != bk_none) { + /* for gcc compatibility we have to produce (dummy) addresses for some + * builtins */ + if (warning.other) { + warningf(&ref->base.source_position, + "taking address of builtin '%Y'", ref->entity->base.symbol); + } + + /* simply create a NULL pointer */ + ir_mode *mode = get_ir_mode_arithmetic(type_void_ptr); + ir_node *res = new_Const_long(mode, 0); + + return res; + } + return create_symconst(dbgi, mode, entity->function.entity); } case DECLARATION_KIND_INNER_FUNCTION: { - ir_mode *const mode = get_ir_mode(type); - if (! declaration->goto_to_outer && !declaration->need_closure) { + 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, declaration->v.entity); + return create_symconst(dbgi, mode, entity->function.entity); } else { /* TODO: need trampoline here */ panic("Trampoline code not implemented"); - return create_symconst(dbgi, mode, declaration->v.entity); + return create_symconst(dbgi, mode, entity->function.entity); } } case DECLARATION_KIND_GLOBAL_VARIABLE: { - ir_node *const addr = get_global_var_address(dbgi, declaration); - return deref_address(dbgi, declaration->type, addr); + ir_node *const addr = get_global_var_address(dbgi, entity); + return deref_address(dbgi, entity->declaration.type, addr); } case DECLARATION_KIND_LOCAL_VARIABLE_ENTITY: { - ir_entity *entity = declaration->v.entity; - ir_node *frame = get_local_frame(entity); - ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, entity); - return deref_address(dbgi, declaration->type, sel); + ir_entity *irentity = entity->variable.v.entity; + ir_node *frame = get_local_frame(irentity); + ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, irentity); + return deref_address(dbgi, entity->declaration.type, sel); + } + case DECLARATION_KIND_PARAMETER_ENTITY: { + ir_entity *irentity = entity->parameter.v.entity; + ir_node *frame = get_local_frame(irentity); + ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, irentity); + return deref_address(dbgi, entity->declaration.type, sel); } case DECLARATION_KIND_VARIABLE_LENGTH_ARRAY: - return declaration->v.vla_base; + return entity->variable.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"); } @@ -1505,52 +1508,119 @@ static ir_node *reference_expression_to_firm(const reference_expression_t *ref) static ir_node *reference_addr(const reference_expression_t *ref) { - dbg_info *dbgi = get_dbg_info(&ref->base.source_position); - declaration_t *declaration = ref->declaration; + dbg_info *dbgi = get_dbg_info(&ref->base.source_position); + entity_t *entity = ref->entity; + assert(is_declaration(entity)); - switch((declaration_kind_t) declaration->declaration_kind) { - case DECLARATION_KIND_TYPE: + switch((declaration_kind_t) entity->declaration.kind) { case DECLARATION_KIND_UNKNOWN: break; + case DECLARATION_KIND_PARAMETER: case DECLARATION_KIND_LOCAL_VARIABLE: /* you can store to a local variable (so we don't panic but return NULL * as an indicator for no real address) */ return NULL; case DECLARATION_KIND_GLOBAL_VARIABLE: { - ir_node *const addr = get_global_var_address(dbgi, declaration); + ir_node *const addr = get_global_var_address(dbgi, entity); return addr; } case DECLARATION_KIND_LOCAL_VARIABLE_ENTITY: { - ir_entity *entity = declaration->v.entity; - ir_node *frame = get_local_frame(entity); - ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, entity); + ir_entity *irentity = entity->variable.v.entity; + ir_node *frame = get_local_frame(irentity); + ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, irentity); return sel; } + case DECLARATION_KIND_PARAMETER_ENTITY: { + ir_entity *irentity = entity->parameter.v.entity; + ir_node *frame = get_local_frame(irentity); + ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, irentity); - case DECLARATION_KIND_VARIABLE_LENGTH_ARRAY: - return declaration->v.vla_base; + return sel; + } - case DECLARATION_KIND_ENUM_ENTRY: - panic("trying to reference enum entry"); + case DECLARATION_KIND_VARIABLE_LENGTH_ARRAY: + return entity->variable.v.vla_base; case DECLARATION_KIND_FUNCTION: { - type_t *const type = skip_typeref(declaration->type); - ir_mode *const mode = get_ir_mode(type); - return create_symconst(dbgi, mode, declaration->v.entity); + 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); } case DECLARATION_KIND_INNER_FUNCTION: - 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"); } panic("reference to declaration with unknown type found"); } +/** + * Generate an unary builtin. + * + * @param kind the builtin kind to generate + * @param op the operand + * @param function_type the function type for the GNU builtin routine + * @param db debug info + */ +static ir_node *gen_unary_builtin(ir_builtin_kind kind, expression_t *op, type_t *function_type, dbg_info *db) +{ + ir_node *in[1]; + in[0] = expression_to_firm(op); + + ir_type *tp = get_ir_type(function_type); + ir_type *res = get_method_res_type(tp, 0); + ir_node *irn = new_d_Builtin(db, get_irg_no_mem(current_ir_graph), kind, 1, in, tp); + set_irn_pinned(irn, op_pin_state_floats); + return new_Proj(irn, get_type_mode(res), pn_Builtin_1_result); +} + +/** + * Generate a pinned unary builtin. + * + * @param kind the builtin kind to generate + * @param op the operand + * @param function_type the function type for the GNU builtin routine + * @param db debug info + */ +static ir_node *gen_unary_builtin_pinned(ir_builtin_kind kind, expression_t *op, type_t *function_type, dbg_info *db) +{ + ir_node *in[1]; + in[0] = expression_to_firm(op); + + ir_type *tp = get_ir_type(function_type); + ir_type *res = get_method_res_type(tp, 0); + ir_node *mem = get_store(); + ir_node *irn = new_d_Builtin(db, mem, kind, 1, in, tp); + set_store(new_Proj(irn, mode_M, pn_Builtin_M)); + return new_Proj(irn, get_type_mode(res), pn_Builtin_1_result); +} + + +/** + * Generate an binary-void-return builtin. + * + * @param kind the builtin kind to generate + * @param op1 the first operand + * @param op2 the second operand + * @param function_type the function type for the GNU builtin routine + * @param db debug info + */ +static ir_node *gen_binary_builtin_mem(ir_builtin_kind kind, expression_t *op1, expression_t *op2, + type_t *function_type, dbg_info *db) +{ + ir_node *in[2]; + in[0] = expression_to_firm(op1); + in[1] = expression_to_firm(op2); + + ir_type *tp = get_ir_type(function_type); + ir_node *mem = get_store(); + ir_node *irn = new_d_Builtin(db, mem, kind, 2, in, tp); + set_store(new_Proj(irn, mode_M, pn_Builtin_M)); + return NULL; +} + /** * Transform calls to builtin functions. */ @@ -1558,17 +1628,16 @@ static ir_node *process_builtin_call(const call_expression_t *call) { dbg_info *dbgi = get_dbg_info(&call->base.source_position); - assert(call->function->kind == EXPR_BUILTIN_SYMBOL); - builtin_symbol_expression_t *builtin = &call->function->builtin_symbol; + assert(call->function->kind == EXPR_REFERENCE); + reference_expression_t *builtin = &call->function->reference; type_t *type = skip_typeref(builtin->base.type); assert(is_type_pointer(type)); type_t *function_type = skip_typeref(type->pointer.points_to); - symbol_t *symbol = builtin->symbol; - switch(symbol->ID) { - case T___builtin_alloca: { + switch (builtin->entity->function.btk) { + case bk_gnu_builtin_alloca: { if (call->arguments == NULL || call->arguments->next != NULL) { panic("invalid number of parameters on __builtin_alloca"); } @@ -1585,29 +1654,154 @@ static ir_node *process_builtin_call(const call_expression_t *call) return res; } - case T___builtin_huge_val: - case T___builtin_inf: - case T___builtin_inff: - case T___builtin_infl: { - ir_mode *mode = get_ir_mode(function_type->function.return_type); + case bk_gnu_builtin_huge_val: + case bk_gnu_builtin_inf: + case bk_gnu_builtin_inff: + case bk_gnu_builtin_infl: { + type_t *type = function_type->function.return_type; + ir_mode *mode = get_ir_mode_arithmetic(type); tarval *tv = get_mode_infinite(mode); - ir_node *res = new_d_Const(dbgi, mode, tv); + ir_node *res = new_d_Const(dbgi, tv); return res; } - case T___builtin_nan: - case T___builtin_nanf: - case T___builtin_nanl: { + case bk_gnu_builtin_nan: + case bk_gnu_builtin_nanf: + case bk_gnu_builtin_nanl: { /* Ignore string for now... */ assert(is_type_function(function_type)); - ir_mode *mode = get_ir_mode(function_type->function.return_type); + type_t *type = function_type->function.return_type; + ir_mode *mode = get_ir_mode_arithmetic(type); tarval *tv = get_mode_NAN(mode); - ir_node *res = new_d_Const(dbgi, mode, tv); + ir_node *res = new_d_Const(dbgi, tv); return res; } - case T___builtin_va_end: + case bk_gnu_builtin_expect: { + expression_t *argument = call->arguments->expression; + return _expression_to_firm(argument); + } + case bk_gnu_builtin_va_end: + /* evaluate the argument of va_end for its side effects */ + _expression_to_firm(call->arguments->expression); + return NULL; + case bk_gnu_builtin_frame_address: { + expression_t *const expression = call->arguments->expression; + long val = fold_constant(expression); + if (val == 0) { + /* the nice case */ + return get_irg_frame(current_ir_graph); + } else { + /* get the argument */ + ir_node *in[2]; + + in[0] = expression_to_firm(expression); + in[1] = get_irg_frame(current_ir_graph); + ir_type *tp = get_ir_type(function_type); + ir_node *irn = new_d_Builtin(dbgi, get_irg_no_mem(current_ir_graph), ir_bk_frame_addess, 2, in, tp); + return new_Proj(irn, mode_P_data, pn_Builtin_1_result); + } + } + case bk_gnu_builtin_return_address: { + expression_t *const expression = call->arguments->expression; + ir_node *in[2]; + + in[0] = expression_to_firm(expression); + in[1] = get_irg_frame(current_ir_graph); + ir_type *tp = get_ir_type(function_type); + ir_node *irn = new_d_Builtin(dbgi, get_irg_no_mem(current_ir_graph), ir_bk_return_address, 2, in, tp); + return new_Proj(irn, mode_P_data, pn_Builtin_1_result); + } + case bk_gnu_builtin_ffs: + return gen_unary_builtin(ir_bk_ffs, call->arguments->expression, function_type, dbgi); + case bk_gnu_builtin_clz: + return gen_unary_builtin(ir_bk_clz, call->arguments->expression, function_type, dbgi); + case bk_gnu_builtin_ctz: + return gen_unary_builtin(ir_bk_ctz, call->arguments->expression, function_type, dbgi); + case bk_gnu_builtin_popcount: + case bk_ms__popcount: + return gen_unary_builtin(ir_bk_popcount, call->arguments->expression, function_type, dbgi); + case bk_gnu_builtin_parity: + return gen_unary_builtin(ir_bk_parity, call->arguments->expression, function_type, dbgi); + case bk_gnu_builtin_prefetch: { + call_argument_t *const args = call->arguments; + expression_t *const addr = args->expression; + ir_node *in[3]; + + in[0] = _expression_to_firm(addr); + if (args->next != NULL) { + expression_t *const rw = args->next->expression; + + in[1] = _expression_to_firm(rw); + + if (args->next->next != NULL) { + expression_t *const locality = args->next->next->expression; + + in[2] = expression_to_firm(locality); + } else { + in[2] = new_Const_long(mode_int, 3); + } + } else { + in[1] = new_Const_long(mode_int, 0); + in[2] = new_Const_long(mode_int, 3); + } + ir_type *tp = get_ir_type(function_type); + ir_node *irn = new_d_Builtin(dbgi, get_store(), ir_bk_prefetch, 3, in, tp); + set_store(new_Proj(irn, mode_M, pn_Builtin_M)); + return NULL; + } + case bk_gnu_builtin_trap: + case bk_ms__ud2: + { + ir_type *tp = get_ir_type(function_type); + ir_node *irn = new_d_Builtin(dbgi, get_store(), ir_bk_trap, 0, NULL, tp); + set_store(new_Proj(irn, mode_M, pn_Builtin_M)); + return NULL; + } + case bk_ms__debugbreak: { + ir_type *tp = get_ir_type(function_type); + ir_node *irn = new_d_Builtin(dbgi, get_store(), ir_bk_debugbreak, 0, NULL, tp); + set_store(new_Proj(irn, mode_M, pn_Builtin_M)); return NULL; + } + case bk_ms_ReturnAddress: { + ir_node *in[2]; + + in[0] = new_Const_long(mode_int, 0); + in[1] = get_irg_frame(current_ir_graph); + ir_type *tp = get_ir_type(function_type); + ir_node *irn = new_d_Builtin(dbgi, get_irg_no_mem(current_ir_graph), ir_bk_return_address, 2, in, tp); + return new_Proj(irn, mode_P_data, pn_Builtin_1_result); + } + case bk_ms_rotl: + case bk_ms_rotl64: { + ir_node *val = expression_to_firm(call->arguments->expression); + ir_node *shf = expression_to_firm(call->arguments->next->expression); + ir_mode *mode = get_irn_mode(val); + return new_d_Rotl(dbgi, val, create_conv(dbgi, shf, mode_uint), mode); + } + case bk_ms_rotr: + case bk_ms_rotr64: { + ir_node *val = expression_to_firm(call->arguments->expression); + ir_node *shf = expression_to_firm(call->arguments->next->expression); + ir_mode *mode = get_irn_mode(val); + ir_node *c = new_Const_long(mode_uint, get_mode_size_bits(mode)); + ir_node *sub = new_d_Sub(dbgi, c, create_conv(dbgi, shf, mode_uint), mode_uint); + return new_d_Rotl(dbgi, val, sub, mode); + } + case bk_ms_byteswap_ushort: + case bk_ms_byteswap_ulong: + case bk_ms_byteswap_uint64: + return gen_unary_builtin(ir_bk_bswap, call->arguments->expression, function_type, dbgi); + case bk_ms__inbyte: + case bk_ms__inword: + case bk_ms__indword: + return gen_unary_builtin_pinned(ir_bk_inport, call->arguments->expression, function_type, dbgi); + case bk_ms__outbyte: + case bk_ms__outword: + case bk_ms__outdword: + return gen_binary_builtin_mem(ir_bk_outport, call->arguments->expression, + call->arguments->next->expression, function_type, dbgi); default: - panic("Unsupported builtin found\n"); + panic("unsupported builtin found"); } } @@ -1618,37 +1812,38 @@ static ir_node *process_builtin_call(const call_expression_t *call) * 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) +static ir_node *call_expression_to_firm(const call_expression_t *const call) { - dbg_info *dbgi = get_dbg_info(&call->base.source_position); + dbg_info *const dbgi = get_dbg_info(&call->base.source_position); assert(get_cur_block() != NULL); expression_t *function = call->function; - if (function->kind == EXPR_BUILTIN_SYMBOL) { - return process_builtin_call(call); - } if (function->kind == EXPR_REFERENCE) { - const reference_expression_t *ref = &function->reference; - declaration_t *declaration = ref->declaration; - - if ((declaration_kind_t)declaration->declaration_kind == DECLARATION_KIND_FUNCTION) { - if (declaration->v.entity == rts_entities[rts_alloca]) { - /* handle alloca() call */ - expression_t *argument = call->arguments->expression; - ir_node *size = expression_to_firm(argument); - - 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); - set_store(proj_m); - ir_node *res = new_Proj(alloca, mode_P_data, pn_Alloc_res); - - return res; - } + 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 + && 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); + + size = create_conv(dbgi, size, mode); + + 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); @@ -1665,14 +1860,13 @@ static ir_node *call_expression_to_firm(const call_expression_t *call) ir_type *new_method_type = NULL; if (function_type->variadic || function_type->unspecified_parameters) { const call_argument_t *argument = call->arguments; - for( ; argument != NULL; argument = argument->next) { + for ( ; argument != NULL; argument = argument->next) { ++n_parameters; } /* we need to construct a new method type matching the 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(id_unique("calltype.%u"), n_parameters, n_res, dbgi); set_method_calling_convention(new_method_type, @@ -1682,12 +1876,12 @@ static ir_node *call_expression_to_firm(const call_expression_t *call) set_method_variadicity(new_method_type, get_method_variadicity(ir_method_type)); - for(int i = 0; i < n_res; ++i) { + for (int i = 0; i < n_res; ++i) { set_method_res_type(new_method_type, i, get_method_res_type(ir_method_type, i)); } argument = call->arguments; - for(int i = 0; i < n_parameters; ++i, argument = argument->next) { + for (int i = 0; i < n_parameters; ++i, argument = argument->next) { expression_t *expression = argument->expression; ir_type *irtype = get_ir_type(expression->base.type); set_method_param_type(new_method_type, i, irtype); @@ -1700,11 +1894,16 @@ static ir_node *call_expression_to_firm(const call_expression_t *call) ir_node *in[n_parameters]; const call_argument_t *argument = call->arguments; - for(int n = 0; n < n_parameters; ++n) { + for (int n = 0; n < n_parameters; ++n) { expression_t *expression = argument->expression; ir_node *arg_node = expression_to_firm(expression); - arg_node = do_strict_conv(dbgi, arg_node); + type_t *type = skip_typeref(expression->base.type); + if (!is_type_compound(type)) { + ir_mode *mode = get_ir_mode_storage(expression->base.type); + arg_node = create_conv(dbgi, arg_node, mode); + arg_node = do_strict_conv(dbgi, arg_node); + } in[n] = arg_node; @@ -1721,18 +1920,21 @@ static ir_node *call_expression_to_firm(const call_expression_t *call) ir_node *result = NULL; if (!is_type_atomic(return_type, ATOMIC_TYPE_VOID)) { - ir_mode *mode; + ir_node *resproj = new_d_Proj(dbgi, node, mode_T, pn_Call_T_result); + if (is_type_scalar(return_type)) { - mode = get_ir_mode(return_type); + ir_mode *mode = get_ir_mode_storage(return_type); + result = new_d_Proj(dbgi, resproj, mode, 0); + ir_mode *mode_arith = get_ir_mode_arithmetic(return_type); + result = create_conv(NULL, result, mode_arith); } else { - mode = mode_P_data; + ir_mode *mode = mode_P_data; + result = new_d_Proj(dbgi, resproj, mode, 0); } - ir_node *resproj = new_d_Proj(dbgi, node, mode_T, pn_Call_T_result); - result = new_d_Proj(dbgi, resproj, mode, 0); } if (function->kind == EXPR_REFERENCE && - function->reference.declaration->modifiers & DM_NORETURN) { + function->reference.entity->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); @@ -1754,15 +1956,19 @@ static ir_node *create_condition_evaluation(const expression_t *expression, static void assign_value(dbg_info *dbgi, ir_node *addr, type_t *type, ir_node *value) { - value = do_strict_conv(dbgi, value); + if (!is_type_compound(type)) { + ir_mode *mode = get_ir_mode_storage(type); + value = create_conv(dbgi, value, mode); + value = do_strict_conv(dbgi, value); + } ir_node *memory = get_store(); if (is_type_scalar(type)) { - ir_node *store = new_d_Store(dbgi, memory, addr, value); + ir_cons_flags flags = type->base.qualifiers & TYPE_QUALIFIER_VOLATILE + ? cons_volatile : cons_none; + ir_node *store = new_d_Store(dbgi, memory, addr, value, flags); ir_node *store_mem = new_d_Proj(dbgi, store, mode_M, pn_Store_M); - if (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) - set_Store_volatility(store, volatility_is_volatile); set_store(store_mem); } else { ir_type *irtype = get_ir_type(type); @@ -1794,7 +2000,7 @@ static tarval *create_bitfield_mask(ir_mode *mode, int offset, int size) return mask1; } -static void bitfield_store_to_firm(dbg_info *dbgi, +static ir_node *bitfield_store_to_firm(dbg_info *dbgi, ir_entity *entity, ir_node *addr, ir_node *value, bool set_volatile) { ir_type *entity_type = get_entity_type(entity); @@ -1809,32 +2015,31 @@ static void bitfield_store_to_firm(dbg_info *dbgi, int bitsize = get_mode_size_bits(get_type_mode(entity_type)); tarval *mask = create_bitfield_mask(mode, 0, bitsize); - ir_node *mask_node = new_d_Const(dbgi, mode, mask); + ir_node *mask_node = new_d_Const(dbgi, mask); ir_node *value_masked = new_d_And(dbgi, value, mask_node, mode); tarval *shiftl = new_tarval_from_long(bitoffset, mode_uint); - ir_node *shiftcount = new_d_Const(dbgi, mode_uint, shiftl); + ir_node *shiftcount = new_d_Const(dbgi, shiftl); ir_node *value_maskshift = new_d_Shl(dbgi, value_masked, shiftcount, mode); /* load current value */ ir_node *mem = get_store(); - ir_node *load = new_d_Load(dbgi, mem, addr, mode); + ir_node *load = new_d_Load(dbgi, mem, addr, mode, + set_volatile ? cons_volatile : cons_none); ir_node *load_mem = new_d_Proj(dbgi, load, mode_M, pn_Load_M); ir_node *load_res = new_d_Proj(dbgi, load, mode, pn_Load_res); tarval *shift_mask = create_bitfield_mask(mode, bitoffset, bitsize); tarval *inv_mask = tarval_not(shift_mask); - ir_node *inv_mask_node = new_d_Const(dbgi, mode, inv_mask); + ir_node *inv_mask_node = new_d_Const(dbgi, inv_mask); ir_node *load_res_masked = new_d_And(dbgi, load_res, inv_mask_node, mode); /* construct new value and store */ ir_node *new_val = new_d_Or(dbgi, load_res_masked, value_maskshift, mode); - ir_node *store = new_d_Store(dbgi, load_mem, addr, new_val); + ir_node *store = new_d_Store(dbgi, load_mem, addr, new_val, + set_volatile ? cons_volatile : cons_none); ir_node *store_mem = new_d_Proj(dbgi, store, mode_M, pn_Store_M); set_store(store_mem); - if (set_volatile) { - set_Load_volatility(load, volatility_is_volatile); - set_Store_volatility(store, volatility_is_volatile); - } + return value_masked; } static ir_node *bitfield_extract_to_firm(const select_expression_t *expression, @@ -1842,9 +2047,9 @@ static ir_node *bitfield_extract_to_firm(const select_expression_t *expression, { dbg_info *dbgi = get_dbg_info(&expression->base.source_position); type_t *type = expression->base.type; - ir_mode *mode = get_ir_mode(type); + ir_mode *mode = get_ir_mode_storage(type); ir_node *mem = get_store(); - ir_node *load = new_d_Load(dbgi, mem, addr, mode); + ir_node *load = new_d_Load(dbgi, mem, addr, mode, cons_none); ir_node *load_mem = new_d_Proj(dbgi, load, mode_M, pn_Load_M); ir_node *load_res = new_d_Proj(dbgi, load, mode, pn_Load_res); @@ -1853,20 +2058,21 @@ static ir_node *bitfield_extract_to_firm(const select_expression_t *expression, set_store(load_mem); /* kill upper bits */ - ir_entity *entity = expression->compound_entry->v.entity; + assert(expression->compound_entry->kind == ENTITY_COMPOUND_MEMBER); + ir_entity *entity = expression->compound_entry->compound_member.entity; int bitoffset = get_entity_offset_bits_remainder(entity); ir_type *entity_type = get_entity_type(entity); int bitsize = get_mode_size_bits(get_type_mode(entity_type)); long shift_bitsl = machine_size - bitoffset - bitsize; assert(shift_bitsl >= 0); tarval *tvl = new_tarval_from_long(shift_bitsl, mode_uint); - ir_node *countl = new_d_Const(dbgi, mode_uint, tvl); + ir_node *countl = new_d_Const(dbgi, tvl); ir_node *shiftl = new_d_Shl(dbgi, load_res, countl, mode_int); long shift_bitsr = bitoffset + shift_bitsl; assert(shift_bitsr <= (long) machine_size); tarval *tvr = new_tarval_from_long(shift_bitsr, mode_uint); - ir_node *countr = new_d_Const(dbgi, mode_uint, tvr); + ir_node *countr = new_d_Const(dbgi, tvr); ir_node *shiftr; if (mode_is_signed(mode)) { shiftr = new_d_Shrs(dbgi, shiftl, countr, mode_int); @@ -1877,42 +2083,66 @@ static ir_node *bitfield_extract_to_firm(const select_expression_t *expression, return create_conv(dbgi, shiftr, mode); } -static void set_value_for_expression_addr(const expression_t *expression, - ir_node *value, ir_node *addr) +/* make sure the selected compound type is constructed */ +static void construct_select_compound(const select_expression_t *expression) +{ + type_t *type = skip_typeref(expression->compound->base.type); + if (is_type_pointer(type)) { + type = type->pointer.points_to; + } + (void) get_ir_type(type); +} + +static ir_node *set_value_for_expression_addr(const expression_t *expression, + ir_node *value, ir_node *addr) { dbg_info *dbgi = get_dbg_info(&expression->base.source_position); - value = do_strict_conv(dbgi, value); + type_t *type = skip_typeref(expression->base.type); + + if (!is_type_compound(type)) { + ir_mode *mode = get_ir_mode_storage(type); + value = create_conv(dbgi, value, mode); + value = do_strict_conv(dbgi, value); + } if (expression->kind == EXPR_REFERENCE) { const reference_expression_t *ref = &expression->reference; - declaration_t *declaration = ref->declaration; - assert(declaration->declaration_kind != DECLARATION_KIND_UNKNOWN); - if (declaration->declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE) { - set_value(declaration->v.value_number, value); - return; + entity_t *entity = ref->entity; + assert(is_declaration(entity)); + assert(entity->declaration.kind != DECLARATION_KIND_UNKNOWN); + if (entity->declaration.kind == DECLARATION_KIND_LOCAL_VARIABLE) { + set_value(entity->variable.v.value_number, value); + return value; + } else if (entity->declaration.kind == DECLARATION_KIND_PARAMETER) { + set_value(entity->parameter.v.value_number, value); + return value; } } if (addr == NULL) addr = expression_to_addr(expression); - - type_t *type = skip_typeref(expression->base.type); + assert(addr != NULL); if (expression->kind == EXPR_SELECT) { const select_expression_t *select = &expression->select; - declaration_t *declaration = select->compound_entry; - if (declaration->type->kind == TYPE_BITFIELD) { - ir_entity *entity = select->compound_entry->v.entity; + construct_select_compound(select); + + entity_t *entity = select->compound_entry; + assert(entity->kind == ENTITY_COMPOUND_MEMBER); + if (entity->declaration.type->kind == TYPE_BITFIELD) { + ir_entity *irentity = entity->compound_member.entity; bool set_volatile = select->base.type->base.qualifiers & TYPE_QUALIFIER_VOLATILE; - bitfield_store_to_firm(dbgi, entity, addr, value, set_volatile); - return; + value = bitfield_store_to_firm(dbgi, irentity, addr, value, + set_volatile); + return value; } } assign_value(dbgi, addr, type, value); + return value; } static void set_value_for_expression(const expression_t *expression, @@ -1927,12 +2157,25 @@ static ir_node *get_value_from_lvalue(const expression_t *expression, if (expression->kind == EXPR_REFERENCE) { const reference_expression_t *ref = &expression->reference; - declaration_t *declaration = ref->declaration; - assert(declaration->declaration_kind != DECLARATION_KIND_UNKNOWN); - if (declaration->declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE) { + entity_t *entity = ref->entity; + assert(entity->kind == ENTITY_VARIABLE + || entity->kind == ENTITY_PARAMETER); + assert(entity->declaration.kind != DECLARATION_KIND_UNKNOWN); + int value_number; + if (entity->declaration.kind == DECLARATION_KIND_LOCAL_VARIABLE) { + value_number = entity->variable.v.value_number; assert(addr == NULL); - ir_mode *mode = get_ir_mode(expression->base.type); - return get_value(declaration->v.value_number, mode); + type_t *type = skip_typeref(expression->base.type); + ir_mode *mode = get_ir_mode_storage(type); + ir_node *res = get_value(value_number, mode); + return create_conv(NULL, res, get_ir_mode_arithmetic(type)); + } else if (entity->declaration.kind == DECLARATION_KIND_PARAMETER) { + value_number = entity->parameter.v.value_number; + assert(addr == NULL); + type_t *type = skip_typeref(expression->base.type); + ir_mode *mode = get_ir_mode_storage(type); + ir_node *res = get_value(value_number, mode); + return create_conv(NULL, res, get_ir_mode_arithmetic(type)); } } @@ -1941,7 +2184,8 @@ static ir_node *get_value_from_lvalue(const expression_t *expression, ir_node *value; if (expression->kind == EXPR_SELECT && - expression->select.compound_entry->type->kind == TYPE_BITFIELD){ + expression->select.compound_entry->declaration.type->kind == TYPE_BITFIELD){ + construct_select_compound(&expression->select); value = bitfield_extract_to_firm(&expression->select, addr); } else { value = deref_address(dbgi, expression->base.type, addr); @@ -1959,7 +2203,7 @@ static ir_node *create_incdec(const unary_expression_t *expression) ir_node *value = get_value_from_lvalue(value_expr, addr); type_t *type = skip_typeref(expression->base.type); - ir_mode *mode = get_ir_mode(expression->base.type); + ir_mode *mode = get_ir_mode_arithmetic(expression->base.type); ir_node *offset; if (is_type_pointer(type)) { @@ -1967,7 +2211,7 @@ static ir_node *create_incdec(const unary_expression_t *expression) offset = get_type_size(pointer_type->points_to); } else { assert(is_type_arithmetic(type)); - offset = new_Const(mode, get_mode_one(mode)); + offset = new_Const(get_mode_one(mode)); } ir_node *result; @@ -2002,9 +2246,12 @@ static bool is_local_variable(expression_t *expression) { if (expression->kind != EXPR_REFERENCE) return false; - reference_expression_t *ref_expr = &expression->reference; - declaration_t *declaration = ref_expr->declaration; - return declaration->declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE; + reference_expression_t *ref_expr = &expression->reference; + entity_t *entity = ref_expr->entity; + if (entity->kind != ENTITY_VARIABLE) + return false; + assert(entity->declaration.kind != DECLARATION_KIND_UNKNOWN); + return entity->declaration.kind == DECLARATION_KIND_LOCAL_VARIABLE; } static pn_Cmp get_pnc(const expression_kind_t kind, type_t *const type) @@ -2045,50 +2292,50 @@ static pn_Cmp get_pnc(const expression_kind_t kind, type_t *const type) static ir_node *handle_assume_compare(dbg_info *dbi, const binary_expression_t *expression) { - expression_t *op1 = expression->left; - expression_t *op2 = expression->right; - declaration_t *var2, *var = NULL; - ir_node *res = NULL; - pn_Cmp cmp_val; + expression_t *op1 = expression->left; + expression_t *op2 = expression->right; + entity_t *var2, *var = NULL; + ir_node *res = NULL; + pn_Cmp cmp_val; cmp_val = get_pnc(expression->base.kind, op1->base.type); if (is_local_variable(op1) && is_local_variable(op2)) { - var = op1->reference.declaration; - var2 = op2->reference.declaration; + var = op1->reference.entity; + var2 = op2->reference.entity; - type_t *const type = skip_typeref(var->type); - ir_mode *const mode = get_ir_mode(type); + type_t *const type = skip_typeref(var->declaration.type); + ir_mode *const mode = get_ir_mode_storage(type); - ir_node *const irn1 = get_value(var->v.value_number, mode); - ir_node *const irn2 = get_value(var2->v.value_number, mode); + ir_node *const irn1 = get_value(var->variable.v.value_number, mode); + ir_node *const irn2 = get_value(var2->variable.v.value_number, mode); res = new_d_Confirm(dbi, irn2, irn1, get_inversed_pnc(cmp_val)); - set_value(var2->v.value_number, res); + set_value(var2->variable.v.value_number, res); res = new_d_Confirm(dbi, irn1, irn2, cmp_val); - set_value(var->v.value_number, res); + set_value(var->variable.v.value_number, res); return res; } expression_t *con; if (is_local_variable(op1) && is_constant_expression(op2)) { - var = op1->reference.declaration; + var = op1->reference.entity; con = op2; } else if (is_constant_expression(op1) && is_local_variable(op2)) { cmp_val = get_inversed_pnc(cmp_val); - var = op2->reference.declaration; + var = op2->reference.entity; con = op1; } if (var != NULL) { - type_t *const type = skip_typeref(var->type); - ir_mode *const mode = get_ir_mode(type); + type_t *const type = skip_typeref(var->declaration.type); + ir_mode *const mode = get_ir_mode_storage(type); - res = get_value(var->v.value_number, mode); + res = get_value(var->variable.v.value_number, mode); res = new_d_Confirm(dbi, res, expression_to_firm(con), cmp_val); - set_value(var->v.value_number, res); + set_value(var->variable.v.value_number, res); } return res; } @@ -2099,7 +2346,8 @@ static ir_node *handle_assume_compare(dbg_info *dbi, * @param dbi debug info * @param expr the IL assume expression */ -static ir_node *handle_assume(dbg_info *dbi, const expression_t *expression) { +static ir_node *handle_assume(dbg_info *dbi, const expression_t *expression) +{ switch(expression->kind) { case EXPR_BINARY_EQUAL: case EXPR_BINARY_NOTEQUAL: @@ -2126,14 +2374,14 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression) switch(expression->base.kind) { case EXPR_UNARY_NEGATE: { ir_node *value_node = expression_to_firm(value); - ir_mode *mode = get_ir_mode(type); + ir_mode *mode = get_ir_mode_arithmetic(type); return new_d_Minus(dbgi, value_node, mode); } case EXPR_UNARY_PLUS: return expression_to_firm(value); case EXPR_UNARY_BITWISE_NEGATE: { ir_node *value_node = expression_to_firm(value); - ir_mode *mode = get_ir_mode(type); + ir_mode *mode = get_ir_mode_arithmetic(type); return new_d_Not(dbgi, value_node, mode); } case EXPR_UNARY_NOT: { @@ -2157,9 +2405,11 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression) case EXPR_UNARY_CAST: { ir_node *value_node = expression_to_firm(value); if (is_type_scalar(type)) { - ir_mode *mode = get_ir_mode(type); - ir_node *node = create_conv(dbgi, value_node, mode); - node = do_strict_conv(dbgi, node); + ir_mode *mode = get_ir_mode_storage(type); + ir_node *node = create_conv(dbgi, value_node, mode); + node = do_strict_conv(dbgi, node); + ir_mode *mode_arith = get_ir_mode_arithmetic(type); + node = create_conv(dbgi, node, mode_arith); return node; } else { /* make sure firm type is constructed */ @@ -2170,8 +2420,11 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression) case EXPR_UNARY_CAST_IMPLICIT: { ir_node *value_node = expression_to_firm(value); if (is_type_scalar(type)) { - ir_mode *mode = get_ir_mode(type); - return create_conv(dbgi, value_node, mode); + ir_mode *mode = get_ir_mode_storage(type); + ir_node *res = create_conv(dbgi, value_node, mode); + ir_mode *mode_arith = get_ir_mode_arithmetic(type); + res = create_conv(dbgi, res, mode_arith); + return res; } else { return value_node; } @@ -2192,17 +2445,18 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression) * produces a 0/1 depending of the value of a mode_b node */ static ir_node *produce_condition_result(const expression_t *expression, - dbg_info *dbgi) + ir_mode *mode, dbg_info *dbgi) { - ir_mode *mode = get_ir_mode(expression->base.type); ir_node *cur_block = get_cur_block(); ir_node *one_block = new_immBlock(); - ir_node *one = new_Const(mode, get_mode_one(mode)); + set_cur_block(one_block); + ir_node *one = new_Const(get_mode_one(mode)); ir_node *jmp_one = new_d_Jmp(dbgi); ir_node *zero_block = new_immBlock(); - ir_node *zero = new_Const(mode, get_mode_null(mode)); + set_cur_block(zero_block); + ir_node *zero = new_Const(get_mode_null(mode)); ir_node *jmp_zero = new_d_Jmp(dbgi); set_cur_block(cur_block); @@ -2222,23 +2476,14 @@ static ir_node *produce_condition_result(const expression_t *expression, static ir_node *adjust_for_pointer_arithmetic(dbg_info *dbgi, ir_node *value, type_t *type) { + ir_mode *const mode = get_ir_mode_arithmetic(type_ptrdiff_t); + assert(is_type_pointer(type)); pointer_type_t *const pointer_type = &type->pointer; 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) - return value; - - value = create_conv(dbgi, value, mode_int); - ir_node *const cnst = new_Const_long(mode_int, (long)elem_size); - ir_node *const mul = new_d_Mul(dbgi, value, cnst, mode_int); + ir_node * elem_size = get_type_size(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); return mul; } @@ -2264,7 +2509,7 @@ static ir_node *create_op(dbg_info *dbgi, const binary_expression_t *expression, if (is_type_pointer(type_left) && is_type_pointer(type_right)) { const pointer_type_t *const ptr_type = &type_left->pointer; - mode = get_ir_mode(expression->base.type); + mode = get_ir_mode_arithmetic(expression->base.type); ir_node *const elem_size = get_type_size(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); @@ -2277,7 +2522,7 @@ static ir_node *create_op(dbg_info *dbgi, const binary_expression_t *expression, case EXPR_BINARY_SUB_ASSIGN: if (is_type_pointer(type_left)) { right = adjust_for_pointer_arithmetic(dbgi, right, type_left); - mode = get_ir_mode(type_left); + mode = get_ir_mode_arithmetic(type_left); break; } goto normal_node; @@ -2286,18 +2531,18 @@ static ir_node *create_op(dbg_info *dbgi, const binary_expression_t *expression, case EXPR_BINARY_ADD_ASSIGN: if (is_type_pointer(type_left)) { right = adjust_for_pointer_arithmetic(dbgi, right, type_left); - mode = get_ir_mode(type_left); + mode = get_ir_mode_arithmetic(type_left); break; } else if (is_type_pointer(type_right)) { left = adjust_for_pointer_arithmetic(dbgi, left, type_right); - mode = get_ir_mode(type_right); + mode = get_ir_mode_arithmetic(type_right); break; } goto normal_node; default: normal_node: - mode = get_irn_mode(right); + mode = get_ir_mode_arithmetic(type_right); left = create_conv(dbgi, left, mode); break; } @@ -2362,22 +2607,35 @@ normal_node: static ir_node *create_lazy_op(const binary_expression_t *expression) { dbg_info *dbgi = get_dbg_info(&expression->base.source_position); - type_t *type = expression->base.type; - ir_mode *mode = get_ir_mode(type); + type_t *type = skip_typeref(expression->base.type); + ir_mode *mode = get_ir_mode_arithmetic(type); if (is_constant_expression(expression->left)) { long val = fold_constant(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 && val != 0) || - (ekind == EXPR_BINARY_LOGICAL_OR && val == 0)) { - return expression_to_firm(expression->right); + if (ekind == EXPR_BINARY_LOGICAL_AND) { + if (val == 0) { + return new_Const(get_mode_null(mode)); + } } else { - return new_Const(mode, get_mode_one(mode)); + if (val != 0) { + return new_Const(get_mode_one(mode)); + } } + + if (is_constant_expression(expression->right)) { + long const valr = fold_constant(expression->right); + return valr != 0 ? + new_Const(get_mode_one(mode)) : + new_Const(get_mode_null(mode)); + } + + return produce_condition_result(expression->right, mode, dbgi); } - return produce_condition_result((const expression_t*) expression, dbgi); + return produce_condition_result((const expression_t*) expression, mode, + dbgi); } typedef ir_node * (*create_arithmetic_func)(dbg_info *dbgi, ir_node *left, @@ -2387,7 +2645,8 @@ 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); + type_t *type = skip_typeref(left_expr->base.type); + ir_mode *left_mode = get_ir_mode_storage(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); @@ -2396,8 +2655,12 @@ static ir_node *create_assign_binop(const binary_expression_t *expression) result = create_conv(dbgi, result, left_mode); result = do_strict_conv(dbgi, result); - set_value_for_expression_addr(left_expr, result, left_addr); + result = set_value_for_expression_addr(left_expr, result, left_addr); + if (!is_type_compound(type)) { + ir_mode *mode_arithmetic = get_ir_mode_arithmetic(type); + result = create_conv(dbgi, result, mode_arithmetic); + } return result; } @@ -2429,9 +2692,15 @@ static ir_node *binary_expression_to_firm(const binary_expression_t *expression) case EXPR_BINARY_ASSIGN: { ir_node *addr = expression_to_addr(expression->left); ir_node *right = expression_to_firm(expression->right); - set_value_for_expression_addr(expression->left, right, addr); + ir_node *res + = set_value_for_expression_addr(expression->left, right, addr); - return right; + type_t *type = skip_typeref(expression->base.type); + if (!is_type_compound(type)) { + ir_mode *mode_arithmetic = get_ir_mode_arithmetic(type); + res = create_conv(NULL, res, mode_arithmetic); + } + return res; } case EXPR_BINARY_ADD: case EXPR_BINARY_SUB: @@ -2468,8 +2737,6 @@ static ir_node *binary_expression_to_firm(const binary_expression_t *expression) case EXPR_BINARY_SHIFTLEFT_ASSIGN: case EXPR_BINARY_SHIFTRIGHT_ASSIGN: return create_assign_binop(expression); - case EXPR_BINARY_BUILTIN_EXPECT: - return _expression_to_firm(expression->left); default: panic("TODO binexpr type"); } @@ -2477,28 +2744,12 @@ static ir_node *binary_expression_to_firm(const binary_expression_t *expression) static ir_node *array_access_addr(const array_access_expression_t *expression) { - dbg_info *dbgi = get_dbg_info(&expression->base.source_position); - ir_node *base_addr = expression_to_firm(expression->array_ref); - ir_node *offset = expression_to_firm(expression->index); - - type_t *offset_type = skip_typeref(expression->index->base.type); - ir_mode *mode; - if (is_type_signed(offset_type)) { - mode = get_ir_mode(type_ssize_t); - } else { - mode = get_ir_mode(type_size_t); - } - offset = create_conv(dbgi, offset, mode); - - type_t *ref_type = skip_typeref(expression->array_ref->base.type); - assert(is_type_pointer(ref_type)); - pointer_type_t *pointer_type = &ref_type->pointer; - - ir_node *elem_size_const = get_type_size(pointer_type->points_to); - elem_size_const = create_conv(dbgi, elem_size_const, mode); - ir_node *real_offset = new_d_Mul(dbgi, offset, elem_size_const, - mode); - ir_node *result = new_d_Add(dbgi, base_addr, real_offset, mode_P_data); + dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + ir_node *base_addr = expression_to_firm(expression->array_ref); + ir_node *offset = expression_to_firm(expression->index); + type_t *ref_type = skip_typeref(expression->array_ref->base.type); + ir_node *real_offset = adjust_for_pointer_arithmetic(dbgi, offset, ref_type); + ir_node *result = new_d_Add(dbgi, base_addr, real_offset, mode_P_data); return result; } @@ -2521,7 +2772,7 @@ static long get_offsetof_offset(const offsetof_expression_t *expression) long offset = 0; designator_t *designator = expression->designator; - for( ; designator != NULL; designator = designator->next) { + for ( ; designator != NULL; designator = designator->next) { type_t *type = skip_typeref(orig_type); /* be sure the type is constructed */ (void) get_ir_type(type); @@ -2530,19 +2781,20 @@ static long get_offsetof_offset(const offsetof_expression_t *expression) assert(is_type_compound(type)); symbol_t *symbol = designator->symbol; - declaration_t *declaration = type->compound.declaration; - declaration_t *iter = declaration->scope.declarations; - for( ; iter != NULL; iter = iter->next) { - if (iter->symbol == symbol) { + compound_t *compound = type->compound.compound; + entity_t *iter = compound->members.entities; + for ( ; iter != NULL; iter = iter->base.next) { + if (iter->base.symbol == symbol) { break; } } assert(iter != NULL); - assert(iter->declaration_kind == DECLARATION_KIND_COMPOUND_MEMBER); - offset += get_entity_offset(iter->v.entity); + assert(iter->kind == ENTITY_COMPOUND_MEMBER); + assert(iter->declaration.kind == DECLARATION_KIND_COMPOUND_MEMBER); + offset += get_entity_offset(iter->compound_member.entity); - orig_type = iter->type; + orig_type = iter->declaration.type; } else { expression_t *array_index = designator->array_index; assert(designator->array_index != NULL); @@ -2564,12 +2816,12 @@ static long get_offsetof_offset(const offsetof_expression_t *expression) static ir_node *offsetof_to_firm(const offsetof_expression_t *expression) { - ir_mode *mode = get_ir_mode(expression->base.type); + ir_mode *mode = get_ir_mode_arithmetic(expression->base.type); long offset = get_offsetof_offset(expression); tarval *tv = new_tarval_from_long(offset, mode); dbg_info *dbgi = get_dbg_info(&expression->base.source_position); - return new_d_Const(dbgi, mode, tv); + return new_d_Const(dbgi, tv); } static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi, @@ -2613,7 +2865,7 @@ static ir_node *sizeof_to_firm(const typeprop_expression_t *expression) } type = skip_typeref(type); - /* § 6.5.3.4 (2) if the type is a VLA, evaluate the expression. */ + /* §6.5.3.4:2 if the type is a VLA, evaluate the expression. */ if (is_type_array(type) && type->array.is_vla && expression->tp_expression != NULL) { expression_to_firm(expression->tp_expression); @@ -2622,27 +2874,61 @@ static ir_node *sizeof_to_firm(const typeprop_expression_t *expression) return get_type_size(type); } +static entity_t *get_expression_entity(const expression_t *expression) +{ + if (expression->kind != EXPR_REFERENCE) + return NULL; + + return expression->reference.entity; +} + /** * Transform an alignof expression into Firm code. */ static ir_node *alignof_to_firm(const typeprop_expression_t *expression) { - type_t *type = expression->type; - if (type == NULL) { - /* beware: if expression is a variable reference, return the - alignment of the variable. */ - const expression_t *tp_expression = expression->tp_expression; - const declaration_t *declaration = expr_is_variable(tp_expression); - if (declaration != NULL) { - /* TODO: get the alignment of this variable. */ + ir_entity *irentity = NULL; + + 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; + } } - type = tp_expression->base.type; - assert(type != NULL); } - ir_mode *const mode = get_ir_mode(expression->base.type); + ir_type *irtype; + if (irentity != NULL) { + irtype = get_entity_type(irentity); + } else { + type_t *type = expression->type; + irtype = get_ir_type(type); + } + + ir_mode *const mode = get_ir_mode_arithmetic(expression->base.type); symconst_symbol sym; - sym.type_p = get_ir_type(type); + sym.type_p = irtype; return new_SymConst(mode, sym, symconst_type_align); } @@ -2660,20 +2946,18 @@ long fold_constant(const expression_t *expression) assert(is_constant_expression(expression)); ir_graph *old_current_ir_graph = current_ir_graph; - if (current_ir_graph == NULL) { - current_ir_graph = get_const_code_irg(); - } + current_ir_graph = get_const_code_irg(); ir_node *cnst = expression_to_firm(expression); current_ir_graph = old_current_ir_graph; if (!is_Const(cnst)) { - panic("couldn't fold constant\n"); + panic("couldn't fold constant"); } tarval *tv = get_Const_tarval(cnst); if (!tarval_is_long(tv)) { - panic("result of constant folding is not integer\n"); + panic("result of constant folding is not integer"); } constant_folding = constant_folding_old; @@ -2702,6 +2986,7 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression) /* create the true block */ ir_node *true_block = new_immBlock(); + set_cur_block(true_block); ir_node *true_val = expression->true_expression != NULL ? expression_to_firm(expression->true_expression) : NULL; @@ -2709,6 +2994,7 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression) /* create the false block */ ir_node *false_block = new_immBlock(); + set_cur_block(false_block); ir_node *false_val = expression_to_firm(expression->false_expression); ir_node *false_jmp = new_Jmp(); @@ -2717,13 +3003,12 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression) set_cur_block(cur_block); ir_node *const cond_expr = create_condition_evaluation(expression->condition, true_block, false_block); if (expression->true_expression == NULL) { - if (cond_expr != NULL) { + if (cond_expr != NULL && get_irn_mode(cond_expr) != mode_b) { 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)); + /* Condition ended with a short circuit (&&, ||, !) operation or a + * comparison. Generate a "1" as value for the true branch. */ + true_val = new_Const(get_mode_one(mode_Is)); } } mature_immBlock(true_block); @@ -2752,24 +3037,24 @@ static ir_node *select_addr(const select_expression_t *expression) { dbg_info *dbgi = get_dbg_info(&expression->base.source_position); - ir_node *compound_addr = expression_to_firm(expression->compound); + construct_select_compound(expression); - /* 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; - - assert(entity != NULL); + ir_node *compound_addr = expression_to_firm(expression->compound); - ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), compound_addr, entity); + entity_t *entry = expression->compound_entry; + assert(entry->kind == ENTITY_COMPOUND_MEMBER); + assert(entry->declaration.kind == DECLARATION_KIND_COMPOUND_MEMBER); - return sel; + if (constant_folding) { + ir_mode *mode = get_irn_mode(compound_addr); + /* FIXME: here, we need an integer mode with the same number of bits as mode */ + ir_node *ofs = new_Const_long(mode_uint, entry->compound_member.offset); + return new_d_Add(dbgi, compound_addr, ofs, mode); + } else { + ir_entity *irentity = entry->compound_member.entity; + assert(irentity != NULL); + return new_d_simpleSel(dbgi, new_NoMem(), compound_addr, irentity); + } } static ir_node *select_to_firm(const select_expression_t *expression) @@ -2780,8 +3065,9 @@ static ir_node *select_to_firm(const select_expression_t *expression) (const expression_t*) expression); type = skip_typeref(type); - declaration_t *entry = expression->compound_entry; - type_t *entry_type = skip_typeref(entry->type); + entity_t *entry = expression->compound_entry; + assert(entry->kind == ENTITY_COMPOUND_MEMBER); + type_t *entry_type = skip_typeref(entry->declaration.type); if (entry_type->kind == TYPE_BITFIELD) { return bitfield_extract_to_firm(expression, addr); @@ -2817,75 +3103,82 @@ typedef enum gcc_type_class static ir_node *classify_type_to_firm(const classify_type_expression_t *const expr) { - const type_t *const type = skip_typeref(expr->type_expression->base.type); + type_t *type = expr->type_expression->base.type; + /* FIXME gcc returns different values depending on whether compiling C or C++ + * e.g. int x[10] is pointer_type_class in C, but array_type_class in C++ */ gcc_type_class tc; - switch (type->kind) - { - case TYPE_ATOMIC: { - const atomic_type_t *const atomic_type = &type->atomic; - switch (atomic_type->akind) { - /* should not be reached */ - case ATOMIC_TYPE_INVALID: - tc = no_type_class; - goto make_const; - - /* gcc cannot do that */ - case ATOMIC_TYPE_VOID: - tc = void_type_class; - goto make_const; - - case ATOMIC_TYPE_CHAR: /* gcc handles this as integer */ - case ATOMIC_TYPE_SCHAR: /* gcc handles this as integer */ - case ATOMIC_TYPE_UCHAR: /* gcc handles this as integer */ - case ATOMIC_TYPE_SHORT: - case ATOMIC_TYPE_USHORT: - case ATOMIC_TYPE_INT: - case ATOMIC_TYPE_UINT: - case ATOMIC_TYPE_LONG: - case ATOMIC_TYPE_ULONG: - case ATOMIC_TYPE_LONGLONG: - case ATOMIC_TYPE_ULONGLONG: - case ATOMIC_TYPE_BOOL: /* gcc handles this as integer */ - tc = integer_type_class; - goto make_const; - - case ATOMIC_TYPE_FLOAT: - case ATOMIC_TYPE_DOUBLE: - case ATOMIC_TYPE_LONG_DOUBLE: - tc = real_type_class; - goto make_const; + for (;;) { + type = skip_typeref(type); + switch (type->kind) { + case TYPE_ATOMIC: { + const atomic_type_t *const atomic_type = &type->atomic; + switch (atomic_type->akind) { + /* should not be reached */ + case ATOMIC_TYPE_INVALID: + tc = no_type_class; + goto make_const; + + /* gcc cannot do that */ + case ATOMIC_TYPE_VOID: + tc = void_type_class; + goto make_const; + + case ATOMIC_TYPE_WCHAR_T: /* gcc handles this as integer */ + case ATOMIC_TYPE_CHAR: /* gcc handles this as integer */ + case ATOMIC_TYPE_SCHAR: /* gcc handles this as integer */ + case ATOMIC_TYPE_UCHAR: /* gcc handles this as integer */ + case ATOMIC_TYPE_SHORT: + case ATOMIC_TYPE_USHORT: + case ATOMIC_TYPE_INT: + case ATOMIC_TYPE_UINT: + case ATOMIC_TYPE_LONG: + case ATOMIC_TYPE_ULONG: + case ATOMIC_TYPE_LONGLONG: + case ATOMIC_TYPE_ULONGLONG: + case ATOMIC_TYPE_BOOL: /* gcc handles this as integer */ + tc = integer_type_class; + goto make_const; + + case ATOMIC_TYPE_FLOAT: + case ATOMIC_TYPE_DOUBLE: + case ATOMIC_TYPE_LONG_DOUBLE: + tc = real_type_class; + goto make_const; + } + panic("Unexpected atomic type in classify_type_to_firm()."); } - panic("Unexpected atomic type in classify_type_to_firm()."); - } - case TYPE_COMPLEX: tc = complex_type_class; goto make_const; - case TYPE_IMAGINARY: tc = complex_type_class; goto make_const; - case TYPE_BITFIELD: tc = integer_type_class; goto make_const; - case TYPE_ARRAY: /* gcc handles this as pointer */ - case TYPE_FUNCTION: /* gcc handles this as pointer */ - case TYPE_POINTER: tc = pointer_type_class; goto make_const; - case TYPE_COMPOUND_STRUCT: tc = record_type_class; goto make_const; - case TYPE_COMPOUND_UNION: tc = union_type_class; goto make_const; - - /* gcc handles this as integer */ - case TYPE_ENUM: tc = integer_type_class; goto make_const; - - case TYPE_BUILTIN: - /* typedef/typeof should be skipped already */ - case TYPE_TYPEDEF: - case TYPE_TYPEOF: - case TYPE_INVALID: - case TYPE_ERROR: - break; + case TYPE_COMPLEX: tc = complex_type_class; goto make_const; + case TYPE_IMAGINARY: tc = complex_type_class; goto make_const; + case TYPE_BITFIELD: tc = integer_type_class; goto make_const; + case TYPE_ARRAY: /* gcc handles this as pointer */ + case TYPE_FUNCTION: /* gcc handles this as pointer */ + case TYPE_POINTER: tc = pointer_type_class; goto make_const; + case TYPE_COMPOUND_STRUCT: tc = record_type_class; goto make_const; + case TYPE_COMPOUND_UNION: tc = union_type_class; goto make_const; + + /* gcc handles this as integer */ + case TYPE_ENUM: tc = integer_type_class; goto make_const; + + /* gcc classifies the referenced type */ + case TYPE_REFERENCE: type = type->reference.refers_to; continue; + + case TYPE_BUILTIN: + /* typedef/typeof should be skipped already */ + case TYPE_TYPEDEF: + case TYPE_TYPEOF: + case TYPE_INVALID: + case TYPE_ERROR: + break; + } + panic("unexpected TYPE classify_type_to_firm()."); } - panic("unexpected TYPE classify_type_to_firm()."); -make_const: ; +make_const:; dbg_info *const dbgi = get_dbg_info(&expr->base.source_position); - ir_mode *const mode = mode_int; - tarval *const tv = new_tarval_from_long(tc, mode); - return new_d_Const(dbgi, mode, tv); + tarval *const tv = new_tarval_from_long(tc, mode_int); + return new_d_Const(dbgi, tv); } static ir_node *function_name_to_firm( @@ -2897,7 +3190,7 @@ static ir_node *function_name_to_firm( case FUNCNAME_FUNCDNAME: if (current_function_name == NULL) { const source_position_t *const src_pos = &expr->base.source_position; - const char *const name = current_function_decl->symbol->string; + const char *name = current_function_entity->base.symbol->string; const string_t string = { name, strlen(name) + 1 }; current_function_name = string_to_firm(src_pos, "__func__.%u", &string); } @@ -2926,7 +3219,8 @@ static ir_node *statement_expression_to_firm(const statement_expression_t *expr) static ir_node *va_start_expression_to_firm( const va_start_expression_t *const expr) { - ir_type *const method_type = get_ir_type(current_function_decl->type); + type_t *const type = current_function_entity->declaration.type; + 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); @@ -2935,8 +3229,13 @@ static ir_node *va_start_expression_to_firm( ir_node *const arg_sel = new_d_simpleSel(dbgi, no_mem, arg_base, parm_ent); - ir_node *const cnst = get_type_size(expr->parameter->type); - ir_node *const add = new_d_Add(dbgi, arg_sel, cnst, mode_P_data); + ir_node *const cnst = get_type_size(expr->parameter->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); + ir_node *const c3 = new_Const_long(mode, -(long)stack_param_align); + ir_node *const c4 = new_d_And(dbgi, c2, c3, mode); + ir_node *const add = new_d_Add(dbgi, arg_sel, c2, mode_P_data); set_value_for_expression(expr->ap, add); return NULL; @@ -2952,7 +3251,12 @@ static ir_node *va_arg_expression_to_firm(const va_arg_expression_t *const expr) ir_node *const res = deref_address(dbgi, type, ap); ir_node *const cnst = get_type_size(expr->base.type); - ir_node *const add = new_d_Add(dbgi, ap, cnst, mode_P_data); + 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); + ir_node *const c3 = new_Const_long(mode, -(long)stack_param_align); + ir_node *const c4 = new_d_And(dbgi, c2, c3, mode); + ir_node *const add = new_d_Add(dbgi, ap, c4, mode_P_data); set_value_for_expression_addr(ap_expr, add, ap_addr); @@ -2971,17 +3275,18 @@ static ir_node *dereference_addr(const unary_expression_t *const expression) static ir_node *expression_to_addr(const expression_t *expression) { switch(expression->kind) { - case EXPR_REFERENCE: - return reference_addr(&expression->reference); case EXPR_ARRAY_ACCESS: return array_access_addr(&expression->array_access); - case EXPR_SELECT: - return select_addr(&expression->select); case EXPR_CALL: return call_expression_to_firm(&expression->call); - case EXPR_UNARY_DEREFERENCE: { + case EXPR_COMPOUND_LITERAL: + return compound_literal_to_firm(&expression->compound_literal); + case EXPR_REFERENCE: + return reference_addr(&expression->reference); + case EXPR_SELECT: + return select_addr(&expression->select); + case EXPR_UNARY_DEREFERENCE: return dereference_addr(&expression->unary); - } default: break; } @@ -2991,7 +3296,7 @@ static ir_node *expression_to_addr(const expression_t *expression) static ir_node *builtin_constant_to_firm( const builtin_constant_expression_t *expression) { - ir_mode *mode = get_ir_mode(expression->base.type); + ir_mode *mode = get_ir_mode_arithmetic(expression->base.type); long v; if (is_constant_expression(expression->value)) { @@ -3002,37 +3307,31 @@ static ir_node *builtin_constant_to_firm( return new_Const_long(mode, v); } -static ir_node *builtin_prefetch_to_firm( - const builtin_prefetch_expression_t *expression) +static ir_node *builtin_types_compatible_to_firm( + const builtin_types_compatible_expression_t *expression) { - ir_node *adr = expression_to_firm(expression->adr); - /* no Firm support for prefetch yet */ - (void) adr; - return NULL; + type_t *const left = get_unqualified_type(skip_typeref(expression->left)); + type_t *const right = get_unqualified_type(skip_typeref(expression->right)); + long const value = types_compatible(left, right) ? 1 : 0; + ir_mode *const mode = get_ir_mode_arithmetic(expression->base.type); + return new_Const_long(mode, value); } -static ir_node *get_label_block(declaration_t *label) +static ir_node *get_label_block(label_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); + if (label->block != NULL) + return label->block; /* 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); + ir_node *block = new_immBlock(); - label->declaration_kind = DECLARATION_KIND_LABEL_BLOCK; - label->v.block = block; + label->block = block; - ARR_APP1(declaration_t *, all_labels, label); + ARR_APP1(label_t *, all_labels, label); current_ir_graph = rem; return block; @@ -3045,7 +3344,7 @@ static ir_node *get_label_block(declaration_t *label) static ir_node *label_address_to_firm( const label_address_expression_t *label) { - ir_node *block = get_label_block(label->declaration); + ir_node *block = get_label_block(label->label); ir_label_t nr = get_Block_label(block); if (nr == 0) { @@ -3084,6 +3383,8 @@ static ir_node *_expression_to_firm(const expression_t *expression) return wide_string_literal_to_firm(&expression->wide_string); case EXPR_REFERENCE: return reference_expression_to_firm(&expression->reference); + case EXPR_REFERENCE_ENUM_VALUE: + return reference_expression_enum_value_to_firm(&expression->reference); case EXPR_CALL: return call_expression_to_firm(&expression->call); EXPR_UNARY_CASES @@ -3110,12 +3411,10 @@ static ir_node *_expression_to_firm(const expression_t *expression) return va_start_expression_to_firm(&expression->va_starte); case EXPR_VA_ARG: return va_arg_expression_to_firm(&expression->va_arge); - case EXPR_BUILTIN_SYMBOL: - panic("unimplemented expression found"); case EXPR_BUILTIN_CONSTANT_P: return builtin_constant_to_firm(&expression->builtin_constant); - case EXPR_BUILTIN_PREFETCH: - return builtin_prefetch_to_firm(&expression->builtin_prefetch); + case EXPR_BUILTIN_TYPES_COMPATIBLE_P: + return builtin_types_compatible_to_firm(&expression->builtin_types_compatible); case EXPR_OFFSETOF: return offsetof_to_firm(&expression->offsetofe); case EXPR_COMPOUND_LITERAL: @@ -3130,6 +3429,25 @@ static ir_node *_expression_to_firm(const expression_t *expression) panic("invalid expression found"); } +/** + * Check if a given expression is a GNU __builtin_expect() call. + */ +static bool is_builtin_expect(const expression_t *expression) +{ + if (expression->kind != EXPR_CALL) + return false; + + expression_t *function = expression->call.function; + if (function->kind != EXPR_REFERENCE) + return false; + reference_expression_t *ref = &function->reference; + if (ref->entity->kind != ENTITY_FUNCTION || + ref->entity->function.btk != bk_gnu_builtin_expect) + return false; + + return true; +} + static bool produces_mode_b(const expression_t *expression) { switch (expression->kind) { @@ -3148,8 +3466,12 @@ static bool produces_mode_b(const expression_t *expression) case EXPR_UNARY_NOT: return true; - case EXPR_BINARY_BUILTIN_EXPECT: - return produces_mode_b(expression->binary.left); + case EXPR_CALL: + if (is_builtin_expect(expression)) { + expression_t *argument = expression->call.arguments->expression; + return produces_mode_b(argument); + } + return false; case EXPR_BINARY_COMMA: return produces_mode_b(expression->binary.right); @@ -3168,7 +3490,7 @@ static ir_node *expression_to_firm(const expression_t *expression) if (is_constant_expression(expression)) { ir_node *res = _expression_to_firm(expression); - ir_mode *mode = get_ir_mode(expression->base.type); + ir_mode *mode = get_ir_mode_arithmetic(expression->base.type); assert(is_Const(res)); if (is_Const_null(res)) { return new_Const_long(mode, 0); @@ -3179,7 +3501,8 @@ static ir_node *expression_to_firm(const expression_t *expression) /* we have to produce a 0/1 from the mode_b expression */ dbg_info *dbgi = get_dbg_info(&expression->base.source_position); - return produce_condition_result(expression, dbgi); + ir_mode *mode = get_ir_mode_arithmetic(expression->base.type); + return produce_condition_result(expression, mode, dbgi); } /** @@ -3200,9 +3523,7 @@ static ir_node *create_condition_evaluation(const expression_t *expression, case EXPR_BINARY_LOGICAL_AND: { const binary_expression_t *binary_expression = &expression->binary; - ir_node *cur_block = get_cur_block(); ir_node *extra_block = new_immBlock(); - set_cur_block(cur_block); create_condition_evaluation(binary_expression->left, extra_block, false_block); mature_immBlock(extra_block); @@ -3214,9 +3535,7 @@ static ir_node *create_condition_evaluation(const expression_t *expression, case EXPR_BINARY_LOGICAL_OR: { const binary_expression_t *binary_expression = &expression->binary; - ir_node *cur_block = get_cur_block(); ir_node *extra_block = new_immBlock(); - set_cur_block(cur_block); create_condition_evaluation(binary_expression->left, true_block, extra_block); mature_immBlock(extra_block); @@ -3231,63 +3550,63 @@ static ir_node *create_condition_evaluation(const expression_t *expression, dbg_info *dbgi = get_dbg_info(&expression->base.source_position); ir_node *cond_expr = _expression_to_firm(expression); - ir_node *condition = create_conv(NULL, cond_expr, mode_b); + ir_node *condition = create_conv(dbgi, 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); /* set branch prediction info based on __builtin_expect */ - if (expression->kind == EXPR_BINARY_BUILTIN_EXPECT) { - long cnst = fold_constant(expression->binary.right); - cond_jmp_predicate pred; - - if (cnst == 0) { - pred = COND_JMP_PRED_FALSE; - } else { - pred = COND_JMP_PRED_TRUE; + 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); + cond_jmp_predicate pred; + + if (cnst == 0) { + pred = COND_JMP_PRED_FALSE; + } else { + pred = COND_JMP_PRED_TRUE; + } + set_Cond_jmp_pred(cond, pred); } - set_Cond_jmp_pred(cond, pred); } add_immBlock_pred(true_block, true_proj); - if (false_block != NULL) { - add_immBlock_pred(false_block, false_proj); - } + add_immBlock_pred(false_block, false_proj); set_cur_block(NULL); return cond_expr; } - -static void create_declaration_entity(declaration_t *declaration, - declaration_kind_t declaration_kind, - ir_type *parent_type) +static void create_variable_entity(entity_t *variable, + declaration_kind_t declaration_kind, + ir_type *parent_type) { - type_t *const type = skip_typeref(declaration->type); - if (is_type_function(type)) { - (void) get_function_entity(declaration); - return; - } + 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(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(parent_type, id, irtype, dbgi); + 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); - handle_gnu_attributes_ent(entity, declaration); + ir_entity *const irentity = new_d_entity(parent_type, id, irtype, dbgi); + + handle_gnu_attributes_ent(irentity, variable); + + variable->declaration.kind = (unsigned char) declaration_kind; + variable->variable.v.entity = irentity; + set_entity_variability(irentity, variability_uninitialized); + set_entity_ld_ident(irentity, create_ld_ident(variable)); - 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); + set_entity_allocation(irentity, allocation_automatic); else if (declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE) - set_entity_allocation(entity, allocation_static); + set_entity_allocation(irentity, allocation_static); if (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) { - set_entity_volatility(entity, volatility_is_volatile); + set_entity_volatility(irentity, volatility_is_volatile); } } @@ -3297,7 +3616,7 @@ struct type_path_entry_t { type_t *type; ir_initializer_t *initializer; size_t index; - declaration_t *compound_entry; + entity_t *compound_entry; }; typedef struct type_path_t type_path_t; @@ -3311,14 +3630,14 @@ static __attribute__((unused)) void debug_print_type_path(const type_path_t *pat { size_t len = ARR_LEN(path->path); - for(size_t i = 0; i < len; ++i) { + for (size_t i = 0; i < len; ++i) { const type_path_entry_t *entry = & path->path[i]; type_t *type = skip_typeref(entry->type); if (is_type_compound(type)) { - fprintf(stderr, ".%s", entry->compound_entry->symbol->string); + fprintf(stderr, ".%s", entry->compound_entry->base.symbol->string); } else if (is_type_array(type)) { - fprintf(stderr, "[%zd]", entry->index); + fprintf(stderr, "[%u]", (unsigned) entry->index); } else { fprintf(stderr, "-INVALID-"); } @@ -3345,17 +3664,16 @@ static type_path_entry_t *append_to_type_path(type_path_t *path) return result; } -static size_t get_compound_size(const compound_type_t *type) +static size_t get_compound_member_count(const compound_type_t *type) { - declaration_t *declaration = type->declaration; - declaration_t *member = declaration->scope.declarations; - size_t size = 0; - for( ; member != NULL; member = member->next) { - ++size; + compound_t *compound = type->compound; + size_t n_members = 0; + entity_t *member = compound->members.entities; + for ( ; member != NULL; member = member->base.next) { + ++n_members; } - /* TODO: cache results? */ - return size; + return n_members; } static ir_initializer_t *get_initializer_entry(type_path_t *path) @@ -3389,14 +3707,16 @@ static void descend_into_subtype(type_path_t *path) size_t len; if (is_type_compound(top_type)) { - declaration_t *declaration = top_type->compound.declaration; - declaration_t *entry = declaration->scope.declarations; + compound_t *compound = top_type->compound.compound; + entity_t *entry = compound->members.entities; top->compound_entry = entry; top->index = 0; - len = get_compound_size(&top_type->compound); - if (entry != NULL) - path->top_type = entry->type; + len = get_compound_member_count(&top_type->compound); + if (entry != NULL) { + assert(entry->kind == ENTITY_COMPOUND_MEMBER); + path->top_type = entry->declaration.type; + } } else { assert(is_type_array(top_type)); assert(top_type->array.size > 0); @@ -3436,7 +3756,7 @@ static void walk_designator(type_path_t *path, const designator_t *designator) /* designators start at current object type */ ARR_RESIZE(type_path_entry_t, path->path, 1); - for( ; designator != NULL; designator = designator->next) { + for ( ; designator != NULL; designator = designator->next) { type_path_entry_t *top = get_type_path_top(path); type_t *orig_type = top->type; type_t *type = skip_typeref(orig_type); @@ -3446,10 +3766,11 @@ static void walk_designator(type_path_t *path, const designator_t *designator) size_t index = 0; symbol_t *symbol = designator->symbol; - declaration_t *declaration = type->compound.declaration; - declaration_t *iter = declaration->scope.declarations; - for( ; iter != NULL; iter = iter->next, ++index) { - if (iter->symbol == symbol) { + compound_t *compound = type->compound.compound; + entity_t *iter = compound->members.entities; + for ( ; iter != NULL; iter = iter->base.next, ++index) { + if (iter->base.symbol == symbol) { + assert(iter->kind == ENTITY_COMPOUND_MEMBER); break; } } @@ -3458,7 +3779,7 @@ static void walk_designator(type_path_t *path, const designator_t *designator) top->type = orig_type; top->compound_entry = iter; top->index = index; - orig_type = iter->type; + orig_type = iter->declaration.type; } else { expression_t *array_index = designator->array_index; assert(designator->array_index != NULL); @@ -3492,7 +3813,6 @@ static void advance_current_object(type_path_t *path) if (path->invalid) { /* TODO: handle this... */ panic("invalid initializer in ast2firm (excessive elements)"); - return; } type_path_entry_t *top = get_type_path_top(path); @@ -3501,13 +3821,14 @@ static void advance_current_object(type_path_t *path) if (is_type_union(type)) { top->compound_entry = NULL; } else if (is_type_struct(type)) { - declaration_t *entry = top->compound_entry; + entity_t *entry = top->compound_entry; top->index++; - entry = entry->next; + entry = entry->base.next; top->compound_entry = entry; if (entry != NULL) { - path->top_type = entry->type; + assert(entry->kind == ENTITY_COMPOUND_MEMBER); + path->top_type = entry->declaration.type; return; } } else { @@ -3542,9 +3863,27 @@ static ir_initializer_t *create_ir_initializer_value( panic("initializer creation for compounds not implemented yet"); } ir_node *value = expression_to_firm(initializer->value); + type_t *type = initializer->value->base.type; + ir_mode *mode = get_ir_mode_storage(type); + value = create_conv(NULL, value, mode); return create_initializer_const(value); } +/** test wether type can be initialized by a string constant */ +static bool is_string_type(type_t *type) +{ + type_t *inner; + if (is_type_pointer(type)) { + inner = skip_typeref(type->pointer.points_to); + } else if(is_type_array(type)) { + inner = skip_typeref(type->array.element_type); + } else { + return false; + } + + return is_type_integer(inner); +} + static ir_initializer_t *create_ir_initializer_list( const initializer_list_t *initializer, type_t *type) { @@ -3555,7 +3894,7 @@ static ir_initializer_t *create_ir_initializer_list( descend_into_subtype(&path); - for(size_t i = 0; i < initializer->len; ++i) { + for (size_t i = 0; i < initializer->len; ++i) { const initializer_t *sub_initializer = initializer->initializers[i]; if (sub_initializer->kind == INITIALIZER_DESIGNATOR) { @@ -3574,6 +3913,18 @@ static ir_initializer_t *create_ir_initializer_list( break; descend_into_subtype(&path); } + } else if (sub_initializer->kind == INITIALIZER_STRING + || sub_initializer->kind == INITIALIZER_WIDE_STRING) { + /* we might have to descend into types until we're at a scalar + * type */ + while (true) { + type_t *orig_top_type = path.top_type; + type_t *top_type = skip_typeref(orig_top_type); + + if (is_string_type(top_type)) + break; + descend_into_subtype(&path); + } } ir_initializer_t *sub_irinitializer @@ -3608,9 +3959,9 @@ static ir_initializer_t *create_ir_initializer_string( ir_initializer_t *irinitializer = create_initializer_compound(len); const char *string = initializer->string.begin; - ir_mode *mode = get_ir_mode(type->array.element_type); + ir_mode *mode = get_ir_mode_storage(type->array.element_type); - for(size_t i = 0; i < len; ++i) { + for (size_t i = 0; i < len; ++i) { char c = 0; if (i < string_len) c = string[i]; @@ -3636,7 +3987,7 @@ static ir_initializer_t *create_ir_initializer_wide_string( const wchar_rep_t *string = initializer->string.begin; ir_mode *mode = get_type_mode(ir_type_wchar_t); - for(size_t i = 0; i < len; ++i) { + for (size_t i = 0; i < len; ++i) { wchar_rep_t c = 0; if (i < string_len) { c = string[i]; @@ -3679,11 +4030,11 @@ static void create_dynamic_null_initializer(ir_type *type, dbg_info *dbgi, 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); + ir_node *cnst = new_d_Const(dbgi, zero); /* TODO: bitfields */ ir_node *mem = get_store(); - ir_node *store = new_d_Store(dbgi, mem, base_addr, cnst); + ir_node *store = new_d_Store(dbgi, mem, base_addr, cnst, cons_none); ir_node *proj_m = new_Proj(store, mode_M, pn_Store_M); set_store(proj_m); } else { @@ -3697,13 +4048,13 @@ static void create_dynamic_null_initializer(ir_type *type, dbg_info *dbgi, n_members = get_compound_n_members(type); } - for(int i = 0; i < n_members; ++i) { + 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 *cnst = new_d_Const(dbgi, 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); @@ -3741,7 +4092,7 @@ static void create_dynamic_initializer_sub(ir_initializer_t *initializer, assert(get_type_mode(type) == mode); ir_node *mem = get_store(); - ir_node *store = new_d_Store(dbgi, mem, base_addr, node); + ir_node *store = new_d_Store(dbgi, mem, base_addr, node, cons_none); ir_node *proj_m = new_Proj(store, mode_M, pn_Store_M); set_store(proj_m); return; @@ -3749,7 +4100,7 @@ static void create_dynamic_initializer_sub(ir_initializer_t *initializer, case IR_INITIALIZER_TARVAL: { tarval *tv = get_initializer_tarval_value(initializer); ir_mode *mode = get_tarval_mode(tv); - ir_node *cnst = new_d_Const(dbgi, mode, tv); + ir_node *cnst = new_d_Const(dbgi, tv); ir_type *ent_type = get_entity_type(entity); /* is it a bitfield type? */ @@ -3761,7 +4112,7 @@ static void create_dynamic_initializer_sub(ir_initializer_t *initializer, assert(get_type_mode(type) == mode); ir_node *mem = get_store(); - ir_node *store = new_d_Store(dbgi, mem, base_addr, cnst); + ir_node *store = new_d_Store(dbgi, mem, base_addr, cnst, cons_none); ir_node *proj_m = new_Proj(store, mode_M, pn_Store_M); set_store(proj_m); return; @@ -3780,13 +4131,13 @@ static void create_dynamic_initializer_sub(ir_initializer_t *initializer, != (unsigned) n_members) panic("initializer doesn't match compound type"); - for(int i = 0; i < n_members; ++i) { + for (int i = 0; i < n_members; ++i) { ir_node *addr; ir_type *irtype; ir_entity *sub_entity; if (is_Array_type(type)) { tarval *index_tv = new_tarval_from_long(i, mode_uint); - ir_node *cnst = new_d_Const(dbgi, mode_uint, index_tv); + ir_node *cnst = new_d_Const(dbgi, index_tv); ir_node *in[1] = { cnst }; irtype = get_array_element_type(type); sub_entity = get_array_element_entity(type); @@ -3876,90 +4227,97 @@ static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi, set_store(copyb_mem); } -static void create_initializer_local_variable_entity(declaration_t *declaration) +static void create_initializer_local_variable_entity(entity_t *entity) { - initializer_t *initializer = declaration->init.initializer; - dbg_info *dbgi = get_dbg_info(&declaration->source_position); - ir_entity *entity = declaration->v.entity; - type_t *type = declaration->type; - create_local_initializer(initializer, dbgi, entity, type); + assert(entity->kind == ENTITY_VARIABLE); + initializer_t *initializer = entity->variable.initializer; + dbg_info *dbgi = get_dbg_info(&entity->base.source_position); + 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); } -static void create_declaration_initializer(declaration_t *declaration) +static void create_variable_initializer(entity_t *entity) { - initializer_t *initializer = declaration->init.initializer; + assert(entity->kind == ENTITY_VARIABLE); + initializer_t *initializer = entity->variable.initializer; if (initializer == NULL) return; declaration_kind_t declaration_kind - = (declaration_kind_t) declaration->declaration_kind; + = (declaration_kind_t) entity->declaration.kind; if (declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE_ENTITY) { - create_initializer_local_variable_entity(declaration); + create_initializer_local_variable_entity(entity); return; } - type_t *type = declaration->type; + type_t *type = entity->declaration.type; type_qualifiers_t tq = get_type_qualifier(type, true); if (initializer->kind == INITIALIZER_VALUE) { initializer_value_t *initializer_value = &initializer->value; - dbg_info *dbgi - = get_dbg_info(&declaration->source_position); + dbg_info *dbgi = get_dbg_info(&entity->base.source_position); ir_node *value = expression_to_firm(initializer_value->value); + + type_t *type = initializer_value->value->base.type; + ir_mode *mode = get_ir_mode_storage(type); + value = create_conv(dbgi, value, mode); value = do_strict_conv(dbgi, value); if (declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE) { - set_value(declaration->v.value_number, value); + set_value(entity->variable.v.value_number, value); } else { assert(declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE); - ir_entity *entity = declaration->v.entity; + ir_entity *irentity = entity->variable.v.entity; if (tq & TYPE_QUALIFIER_CONST) { - set_entity_variability(entity, variability_constant); + set_entity_variability(irentity, variability_constant); } else { - set_entity_variability(entity, variability_initialized); + set_entity_variability(irentity, variability_initialized); } - set_atomic_ent_value(entity, value); + set_atomic_ent_value(irentity, value); } } else { assert(declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE_ENTITY || declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE); - ir_entity *entity = declaration->v.entity; + ir_entity *irentity = entity->variable.v.entity; ir_initializer_t *irinitializer = create_ir_initializer(initializer, type); if (tq & TYPE_QUALIFIER_CONST) { - set_entity_variability(entity, variability_constant); + set_entity_variability(irentity, variability_constant); } else { - set_entity_variability(entity, variability_initialized); + set_entity_variability(irentity, variability_initialized); } - set_entity_initializer(entity, irinitializer); + set_entity_initializer(irentity, irinitializer); } } -static void create_variable_length_array(declaration_t *declaration) +static void create_variable_length_array(entity_t *entity) { - /* initializers are not allowed for VLAs */ - assert(declaration->init.initializer == NULL); + assert(entity->kind == ENTITY_VARIABLE); + assert(entity->variable.initializer == NULL); - declaration->declaration_kind = DECLARATION_KIND_VARIABLE_LENGTH_ARRAY; - declaration->v.vla_base = NULL; + entity->declaration.kind = DECLARATION_KIND_VARIABLE_LENGTH_ARRAY; + entity->variable.v.vla_base = NULL; /* TODO: record VLA somewhere so we create the free node when we leave * it's scope */ } -static void allocate_variable_length_array(declaration_t *declaration) +static void allocate_variable_length_array(entity_t *entity) { - /* initializers are not allowed for VLAs */ - assert(declaration->init.initializer == NULL); + assert(entity->kind == ENTITY_VARIABLE); + assert(entity->variable.initializer == NULL); assert(get_cur_block() != NULL); - dbg_info *dbgi = get_dbg_info(&declaration->source_position); - type_t *type = declaration->type; + dbg_info *dbgi = get_dbg_info(&entity->base.source_position); + type_t *type = entity->declaration.type; ir_type *el_type = get_ir_type(type->array.element_type); /* make sure size_node is calculated */ @@ -3972,24 +4330,24 @@ static void allocate_variable_length_array(declaration_t *declaration) ir_node *addr = new_d_Proj(dbgi, alloc, mode_P_data, pn_Alloc_res); set_store(proj_m); - assert(declaration->declaration_kind - == DECLARATION_KIND_VARIABLE_LENGTH_ARRAY); - declaration->v.vla_base = addr; + assert(entity->declaration.kind == DECLARATION_KIND_VARIABLE_LENGTH_ARRAY); + entity->variable.v.vla_base = addr; } /** * Creates a Firm local variable from a declaration. */ -static void create_local_variable(declaration_t *declaration) +static void create_local_variable(entity_t *entity) { - assert(declaration->declaration_kind == DECLARATION_KIND_UNKNOWN); + assert(entity->kind == ENTITY_VARIABLE); + assert(entity->declaration.kind == DECLARATION_KIND_UNKNOWN); - bool needs_entity = declaration->address_taken; - type_t *type = skip_typeref(declaration->type); + bool needs_entity = entity->variable.address_taken; + type_t *type = skip_typeref(entity->declaration.type); /* is it a variable length array? */ if (is_type_array(type) && !type->array.size_constant) { - create_variable_length_array(declaration); + create_variable_length_array(entity); return; } else if (is_type_array(type) || is_type_compound(type)) { needs_entity = true; @@ -3999,48 +4357,55 @@ static void create_local_variable(declaration_t *declaration) if (needs_entity) { ir_type *frame_type = get_irg_frame_type(current_ir_graph); - create_declaration_entity(declaration, - DECLARATION_KIND_LOCAL_VARIABLE_ENTITY, - frame_type); + create_variable_entity(entity, + DECLARATION_KIND_LOCAL_VARIABLE_ENTITY, + frame_type); } else { - declaration->declaration_kind = DECLARATION_KIND_LOCAL_VARIABLE; - declaration->v.value_number = next_value_number_function; - set_irg_loc_description(current_ir_graph, next_value_number_function, declaration); + entity->declaration.kind = DECLARATION_KIND_LOCAL_VARIABLE; + entity->variable.v.value_number = next_value_number_function; + set_irg_loc_description(current_ir_graph, next_value_number_function, + entity); ++next_value_number_function; } } -static void create_local_static_variable(declaration_t *declaration) +static void create_local_static_variable(entity_t *entity) { - assert(declaration->declaration_kind == DECLARATION_KIND_UNKNOWN); + assert(entity->kind == ENTITY_VARIABLE); + assert(entity->declaration.kind == DECLARATION_KIND_UNKNOWN); - type_t *const type = skip_typeref(declaration->type); - ir_type *const global_type = get_glob_type(); - ir_type *const irtype = get_ir_type(type); - dbg_info *const dbgi = get_dbg_info(&declaration->source_position); + 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 ? + 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); - size_t l = strlen(declaration->symbol->string); + size_t l = strlen(entity->base.symbol->string); char buf[l + sizeof(".%u")]; - snprintf(buf, sizeof(buf), "%s.%%u", declaration->symbol->string); + snprintf(buf, sizeof(buf), "%s.%%u", entity->base.symbol->string); ident *const id = id_unique(buf); - ir_entity *const entity = new_d_entity(global_type, id, irtype, dbgi); + ir_entity *const irentity = new_d_entity(var_type, id, irtype, dbgi); if (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) { - set_entity_volatility(entity, volatility_is_volatile); + set_entity_volatility(irentity, volatility_is_volatile); } - 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); + entity->declaration.kind = DECLARATION_KIND_GLOBAL_VARIABLE; + entity->variable.v.entity = irentity; + + set_entity_ld_ident(irentity, id); + set_entity_variability(irentity, variability_uninitialized); + set_entity_visibility(irentity, visibility_local); + set_entity_allocation(irentity, entity->variable.thread_local ? + allocation_automatic : allocation_static); ir_graph *const old_current_ir_graph = current_ir_graph; current_ir_graph = get_const_code_irg(); - create_declaration_initializer(declaration); + create_variable_initializer(entity); assert(current_ir_graph == get_const_code_irg()); current_ir_graph = old_current_ir_graph; @@ -4054,7 +4419,8 @@ static void return_statement_to_firm(return_statement_t *statement) return; dbg_info *dbgi = get_dbg_info(&statement->base.source_position); - ir_type *func_irtype = get_ir_type(current_function_decl->type); + type_t *type = current_function_entity->declaration.type; + ir_type *func_irtype = get_ir_type(type); ir_node *in[1]; @@ -4064,7 +4430,12 @@ static void return_statement_to_firm(return_statement_t *statement) if (statement->value != NULL) { ir_node *node = expression_to_firm(statement->value); - node = do_strict_conv(dbgi, node); + if (!is_compound_type(res_type)) { + type_t *type = statement->value->base.type; + ir_mode *mode = get_ir_mode_storage(type); + node = create_conv(dbgi, node, mode); + node = do_strict_conv(dbgi, node); + } in[0] = node; } else { ir_mode *mode; @@ -4103,14 +4474,17 @@ static ir_node *expression_statement_to_firm(expression_statement_t *statement) static ir_node *compound_statement_to_firm(compound_statement_t *compound) { - declaration_t *declaration = compound->scope.declarations; - for( ; declaration != NULL; declaration = declaration->next) { - create_local_declaration(declaration); + entity_t *entity = compound->scope.entities; + for ( ; entity != NULL; entity = entity->base.next) { + if (!is_declaration(entity)) + continue; + + create_local_declaration(entity); } ir_node *result = NULL; statement_t *statement = compound->statements; - for( ; statement != NULL; statement = statement->base.next) { + for ( ; statement != NULL; statement = statement->base.next) { if (statement->base.next == NULL && statement->kind == STATEMENT_EXPRESSION) { result = expression_statement_to_firm( @@ -4123,138 +4497,95 @@ static ir_node *compound_statement_to_firm(compound_statement_t *compound) return result; } -static void create_global_variable(declaration_t *declaration) +static void create_global_variable(entity_t *entity) { - ir_visibility vis; - ir_type *var_type; - switch ((storage_class_tag_t)declaration->storage_class) { - case STORAGE_CLASS_STATIC: - vis = visibility_local; - goto global_var; - - case STORAGE_CLASS_EXTERN: - vis = visibility_external_allocated; - goto global_var; - - case STORAGE_CLASS_NONE: - vis = visibility_external_visible; - goto global_var; - - case STORAGE_CLASS_THREAD: - vis = visibility_external_visible; - goto tls_var; - - case STORAGE_CLASS_THREAD_EXTERN: - vis = visibility_external_allocated; - goto tls_var; + assert(entity->kind == ENTITY_VARIABLE); - case STORAGE_CLASS_THREAD_STATIC: - vis = visibility_local; - goto tls_var; + ir_visibility vis; + switch ((storage_class_tag_t)entity->declaration.storage_class) { + case STORAGE_CLASS_STATIC: vis = visibility_local; break; + case STORAGE_CLASS_EXTERN: vis = visibility_external_allocated; break; + case STORAGE_CLASS_NONE: vis = visibility_external_visible; break; -tls_var: - var_type = get_tls_type(); - goto create_var; - -global_var: - var_type = get_glob_type(); - goto create_var; - -create_var: - create_declaration_entity(declaration, - DECLARATION_KIND_GLOBAL_VARIABLE, - var_type); - if (!is_type_function(skip_typeref(declaration->type))) { - set_entity_visibility(declaration->v.entity, vis); - } - - return; - - case STORAGE_CLASS_TYPEDEF: - case STORAGE_CLASS_AUTO: - case STORAGE_CLASS_REGISTER: - case STORAGE_CLASS_ENUM_ENTRY: - break; + default: panic("Invalid storage class for global variable"); } - panic("Invalid storage class for global variable"); + + ir_type *var_type = entity->variable.thread_local ? + get_tls_type() : get_glob_type(); + create_variable_entity(entity, + DECLARATION_KIND_GLOBAL_VARIABLE, var_type); + set_entity_visibility(entity->variable.v.entity, vis); } -static void create_local_declaration(declaration_t *declaration) +static void create_local_declaration(entity_t *entity) { - if (declaration->namespc != NAMESPACE_NORMAL) - return; + assert(is_declaration(entity)); + /* construct type */ - (void) get_ir_type(declaration->type); - if (declaration->symbol == NULL) { + (void) get_ir_type(entity->declaration.type); + if (entity->base.symbol == NULL) { return; } - type_t *type = skip_typeref(declaration->type); - - switch ((storage_class_tag_t) declaration->storage_class) { + switch ((storage_class_tag_t) entity->declaration.storage_class) { case STORAGE_CLASS_STATIC: - create_local_static_variable(declaration); + create_local_static_variable(entity); return; case STORAGE_CLASS_EXTERN: - create_global_variable(declaration); - create_declaration_initializer(declaration); + if (entity->kind == ENTITY_FUNCTION) { + assert(entity->function.statement == NULL); + get_function_entity(entity); + } else { + create_global_variable(entity); + create_variable_initializer(entity); + } return; case STORAGE_CLASS_NONE: case STORAGE_CLASS_AUTO: case STORAGE_CLASS_REGISTER: - if (is_type_function(type)) { - if (declaration->init.statement != NULL) { - get_function_entity(declaration); - declaration->declaration_kind = DECLARATION_KIND_INNER_FUNCTION; - enqueue_inner_function(declaration); + if (entity->kind == ENTITY_FUNCTION) { + if (entity->function.statement != NULL) { + get_function_entity(entity); + entity->declaration.kind = DECLARATION_KIND_INNER_FUNCTION; + enqueue_inner_function(entity); } else { - get_function_entity(declaration); + get_function_entity(entity); } } else { - create_local_variable(declaration); + create_local_variable(entity); } return; - case STORAGE_CLASS_ENUM_ENTRY: - /* should already be handled */ - assert(declaration->declaration_kind == DECLARATION_KIND_ENUM_ENTRY); - return; case STORAGE_CLASS_TYPEDEF: - declaration->declaration_kind = DECLARATION_KIND_TYPE; - return; - case STORAGE_CLASS_THREAD: - case STORAGE_CLASS_THREAD_EXTERN: - case STORAGE_CLASS_THREAD_STATIC: break; } panic("invalid storage class found"); } -static void initialize_local_declaration(declaration_t *declaration) +static void initialize_local_declaration(entity_t *entity) { - if (declaration->symbol == NULL || declaration->namespc != NAMESPACE_NORMAL) + if (entity->base.symbol == NULL) return; - switch ((declaration_kind_t) declaration->declaration_kind) { + switch ((declaration_kind_t) entity->declaration.kind) { case DECLARATION_KIND_LOCAL_VARIABLE: case DECLARATION_KIND_LOCAL_VARIABLE_ENTITY: - create_declaration_initializer(declaration); + create_variable_initializer(entity); return; case DECLARATION_KIND_VARIABLE_LENGTH_ARRAY: - allocate_variable_length_array(declaration); + allocate_variable_length_array(entity); return; - case DECLARATION_KIND_LABEL_BLOCK: case DECLARATION_KIND_COMPOUND_MEMBER: case DECLARATION_KIND_GLOBAL_VARIABLE: - case DECLARATION_KIND_COMPOUND_TYPE_INCOMPLETE: - case DECLARATION_KIND_COMPOUND_TYPE_COMPLETE: case DECLARATION_KIND_FUNCTION: - case DECLARATION_KIND_TYPE: - case DECLARATION_KIND_ENUM_ENTRY: case DECLARATION_KIND_INNER_FUNCTION: return; + case DECLARATION_KIND_PARAMETER: + case DECLARATION_KIND_PARAMETER_ENTITY: + panic("can't initialize parameters"); + case DECLARATION_KIND_UNKNOWN: panic("can't initialize unknown declaration"); } @@ -4263,12 +4594,21 @@ static void initialize_local_declaration(declaration_t *declaration) static void declaration_statement_to_firm(declaration_statement_t *statement) { - declaration_t *declaration = statement->declarations_begin; - declaration_t *end = statement->declarations_end->next; - for( ; declaration != end; declaration = declaration->next) { - if (declaration->namespc != NAMESPACE_NORMAL) - continue; - initialize_local_declaration(declaration); + entity_t *entity = statement->declarations_begin; + if (entity == NULL) + return; + + entity_t *const last = statement->declarations_end; + for ( ;; entity = entity->base.next) { + if (is_declaration(entity)) { + initialize_local_declaration(entity); + } else if (entity->kind == ENTITY_TYPEDEF) { + type_t *const type = skip_typeref(entity->typedefe.type); + if (is_type_array(type) && type->array.is_vla) + get_vla_size(&type->array); + } + if (entity == last) + break; } } @@ -4282,6 +4622,7 @@ static void if_statement_to_firm(if_statement_t *statement) ir_node *true_block = NULL; if (statement->true_statement != NULL) { true_block = new_immBlock(); + set_cur_block(true_block); statement_to_firm(statement->true_statement); if (get_cur_block() != NULL) { ir_node *jmp = new_Jmp(); @@ -4295,6 +4636,7 @@ static void if_statement_to_firm(if_statement_t *statement) ir_node *false_block = NULL; if (statement->false_statement != NULL) { false_block = new_immBlock(); + set_cur_block(false_block); statement_to_firm(statement->false_statement); if (get_cur_block() != NULL) { @@ -4352,6 +4694,7 @@ static void while_statement_to_firm(while_statement_t *statement) break_label = NULL; ir_node *body_block = new_immBlock(); + set_cur_block(body_block); statement_to_firm(statement->body); ir_node *false_block = break_label; @@ -4416,6 +4759,7 @@ static void do_while_statement_to_firm(do_while_statement_t *statement) continue_label = header_block; break_label = NULL; + set_cur_block(body_block); statement_to_firm(statement->body); ir_node *false_block = break_label; @@ -4439,9 +4783,7 @@ static void do_while_statement_to_firm(do_while_statement_t *statement) create_condition_evaluation(statement->condition, body_block, false_block); mature_immBlock(body_block); mature_immBlock(header_block); - if (false_block != NULL) { - mature_immBlock(false_block); - } + mature_immBlock(false_block); set_cur_block(false_block); } @@ -4451,15 +4793,21 @@ static void for_statement_to_firm(for_statement_t *statement) ir_node *jmp = NULL; /* create declarations */ - declaration_t *declaration = statement->scope.declarations; - for( ; declaration != NULL; declaration = declaration->next) { - create_local_declaration(declaration); + entity_t *entity = statement->scope.entities; + for ( ; entity != NULL; entity = entity->base.next) { + if (!is_declaration(entity)) + continue; + + create_local_declaration(entity); } if (get_cur_block() != NULL) { - declaration = statement->scope.declarations; - for( ; declaration != NULL; declaration = declaration->next) { - initialize_local_declaration(declaration); + entity = statement->scope.entities; + for ( ; entity != NULL; entity = entity->base.next) { + if (!is_declaration(entity)) + continue; + + initialize_local_declaration(entity); } if (statement->initialisation != NULL) { @@ -4472,6 +4820,7 @@ static void for_statement_to_firm(for_statement_t *statement) /* create the step block */ ir_node *const step_block = new_immBlock(); + set_cur_block(step_block); if (statement->step != NULL) { expression_to_firm(statement->step); } @@ -4479,6 +4828,7 @@ static void for_statement_to_firm(for_statement_t *statement) /* create the header block */ ir_node *const header_block = new_immBlock(); + set_cur_block(header_block); if (jmp != NULL) { add_immBlock_pred(header_block, jmp); } @@ -4488,7 +4838,7 @@ static void for_statement_to_firm(for_statement_t *statement) ir_node *const false_block = new_immBlock(); /* the loop body */ - ir_node * body_block; + ir_node *body_block; if (statement->body != NULL) { ir_node *const old_continue_label = continue_label; ir_node *const old_break_label = break_label; @@ -4496,6 +4846,7 @@ static void for_statement_to_firm(for_statement_t *statement) break_label = false_block; body_block = new_immBlock(); + set_cur_block(body_block); statement_to_firm(statement->body); assert(continue_label == step_block); @@ -4548,9 +4899,7 @@ static void create_jump_statement(const statement_t *statement, static ir_node *get_break_label(void) { if (break_label == NULL) { - ir_node *cur_block = get_cur_block(); break_label = new_immBlock(); - set_cur_block(cur_block); } return break_label; } @@ -4582,18 +4931,17 @@ static void switch_statement_to_firm(switch_statement_t *statement) continue; } if (l->last_case >= l->first_case) - num_cases += l->last_case - l->first_case; + num_cases += l->last_case - l->first_case + 1; 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. - */ + if (def_nr == INT_MAX) { + /* Bad: an overflow will occurr, 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) { @@ -4601,9 +4949,13 @@ static void switch_statement_to_firm(switch_statement_t *statement) /* default case */ continue; } - for (long cns = l->first_case; cns <= l->last_case; ++cns) { - if (cns >= 0 && (unsigned long)cns < num_cases) + unsigned long start = l->first_case > 0 ? (unsigned long)l->first_case : 0; + if (start < num_cases && l->last_case >= 0) { + unsigned long end = (unsigned long)l->last_case < num_cases ? + (unsigned long)l->last_case : num_cases - 1; + for (unsigned long cns = start; cns <= end; ++cns) { bits[cns >> 3] |= (1 << (cns & 7)); + } } } /* We look at the first num_cases constants: @@ -4611,8 +4963,9 @@ static void switch_statement_to_firm(switch_statement_t *statement) * one, or they are non densed, so we will find one free * there... */ + unsigned long i; for (i = 0; i < num_cases; ++i) - if ((bits[i >> 3] & (i & 7)) == 0) + if ((bits[i >> 3] & (1 << (i & 7))) == 0) break; free(bits); @@ -4660,10 +5013,9 @@ static void case_label_to_firm(const case_label_statement_t *statement) ir_node *const fallthrough = (get_cur_block() == NULL ? NULL : new_Jmp()); ir_node *proj; - ir_node *old_block = get_nodes_block(current_switch_cond); ir_node *block = new_immBlock(); - set_cur_block(old_block); + set_cur_block(get_nodes_block(current_switch_cond)); if (statement->expression != NULL) { long pn = statement->first_case; long end_pn = statement->last_case; @@ -4723,14 +5075,9 @@ static void goto_to_firm(const goto_statement_t *statement) set_irn_link(ijmp, ijmp_list); ijmp_list = ijmp; } else { - if (statement->outer_fkt_jmp) { - /* TODO: this is a outer function jmp */ - panic("outer function jump not implemented"); - } else { - ir_node *block = get_label_block(statement->label); - ir_node *jmp = new_Jmp(); - add_immBlock_pred(block, jmp); - } + ir_node *block = get_label_block(statement->label); + ir_node *jmp = new_Jmp(); + add_immBlock_pred(block, jmp); } set_cur_block(NULL); } @@ -4745,7 +5092,7 @@ static void asm_statement_to_firm(const asm_statement_t *statement) size_t n_clobbers = 0; asm_clobber_t *clobber = statement->clobbers; - for( ; clobber != NULL; clobber = clobber->next) { + for ( ; clobber != NULL; clobber = clobber->next) { const char *clobber_str = clobber->clobber.begin; if (!be_is_valid_clobber(clobber_str)) { @@ -4796,9 +5143,8 @@ static void asm_statement_to_firm(const asm_statement_t *statement) = be_parse_asm_constraints(constraints); if (asm_flags & ASM_CONSTRAINT_FLAG_NO_SUPPORT) { - errorf(&statement->base.source_position, + warningf(&statement->base.source_position, "some constraints in '%s' are not supported", constraints); - continue; } if (asm_flags & ASM_CONSTRAINT_FLAG_INVALID) { errorf(&statement->base.source_position, @@ -4823,12 +5169,12 @@ static void asm_statement_to_firm(const asm_statement_t *statement) char buf[64]; ir_node *value = get_value_from_lvalue(expr, addr); - snprintf(buf, sizeof(buf), "%d", pos); + snprintf(buf, sizeof(buf), "%u", pos); ir_asm_constraint constraint; constraint.pos = pos; constraint.constraint = new_id_from_str(buf); - constraint.mode = get_ir_mode(expr->base.type); + constraint.mode = get_ir_mode_storage(expr->base.type); tmp_in_constraints[in_size] = constraint; ins[in_size] = value; @@ -4868,7 +5214,7 @@ static void asm_statement_to_firm(const asm_statement_t *statement) ir_asm_constraint constraint; constraint.pos = pos; constraint.constraint = new_id_from_str(constraints); - constraint.mode = get_ir_mode(argument->expression->base.type); + constraint.mode = get_ir_mode_storage(argument->expression->base.type); obstack_grow(&asm_obst, &constraint, sizeof(constraint)); } @@ -4881,7 +5227,7 @@ static void asm_statement_to_firm(const asm_statement_t *statement) in_size * sizeof(tmp_in_constraints[0])); /* find and count input and output arguments */ argument = statement->inputs; - for( ; argument != NULL; argument = argument->next) { + for ( ; argument != NULL; argument = argument->next) { const char *constraints = argument->constraints.begin; asm_constraint_flags_t asm_flags = be_parse_asm_constraints(constraints); @@ -4971,7 +5317,7 @@ static void asm_statement_to_firm(const asm_statement_t *statement) for (i = 0; i < out_size; ++i) { const expression_t *out_expr = out_exprs[i]; long pn = i; - ir_mode *mode = get_ir_mode(out_expr->base.type); + ir_mode *mode = get_ir_mode_storage(out_expr->base.type); ir_node *proj = new_Proj(node, mode, pn); ir_node *addr = out_addrs[i]; @@ -4979,12 +5325,14 @@ static void asm_statement_to_firm(const asm_statement_t *statement) } } -static void ms_try_statement_to_firm(ms_try_statement_t *statement) { +static void ms_try_statement_to_firm(ms_try_statement_t *statement) +{ statement_to_firm(statement->try_statement); warningf(&statement->base.source_position, "structured exception handling ignored"); } -static void leave_statement_to_firm(leave_statement_t *statement) { +static void leave_statement_to_firm(leave_statement_t *statement) +{ errorf(&statement->base.source_position, "__leave not supported yet"); } @@ -4998,10 +5346,9 @@ static void statement_to_firm(statement_t *statement) statement->base.transformed = true; #endif - switch(statement->kind) { + switch (statement->kind) { case STATEMENT_INVALID: panic("invalid statement found"); - return; case STATEMENT_EMPTY: /* nothing */ return; @@ -5057,263 +5404,86 @@ static void statement_to_firm(statement_t *statement) leave_statement_to_firm(&statement->leave); return; } - panic("Statement not implemented\n"); + panic("statement not implemented"); } -static int count_decls_in_expression(const expression_t *expression); - -static int count_local_declarations(const declaration_t * decl, - const declaration_t *const end) +static int count_local_variables(const entity_t *entity, + const entity_t *const last) { int count = 0; - for (; decl != end; decl = decl->next) { - if (decl->namespc != NAMESPACE_NORMAL) + entity_t const *const end = last != NULL ? last->base.next : NULL; + for (; entity != end; entity = entity->base.next) { + type_t *type; + bool address_taken; + + if (entity->kind == ENTITY_VARIABLE) { + type = skip_typeref(entity->declaration.type); + address_taken = entity->variable.address_taken; + } else if (entity->kind == ENTITY_PARAMETER) { + type = skip_typeref(entity->declaration.type); + address_taken = entity->parameter.address_taken; + } else { continue; - type_t *type = skip_typeref(decl->type); + } - if (!decl->address_taken && is_type_scalar(type)) + if (!address_taken && is_type_scalar(type)) ++count; - const initializer_t *initializer = decl->init.initializer; - /* FIXME: should walk initializer hierarchies... */ - if (initializer != NULL && initializer->kind == INITIALIZER_VALUE) { - count += count_decls_in_expression(initializer->value.value); - } } return count; } -static int count_decls_in_expression(const expression_t *expression) { - int count = 0; - - if (expression == NULL) - return 0; - - switch((expression_kind_t) expression->base.kind) { - case EXPR_STATEMENT: - return count_decls_in_stmts(expression->statement.statement); - EXPR_BINARY_CASES { - int count_left = count_decls_in_expression(expression->binary.left); - int count_right = count_decls_in_expression(expression->binary.right); - return count_left + count_right; - } - EXPR_UNARY_CASES - return count_decls_in_expression(expression->unary.value); - case EXPR_CALL: { - call_argument_t *argument = expression->call.arguments; - for( ; argument != NULL; argument = argument->next) { - count += count_decls_in_expression(argument->expression); - } - return count; - } - - case EXPR_UNKNOWN: - case EXPR_INVALID: - panic("unexpected expression kind"); +static void count_local_variables_in_stmt(statement_t *stmt, void *const env) +{ + int *const count = env; - case EXPR_COMPOUND_LITERAL: - /* TODO... */ + switch (stmt->kind) { + case STATEMENT_DECLARATION: { + const declaration_statement_t *const decl_stmt = &stmt->declaration; + *count += count_local_variables(decl_stmt->declarations_begin, + decl_stmt->declarations_end); break; - - case EXPR_CONDITIONAL: - count += count_decls_in_expression(expression->conditional.condition); - count += count_decls_in_expression(expression->conditional.true_expression); - count += count_decls_in_expression(expression->conditional.false_expression); - return count; - - case EXPR_BUILTIN_PREFETCH: - count += count_decls_in_expression(expression->builtin_prefetch.adr); - count += count_decls_in_expression(expression->builtin_prefetch.rw); - count += count_decls_in_expression(expression->builtin_prefetch.locality); - return count; - - case EXPR_BUILTIN_CONSTANT_P: - count += count_decls_in_expression(expression->builtin_constant.value); - return count; - - case EXPR_SELECT: - count += count_decls_in_expression(expression->select.compound); - return count; - - case EXPR_ARRAY_ACCESS: - count += count_decls_in_expression(expression->array_access.array_ref); - count += count_decls_in_expression(expression->array_access.index); - return count; - - case EXPR_CLASSIFY_TYPE: - count += count_decls_in_expression(expression->classify_type.type_expression); - return count; - - case EXPR_SIZEOF: - case EXPR_ALIGNOF: { - expression_t *tp_expression = expression->typeprop.tp_expression; - if (tp_expression != NULL) { - count += count_decls_in_expression(tp_expression); - } - return count; } - case EXPR_OFFSETOF: - case EXPR_REFERENCE: - case EXPR_CONST: - case EXPR_CHARACTER_CONSTANT: - case EXPR_WIDE_CHARACTER_CONSTANT: - case EXPR_STRING_LITERAL: - case EXPR_WIDE_STRING_LITERAL: - case EXPR_FUNCNAME: - case EXPR_BUILTIN_SYMBOL: - case EXPR_VA_START: - case EXPR_VA_ARG: - case EXPR_LABEL_ADDRESS: + case STATEMENT_FOR: + *count += count_local_variables(stmt->fors.scope.entities, NULL); break; - } - - /* TODO FIXME: finish/fix that firm patch that allows dynamic value numbers - * (or implement all the missing expressions here/implement a walker) - */ - - return 0; -} - -static int count_decls_in_stmts(const statement_t *stmt) -{ - int count = 0; - for (; stmt != NULL; stmt = stmt->base.next) { - switch (stmt->kind) { - case STATEMENT_EMPTY: - break; - - case STATEMENT_DECLARATION: { - const declaration_statement_t *const decl_stmt = &stmt->declaration; - count += count_local_declarations(decl_stmt->declarations_begin, - decl_stmt->declarations_end->next); - break; - } - - case STATEMENT_COMPOUND: { - const compound_statement_t *const comp = - &stmt->compound; - count += count_decls_in_stmts(comp->statements); - break; - } - case STATEMENT_IF: { - const if_statement_t *const if_stmt = &stmt->ifs; - count += count_decls_in_expression(if_stmt->condition); - count += count_decls_in_stmts(if_stmt->true_statement); - count += count_decls_in_stmts(if_stmt->false_statement); - break; - } - - case STATEMENT_SWITCH: { - const switch_statement_t *const switch_stmt = &stmt->switchs; - count += count_decls_in_expression(switch_stmt->expression); - count += count_decls_in_stmts(switch_stmt->body); - break; - } - - case STATEMENT_LABEL: { - const label_statement_t *const label_stmt = &stmt->label; - if (label_stmt->statement != NULL) { - count += count_decls_in_stmts(label_stmt->statement); - } - break; - } - - case STATEMENT_WHILE: { - const while_statement_t *const while_stmt = &stmt->whiles; - count += count_decls_in_expression(while_stmt->condition); - count += count_decls_in_stmts(while_stmt->body); - break; - } - - case STATEMENT_DO_WHILE: { - const do_while_statement_t *const do_while_stmt = &stmt->do_while; - count += count_decls_in_expression(do_while_stmt->condition); - count += count_decls_in_stmts(do_while_stmt->body); - break; - } - - case STATEMENT_FOR: { - const for_statement_t *const for_stmt = &stmt->fors; - count += count_local_declarations(for_stmt->scope.declarations, NULL); - count += count_decls_in_expression(for_stmt->initialisation); - count += count_decls_in_expression(for_stmt->condition); - count += count_decls_in_expression(for_stmt->step); - count += count_decls_in_stmts(for_stmt->body); - break; - } - - case STATEMENT_CASE_LABEL: { - const case_label_statement_t *label = &stmt->case_label; - count += count_decls_in_expression(label->expression); - if (label->statement != NULL) { - count += count_decls_in_stmts(label->statement); - } - break; - } - - case STATEMENT_ASM: - case STATEMENT_BREAK: - case STATEMENT_CONTINUE: - break; - - case STATEMENT_EXPRESSION: { - const expression_statement_t *expr_stmt = &stmt->expression; - count += count_decls_in_expression(expr_stmt->expression); - break; - } - - case STATEMENT_GOTO: - case STATEMENT_LEAVE: - case STATEMENT_INVALID: - break; - - case STATEMENT_RETURN: { - const return_statement_t *ret_stmt = &stmt->returns; - count += count_decls_in_expression(ret_stmt->value); - break; - } - - case STATEMENT_MS_TRY: { - const ms_try_statement_t *const try_stmt = &stmt->ms_try; - count += count_decls_in_stmts(try_stmt->try_statement); - if (try_stmt->except_expression != NULL) - count += count_decls_in_expression(try_stmt->except_expression); - count += count_decls_in_stmts(try_stmt->final_statement); - break; - } - } + default: + break; } - return count; } -static int get_function_n_local_vars(declaration_t *declaration) +static int get_function_n_local_vars(entity_t *entity) { int count = 0; /* count parameters */ - count += count_local_declarations(declaration->scope.declarations, NULL); + count += count_local_variables(entity->function.parameters.entities, NULL); /* count local variables declared in body */ - count += count_decls_in_stmts(declaration->init.statement); - + walk_statements(entity->function.statement, count_local_variables_in_stmt, + &count); return count; } -static void initialize_function_parameters(declaration_t *declaration) +static void initialize_function_parameters(entity_t *entity) { - ir_graph *irg = current_ir_graph; - ir_node *args = get_irg_args(irg); - ir_node *start_block = get_irg_start_block(irg); - ir_type *function_irtype = get_ir_type(declaration->type); + assert(entity->kind == ENTITY_FUNCTION); + ir_graph *irg = current_ir_graph; + 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 n = 0; - declaration_t *parameter = declaration->scope.declarations; - for( ; parameter != NULL; parameter = parameter->next, ++n) { - assert(parameter->declaration_kind == DECLARATION_KIND_UNKNOWN); - type_t *type = skip_typeref(parameter->type); + int n = 0; + entity_t *parameter = entity->function.parameters.entities; + for ( ; parameter != NULL; parameter = parameter->base.next, ++n) { + if (parameter->kind != ENTITY_PARAMETER) + continue; + + assert(parameter->declaration.kind == DECLARATION_KIND_UNKNOWN); + type_t *type = skip_typeref(parameter->declaration.type); - bool needs_entity = parameter->address_taken; + bool needs_entity = parameter->parameter.address_taken; assert(!is_type_array(type)); if (is_type_compound(type)) { needs_entity = true; @@ -5321,12 +5491,12 @@ static void initialize_function_parameters(declaration_t *declaration) if (needs_entity) { ir_entity *entity = get_method_value_param_ent(function_irtype, n); - ident *id = new_id_from_str(parameter->symbol->string); + ident *id = new_id_from_str(parameter->base.symbol->string); set_entity_ident(entity, id); - parameter->declaration_kind - = DECLARATION_KIND_LOCAL_VARIABLE_ENTITY; - parameter->v.entity = entity; + parameter->declaration.kind + = DECLARATION_KIND_PARAMETER_ENTITY; + parameter->parameter.v.entity = entity; continue; } @@ -5336,16 +5506,17 @@ 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(type); + ir_mode *mode = get_ir_mode_storage(type); value = create_conv(NULL, value, mode); value = do_strict_conv(NULL, value); - parameter->declaration_kind = DECLARATION_KIND_LOCAL_VARIABLE; - parameter->v.value_number = next_value_number_function; - set_irg_loc_description(current_ir_graph, next_value_number_function, parameter); + parameter->declaration.kind = DECLARATION_KIND_PARAMETER; + parameter->parameter.v.value_number = next_value_number_function; + set_irg_loc_description(current_ir_graph, next_value_number_function, + parameter); ++next_value_number_function; - set_value(parameter->v.value_number, value); + set_value(parameter->parameter.v.value_number, value); } } @@ -5357,6 +5528,10 @@ static void initialize_function_parameters(declaration_t *declaration) */ 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)) */ + set_irg_additional_property(irg, mtp_property_returns_twice); + } if (decl_modifiers & DM_NORETURN) { /* TRUE if the declaration includes the Microsoft __declspec(noreturn) specifier. */ @@ -5405,7 +5580,8 @@ static void add_function_pointer(ir_type *segment, ir_entity *method, /** * Generate possible IJmp branches to a given label block. */ -static void gen_ijmp_branches(ir_node *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); @@ -5415,57 +5591,58 @@ static void gen_ijmp_branches(ir_node *block) { /** * Create code for a function. */ -static void create_function(declaration_t *declaration) +static void create_function(entity_t *entity) { - ir_entity *function_entity = get_function_entity(declaration); + assert(entity->kind == ENTITY_FUNCTION); + ir_entity *function_entity = get_function_entity(entity); - if (declaration->init.statement == NULL) + if (entity->function.statement == NULL) return; - if (declaration->modifiers & DM_CONSTRUCTOR) { + if (entity->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) { + if (entity->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; + current_function_entity = entity; + current_function_name = NULL; + current_funcsig = NULL; assert(all_labels == NULL); - all_labels = NEW_ARR_F(declaration_t *, 0); + all_labels = NEW_ARR_F(label_t *, 0); ijmp_list = NULL; - int n_local_vars = get_function_n_local_vars(declaration); + int n_local_vars = get_function_n_local_vars(entity); 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); + tarval_enable_fp_ops(1); 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) + if (entity->function.is_inline) set_irg_inline_property(irg, irg_inline_recomended); - handle_decl_modifier_irg(irg, declaration->modifiers); + handle_decl_modifier_irg(irg, entity->declaration.modifiers); next_value_number_function = 0; - initialize_function_parameters(declaration); + initialize_function_parameters(entity); - statement_to_firm(declaration->init.statement); + statement_to_firm(entity->function.statement); ir_node *end_block = get_irg_end_block(irg); /* do we have a return statement yet? */ if (get_cur_block() != NULL) { - type_t *type = skip_typeref(declaration->type); + type_t *type = skip_typeref(entity->declaration.type); assert(is_type_function(type)); const function_type_t *func_type = &type->function; const type_t *return_type @@ -5477,15 +5654,15 @@ static void create_function(declaration_t *declaration) } else { ir_mode *mode; if (is_type_scalar(return_type)) { - mode = get_ir_mode(func_type->return_type); + mode = get_ir_mode_storage(func_type->return_type); } else { mode = mode_P_data; } ir_node *in[1]; /* §5.1.2.2.3 main implicitly returns 0 */ - if (strcmp(declaration->symbol->string, "main") == 0) { - in[0] = new_Const(mode, get_mode_null(mode)); + if (is_main(entity)) { + in[0] = new_Const(get_mode_null(mode)); } else { in[0] = new_Unknown(mode); } @@ -5496,19 +5673,19 @@ static void create_function(declaration_t *declaration) bool has_computed_gotos = false; for (int i = ARR_LEN(all_labels) - 1; i >= 0; --i) { - declaration_t *label = all_labels[i]; + label_t *label = all_labels[i]; if (label->address_taken) { - gen_ijmp_branches(label->v.block); + gen_ijmp_branches(label->block); has_computed_gotos = true; } - mature_immBlock(label->v.block); + mature_immBlock(label->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); + warningf(&entity->base.source_position, + "function '%Y' can never be inlined because it contains a computed goto", + entity->base.symbol); } set_irg_inline_property(irg, irg_inline_forbidden); } @@ -5526,7 +5703,7 @@ static void create_function(declaration_t *declaration) int n = get_compound_n_members(frame_type); int align_all = 4; int offset = 0; - for(int i = 0; i < n; ++i) { + for (int i = 0; i < n; ++i) { ir_entity *entity = get_compound_member(frame_type, i); ir_type *entity_type = get_entity_type(entity); @@ -5549,90 +5726,77 @@ static void create_function(declaration_t *declaration) 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); + } } static void scope_to_firm(scope_t *scope) { /* first pass: create declarations */ - declaration_t *declaration = scope->declarations; - for( ; declaration != NULL; declaration = declaration->next) { - if (declaration->namespc != NAMESPACE_NORMAL) - continue; - if (declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY - || declaration->storage_class == STORAGE_CLASS_TYPEDEF) - continue; - if (declaration->symbol == NULL) + entity_t *entity = scope->entities; + for ( ; entity != NULL; entity = entity->base.next) { + if (entity->base.symbol == NULL) continue; - type_t *type = skip_typeref(declaration->type); - if (is_type_function(type)) { - get_function_entity(declaration); - } else { - create_global_variable(declaration); + if (entity->kind == ENTITY_FUNCTION) { + if (entity->function.btk != bk_none) { + /* builtins have no representation */ + continue; + } + get_function_entity(entity); + } else if (entity->kind == ENTITY_VARIABLE) { + create_global_variable(entity); } } /* second pass: create code/initializers */ - declaration = scope->declarations; - for( ; declaration != NULL; declaration = declaration->next) { - if (declaration->namespc != NAMESPACE_NORMAL) - continue; - if (declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY - || declaration->storage_class == STORAGE_CLASS_TYPEDEF) - continue; - if (declaration->symbol == NULL) + entity = scope->entities; + for ( ; entity != NULL; entity = entity->base.next) { + if (entity->base.symbol == NULL) continue; - type_t *type = declaration->type; - if (type->kind == TYPE_FUNCTION) { - create_function(declaration); - declaration_t *inner; - for (inner = next_inner_function(); inner != NULL; - inner = next_inner_function()) - create_function(inner); - } else { - assert(declaration->declaration_kind + if (entity->kind == ENTITY_FUNCTION) { + if (entity->function.btk != bk_none) { + /* builtins have no representation */ + continue; + } + create_function(entity); + } else if (entity->kind == ENTITY_VARIABLE) { + assert(entity->declaration.kind == DECLARATION_KIND_GLOBAL_VARIABLE); current_ir_graph = get_const_code_irg(); - create_declaration_initializer(declaration); + create_variable_initializer(entity); } } } -static void set_be_option(const char *option) -{ - int res = firm_be_option(option); - assert(res); -} - 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 */ switch (firm_opt.os_support) { case OS_SUPPORT_MINGW: - create_ld_ident = create_ld_ident_win32; - set_be_option("ia32-gasmode=mingw"); + create_ld_ident = create_name_win32; break; case OS_SUPPORT_LINUX: - create_ld_ident = create_ld_ident_linux_elf; - set_be_option("ia32-gasmode=elf"); + create_ld_ident = create_name_linux_elf; break; case OS_SUPPORT_MACHO: - create_ld_ident = create_ld_ident_macho; - set_be_option("ia32-gasmode=macho"); - set_be_option("ia32-stackalign=4"); - set_be_option("pic"); + create_ld_ident = create_name_macho; break; + default: + panic("unexpected OS support mode"); } /* create idents for all known runtime functions */ - for (size_t i = 0; i < sizeof(rts_data) / sizeof(rts_data[0]); ++i) { + for (size_t i = 0; i < lengthof(rts_data); ++i) { rts_idents[i] = new_id_from_str(rts_data[i].name); } @@ -5650,6 +5814,11 @@ static void init_ir_types(void) 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(); + mode_float_arithmetic = be_params->mode_float_arithmetic; + + stack_param_align = be_params->stack_param_align; } void exit_ast2firm(void) @@ -5678,14 +5847,20 @@ static void global_asm_to_firm(statement_t *s) void translation_unit_to_firm(translation_unit_t *unit) { /* just to be sure */ - continue_label = NULL; - break_label = NULL; - current_switch_cond = NULL; + continue_label = NULL; + break_label = NULL; + current_switch_cond = NULL; + 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); - current_ir_graph = NULL; + DEL_ARR_F(inner_functions); + inner_functions = NULL; + + current_ir_graph = NULL; + current_translation_unit = NULL; }