X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast2firm.c;h=e4a12a7637865f450f0fda6c10ac56a98cffe2cd;hb=f88017a35b44823c9c8139796368d77c0ed11b4d;hp=6131c7eb83705d9ce7cc312c776286bb31885f2e;hpb=431b8534737f57aedaa9aa747cba2fd33391283f;p=cparser diff --git a/ast2firm.c b/ast2firm.c index 6131c7e..e4a12a7 100644 --- a/ast2firm.c +++ b/ast2firm.c @@ -1,6 +1,6 @@ /* * This file is part of cparser. - * Copyright (C) 2007-2008 Matthias Braun + * Copyright (C) 2007-2009 Matthias Braun * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -32,6 +32,7 @@ #include "adt/error.h" #include "adt/array.h" +#include "adt/util.h" #include "symbol_t.h" #include "token_t.h" #include "type_t.h" @@ -49,11 +50,26 @@ #include "driver/firm_opt.h" #include "driver/firm_cmdline.h" +typedef struct trampoline_region trampoline_region; +struct trampoline_region { + ir_entity *function; /**< The function that is called by this trampoline */ + ir_entity *region; /**< created region for the trampoline */ +}; + +static const backend_params *be_params; + +static ir_type *ir_type_char; static ir_type *ir_type_const_char; static ir_type *ir_type_wchar_t; static ir_type *ir_type_void; static ir_type *ir_type_int; +/* 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; @@ -63,6 +79,7 @@ static label_t **all_labels; static entity_t **inner_functions; static ir_node *ijmp_list; static bool constant_folding; +static bool initializer_use_bitfield_basetype; extern bool have_const_functions; @@ -72,6 +89,10 @@ static ir_node *current_funcsig; static switch_statement_t *current_switch; static ir_graph *current_function; static translation_unit_t *current_translation_unit; +static trampoline_region *current_trampolines; +static ir_type *current_outer_frame; +static ir_type *current_outer_value_type; +static ir_node *current_static_link; static entitymap_t entitymap; @@ -90,26 +111,23 @@ typedef enum declaration_kind_t { DECLARATION_KIND_INNER_FUNCTION } declaration_kind_t; -static ir_mode *get_ir_mode(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 void enqueue_inner_function(entity_t *entity) { + if (inner_functions == NULL) + inner_functions = NEW_ARR_F(entity_t *, 0); ARR_APP1(entity_t*, inner_functions, entity); } -static entity_t *next_inner_function(void) -{ - int len = ARR_LEN(inner_functions); - if (len == 0) - return NULL; - - entity_t *entity = inner_functions[len-1]; - ARR_SHRINKLEN(inner_functions, len-1); - - return entity; -} - ir_node *uninitialized_local_var(ir_graph *irg, ir_mode *mode, int pos) { const entity_t *entity = get_irg_loc_description(irg, pos); @@ -230,73 +248,32 @@ ir_mode *get_atomic_mode(atomic_type_kind_t kind) return atomic_modes[kind]; } -static unsigned get_compound_type_size(compound_type_t *type) +static ir_node *get_vla_size(array_type_t *const 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) -{ - assert(!type->is_vla); - ir_type *irtype = get_ir_type((type_t*) type); - return get_type_size_bytes(irtype); -} - -static unsigned get_type_size_const(type_t *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: - case TYPE_REFERENCE: - 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; } -static ir_node *get_type_size(type_t *type) +/** + * Return a node representing the size of a type. + */ +static ir_node *get_type_size_node(type_t *type) { type = skip_typeref(type); if (is_type_array(type) && type->array.is_vla) { - ir_node *size_node = type->array.size_node; - if (size_node == NULL) { - size_node = expression_to_firm(type->array.size_expression); - type->array.size_node = size_node; - } - - ir_node *elem_size = get_type_size(type->array.element_type); + ir_node *size_node = get_vla_size(&type->array); + ir_node *elem_size = get_type_size_node(type->array.element_type); ir_mode *mode = get_irn_mode(size_node); ir_node *real_size = new_d_Mul(NULL, size_node, elem_size, mode); return real_size; } - 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); @@ -317,14 +294,14 @@ static unsigned count_parameters(const function_type_t *function_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) { - atomic_type_kind_t kind = type->akind; - ir_mode *mode = atomic_modes[kind]; - ident *id = get_mode_ident(mode); - ir_type *irtype = new_type_primitive(id, mode); + ir_mode *mode = atomic_modes[akind]; + ident *id = get_mode_ident(mode); + ir_type *irtype = new_type_primitive(id, mode); + il_alignment_t alignment = get_atomic_type_alignment(akind); - set_type_alignment_bytes(irtype, type->base.alignment); + set_type_alignment_bytes(irtype, alignment); return irtype; } @@ -347,14 +324,15 @@ static ir_type *create_complex_type(const complex_type_t *type) /** * Creates a Firm type for an imaginary type */ -static ir_type *create_imaginary_type(const imaginary_type_t *type) +static ir_type *create_imaginary_type(imaginary_type_t *type) { atomic_type_kind_t kind = type->akind; ir_mode *mode = atomic_modes[kind]; ident *id = get_mode_ident(mode); ir_type *irtype = new_type_primitive(id, mode); + il_alignment_t alignment = get_type_alignment((type_t*) type); - set_type_alignment_bytes(irtype, type->base.alignment); + set_type_alignment_bytes(irtype, alignment); return irtype; } @@ -363,10 +341,11 @@ static ir_type *create_imaginary_type(const imaginary_type_t *type) * return type of a parameter (and take transparent union gnu extension into * account) */ -static type_t *get_parameter_type(type_t *type) +static type_t *get_parameter_type(type_t *orig_type) { - type = skip_typeref(type); - if (type->base.modifiers & TYPE_MODIFIER_TRANSPARENT_UNION) { + type_t *type = skip_typeref(orig_type); + if (is_type_union(type) + && get_type_modifiers(orig_type) & DM_TRANSPARENT_UNION) { compound_t *compound = type->compound.compound; type = compound->members.entities->declaration.type; } @@ -374,12 +353,12 @@ static type_t *get_parameter_type(type_t *type) return type; } -static ir_type *create_method_type(const function_type_t *function_type) +static ir_type *create_method_type(const function_type_t *function_type, bool for_closure) { type_t *return_type = skip_typeref(function_type->return_type); ident *id = id_unique("functiontype.%u"); - int n_parameters = count_parameters(function_type); + int n_parameters = count_parameters(function_type) + (for_closure ? 1 : 0); int n_results = return_type == type_void ? 0 : 1; ir_type *irtype = new_type_method(id, n_parameters, n_results); @@ -390,6 +369,11 @@ static ir_type *create_method_type(const function_type_t *function_type) function_parameter_t *parameter = function_type->parameters; int n = 0; + if (for_closure) { + ir_type *p_irtype = get_ir_type(type_void_ptr); + set_method_param_type(irtype, n, p_irtype); + ++n; + } for ( ; parameter != NULL; parameter = parameter->next) { type_t *type = get_parameter_type(parameter->type); ir_type *p_irtype = get_ir_type(type); @@ -397,9 +381,10 @@ static ir_type *create_method_type(const function_type_t *function_type) ++n; } - if (function_type->variadic || function_type->unspecified_parameters) { + bool is_variadic = function_type->variadic; + + if (is_variadic) set_method_variadicity(irtype, variadicity_variadic); - } unsigned cc = get_method_calling_convention(irtype); switch (function_type->calling_convention) { @@ -410,7 +395,7 @@ is_cdecl: break; case CC_STDCALL: - if (function_type->variadic || function_type->unspecified_parameters) + if (is_variadic) goto is_cdecl; /* only non-variadic function can use stdcall, else use cdecl */ @@ -418,7 +403,7 @@ is_cdecl: break; case CC_FASTCALL: - if (function_type->variadic || function_type->unspecified_parameters) + if (is_variadic) goto is_cdecl; /* only non-variadic function can use fastcall, else use cdecl */ set_method_calling_convention(irtype, SET_FASTCALL(cc)); @@ -429,6 +414,9 @@ is_cdecl: break; } + if (for_closure) + set_method_calling_convention(irtype, get_method_calling_convention(irtype) | cc_this_call); + return irtype; } @@ -577,13 +565,8 @@ enum { /** * Construct firm type from ast struct type. - * - * As anonymous inner structs get flattened to a single firm type, we might get - * irtype, outer_offset and out_align passed (they represent the position of - * the anonymous inner struct inside the resulting firm struct) */ -static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype, - size_t *outer_offset, size_t *outer_align, +static ir_type *create_compound_type(compound_type_t *type, bool incomplete, bool is_union) { compound_t *compound = type->compound; @@ -592,41 +575,38 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype, return compound->irtype; } - size_t align_all = 1; - size_t offset = 0; - size_t bit_offset = 0; - size_t size = 0; - - if (irtype == NULL) { - symbol_t *symbol = compound->base.symbol; - ident *id; - if (symbol != NULL) { - id = new_id_from_str(symbol->string); - } else { - if (is_union) { - id = id_unique("__anonymous_union.%u"); - } else { - id = id_unique("__anonymous_struct.%u"); - } - } - dbg_info *dbgi = get_dbg_info(&compound->base.source_position); - + symbol_t *symbol = compound->base.symbol; + ident *id; + if (symbol != NULL) { + id = new_id_from_str(symbol->string); + } else { if (is_union) { - irtype = new_d_type_union(id, dbgi); + id = id_unique("__anonymous_union.%u"); } else { - irtype = new_d_type_struct(id, dbgi); + id = id_unique("__anonymous_struct.%u"); } + } + dbg_info *dbgi = get_dbg_info(&compound->base.source_position); - compound->irtype_complete = false; - compound->irtype = irtype; + ir_type *irtype; + if (is_union) { + irtype = new_d_type_union(id, dbgi); } else { - offset = *outer_offset; - align_all = *outer_align; + irtype = new_d_type_struct(id, dbgi); } + compound->irtype_complete = false; + compound->irtype = irtype; + if (incomplete) return irtype; + if (is_union) { + layout_union_type(type); + } else { + layout_struct_type(type); + } + compound->irtype_complete = true; entity_t *entry = compound->members.entities; @@ -634,128 +614,37 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype, if (entry->kind != ENTITY_COMPOUND_MEMBER) continue; - size_t prev_offset = offset; - symbol_t *symbol = entry->base.symbol; - type_t *entry_type = skip_typeref(entry->declaration.type); - dbg_info *dbgi = get_dbg_info(&entry->base.source_position); - + type_t *entry_type = entry->declaration.type; ident *ident; - if (symbol != NULL) { - ident = new_id_from_str(symbol->string); - } else { - if (entry_type->kind == TYPE_COMPOUND_STRUCT) { - create_compound_type(&entry_type->compound, irtype, &offset, - &align_all, false, COMPOUND_IS_STRUCT); - goto finished_member; - } else if (entry_type->kind == TYPE_COMPOUND_UNION) { - create_compound_type(&entry_type->compound, irtype, &offset, - &align_all, false, COMPOUND_IS_UNION); - goto finished_member; - } else { - assert(entry_type->kind == TYPE_BITFIELD); - } + if (symbol == NULL) { + /* anonymous bitfield member, skip */ + if (entry_type->kind == TYPE_BITFIELD) + continue; + assert(entry_type->kind == TYPE_COMPOUND_STRUCT + || entry_type->kind == TYPE_COMPOUND_UNION); ident = id_unique("anon.%u"); - } - - ir_type *base_irtype; - if (entry_type->kind == TYPE_BITFIELD) { - base_irtype = get_ir_type(entry_type->bitfield.base_type); } else { - base_irtype = get_ir_type(entry_type); + ident = new_id_from_str(symbol->string); } - size_t entry_alignment = get_type_alignment_bytes(base_irtype); - size_t misalign = offset % entry_alignment; + dbg_info *dbgi = get_dbg_info(&entry->base.source_position); ir_type *entry_irtype = get_ir_type(entry_type); ir_entity *entity = new_d_entity(irtype, ident, entry_irtype, dbgi); - size_t base; - size_t bits_remainder; - if (entry_type->kind == TYPE_BITFIELD) { - size_t size_bits = entry_type->bitfield.bit_size; - size_t rest_size_bits = (entry_alignment - misalign)*8 - bit_offset; - - if (size_bits > rest_size_bits) { - /* start a new bucket */ - offset += entry_alignment - misalign; - bit_offset = 0; - - base = offset; - bits_remainder = 0; - } else { - /* put into current bucket */ - base = offset - misalign; - bits_remainder = misalign * 8 + bit_offset; - } - - offset += size_bits / 8; - bit_offset = bit_offset + (size_bits % 8); - } else { - size_t entry_size = get_type_size_bytes(base_irtype); - if (misalign > 0 || bit_offset > 0) - offset += entry_alignment - misalign; - - base = offset; - bits_remainder = 0; - offset += entry_size; - bit_offset = 0; - } - - if (entry_alignment > align_all) { - if (entry_alignment % align_all != 0) { - panic("uneven alignments not supported yet"); - } - align_all = entry_alignment; - } - - set_entity_offset(entity, base); + set_entity_offset(entity, entry->compound_member.offset); set_entity_offset_bits_remainder(entity, - (unsigned char) bits_remainder); - //add_struct_member(irtype, entity); - entry->declaration.kind = DECLARATION_KIND_COMPOUND_MEMBER; - assert(entry->compound_member.entity == NULL); - entry->compound_member.entity = entity; - -finished_member: - if (is_union) { - size_t entry_size = offset - prev_offset; - if (entry_size > size) { - size = entry_size; - } - offset = 0; - bit_offset = 0; - } - } + entry->compound_member.bit_offset); - if (!is_union) { - size = offset; - } - - size_t misalign = offset % align_all; - if (misalign > 0 || bit_offset > 0) { - size += align_all - misalign; + assert(entry->declaration.kind == DECLARATION_KIND_UNKNOWN); + entry->declaration.kind = DECLARATION_KIND_COMPOUND_MEMBER; + entry->compound_member.entity = entity; } - if (outer_offset != NULL) { - if (!is_union) { - *outer_offset = offset; - } else { - *outer_offset += size; - } - - if (align_all > *outer_align) { - if (align_all % *outer_align != 0) { - panic("uneven alignments not supported yet"); - } - *outer_align = align_all; - } - } else { - set_type_alignment_bytes(irtype, align_all); - set_type_size_bytes(irtype, size); - set_type_state(irtype, layout_fixed); - } + set_type_alignment_bytes(irtype, compound->alignment); + set_type_size_bytes(irtype, compound->size); + set_type_state(irtype, layout_fixed); return irtype; } @@ -791,7 +680,7 @@ static ir_type *create_enum_type(enum_type_t *const type) constant_folding = constant_folding_old; - return ir_type_int; + return create_atomic_type(type->akind); } static ir_type *get_ir_type_incomplete(type_t *type) @@ -806,11 +695,9 @@ static ir_type *get_ir_type_incomplete(type_t *type) switch (type->kind) { case TYPE_COMPOUND_STRUCT: - return create_compound_type(&type->compound, NULL, NULL, NULL, - true, COMPOUND_IS_STRUCT); + return create_compound_type(&type->compound, true, COMPOUND_IS_STRUCT); case TYPE_COMPOUND_UNION: - return create_compound_type(&type->compound, NULL, NULL, NULL, - true, COMPOUND_IS_UNION); + return create_compound_type(&type->compound, true, COMPOUND_IS_UNION); default: return get_ir_type(type); } @@ -831,10 +718,10 @@ ir_type *get_ir_type(type_t *type) switch (type->kind) { case TYPE_ERROR: /* Happens while constant folding, when there was an error */ - return create_atomic_type(&type_void->atomic); + return create_atomic_type(ATOMIC_TYPE_VOID); case TYPE_ATOMIC: - firm_type = create_atomic_type(&type->atomic); + firm_type = create_atomic_type(type->atomic.akind); break; case TYPE_COMPLEX: firm_type = create_complex_type(&type->complex); @@ -843,7 +730,7 @@ ir_type *get_ir_type(type_t *type) firm_type = create_imaginary_type(&type->imaginary); break; case TYPE_FUNCTION: - firm_type = create_method_type(&type->function); + firm_type = create_method_type(&type->function, false); break; case TYPE_POINTER: firm_type = create_pointer_type(&type->pointer); @@ -855,12 +742,10 @@ ir_type *get_ir_type(type_t *type) firm_type = create_array_type(&type->array); break; case TYPE_COMPOUND_STRUCT: - firm_type = create_compound_type(&type->compound, NULL, NULL, NULL, - false, COMPOUND_IS_STRUCT); + firm_type = create_compound_type(&type->compound, false, COMPOUND_IS_STRUCT); break; case TYPE_COMPOUND_UNION: - firm_type = create_compound_type(&type->compound, NULL, NULL, NULL, - false, COMPOUND_IS_UNION); + firm_type = create_compound_type(&type->compound, false, COMPOUND_IS_UNION); break; case TYPE_ENUM: firm_type = create_enum_type(&type->enumt); @@ -884,7 +769,7 @@ ir_type *get_ir_type(type_t *type) return firm_type; } -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 +783,16 @@ 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 */ @@ -974,13 +869,18 @@ static const struct { { rts_coshl, 1, "coshl", 1, _C99 }, { rts_tanhl, 1, "tanhl", 1, _C99 }, + { rts_strcmp, 1, "strcmp", 2, _C89 }, + { rts_strncmp, 1, "strncmp", 3, _C89 }, + { rts_strcpy, 1, "strcpy", 2, _C89 }, + { rts_strlen, 1, "strlen", 1, _C89 }, { rts_memcpy, 1, "memcpy", 3, _C89 }, /* HMM, man say its C99 */ + { rts_mempcpy, 1, "mempcpy", 3, _GNUC }, + { rts_memmove, 1, "memmove", 3, _C89 }, /* HMM, man say its C99 */ { rts_memset, 1, "memset", 3, _C89 }, /* HMM, man say its C99 */ - { rts_strcmp, 1, "strcmp", 2, _C89 }, - { rts_strncmp, 1, "strncmp", 3, _C89 } + { rts_memcmp, 1, "memcmp", 3, _C89 }, /* HMM, man say its C99 */ }; -static ident *rts_idents[sizeof(rts_data) / sizeof(rts_data[0])]; +static ident *rts_idents[lengthof(rts_data)]; static ident* (*create_ld_ident)(entity_t*) = create_name_linux_elf; @@ -990,7 +890,7 @@ static ident* (*create_ld_ident)(entity_t*) = create_name_linux_elf; * @param ent the entity * @param decl the routine declaration */ -static void handle_gnu_attributes_ent(ir_entity *irentity, entity_t *entity) +static void handle_decl_modifiers(ir_entity *irentity, entity_t *entity) { assert(is_declaration(entity)); decl_modifiers_t modifiers = entity->declaration.modifiers; @@ -1030,12 +930,14 @@ static bool is_main(entity_t *entity) * Creates an entity representing a function. * * @param declaration the function declaration + * @param owner_type the owner type of this function, NULL + * for global functions */ -static ir_entity *get_function_entity(entity_t *entity) +static ir_entity *get_function_entity(entity_t *entity, ir_type *owner_type) { assert(entity->kind == ENTITY_FUNCTION); - if (entity->function.entity != NULL) { - return entity->function.entity; + if (entity->function.irentity != NULL) { + return entity->function.irentity; } if (is_main(entity)) { @@ -1045,24 +947,18 @@ static ir_entity *get_function_entity(entity_t *entity) if (type->function.linkage != LINKAGE_C) { type_t *new_type = duplicate_type(type); new_type->function.linkage = LINKAGE_C; - - type = typehash_insert(new_type); - if (type != new_type) { - obstack_free(type_obst, new_type); - } - entity->declaration.type = type; + 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(entity->declaration.type); - bool const has_body = entity->function.statement != NULL; /* already an entity defined? */ ir_entity *irentity = entitymap_get(&entitymap, symbol); + bool const has_body = entity->function.statement != NULL; if (irentity != NULL) { if (get_entity_visibility(irentity) == visibility_external_allocated && has_body) { @@ -1071,40 +967,64 @@ static ir_entity *get_function_entity(entity_t *entity) goto entity_created; } + ir_type *ir_type_method; + if (entity->function.need_closure) + ir_type_method = create_method_type(&entity->declaration.type->function, true); + else + ir_type_method = get_ir_type(entity->declaration.type); + + bool nested_function = false; + if (owner_type == NULL) + owner_type = get_glob_type(); + else + nested_function = true; + dbg_info *const dbgi = get_dbg_info(&entity->base.source_position); - irentity = new_d_entity(global_type, id, ir_type_method, dbgi); - set_entity_ld_ident(irentity, create_ld_ident(entity)); - - handle_gnu_attributes_ent(irentity, entity); - - /* static inline => local - * extern inline => local - * inline without definition => local - * inline with definition => external_visible */ - storage_class_tag_t const storage_class - = (storage_class_tag_t) entity->declaration.storage_class; - bool const is_inline = entity->function.is_inline; - if (is_inline && storage_class == STORAGE_CLASS_NONE && has_body) { - set_entity_visibility(irentity, visibility_external_visible); - } else if (storage_class == STORAGE_CLASS_STATIC || - (is_inline && has_body)) { - if (!has_body) { - /* this entity was declared, but is defined nowhere */ - set_entity_peculiarity(irentity, peculiarity_description); + irentity = new_d_entity(owner_type, id, ir_type_method, dbgi); + + ident *ld_id; + if (nested_function) + ld_id = id_unique("inner.%u"); + else + ld_id = create_ld_ident(entity); + set_entity_ld_ident(irentity, ld_id); + + handle_decl_modifiers(irentity, entity); + + if (! nested_function) { + /* static inline => local + * extern inline => local + * inline without definition => local + * inline with definition => external_visible */ + storage_class_tag_t const storage_class + = (storage_class_tag_t) entity->declaration.storage_class; + bool const is_inline = entity->function.is_inline; + + if (is_inline && storage_class == STORAGE_CLASS_NONE && has_body) { + set_entity_visibility(irentity, visibility_external_visible); + } else if (storage_class == STORAGE_CLASS_STATIC || + (is_inline && has_body)) { + if (!has_body) { + /* this entity was declared, but is defined nowhere */ + set_entity_peculiarity(irentity, peculiarity_description); + } + set_entity_visibility(irentity, visibility_local); + } else if (has_body) { + set_entity_visibility(irentity, visibility_external_visible); + } else { + set_entity_visibility(irentity, visibility_external_allocated); } - set_entity_visibility(irentity, visibility_local); - } else if (has_body) { - set_entity_visibility(irentity, visibility_external_visible); } else { - set_entity_visibility(irentity, visibility_external_allocated); + /* nested functions are always local */ + set_entity_visibility(irentity, visibility_local); } set_entity_allocation(irentity, allocation_static); /* We should check for file scope here, but as long as we compile C only this is not needed. */ - if (! firm_opt.freestanding) { + if (! firm_opt.freestanding && !has_body) { /* check for a known runtime function */ - for (size_t i = 0; i < sizeof(rts_data) / sizeof(rts_data[0]); ++i) { + for (size_t i = 0; i < lengthof(rts_data); ++i) { if (id != rts_idents[i]) continue; @@ -1119,19 +1039,37 @@ static ir_entity *get_function_entity(entity_t *entity) entitymap_insert(&entitymap, symbol, irentity); entity_created: - entity->declaration.kind = DECLARATION_KIND_FUNCTION; - entity->function.entity = irentity; + entity->declaration.kind = DECLARATION_KIND_FUNCTION; + entity->function.irentity = irentity; return irentity; } +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); +} + /** * Creates a Const node representing a constant. */ 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; @@ -1148,7 +1086,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, 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); } /** @@ -1157,13 +1097,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]); } } @@ -1180,7 +1122,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]; @@ -1191,6 +1133,68 @@ static ir_node *wide_character_constant_to_firm(const const_expression_t *cnst) return new_d_Const(dbgi, tv); } +/* + * Allocate an area of size bytes aligned at alignment + * at a frame type. + */ +static ir_entity *alloc_trampoline(ir_type *frame_type, int size, unsigned alignment) { + static unsigned area_cnt = 0; + char buf[32]; + + snprintf(buf, sizeof(buf), "trampolin%u", area_cnt++); + ident *name = new_id_from_str(buf); + + ir_type *tp = new_type_array(id_mangle_u(get_type_ident(frame_type), name), 1, ir_type_char); + set_array_bounds_int(tp, 0, 0, size); + set_type_alignment_bytes(tp, alignment); + + ir_entity *area = new_entity(frame_type, name, tp); + + /* mark this entity as compiler generated */ + set_entity_compiler_generated(area, 1); + return area; +} + +/** + * Return a node representing a trampoline reagion + * for a given entity. + * + * @param dbgi debug info + * @param entity the entity + */ +static ir_node *get_trampoline_region(dbg_info *dbgi, ir_entity *entity) +{ + ir_entity *region = NULL; + int i; + + if (current_trampolines != NULL) { + for (i = ARR_LEN(current_trampolines) - 1; i >= 0; --i) { + if (current_trampolines[i].function == entity) { + region = current_trampolines[i].region; + break; + } + } + } else { + current_trampolines = NEW_ARR_F(trampoline_region, 0); + } + ir_graph *irg = current_ir_graph; + if (region == NULL) { + /* create a new region */ + ir_type *frame_tp = get_irg_frame_type(irg); + trampoline_region reg; + reg.function = entity; + + reg.region = alloc_trampoline(frame_tp, + be_params->trampoline_size, + be_params->trampoline_align); + ARR_APP1(trampoline_region, current_trampolines, reg); + region = reg.region; + } + return new_d_simpleSel(dbgi, get_irg_no_mem(irg), get_irg_frame(irg), + region); +} + + /** * Creates a SymConst for a given entity. * @@ -1199,7 +1203,7 @@ static ir_node *wide_character_constant_to_firm(const const_expression_t *cnst) * @param entity the entity */ static ir_node *create_symconst(dbg_info *dbgi, ir_mode *mode, - ir_entity *entity) + ir_entity *entity) { assert(entity != NULL); union symconst_symbol sym; @@ -1207,6 +1211,27 @@ static ir_node *create_symconst(dbg_info *dbgi, ir_mode *mode, return new_d_SymConst(dbgi, mode, sym, symconst_addr_ent); } +/** + * Creates a SymConst for a given trampoline of an entity. + * + * @param dbgi debug info + * @param mode the (reference) mode for the SymConst + * @param entity the entity + */ +static ir_node *create_trampoline(dbg_info *dbgi, ir_mode *mode, + ir_entity *entity) +{ + assert(entity != NULL); + ir_node *in[3]; + in[0] = get_trampoline_region(dbgi, entity); + in[1] = create_symconst(dbgi, mode, entity); + in[2] = get_irg_frame(current_ir_graph); + + ir_node *irn = new_d_Builtin(dbgi, get_store(), 3, in, ir_bk_inner_trampoline, get_unknown_type()); + set_store(new_Proj(irn, mode_M, pn_Builtin_M)); + return new_Proj(irn, mode, pn_Builtin_1_result); +} + /** * Creates a SymConst node representing a string constant. * @@ -1228,6 +1253,7 @@ static ir_node *string_to_firm(const source_position_t *const src_pos, set_entity_ld_ident(entity, id); set_entity_variability(entity, variability_constant); set_entity_allocation(entity, allocation_static); + set_entity_visibility(entity, visibility_local); ir_type *const elem_type = ir_type_const_char; ir_mode *const mode = get_type_mode(elem_type); @@ -1304,6 +1330,13 @@ static ir_node *wide_string_literal_to_firm( return create_symconst(dbgi, mode_P_data, entity); } +/** + * Dereference an address. + * + * @param dbgi debug info + * @param type the type of the dereferenced result (the points_to type) + * @param addr the address to dereference + */ static ir_node *deref_address(dbg_info *const dbgi, type_t *const type, ir_node *const addr) { @@ -1314,22 +1347,25 @@ 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 && !is_Bad(load)) { - 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 (to the node's mode) if necessary. + * + * @param dbgi debug info + * @param node the node to strict conv */ static ir_node *do_strict_conv(dbg_info *dbgi, ir_node *node) { @@ -1351,14 +1387,17 @@ static ir_node *do_strict_conv(dbg_info *dbgi, ir_node *node) return new_d_strictConv(dbgi, node, mode); } +/** + * Returns the address of a global variable. + * + * @param dbgi debug info + * @param variable the variable + */ static ir_node *get_global_var_address(dbg_info *const dbgi, - const entity_t *const entity) + const variable_t *const variable) { - assert(entity->kind == ENTITY_VARIABLE); - assert(entity->declaration.kind == DECLARATION_KIND_GLOBAL_VARIABLE); - - ir_entity *const irentity = entity->variable.v.entity; - if (entity->variable.thread_local) { + ir_entity *const irentity = variable->v.entity; + if (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); @@ -1375,35 +1414,19 @@ static ir_node *get_local_frame(ir_entity *const ent) { ir_graph *const irg = current_ir_graph; const ir_type *const owner = get_entity_owner(ent); - if (owner == get_irg_frame_type(irg)) { - return get_irg_frame(irg); + if (owner == current_outer_frame || owner == current_outer_value_type) { + assert(current_static_link != NULL); + return current_static_link; } else { - assert(owner == get_method_value_param_type(get_entity_type(get_irg_entity(irg)))); - return get_irg_value_param_base(irg); - } -} - -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 get_irg_frame(irg); } - - 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); @@ -1433,36 +1456,53 @@ static ir_node *reference_expression_to_firm(const reference_expression_t *ref) /* make sure the type is constructed */ (void) get_ir_type(type); + /* for gcc compatibility we have to produce (dummy) addresses for some + * builtins */ + if (entity->kind == ENTITY_FUNCTION && entity->function.btk != bk_none) { + 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; + } + switch ((declaration_kind_t) entity->declaration.kind) { case DECLARATION_KIND_UNKNOWN: break; case DECLARATION_KIND_LOCAL_VARIABLE: { - ir_mode *const mode = get_ir_mode(type); - return get_value(entity->variable.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(type); - return get_value(entity->parameter.v.value_number, mode); + 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, entity->function.entity); + ir_mode *const mode = get_ir_mode_storage(type); + return create_symconst(dbgi, mode, entity->function.irentity); } case DECLARATION_KIND_INNER_FUNCTION: { - ir_mode *const mode = get_ir_mode(type); + ir_mode *const mode = get_ir_mode_storage(type); if (!entity->function.goto_to_outer && !entity->function.need_closure) { /* inner function not using the closure */ - return create_symconst(dbgi, mode, entity->function.entity); + return create_symconst(dbgi, mode, entity->function.irentity); } else { - /* TODO: need trampoline here */ - panic("Trampoline code not implemented"); - return create_symconst(dbgi, mode, entity->function.entity); + /* need trampoline here */ + return create_trampoline(dbgi, mode, entity->function.irentity); } } case DECLARATION_KIND_GLOBAL_VARIABLE: { - ir_node *const addr = get_global_var_address(dbgi, entity); - return deref_address(dbgi, entity->declaration.type, addr); + const variable_t *variable = &entity->variable; + ir_node *const addr = get_global_var_address(dbgi, variable); + return deref_address(dbgi, variable->base.type, addr); } case DECLARATION_KIND_LOCAL_VARIABLE_ENTITY: { @@ -1503,7 +1543,7 @@ static ir_node *reference_addr(const reference_expression_t *ref) * as an indicator for no real address) */ return NULL; case DECLARATION_KIND_GLOBAL_VARIABLE: { - ir_node *const addr = get_global_var_address(dbgi, entity); + ir_node *const addr = get_global_var_address(dbgi, &entity->variable); return addr; } case DECLARATION_KIND_LOCAL_VARIABLE_ENTITY: { @@ -1526,11 +1566,22 @@ static ir_node *reference_addr(const reference_expression_t *ref) case DECLARATION_KIND_FUNCTION: { type_t *const type = skip_typeref(entity->declaration.type); - ir_mode *const mode = get_ir_mode(type); - return create_symconst(dbgi, mode, entity->function.entity); + ir_mode *const mode = get_ir_mode_storage(type); + return create_symconst(dbgi, mode, entity->function.irentity); + } + + case DECLARATION_KIND_INNER_FUNCTION: { + type_t *const type = skip_typeref(entity->declaration.type); + ir_mode *const mode = get_ir_mode_storage(type); + if (!entity->function.goto_to_outer && !entity->function.need_closure) { + /* inner function not using the closure */ + return create_symconst(dbgi, mode, entity->function.irentity); + } else { + /* need trampoline here */ + return create_trampoline(dbgi, mode, entity->function.irentity); + } } - case DECLARATION_KIND_INNER_FUNCTION: case DECLARATION_KIND_COMPOUND_MEMBER: panic("not implemented reference type"); } @@ -1538,6 +1589,71 @@ static ir_node *reference_addr(const reference_expression_t *ref) 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), 1, in, kind, 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, 1, in, kind, 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, 2, in, kind, tp); + set_store(new_Proj(irn, mode_M, pn_Builtin_M)); + return NULL; +} + /** * Transform calls to builtin functions. */ @@ -1545,17 +1661,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"); } @@ -1572,35 +1687,155 @@ 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, 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, tv); return res; } - case T___builtin_expect: { + case bk_gnu_builtin_expect: { expression_t *argument = call->arguments->expression; return _expression_to_firm(argument); } - case T___builtin_va_end: + 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; + bool val = fold_constant_to_bool(expression); + if (!val) { + /* 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), 2, in, ir_bk_frame_address, 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), 2, in, ir_bk_return_address, 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(), 3, in, ir_bk_prefetch, 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(), 0, NULL, ir_bk_trap, 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(), 0, NULL, ir_bk_debugbreak, 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), 2, in, ir_bk_return_address, 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"); } } @@ -1611,36 +1846,42 @@ 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; entity_t *entity = ref->entity; - 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); + if (entity->kind == ENTITY_FUNCTION) { + if (entity->function.btk != bk_none) { + return process_builtin_call(call); + } + + ir_entity *irentity = entity->function.irentity; + if (irentity == NULL) + irentity = get_function_entity(entity, NULL); - size = create_conv(dbgi, size, get_ir_mode(type_size_t)); + if (irentity == rts_entities[rts_alloca]) { + /* handle alloca() call */ + expression_t *argument = call->arguments->expression; + ir_node *size = expression_to_firm(argument); + ir_mode *mode = get_ir_mode_arithmetic(type_size_t); - ir_node *store = get_store(); - 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); + size = create_conv(dbgi, size, mode); - return res; + ir_node *store = get_store(); + ir_node *alloca = new_d_Alloc(dbgi, store, size, + firm_unknown_type, stack_alloc); + ir_node *proj_m = new_Proj(alloca, mode_M, pn_Alloc_M); + set_store(proj_m); + ir_node *res = new_Proj(alloca, mode_P_data, pn_Alloc_res); + + return res; + } } } ir_node *callee = expression_to_firm(function); @@ -1664,7 +1905,6 @@ static ir_node *call_expression_to_firm(const call_expression_t *call) /* 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, @@ -1696,7 +1936,12 @@ static ir_node *call_expression_to_firm(const call_expression_t *call) 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; @@ -1713,14 +1958,17 @@ 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 && @@ -1746,15 +1994,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 && !is_Bad(store)) - set_Store_volatility(store, volatility_is_volatile); set_store(store_mem); } else { ir_type *irtype = get_ir_type(type); @@ -1786,7 +2038,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,7 +2061,8 @@ static void bitfield_store_to_firm(dbg_info *dbgi, /* 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); @@ -1819,16 +2072,12 @@ static void bitfield_store_to_firm(dbg_info *dbgi, /* 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) { - if (!is_Bad(load)) - set_Load_volatility(load, volatility_is_volatile); - if (!is_Bad(store)) - set_Store_volatility(store, volatility_is_volatile); - } + return value_masked; } static ir_node *bitfield_extract_to_firm(const select_expression_t *expression, @@ -1836,9 +2085,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); @@ -1882,11 +2131,17 @@ static void construct_select_compound(const select_expression_t *expression) (void) get_ir_type(type); } -static void set_value_for_expression_addr(const expression_t *expression, - ir_node *value, ir_node *addr) +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; @@ -1896,10 +2151,10 @@ static void set_value_for_expression_addr(const expression_t *expression, assert(entity->declaration.kind != DECLARATION_KIND_UNKNOWN); if (entity->declaration.kind == DECLARATION_KIND_LOCAL_VARIABLE) { set_value(entity->variable.v.value_number, value); - return; + return value; } else if (entity->declaration.kind == DECLARATION_KIND_PARAMETER) { set_value(entity->parameter.v.value_number, value); - return; + return value; } } @@ -1907,8 +2162,6 @@ static void set_value_for_expression_addr(const expression_t *expression, addr = expression_to_addr(expression); assert(addr != NULL); - type_t *type = skip_typeref(expression->base.type); - if (expression->kind == EXPR_SELECT) { const select_expression_t *select = &expression->select; @@ -1920,12 +2173,14 @@ static void set_value_for_expression_addr(const expression_t *expression, ir_entity *irentity = entity->compound_member.entity; bool set_volatile = select->base.type->base.qualifiers & TYPE_QUALIFIER_VOLATILE; - bitfield_store_to_firm(dbgi, irentity, 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, @@ -1944,14 +2199,21 @@ static ir_node *get_value_from_lvalue(const expression_t *expression, 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(entity->variable.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); - ir_mode *mode = get_ir_mode(expression->base.type); - return get_value(entity->parameter.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)); } } @@ -1979,12 +2241,12 @@ 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)) { pointer_type_t *pointer_type = &type->pointer; - offset = get_type_size(pointer_type->points_to); + offset = get_type_size_node(pointer_type->points_to); } else { assert(is_type_arithmetic(type)); offset = new_Const(get_mode_one(mode)); @@ -2081,7 +2343,7 @@ static ir_node *handle_assume_compare(dbg_info *dbi, var2 = op2->reference.entity; type_t *const type = skip_typeref(var->declaration.type); - ir_mode *const mode = get_ir_mode(type); + ir_mode *const mode = get_ir_mode_storage(type); ir_node *const irn1 = get_value(var->variable.v.value_number, mode); ir_node *const irn2 = get_value(var2->variable.v.value_number, mode); @@ -2107,7 +2369,7 @@ static ir_node *handle_assume_compare(dbg_info *dbi, if (var != NULL) { type_t *const type = skip_typeref(var->declaration.type); - ir_mode *const mode = get_ir_mode(type); + ir_mode *const mode = get_ir_mode_storage(type); res = get_value(var->variable.v.value_number, mode); res = new_d_Confirm(dbi, res, expression_to_firm(con), cmp_val); @@ -2122,7 +2384,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: @@ -2136,6 +2399,50 @@ static ir_node *handle_assume(dbg_info *dbi, const expression_t *expression) { } } +static ir_node *create_cast(dbg_info *dbgi, ir_node *value_node, + type_t *from_type, type_t *type) +{ + type = skip_typeref(type); + if (!is_type_scalar(type)) { + /* make sure firm type is constructed */ + (void) get_ir_type(type); + return value_node; + } + + from_type = skip_typeref(from_type); + ir_mode *mode = get_ir_mode_storage(type); + /* check for conversion from / to __based types */ + if (is_type_pointer(type) && is_type_pointer(from_type)) { + const variable_t *from_var = from_type->pointer.base_variable; + const variable_t *to_var = type->pointer.base_variable; + if (from_var != to_var) { + if (from_var != NULL) { + ir_node *const addr = get_global_var_address(dbgi, from_var); + ir_node *const base = deref_address(dbgi, from_var->base.type, addr); + value_node = new_d_Add(dbgi, value_node, base, get_ir_mode_storage(from_type)); + } + if (to_var != NULL) { + ir_node *const addr = get_global_var_address(dbgi, to_var); + ir_node *const base = deref_address(dbgi, to_var->base.type, addr); + value_node = new_d_Sub(dbgi, value_node, base, mode); + } + } + } + + if (is_type_atomic(type, ATOMIC_TYPE_BOOL)) { + /* bool adjustments (we save a mode_Bu, but have to temporarily + * convert to mode_b so we only get a 0/1 value */ + value_node = create_conv(dbgi, value_node, mode_b); + } + + ir_mode *mode_arith = get_ir_mode_arithmetic(type); + ir_node *node = create_conv(dbgi, value_node, mode); + node = do_strict_conv(dbgi, node); + node = create_conv(dbgi, node, mode_arith); + + return node; +} + static ir_node *unary_expression_to_firm(const unary_expression_t *expression) { dbg_info *dbgi = get_dbg_info(&expression->base.source_position); @@ -2149,14 +2456,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: { @@ -2169,6 +2476,14 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression) ir_node *value_node = expression_to_firm(value); type_t *value_type = skip_typeref(value->base.type); assert(is_type_pointer(value_type)); + + /* check for __based */ + const variable_t *const base_var = value_type->pointer.base_variable; + if (base_var != NULL) { + ir_node *const addr = get_global_var_address(dbgi, base_var); + ir_node *const base = deref_address(dbgi, base_var->base.type, addr); + value_node = new_d_Add(dbgi, value_node, base, get_ir_mode_storage(value_type)); + } type_t *points_to = value_type->pointer.points_to; return deref_address(dbgi, points_to, value_node); } @@ -2177,27 +2492,11 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression) case EXPR_UNARY_PREFIX_INCREMENT: case EXPR_UNARY_PREFIX_DECREMENT: return create_incdec(expression); + case EXPR_UNARY_CAST_IMPLICIT: 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); - return node; - } else { - /* make sure firm type is constructed */ - (void) get_ir_type(type); - return value_node; - } - } - 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); - } else { - return value_node; - } + type_t *from_type = value->base.type; + return create_cast(dbgi, value_node, from_type, type); } case EXPR_UNARY_ASSUME: if (firm_opt.confirm) @@ -2220,10 +2519,12 @@ static ir_node *produce_condition_result(const expression_t *expression, ir_node *cur_block = get_cur_block(); ir_node *one_block = new_immBlock(); + 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(); + set_cur_block(zero_block); ir_node *zero = new_Const(get_mode_null(mode)); ir_node *jmp_zero = new_d_Jmp(dbgi); @@ -2244,26 +2545,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(type_ptrdiff_t); + 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); - - value = create_conv(dbgi, value, mode); - - /* 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; - - ir_node *const cnst = new_Const_long(mode, (long)elem_size); - ir_node *const mul = new_d_Mul(dbgi, value, cnst, mode); + ir_node * elem_size = get_type_size_node(points_to); + elem_size = create_conv(dbgi, elem_size, mode); + value = create_conv(dbgi, value, mode); + ir_node *const mul = new_d_Mul(dbgi, value, elem_size, mode); return mul; } @@ -2289,8 +2578,8 @@ 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); - ir_node *const elem_size = get_type_size(ptr_type->points_to); + mode = get_ir_mode_arithmetic(expression->base.type); + ir_node *const elem_size = get_type_size_node(ptr_type->points_to); ir_node *const conv_size = new_d_Conv(dbgi, elem_size, mode); ir_node *const sub = new_d_Sub(dbgi, left, right, mode); ir_node *const no_mem = new_NoMem(); @@ -2302,7 +2591,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; @@ -2311,18 +2600,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_ir_mode(type_right); + mode = get_ir_mode_arithmetic(type_right); left = create_conv(dbgi, left, mode); break; } @@ -2387,19 +2676,31 @@ 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); + bool val = fold_constant_to_bool(expression->left); expression_kind_t ekind = expression->base.kind; assert(ekind == EXPR_BINARY_LOGICAL_AND || ekind == EXPR_BINARY_LOGICAL_OR); - if ((ekind == EXPR_BINARY_LOGICAL_AND && val != 0) || - (ekind == EXPR_BINARY_LOGICAL_OR && val == 0)) { - return produce_condition_result(expression->right, mode, dbgi); + if (ekind == EXPR_BINARY_LOGICAL_AND) { + if (!val) { + return new_Const(get_mode_null(mode)); + } } else { - return new_Const(get_mode_one(mode)); + if (val) { + return new_Const(get_mode_one(mode)); + } } + + if (is_constant_expression(expression->right)) { + bool valr = fold_constant_to_bool(expression->right); + return valr ? + 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, mode, @@ -2413,17 +2714,21 @@ 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_node *right = expression_to_firm(expression->right); ir_node *left_addr = expression_to_addr(left_expr); ir_node *left = get_value_from_lvalue(left_expr, left_addr); ir_node *result = create_op(dbgi, expression, left, right); - result = create_conv(dbgi, result, left_mode); + result = create_cast(dbgi, result, expression->right->base.type, type); 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; } @@ -2455,9 +2760,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: @@ -2557,7 +2868,7 @@ static long get_offsetof_offset(const offsetof_expression_t *expression) assert(designator->array_index != NULL); assert(is_type_array(type)); - long index = fold_constant(array_index); + long index = fold_constant_to_int(array_index); ir_type *arr_type = get_ir_type(type); ir_type *elem_type = get_array_element_type(arr_type); long elem_size = get_type_size_bytes(elem_type); @@ -2573,7 +2884,7 @@ 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); @@ -2605,7 +2916,7 @@ static ir_node *compound_literal_to_firm( create_local_initializer(initializer, dbgi, entity, type); /* create a sel for the compound literal address */ - ir_node *frame = get_local_frame(entity); + ir_node *frame = get_irg_frame(current_ir_graph); ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, entity); return sel; } @@ -2615,20 +2926,38 @@ static ir_node *compound_literal_to_firm( */ static ir_node *sizeof_to_firm(const typeprop_expression_t *expression) { - type_t *type = expression->type; - if (type == NULL) { - type = expression->tp_expression->base.type; - assert(type != NULL); - } - - type = skip_typeref(type); - /* § 6.5.3.4 (2) if the type is a VLA, evaluate the expression. */ + type_t *const type = skip_typeref(expression->type); + /* §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); } - return get_type_size(type); + return get_type_size_node(type); +} + +static entity_t *get_expression_entity(const expression_t *expression) +{ + if (expression->kind != EXPR_REFERENCE) + return NULL; + + return expression->reference.entity; +} + +static unsigned get_cparser_entity_alignment(const entity_t *entity) +{ + switch(entity->kind) { + DECLARATION_KIND_CASES + return entity->declaration.alignment; + case ENTITY_STRUCT: + case ENTITY_UNION: + return entity->compound.alignment; + case ENTITY_TYPEDEF: + return entity->typedefe.alignment; + default: + break; + } + return 0; } /** @@ -2636,29 +2965,30 @@ static ir_node *sizeof_to_firm(const typeprop_expression_t *expression) */ 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 entity_t *entity = expression_is_variable(tp_expression); + unsigned alignment = 0; + + const expression_t *tp_expression = expression->tp_expression; + if (tp_expression != NULL) { + entity_t *entity = get_expression_entity(tp_expression); if (entity != NULL) { - /* TODO: get the alignment of this variable. */ - (void) entity; + alignment = get_cparser_entity_alignment(entity); } - type = tp_expression->base.type; - assert(type != NULL); } - ir_mode *const mode = get_ir_mode(expression->base.type); - symconst_symbol sym; - sym.type_p = get_ir_type(type); - return new_SymConst(mode, sym, symconst_type_align); + if (alignment == 0) { + type_t *type = expression->type; + alignment = get_type_alignment(type); + } + + dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + ir_mode *mode = get_ir_mode_arithmetic(expression->base.type); + tarval *tv = new_tarval_from_long(alignment, mode); + return new_d_Const(dbgi, tv); } static void init_ir_types(void); -long fold_constant(const expression_t *expression) +static tarval *fold_constant_to_tarval(const expression_t *expression) { assert(is_type_valid(skip_typeref(expression->base.type))); @@ -2670,34 +3000,49 @@ 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"); } + constant_folding = constant_folding_old; + tarval *tv = get_Const_tarval(cnst); + return tv; +} + +long fold_constant_to_int(const expression_t *expression) +{ + if (expression->kind == EXPR_INVALID) + return 0; + + tarval *tv = fold_constant_to_tarval(expression); if (!tarval_is_long(tv)) { - panic("result of constant folding is not integer\n"); + panic("result of constant folding is not integer"); } - constant_folding = constant_folding_old; - return get_tarval_long(tv); } +bool fold_constant_to_bool(const expression_t *expression) +{ + if (expression->kind == EXPR_INVALID) + return false; + tarval *tv = fold_constant_to_tarval(expression); + return !tarval_is_null(tv); +} + static ir_node *conditional_to_firm(const conditional_expression_t *expression) { dbg_info *const dbgi = get_dbg_info(&expression->base.source_position); /* first try to fold a constant condition */ if (is_constant_expression(expression->condition)) { - long val = fold_constant(expression->condition); + bool val = fold_constant_to_bool(expression->condition); if (val) { expression_t *true_expression = expression->true_expression; if (true_expression == NULL) @@ -2712,6 +3057,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; @@ -2719,6 +3065,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(); @@ -2727,11 +3074,11 @@ 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. */ + /* 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)); } } @@ -2947,14 +3294,20 @@ static ir_node *va_start_expression_to_firm( ir_type *const method_type = get_ir_type(type); int const n = get_method_n_params(method_type) - 1; ir_entity *const parm_ent = get_method_value_param_ent(method_type, n); - ir_node *const arg_base = get_irg_value_param_base(current_ir_graph); + ir_node *const frame = get_irg_frame(current_ir_graph); dbg_info *const dbgi = get_dbg_info(&expr->base.source_position); ir_node *const no_mem = new_NoMem(); ir_node *const arg_sel = - new_d_simpleSel(dbgi, no_mem, arg_base, parm_ent); - - ir_node *const cnst = get_type_size(expr->parameter->base.type); - ir_node *const add = new_d_Add(dbgi, arg_sel, cnst, mode_P_data); + new_d_simpleSel(dbgi, no_mem, frame, parm_ent); + + type_t *const param_type = expr->parameter->base.type; + ir_node *const cnst = get_type_size_node(param_type); + ir_mode *const mode = get_irn_mode(cnst); + ir_node *const c1 = new_Const_long(mode, stack_param_align - 1); + ir_node *const c2 = new_d_Add(dbgi, cnst, c1, mode); + 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, c4, mode_P_data); set_value_for_expression(expr->ap, add); return NULL; @@ -2969,14 +3322,29 @@ static ir_node *va_arg_expression_to_firm(const va_arg_expression_t *const expr) dbg_info *const dbgi = get_dbg_info(&expr->base.source_position); ir_node *const res = deref_address(dbgi, type, ap); - ir_node *const cnst = get_type_size(expr->base.type); - ir_node *const add = new_d_Add(dbgi, ap, cnst, mode_P_data); + ir_node *const cnst = get_type_size_node(expr->base.type); + ir_mode *const mode = get_irn_mode(cnst); + ir_node *const c1 = new_Const_long(mode, stack_param_align - 1); + ir_node *const c2 = new_d_Add(dbgi, cnst, c1, mode); + 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); return res; } +/** + * Generate Firm for a va_copy expression. + */ +static ir_node *va_copy_expression_to_firm(const va_copy_expression_t *const expr) +{ + ir_node *const src = expression_to_firm(expr->src); + set_value_for_expression(expr->dst, src); + return NULL; +} + static ir_node *dereference_addr(const unary_expression_t *const expression) { assert(expression->base.kind == EXPR_UNARY_DEREFERENCE); @@ -3010,7 +3378,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)) { @@ -3021,13 +3389,14 @@ 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(label_t *label) @@ -3040,9 +3409,7 @@ static ir_node *get_label_block(label_t *label) 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->block = block; @@ -3056,36 +3423,15 @@ static ir_node *get_label_block(label_t *label) * Pointer to a label. This is used for the * GNU address-of-label extension. */ -static ir_node *label_address_to_firm( - const label_address_expression_t *label) +static ir_node *label_address_to_firm(const label_address_expression_t *label) { - ir_node *block = get_label_block(label->label); - ir_label_t nr = get_Block_label(block); + dbg_info *dbgi = get_dbg_info(&label->base.source_position); + ir_node *block = get_label_block(label->label); + ir_entity *entity = create_Block_entity(block); - if (nr == 0) { - nr = get_irp_next_label_nr(); - set_Block_label(block, nr); - } symconst_symbol value; - value.label = nr; - return new_SymConst(mode_P_code, value, symconst_label); -} - -static ir_node *builtin_symbol_to_firm( - const builtin_symbol_expression_t *expression) -{ - /* for gcc compatibility we have to produce (dummy) addresses for some - * builtins */ - if (warning.other) { - warningf(&expression->base.source_position, - "taking address of builtin '%Y'", expression->symbol); - } - - /* simply create a NULL pointer */ - ir_mode *mode = get_ir_mode(type_void_ptr); - ir_node *res = new_Const_long(mode, 0); - - return res; + value.entity_p = entity; + return new_d_SymConst(dbgi, mode_P_code, value, symconst_addr_ent); } /** @@ -3143,12 +3489,12 @@ 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: - return builtin_symbol_to_firm(&expression->builtin_symbol); + case EXPR_VA_COPY: + return va_copy_expression_to_firm(&expression->va_copye); 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: @@ -3163,15 +3509,20 @@ 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_BUILTIN_SYMBOL) + if (function->kind != EXPR_REFERENCE) return false; - if (function->builtin_symbol.symbol->ID != T___builtin_expect) + reference_expression_t *ref = &function->reference; + if (ref->entity->kind != ENTITY_FUNCTION || + ref->entity->function.btk != bk_gnu_builtin_expect) return false; return true; @@ -3219,7 +3570,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); @@ -3230,7 +3581,7 @@ 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); - ir_mode *mode = get_ir_mode(expression->base.type); + ir_mode *mode = get_ir_mode_arithmetic(expression->base.type); return produce_condition_result(expression, mode, dbgi); } @@ -3252,9 +3603,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); @@ -3266,9 +3615,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); @@ -3289,13 +3636,13 @@ static ir_node *create_condition_evaluation(const expression_t *expression, ir_node *false_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_false); /* set branch prediction info based on __builtin_expect */ - if (is_builtin_expect(expression)) { + if (is_builtin_expect(expression) && is_Cond(cond)) { call_argument_t *argument = expression->call.arguments->next; if (is_constant_expression(argument->expression)) { - long cnst = fold_constant(argument->expression); + bool cnst = fold_constant_to_bool(argument->expression); cond_jmp_predicate pred; - if (cnst == 0) { + if (cnst == false) { pred = COND_JMP_PRED_FALSE; } else { pred = COND_JMP_PRED_TRUE; @@ -3311,24 +3658,28 @@ static ir_node *create_condition_evaluation(const expression_t *expression, return cond_expr; } - static void create_variable_entity(entity_t *variable, declaration_kind_t declaration_kind, ir_type *parent_type) { assert(variable->kind == ENTITY_VARIABLE); - type_t *const type = skip_typeref(variable->declaration.type); - ident *const id = new_id_from_str(variable->base.symbol->string); - ir_type *const irtype = get_ir_type(type); - dbg_info *const dbgi = get_dbg_info(&variable->base.source_position); - ir_entity *const irentity = new_d_entity(parent_type, id, irtype, dbgi); + type_t *type = skip_typeref(variable->declaration.type); + + ident *const id = new_id_from_str(variable->base.symbol->string); + ir_type *const irtype = get_ir_type(type); + dbg_info *const dbgi = get_dbg_info(&variable->base.source_position); + ir_entity *const irentity = new_d_entity(parent_type, id, irtype, dbgi); + unsigned alignment = variable->declaration.alignment; - handle_gnu_attributes_ent(irentity, variable); + set_entity_alignment(irentity, alignment); + + handle_decl_modifiers(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)); + if (parent_type == get_tls_type()) set_entity_allocation(irentity, allocation_automatic); else if (declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE) @@ -3505,6 +3856,27 @@ static void walk_designator(type_path_t *path, const designator_t *designator) } assert(iter != NULL); + /* revert previous initialisations of other union elements */ + if (type->kind == TYPE_COMPOUND_UNION) { + ir_initializer_t *initializer = top->initializer; + if (initializer != NULL + && get_initializer_kind(initializer) == IR_INITIALIZER_COMPOUND) { + /* are we writing to a new element? */ + ir_initializer_t *oldi + = get_initializer_compound_value(initializer, index); + if (get_initializer_kind(oldi) == IR_INITIALIZER_NULL) { + /* clear initializer */ + size_t len + = get_initializer_compound_n_entries(initializer); + ir_initializer_t *nulli = get_initializer_null(); + for (size_t i = 0; i < len; ++i) { + set_initializer_compound_value(initializer, i, + nulli); + } + } + } + } + top->type = orig_type; top->compound_entry = iter; top->index = index; @@ -3514,7 +3886,7 @@ static void walk_designator(type_path_t *path, const designator_t *designator) assert(designator->array_index != NULL); assert(is_type_array(type)); - long index = fold_constant(array_index); + long index = fold_constant_to_int(array_index); assert(index >= 0); #ifndef NDEBUG if (type->array.size_constant) { @@ -3548,6 +3920,7 @@ static void advance_current_object(type_path_t *path) type_t *type = skip_typeref(top->type); if (is_type_union(type)) { + /* only the first element is initialized in unions */ top->compound_entry = NULL; } else if (is_type_struct(type)) { entity_t *entry = top->compound_entry; @@ -3591,7 +3964,20 @@ static ir_initializer_t *create_ir_initializer_value( if (is_type_compound(initializer->value->base.type)) { panic("initializer creation for compounds not implemented yet"); } - ir_node *value = expression_to_firm(initializer->value); + type_t *type = initializer->value->base.type; + expression_t *expr = initializer->value; + if (initializer_use_bitfield_basetype) { + type_t *skipped = skip_typeref(type); + if (skipped->kind == TYPE_BITFIELD) { + /* remove the bitfield cast... */ + assert(expr->kind == EXPR_UNARY_CAST_IMPLICIT); + expr = expr->unary.value; + type = skipped->bitfield.base_type; + } + } + ir_node *value = expression_to_firm(expr); + ir_mode *mode = get_ir_mode_storage(type); + value = create_conv(NULL, value, mode); return create_initializer_const(value); } @@ -3685,7 +4071,7 @@ 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) { char c = 0; @@ -3750,58 +4136,12 @@ static ir_initializer_t *create_ir_initializer( panic("unknown initializer"); } -static void create_dynamic_null_initializer(ir_type *type, dbg_info *dbgi, - ir_node *base_addr) -{ - 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, zero); - - /* TODO: bitfields */ - ir_node *mem = get_store(); - ir_node *store = new_d_Store(dbgi, mem, base_addr, cnst); - ir_node *proj_m = new_Proj(store, mode_M, pn_Store_M); - set_store(proj_m); - } else { - assert(is_compound_type(type)); - - int n_members; - if (is_Array_type(type)) { - assert(has_array_upper_bound(type, 0)); - n_members = get_array_upper_bound_int(type, 0); - } else { - n_members = get_compound_n_members(type); - } - - for (int i = 0; i < n_members; ++i) { - ir_node *addr; - ir_type *irtype; - if (is_Array_type(type)) { - ir_entity *entity = get_array_element_entity(type); - tarval *index_tv = new_tarval_from_long(i, mode_uint); - ir_node *cnst = new_d_Const(dbgi, index_tv); - ir_node *in[1] = { cnst }; - irtype = get_array_element_type(type); - addr = new_d_Sel(dbgi, new_NoMem(), base_addr, 1, in, entity); - } else { - ir_entity *member = get_compound_member(type, i); - - irtype = get_entity_type(member); - addr = new_d_simpleSel(dbgi, new_NoMem(), base_addr, member); - } - - create_dynamic_null_initializer(irtype, dbgi, addr); - } - } -} - static void create_dynamic_initializer_sub(ir_initializer_t *initializer, ir_entity *entity, ir_type *type, dbg_info *dbgi, ir_node *base_addr) { switch(get_initializer_kind(initializer)) { case IR_INITIALIZER_NULL: { - create_dynamic_null_initializer(type, dbgi, base_addr); + /* NULL is undefined for dynamic initializers */ return; } case IR_INITIALIZER_CONST: { @@ -3818,7 +4158,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; @@ -3838,7 +4178,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; @@ -3892,7 +4232,7 @@ static void create_dynamic_initializer_sub(ir_initializer_t *initializer, static void create_dynamic_initializer(ir_initializer_t *initializer, dbg_info *dbgi, ir_entity *entity) { - ir_node *frame = get_local_frame(entity); + ir_node *frame = get_irg_frame(current_ir_graph); ir_node *base_addr = new_d_simpleSel(dbgi, new_NoMem(), frame, entity); ir_type *type = get_entity_type(entity); @@ -3917,8 +4257,13 @@ static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi, } if (!is_constant_initializer(initializer)) { + bool old_initializer_use_bitfield_basetype + = initializer_use_bitfield_basetype; + initializer_use_bitfield_basetype = true; ir_initializer_t *irinitializer = create_ir_initializer(initializer, type); + initializer_use_bitfield_basetype + = old_initializer_use_bitfield_basetype; create_dynamic_initializer(irinitializer, dbgi, entity); return; @@ -3960,6 +4305,7 @@ static void create_initializer_local_variable_entity(entity_t *entity) dbg_info *dbgi = get_dbg_info(&entity->base.source_position); ir_entity *irentity = entity->variable.v.entity; type_t *type = entity->declaration.type; + create_local_initializer(initializer, dbgi, irentity, type); } @@ -3985,6 +4331,10 @@ static void create_variable_initializer(entity_t *entity) 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) { @@ -4041,7 +4391,7 @@ static void allocate_variable_length_array(entity_t *entity) ir_type *el_type = get_ir_type(type->array.element_type); /* make sure size_node is calculated */ - get_type_size(type); + get_type_size_node(type); ir_node *elems = type->array.size_node; ir_node *mem = get_store(); ir_node *alloc = new_d_Alloc(dbgi, mem, elems, el_type, stack_alloc); @@ -4094,11 +4444,11 @@ static void create_local_static_variable(entity_t *entity) assert(entity->kind == ENTITY_VARIABLE); assert(entity->declaration.kind == DECLARATION_KIND_UNKNOWN); - type_t *const type = skip_typeref(entity->declaration.type); - ir_type *const var_type = entity->variable.thread_local ? + type_t *type = skip_typeref(entity->declaration.type); + ir_type *const var_type = entity->variable.thread_local ? get_tls_type() : get_glob_type(); - ir_type *const irtype = get_ir_type(type); - dbg_info *const dbgi = get_dbg_info(&entity->base.source_position); + ir_type *const irtype = get_ir_type(type); + dbg_info *const dbgi = get_dbg_info(&entity->base.source_position); size_t l = strlen(entity->base.symbol->string); char buf[l + sizeof(".%u")]; @@ -4113,6 +4463,7 @@ static void create_local_static_variable(entity_t *entity) 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); @@ -4147,7 +4498,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; @@ -4241,12 +4597,16 @@ static void create_local_declaration(entity_t *entity) switch ((storage_class_tag_t) entity->declaration.storage_class) { case STORAGE_CLASS_STATIC: - create_local_static_variable(entity); + if (entity->kind == ENTITY_FUNCTION) { + (void)get_function_entity(entity, NULL); + } else { + create_local_static_variable(entity); + } return; case STORAGE_CLASS_EXTERN: if (entity->kind == ENTITY_FUNCTION) { assert(entity->function.statement == NULL); - get_function_entity(entity); + (void)get_function_entity(entity, NULL); } else { create_global_variable(entity); create_variable_initializer(entity); @@ -4257,11 +4617,12 @@ static void create_local_declaration(entity_t *entity) case STORAGE_CLASS_REGISTER: if (entity->kind == ENTITY_FUNCTION) { if (entity->function.statement != NULL) { - get_function_entity(entity); + ir_type *owner = get_irg_frame_type(current_ir_graph); + (void)get_function_entity(entity, owner); entity->declaration.kind = DECLARATION_KIND_INNER_FUNCTION; enqueue_inner_function(entity); } else { - get_function_entity(entity); + (void)get_function_entity(entity, NULL); } } else { create_local_variable(entity); @@ -4278,6 +4639,11 @@ static void initialize_local_declaration(entity_t *entity) if (entity->base.symbol == NULL) return; + // no need to emit code in dead blocks + if (entity->declaration.storage_class != STORAGE_CLASS_STATIC + && get_cur_block() == NULL) + return; + switch ((declaration_kind_t) entity->declaration.kind) { case DECLARATION_KIND_LOCAL_VARIABLE: case DECLARATION_KIND_LOCAL_VARIABLE_ENTITY: @@ -4306,15 +4672,24 @@ static void initialize_local_declaration(entity_t *entity) static void declaration_statement_to_firm(declaration_statement_t *statement) { - entity_t * entity = statement->declarations_begin; - entity_t *const last = statement->declarations_end; - if (entity != NULL) { - for ( ;; entity = entity->base.next) { - if (is_declaration(entity)) - initialize_local_declaration(entity); - if (entity == last) - break; + 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) { + /* §6.7.7:3 Any array size expressions associated with variable length + * array declarators are evaluated each time the declaration of the + * typedef name is reached in the order of execution. */ + type_t *const type = skip_typeref(entity->typedefe.type); + if (is_type_array(type) && type->array.is_vla) + get_vla_size(&type->array); } + if (entity == last) + break; } } @@ -4328,6 +4703,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(); @@ -4341,6 +4717,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) { @@ -4398,6 +4775,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; @@ -4412,7 +4790,7 @@ static void while_statement_to_firm(while_statement_t *statement) /* shortcut for while(true) */ if (is_constant_expression(statement->condition) - && fold_constant(statement->condition) != 0) { + && fold_constant_to_bool(statement->condition) != 0) { set_cur_block(header_block); ir_node *header_jmp = new_Jmp(); add_immBlock_pred(body_block, header_jmp); @@ -4462,6 +4840,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; @@ -4522,6 +4901,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); } @@ -4529,6 +4909,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); } @@ -4546,6 +4927,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); @@ -4598,19 +4980,20 @@ 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; } static void switch_statement_to_firm(switch_statement_t *statement) { - dbg_info *dbgi = get_dbg_info(&statement->base.source_position); - - ir_node *expression = expression_to_firm(statement->expression); - ir_node *cond = new_d_Cond(dbgi, expression); + ir_node *first_block = get_cur_block(); + dbg_info *dbgi = get_dbg_info(&statement->base.source_position); + ir_node *cond = NULL; + if (first_block != NULL) { + ir_node *expression = expression_to_firm(statement->expression); + cond = new_d_Cond(dbgi, expression); + } set_cur_block(NULL); @@ -4638,7 +5021,7 @@ static void switch_statement_to_firm(switch_statement_t *statement) } if (def_nr == INT_MAX) { - /* Bad: an overflow will occurr, we cannot be sure that the + /* Bad: an overflow will occur, we cannot be sure that the * maximum + 1 is a free number. Scan the values a second * time to find a free number. */ @@ -4660,8 +5043,8 @@ static void switch_statement_to_firm(switch_statement_t *statement) } } /* We look at the first num_cases constants: - * Either they are densed, so we took the last (num_cases) - * one, or they are non densed, so we will find one free + * Either they are dense, so we took the last (num_cases) + * one, or they are not dense, so we will find one free * there... */ unsigned long i; @@ -4685,8 +5068,8 @@ static void switch_statement_to_firm(switch_statement_t *statement) add_immBlock_pred(get_break_label(), jmp); } - if (!saw_default_label) { - set_cur_block(get_nodes_block(cond)); + if (!saw_default_label && first_block != NULL) { + set_cur_block(first_block); ir_node *const proj = new_d_defaultProj(dbgi, cond, statement->default_proj_nr); add_immBlock_pred(get_break_label(), proj); @@ -4714,25 +5097,26 @@ 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); - if (statement->expression != NULL) { - long pn = statement->first_case; - long end_pn = statement->last_case; - assert(pn <= end_pn); - /* create jumps for all cases in the given range */ - do { - proj = new_d_Proj(dbgi, current_switch_cond, mode_X, pn); - add_immBlock_pred(block, proj); - } while(pn++ < end_pn); - } else { - saw_default_label = true; - proj = new_d_defaultProj(dbgi, current_switch_cond, - current_switch->default_proj_nr); + ir_node *block = new_immBlock(); + + if (current_switch_cond != NULL) { + set_cur_block(get_nodes_block(current_switch_cond)); + if (statement->expression != NULL) { + long pn = statement->first_case; + long end_pn = statement->last_case; + assert(pn <= end_pn); + /* create jumps for all cases in the given range */ + do { + proj = new_d_Proj(dbgi, current_switch_cond, mode_X, pn); + add_immBlock_pred(block, proj); + } while (pn++ < end_pn); + } else { + saw_default_label = true; + proj = new_d_defaultProj(dbgi, current_switch_cond, + current_switch->default_proj_nr); - add_immBlock_pred(block, proj); + add_immBlock_pred(block, proj); + } } if (fallthrough != NULL) { @@ -4876,7 +5260,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(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; @@ -4916,7 +5300,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)); } @@ -5019,7 +5403,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]; @@ -5027,12 +5411,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"); } @@ -5091,10 +5477,6 @@ static void statement_to_firm(statement_t *statement) case STATEMENT_LABEL: label_to_firm(&statement->label); return; - case STATEMENT_LOCAL_LABEL: - /* local labels transform the semantics of labels while parsing - * they don't need any special treatment here */ - return; case STATEMENT_GOTO: goto_to_firm(&statement->gotos); return; @@ -5108,14 +5490,15 @@ 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_local_variables(const entity_t *entity, const entity_t *const last) { int count = 0; - for (; entity != NULL; entity = entity->base.next) { + entity_t const *const end = last != NULL ? last->base.next : NULL; + for (; entity != end; entity = entity->base.next) { type_t *type; bool address_taken; @@ -5131,9 +5514,6 @@ static int count_local_variables(const entity_t *entity, if (!address_taken && is_type_scalar(type)) ++count; - - if (entity == last) - break; } return count; } @@ -5159,19 +5539,25 @@ static void count_local_variables_in_stmt(statement_t *stmt, void *const env) } } +/** + * Return the number of local (alias free) variables used by a function. + */ static int get_function_n_local_vars(entity_t *entity) { + const function_t *function = &entity->function; int count = 0; /* count parameters */ - count += count_local_variables(entity->function.parameters.entities, NULL); + count += count_local_variables(function->parameters.entities, NULL); /* count local variables declared in body */ - walk_statements(entity->function.statement, count_local_variables_in_stmt, - &count); + walk_statements(function->statement, count_local_variables_in_stmt, &count); return count; } +/** + * Build Firm code for the parameters of a function. + */ static void initialize_function_parameters(entity_t *entity) { assert(entity->kind == ENTITY_FUNCTION); @@ -5179,11 +5565,20 @@ static void initialize_function_parameters(entity_t *entity) ir_node *args = get_irg_args(irg); ir_node *start_block = get_irg_start_block(irg); ir_type *function_irtype = get_ir_type(entity->declaration.type); + int first_param_nr = 0; + + if (entity->function.need_closure) { + /* add an extra parameter for the static link */ + entity->function.static_link = new_r_Proj(irg, start_block, args, mode_P_data, 0); + ++first_param_nr; + } int n = 0; entity_t *parameter = entity->function.parameters.entities; for ( ; parameter != NULL; parameter = parameter->base.next, ++n) { - assert(parameter->kind == ENTITY_PARAMETER); + if (parameter->kind != ENTITY_PARAMETER) + continue; + assert(parameter->declaration.kind == DECLARATION_KIND_UNKNOWN); type_t *type = skip_typeref(parameter->declaration.type); @@ -5207,10 +5602,10 @@ static void initialize_function_parameters(entity_t *entity) ir_type *param_irtype = get_method_param_type(function_irtype, n); ir_mode *param_mode = get_type_mode(param_irtype); - long pn = n; + long pn = n + first_param_nr; ir_node *value = new_r_Proj(irg, start_block, args, param_mode, pn); - ir_mode *mode = get_ir_mode(type); + ir_mode *mode = get_ir_mode_storage(type); value = create_conv(NULL, value, mode); value = do_strict_conv(NULL, value); @@ -5230,8 +5625,13 @@ static void initialize_function_parameters(entity_t *entity) * @param irg the IR-graph * @param dec_modifiers additional modifiers */ -static void handle_decl_modifier_irg(ir_graph_ptr irg, decl_modifiers_t decl_modifiers) +static void handle_decl_modifier_irg(ir_graph_ptr irg, + decl_modifiers_t decl_modifiers) { + if (decl_modifiers & DM_RETURNS_TWICE) { + /* TRUE if the declaration includes __attribute__((returns_twice)) */ + set_irg_additional_property(irg, mtp_property_returns_twice); + } if (decl_modifiers & DM_NORETURN) { /* TRUE if the declaration includes the Microsoft __declspec(noreturn) specifier. */ @@ -5280,7 +5680,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); @@ -5288,16 +5689,25 @@ static void gen_ijmp_branches(ir_node *block) { } /** - * Create code for a function. + * Create code for a function and all inner functions. + * + * @param entity the function entity */ static void create_function(entity_t *entity) { assert(entity->kind == ENTITY_FUNCTION); - ir_entity *function_entity = get_function_entity(entity); + ir_entity *function_entity = get_function_entity(entity, current_outer_frame); if (entity->function.statement == NULL) return; + if (is_main(entity) && firm_opt.os_support == OS_SUPPORT_MINGW) { + prepare_main_collect2(entity); + } + + inner_functions = NULL; + current_trampolines = NULL; + if (entity->declaration.modifiers & DM_CONSTRUCTOR) { ir_type *segment = get_segment_type(IR_SEGMENT_CONSTRUCTORS); add_function_pointer(segment, function_entity, "constructor_ptr.%u"); @@ -5322,7 +5732,7 @@ static void create_function(entity_t *entity) 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(); @@ -5334,6 +5744,7 @@ static void create_function(entity_t *entity) next_value_number_function = 0; initialize_function_parameters(entity); + current_static_link = entity->function.static_link; statement_to_firm(entity->function.statement); @@ -5353,7 +5764,7 @@ static void create_function(entity_t *entity) } 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; } @@ -5426,11 +5837,25 @@ static void create_function(entity_t *entity) irg_vrfy(irg); current_function = old_current_function; - /* create inner functions */ - entity_t *inner; - for (inner = next_inner_function(); inner != NULL; - inner = next_inner_function()) { - create_function(inner); + if (current_trampolines != NULL) { + DEL_ARR_F(current_trampolines); + current_trampolines = NULL; + } + + /* create inner functions if any */ + entity_t **inner = inner_functions; + if (inner != NULL) { + ir_type *rem_outer_frame = current_outer_frame; + current_outer_frame = get_irg_frame_type(current_ir_graph); + ir_type *rem_outer_value_type = current_outer_value_type; + current_outer_value_type = get_irg_value_param_type(current_ir_graph); + for (int i = ARR_LEN(inner) - 1; i >= 0; --i) { + create_function(inner[i]); + } + DEL_ARR_F(inner); + + current_outer_value_type = rem_outer_value_type; + current_outer_frame = rem_outer_frame; } } @@ -5443,7 +5868,11 @@ static void scope_to_firm(scope_t *scope) continue; if (entity->kind == ENTITY_FUNCTION) { - get_function_entity(entity); + if (entity->function.btk != bk_none) { + /* builtins have no representation */ + continue; + } + (void)get_function_entity(entity, NULL); } else if (entity->kind == ENTITY_VARIABLE) { create_global_variable(entity); } @@ -5456,6 +5885,10 @@ static void scope_to_firm(scope_t *scope) continue; 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 @@ -5487,7 +5920,7 @@ void init_ast2firm(void) } /* 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); } @@ -5502,9 +5935,15 @@ static void init_ir_types(void) ir_types_initialized = 1; ir_type_int = get_ir_type(type_int); + ir_type_char = get_ir_type(type_char); ir_type_const_char = get_ir_type(type_const_char); ir_type_wchar_t = get_ir_type(type_wchar_t); ir_type_void = get_ir_type(type_void); + + 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) @@ -5539,14 +5978,10 @@ void translation_unit_to_firm(translation_unit_t *unit) current_translation_unit = unit; init_ir_types(); - inner_functions = NEW_ARR_F(entity_t *, 0); scope_to_firm(&unit->scope); global_asm_to_firm(unit->global_asm); - DEL_ARR_F(inner_functions); - inner_functions = NULL; - current_ir_graph = NULL; current_translation_unit = NULL; }