X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ast2firm.c;h=ac6e088023b962ab56f48b8de996045177f36dec;hb=c2564629583b7a0969aa0102d628f065b1ed66d3;hp=97d26045f82b72bc9e0b392e7d26b4c0fc710874;hpb=abb8fbf8f749167dabff786e43009e2a509f43e8;p=cparser diff --git a/ast2firm.c b/ast2firm.c index 97d2604..ac6e088 100644 --- a/ast2firm.c +++ b/ast2firm.c @@ -22,9 +22,11 @@ #include #include #include +#include #include #include +#include #include "ast2firm.h" @@ -34,17 +36,17 @@ #include "token_t.h" #include "type_t.h" #include "ast_t.h" +#include "entity_t.h" #include "parser.h" #include "diagnostic.h" #include "lang_features.h" #include "types.h" +#include "walk_statements.h" #include "warning.h" #include "entitymap_t.h" #include "driver/firm_opt.h" #include "driver/firm_cmdline.h" -#define MAGIC_DEFAULT_PN_NUMBER (long) -314159265 - /* some idents needed for name mangling */ static ident *id_underscore; static ident *id_imp; @@ -54,19 +56,23 @@ static ir_type *ir_type_wchar_t; static ir_type *ir_type_void; static ir_type *ir_type_int; -static type_t *type_const_char; +static int next_value_number_function; +static ir_node *continue_label; +static ir_node *break_label; +static ir_node *current_switch_cond; +static bool saw_default_label; +static label_t **all_labels; +static entity_t **inner_functions; +static ir_node *ijmp_list; +static bool constant_folding; -static int next_value_number_function; -static ir_node *continue_label; -static ir_node *break_label; -static ir_node *current_switch_cond; -static bool saw_default_label; -static ir_node **imature_blocks; -static bool constant_folding; +extern bool have_const_functions; -static const declaration_t *current_function_decl; -static ir_node *current_function_name; -static ir_node *current_funcsig; +static const entity_t *current_function_entity; +static ir_node *current_function_name; +static ir_node *current_funcsig; +static switch_statement_t *current_switch; +static ir_graph *current_function; static entitymap_t entitymap; @@ -74,30 +80,44 @@ static struct obstack asm_obst; typedef enum declaration_kind_t { DECLARATION_KIND_UNKNOWN, - DECLARATION_KIND_FUNCTION, DECLARATION_KIND_VARIABLE_LENGTH_ARRAY, DECLARATION_KIND_GLOBAL_VARIABLE, DECLARATION_KIND_LOCAL_VARIABLE, DECLARATION_KIND_LOCAL_VARIABLE_ENTITY, + DECLARATION_KIND_FUNCTION, DECLARATION_KIND_COMPOUND_MEMBER, - DECLARATION_KIND_LABEL_BLOCK, - DECLARATION_KIND_ENUM_ENTRY, - DECLARATION_KIND_COMPOUND_TYPE_INCOMPLETE, - DECLARATION_KIND_COMPOUND_TYPE_COMPLETE, - DECLARATION_KIND_TYPE + DECLARATION_KIND_INNER_FUNCTION } declaration_kind_t; static ir_type *get_ir_type(type_t *type); static ir_type *get_ir_type_incomplete(type_t *type); -static int count_decls_in_stmts(const statement_t *stmt); + +static void enqueue_inner_function(entity_t *entity) +{ + 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 declaration_t *declaration = get_irg_loc_description(irg, pos); + const variable_t *variable = get_irg_loc_description(irg, pos); - warningf(&declaration->source_position, - "variable '%#T' might be used uninitialized", - declaration->type, declaration->symbol); + if (variable != NULL) { + warningf(&variable->base.base.source_position, + "variable '%#T' might be used uninitialized", + variable->base.type, variable->base.base.symbol); + } return new_r_Unknown(irg, mode); } @@ -132,7 +152,7 @@ static ir_mode *mode_int, *mode_uint; static ir_node *_expression_to_firm(const expression_t *expression); static ir_node *expression_to_firm(const expression_t *expression); static inline ir_mode *get_ir_mode(type_t *type); -static void create_local_declaration(declaration_t *declaration); +static void create_local_declaration(entity_t *entity); static ir_mode *init_atomic_ir_mode(atomic_type_kind_t kind) { @@ -149,13 +169,13 @@ static ir_mode *init_atomic_ir_mode(atomic_type_kind_t kind) if (flags & ATOMIC_TYPE_FLAG_INTEGER) { assert(! (flags & ATOMIC_TYPE_FLAG_FLOAT)); - snprintf(name, sizeof(name), "i%s%d", is_signed?"":"u", bit_size); + snprintf(name, sizeof(name), "i%s%u", is_signed ? "" : "u", bit_size); sort = irms_int_number; arithmetic = irma_twos_complement; modulo_shift = bit_size < machine_size ? machine_size : bit_size; } else { assert(flags & ATOMIC_TYPE_FLAG_FLOAT); - snprintf(name, sizeof(name), "f%d", bit_size); + snprintf(name, sizeof(name), "f%u", bit_size); sort = irms_float_number; arithmetic = irma_ieee754; modulo_shift = 0; @@ -172,7 +192,7 @@ static ir_mode *init_atomic_ir_mode(atomic_type_kind_t kind) */ static void init_atomic_modes(void) { - for(int i = 0; i <= ATOMIC_TYPE_LAST; ++i) { + for (int i = 0; i <= ATOMIC_TYPE_LAST; ++i) { _atomic_modes[i] = init_atomic_ir_mode((atomic_type_kind_t) i); } mode_int = _atomic_modes[ATOMIC_TYPE_INT]; @@ -190,7 +210,7 @@ static void init_atomic_modes(void) unsigned modulo_shift = bit_size < machine_size ? machine_size : bit_size; - snprintf(name, sizeof(name), "p%d", machine_size); + snprintf(name, sizeof(name), "p%u", machine_size); ir_mode *ptr_mode = new_ir_mode(name, sort, bit_size, is_signed, arithmetic, modulo_shift); @@ -215,11 +235,8 @@ static unsigned get_array_type_size(array_type_t *type) return get_type_size_bytes(irtype); } - static unsigned get_type_size_const(type_t *type) { - type = skip_typeref(type); - switch(type->kind) { case TYPE_ERROR: panic("error type occurred"); @@ -294,11 +311,10 @@ static unsigned count_parameters(const function_type_t *function_type) */ static ir_type *create_atomic_type(const atomic_type_t *type) { - dbg_info *dbgi = get_dbg_info(&type->base.source_position); - atomic_type_kind_t kind = type->akind; - ir_mode *mode = _atomic_modes[kind]; - ident *id = get_mode_ident(mode); - ir_type *irtype = new_d_type_primitive(id, mode, dbgi); + 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); set_type_alignment_bytes(irtype, type->base.alignment); @@ -310,13 +326,11 @@ static ir_type *create_atomic_type(const atomic_type_t *type) */ static ir_type *create_complex_type(const complex_type_t *type) { - dbg_info *dbgi = get_dbg_info(&type->base.source_position); - atomic_type_kind_t kind = type->akind; - ir_mode *mode = _atomic_modes[kind]; - ident *id = get_mode_ident(mode); + atomic_type_kind_t kind = type->akind; + ir_mode *mode = _atomic_modes[kind]; + ident *id = get_mode_ident(mode); (void) id; - (void) dbgi; /* FIXME: finish the array */ return NULL; @@ -327,26 +341,39 @@ static ir_type *create_complex_type(const complex_type_t *type) */ static ir_type *create_imaginary_type(const imaginary_type_t *type) { - dbg_info *dbgi = get_dbg_info(&type->base.source_position); atomic_type_kind_t kind = type->akind; ir_mode *mode = _atomic_modes[kind]; ident *id = get_mode_ident(mode); - ir_type *irtype = new_d_type_primitive(id, mode, dbgi); + ir_type *irtype = new_type_primitive(id, mode); set_type_alignment_bytes(irtype, type->base.alignment); return irtype; } +/** + * return type of a parameter (and take transparent union gnu extension into + * account) + */ +static type_t *get_parameter_type(type_t *type) +{ + type = skip_typeref(type); + if (type->base.modifiers & TYPE_MODIFIER_TRANSPARENT_UNION) { + compound_t *compound = type->compound.compound; + type = compound->members.entities->declaration.type; + } + + return type; +} + static ir_type *create_method_type(const function_type_t *function_type) { - type_t *return_type = function_type->return_type; + type_t *return_type = skip_typeref(function_type->return_type); ident *id = id_unique("functiontype.%u"); int n_parameters = count_parameters(function_type); int n_results = return_type == type_void ? 0 : 1; - dbg_info *dbgi = get_dbg_info(&function_type->base.source_position); - ir_type *irtype = new_d_type_method(id, n_parameters, n_results, dbgi); + ir_type *irtype = new_type_method(id, n_parameters, n_results); if (return_type != type_void) { ir_type *restype = get_ir_type(return_type); @@ -356,7 +383,8 @@ static ir_type *create_method_type(const function_type_t *function_type) function_parameter_t *parameter = function_type->parameters; int n = 0; for ( ; parameter != NULL; parameter = parameter->next) { - ir_type *p_irtype = get_ir_type(parameter->type); + type_t *type = get_parameter_type(parameter->type); + ir_type *p_irtype = get_ir_type(type); set_method_param_type(irtype, n, p_irtype); ++n; } @@ -365,6 +393,33 @@ static ir_type *create_method_type(const function_type_t *function_type) set_method_variadicity(irtype, variadicity_variadic); } + unsigned cc = get_method_calling_convention(irtype); + switch (function_type->calling_convention) { + case CC_DEFAULT: /* unspecified calling convention, equal to one of the other, typically cdecl */ + case CC_CDECL: +is_cdecl: + set_method_calling_convention(irtype, SET_CDECL(cc)); + break; + + case CC_STDCALL: + if (function_type->variadic || function_type->unspecified_parameters) + goto is_cdecl; + + /* only non-variadic function can use stdcall, else use cdecl */ + set_method_calling_convention(irtype, SET_STDCALL(cc)); + break; + + case CC_FASTCALL: + if (function_type->variadic || function_type->unspecified_parameters) + goto is_cdecl; + /* only non-variadic function can use fastcall, else use cdecl */ + set_method_calling_convention(irtype, SET_FASTCALL(cc)); + break; + + case CC_THISCALL: + /* Hmm, leave default, not accepted by the parser yet. */ + break; + } return irtype; } @@ -372,9 +427,8 @@ static ir_type *create_pointer_type(pointer_type_t *type) { type_t *points_to = type->points_to; ir_type *ir_points_to = get_ir_type_incomplete(points_to); - dbg_info *dbgi = get_dbg_info(&type->base.source_position); - ir_type *ir_type = new_d_type_pointer(id_unique("pointer.%u"), - ir_points_to, mode_P_data, dbgi); + ir_type *ir_type = new_type_pointer(id_unique("pointer.%u"), + ir_points_to, mode_P_data); return ir_type; } @@ -385,8 +439,7 @@ static ir_type *create_array_type(array_type_t *type) ir_type *ir_element_type = get_ir_type(element_type); ident *id = id_unique("array.%u"); - dbg_info *dbgi = get_dbg_info(&type->base.source_position); - ir_type *ir_type = new_d_type_array(id, 1, ir_element_type, dbgi); + ir_type *ir_type = new_type_array(id, 1, ir_element_type); const int align = get_type_alignment_bytes(ir_element_type); set_type_alignment_bytes(ir_type, align); @@ -483,10 +536,10 @@ static ir_type *get_unsigned_int_type_for_bit_size(ir_type *base_tp, static ir_type *create_bitfield_type(bitfield_type_t *const type) { type_t *base = skip_typeref(type->base_type); - assert(base->kind == TYPE_ATOMIC); + assert(base->kind == TYPE_ATOMIC || base->kind == TYPE_ENUM); ir_type *irbase = get_ir_type(base); - unsigned size = fold_constant(type->size); + unsigned size = type->bit_size; assert(!is_type_float(base)); if (is_type_signed(base)) { @@ -514,13 +567,11 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype, size_t *outer_offset, size_t *outer_align, bool incomplete, bool is_union) { - declaration_t *declaration = type->declaration; - declaration_kind_t kind = (declaration_kind_t)declaration->declaration_kind; + compound_t *compound = type->compound; - if (kind == DECLARATION_KIND_COMPOUND_TYPE_COMPLETE - || (kind == DECLARATION_KIND_COMPOUND_TYPE_INCOMPLETE - && incomplete)) - return declaration->v.irtype; + if (compound->irtype != NULL && (compound->irtype_complete || incomplete)) { + return compound->irtype; + } size_t align_all = 1; size_t offset = 0; @@ -528,7 +579,7 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype, size_t size = 0; if (irtype == NULL) { - symbol_t *symbol = declaration->symbol; + symbol_t *symbol = compound->base.symbol; ident *id; if (symbol != NULL) { id = new_id_from_str(symbol->string); @@ -539,7 +590,7 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype, id = id_unique("__anonymous_struct.%u"); } } - dbg_info *dbgi = get_dbg_info(&type->base.source_position); + dbg_info *dbgi = get_dbg_info(&compound->base.source_position); if (is_union) { irtype = new_d_type_union(id, dbgi); @@ -547,10 +598,8 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype, irtype = new_d_type_struct(id, dbgi); } - declaration->declaration_kind - = DECLARATION_KIND_COMPOUND_TYPE_INCOMPLETE; - declaration->v.irtype = irtype; - //type->base.firm_type = irtype; + compound->irtype_complete = false; + compound->irtype = irtype; } else { offset = *outer_offset; align_all = *outer_align; @@ -559,18 +608,18 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype, if (incomplete) return irtype; - declaration->declaration_kind = DECLARATION_KIND_COMPOUND_TYPE_COMPLETE; + compound->irtype_complete = true; - declaration_t *entry = declaration->scope.declarations; - for( ; entry != NULL; entry = entry->next) { - if (entry->namespc != NAMESPACE_NORMAL) + entity_t *entry = compound->members.entities; + for ( ; entry != NULL; entry = entry->base.next) { + if (entry->kind != ENTITY_COMPOUND_MEMBER) continue; size_t prev_offset = offset; - symbol_t *symbol = entry->symbol; - type_t *entry_type = skip_typeref(entry->type); - dbg_info *dbgi = get_dbg_info(&entry->source_position); + symbol_t *symbol = entry->base.symbol; + type_t *entry_type = skip_typeref(entry->declaration.type); + dbg_info *dbgi = get_dbg_info(&entry->base.source_position); ident *ident; if (symbol != NULL) { @@ -606,7 +655,7 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype, size_t base; size_t bits_remainder; if (entry_type->kind == TYPE_BITFIELD) { - size_t size_bits = fold_constant(entry_type->bitfield.size); + size_t size_bits = entry_type->bitfield.bit_size; size_t rest_size_bits = (entry_alignment - misalign)*8 - bit_offset; if (size_bits > rest_size_bits) { @@ -646,9 +695,9 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype, set_entity_offset_bits_remainder(entity, (unsigned char) bits_remainder); //add_struct_member(irtype, entity); - entry->declaration_kind = DECLARATION_KIND_COMPOUND_MEMBER; - assert(entry->v.entity == NULL); - entry->v.entity = entity; + entry->declaration.kind = DECLARATION_KIND_COMPOUND_MEMBER; + assert(entry->compound_member.entity == NULL); + entry->compound_member.entity = entity; finished_member: if (is_union) { @@ -703,14 +752,13 @@ static ir_type *create_enum_type(enum_type_t *const type) bool constant_folding_old = constant_folding; constant_folding = true; - declaration_t *declaration = type->declaration->next; - for (; declaration != NULL; declaration = declaration->next) { - if (declaration->storage_class != STORAGE_CLASS_ENUM_ENTRY) + enum_t *enume = type->enume; + entity_t *entry = enume->base.next; + for (; entry != NULL; entry = entry->base.next) { + if (entry->kind != ENTITY_ENUM_VALUE) break; - declaration->declaration_kind = DECLARATION_KIND_ENUM_ENTRY; - - expression_t *const init = declaration->init.enum_value; + expression_t *const init = entry->enum_value.value; if (init != NULL) { ir_node *const cnst = expression_to_firm(init); if (!is_Const(cnst)) { @@ -718,7 +766,7 @@ static ir_type *create_enum_type(enum_type_t *const type) } tv_next = get_Const_tarval(cnst); } - declaration->v.enum_val = tv_next; + entry->enum_value.tv = tv_next; tv_next = tarval_add(tv_next, one); } @@ -763,7 +811,9 @@ static ir_type *get_ir_type(type_t *type) ir_type *firm_type = NULL; switch (type->kind) { case TYPE_ERROR: - panic("error type occurred"); + /* Happens while constant folding, when there was an error */ + return create_atomic_type(&type_void->atomic); + case TYPE_ATOMIC: firm_type = create_atomic_type(&type->atomic); break; @@ -916,18 +966,19 @@ static ident *rts_idents[sizeof(rts_data) / sizeof(rts_data[0])]; * @param ent the entity to be mangled * @param declaration the declaration */ -static ident *create_ld_ident_win32(ir_entity *ent, declaration_t *declaration) +static ident *create_ld_ident_win32(ir_entity *irentity, entity_t *entity) { ident *id; - if (is_Method_type(get_entity_type(ent))) - id = decorate_win32_c_fkt(ent, get_entity_ident(ent)); + if (is_Method_type(get_entity_type(irentity))) + id = decorate_win32_c_fkt(irentity, get_entity_ident(irentity)); else { /* always add an underscore in win32 */ - id = mangle(id_underscore, get_entity_ident(ent)); + id = mangle(id_underscore, get_entity_ident(irentity)); } - decl_modifiers_t decl_modifiers = declaration->decl_modifiers; + assert(is_declaration(entity)); + decl_modifiers_t decl_modifiers = entity->declaration.modifiers; if (decl_modifiers & DM_DLLIMPORT) { /* add prefix for imported symbols */ id = mangle(id_imp, id); @@ -941,11 +992,10 @@ static ident *create_ld_ident_win32(ir_entity *ent, declaration_t *declaration) * @param ent the entity to be mangled * @param declaration the declaration */ -static ident *create_ld_ident_linux_elf(ir_entity *entity, - declaration_t *declaration) +static ident *create_ld_ident_linux_elf(ir_entity *irentity, entity_t *entity) { - (void) declaration; - return get_entity_ident(entity); + (void) entity; + return get_entity_ident(irentity); } /** @@ -954,62 +1004,99 @@ static ident *create_ld_ident_linux_elf(ir_entity *entity, * @param ent the entity to be mangled * @param declaration the declaration */ -static ident *create_ld_ident_macho(ir_entity *ent, declaration_t *declaration) +static ident *create_ld_ident_macho(ir_entity *irentity, entity_t *entity) { - (void) declaration; - ident *id = mangle(id_underscore, get_entity_ident(ent)); + (void) entity; + ident *id = mangle(id_underscore, get_entity_ident(irentity)); return id; } -typedef ident* (*create_ld_ident_func)(ir_entity *entity, - declaration_t *declaration); -create_ld_ident_func create_ld_ident = create_ld_ident_linux_elf; +typedef ident* (*create_ld_ident_func)(ir_entity *irentity, entity_t *entity); +create_ld_ident_func create_ld_ident = create_ld_ident_linux_elf; + +/** + * Handle GNU attributes for entities + * + * @param ent the entity + * @param decl the routine declaration + */ +static void handle_gnu_attributes_ent(ir_entity *irentity, entity_t *entity) +{ + assert(is_declaration(entity)); + decl_modifiers_t modifiers = entity->declaration.modifiers; + if (modifiers & DM_PURE) { + /* TRUE if the declaration includes the GNU + __attribute__((pure)) specifier. */ + set_entity_additional_property(irentity, mtp_property_pure); + } + if (modifiers & DM_CONST) { + set_entity_additional_property(irentity, mtp_property_const); + have_const_functions = true; + } + if (modifiers & DM_USED) { + /* TRUE if the declaration includes the GNU + __attribute__((used)) specifier. */ + set_entity_stickyness(irentity, stickyness_sticky); + } +} /** * Creates an entity representing a function. * * @param declaration the function declaration */ -static ir_entity *get_function_entity(declaration_t *declaration) +static ir_entity *get_function_entity(entity_t *entity) { - if (declaration->declaration_kind == DECLARATION_KIND_FUNCTION) - return declaration->v.entity; - assert(declaration->declaration_kind == DECLARATION_KIND_UNKNOWN); + assert(entity->kind == ENTITY_FUNCTION); + if (entity->function.entity != NULL) { + return entity->function.entity; + } - symbol_t *symbol = declaration->symbol; + symbol_t *symbol = entity->base.symbol; ident *id = new_id_from_str(symbol->string); - ir_type *global_type = get_glob_type(); - ir_type *ir_type_method = get_ir_type(declaration->type); - assert(is_Method_type(ir_type_method)); + ir_type *global_type = get_glob_type(); + ir_type *ir_type_method = get_ir_type(entity->declaration.type); + bool const has_body = entity->function.statement != NULL; /* already an entity defined? */ - ir_entity *entity = entitymap_get(&entitymap, symbol); - if (entity != NULL) { - if (get_entity_visibility(entity) == visibility_external_allocated - && declaration->init.statement != NULL) { - set_entity_visibility(entity, visibility_external_visible); + ir_entity *irentity = entitymap_get(&entitymap, symbol); + if (irentity != NULL) { + if (get_entity_visibility(irentity) == visibility_external_allocated + && has_body) { + set_entity_visibility(irentity, visibility_external_visible); } goto entity_created; } - dbg_info *const dbgi = get_dbg_info(&declaration->source_position); - entity = new_d_entity(global_type, id, ir_type_method, dbgi); - set_entity_ld_ident(entity, create_ld_ident(entity, declaration)); - if (declaration->storage_class == STORAGE_CLASS_STATIC && - declaration->init.statement == NULL) { - /* this entity was declared, but never defined */ - set_entity_peculiarity(entity, peculiarity_description); - } - if (declaration->storage_class == STORAGE_CLASS_STATIC - || declaration->is_inline) { - set_entity_visibility(entity, visibility_local); - } else if (declaration->init.statement != NULL) { - set_entity_visibility(entity, visibility_external_visible); + 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(irentity, 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); + } + set_entity_visibility(irentity, visibility_local); + } else if (has_body) { + set_entity_visibility(irentity, visibility_external_visible); } else { - set_entity_visibility(entity, visibility_external_allocated); + set_entity_visibility(irentity, visibility_external_allocated); } - set_entity_allocation(entity, allocation_static); + set_entity_allocation(irentity, allocation_static); /* We should check for file scope here, but as long as we compile C only this is not needed. */ @@ -1023,17 +1110,17 @@ static ir_entity *get_function_entity(declaration_t *declaration) if ((c_mode & rts_data[i].flags) == 0) continue; assert(rts_entities[rts_data[i].id] == NULL); - rts_entities[rts_data[i].id] = entity; + rts_entities[rts_data[i].id] = irentity; } } - entitymap_insert(&entitymap, symbol, entity); + entitymap_insert(&entitymap, symbol, irentity); entity_created: - declaration->declaration_kind = DECLARATION_KIND_FUNCTION; - declaration->v.entity = entity; + entity->declaration.kind = DECLARATION_KIND_FUNCTION; + entity->function.entity = irentity; - return entity; + return irentity; } /** @@ -1152,7 +1239,7 @@ static ir_node *string_to_firm(const source_position_t *const src_pos, set_type_state(type, layout_fixed); tarval **const tvs = xmalloc(slen * sizeof(tvs[0])); - for(size_t i = 0; i < slen; ++i) { + for (size_t i = 0; i < slen; ++i) { tvs[i] = new_tarval_from_long(string[i], mode); } @@ -1205,7 +1292,7 @@ static ir_node *wide_string_literal_to_firm( set_type_state(type, layout_fixed); tarval **const tvs = xmalloc(slen * sizeof(tvs[0])); - for(size_t i = 0; i < slen; ++i) { + for (size_t i = 0; i < slen; ++i) { tvs[i] = new_tarval_from_long(string[i], mode); } @@ -1263,22 +1350,23 @@ static ir_node *do_strict_conv(dbg_info *dbgi, ir_node *node) } static ir_node *get_global_var_address(dbg_info *const dbgi, - const declaration_t *const decl) + const entity_t *const entity) { - assert(decl->declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE); + assert(entity->kind == ENTITY_VARIABLE); + assert(entity->declaration.kind == DECLARATION_KIND_GLOBAL_VARIABLE); - ir_entity *const entity = decl->v.entity; - switch ((storage_class_tag_t)decl->storage_class) { + ir_entity *const irentity = entity->variable.v.entity; + switch ((storage_class_tag_t) entity->declaration.storage_class) { case STORAGE_CLASS_THREAD: case STORAGE_CLASS_THREAD_EXTERN: case STORAGE_CLASS_THREAD_STATIC: { ir_node *const no_mem = new_NoMem(); ir_node *const tls = get_irg_tls(current_ir_graph); - return new_d_simpleSel(dbgi, no_mem, tls, entity); + return new_d_simpleSel(dbgi, no_mem, tls, irentity); } default: - return create_symconst(dbgi, mode_P_data, entity); + return create_symconst(dbgi, mode_P_data, irentity); } } @@ -1315,52 +1403,79 @@ static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode) return new_d_Conv(dbgi, value, dest_mode); } +/** + * Keep all memory edges of the given block. + */ +static void keep_all_memory(ir_node *block) { + ir_node *old = get_cur_block(); + + set_cur_block(block); + keep_alive(get_store()); + /* TODO: keep all memory edges from restricted pointers */ + set_cur_block(old); +} + +static ir_node *reference_expression_enum_value_to_firm( + const reference_expression_t *ref) +{ + entity_t *entity = ref->entity; + type_t *type = skip_typeref(entity->enum_value.enum_type); + /* make sure the type is constructed */ + (void) get_ir_type(type); + + ir_mode *const mode = get_ir_mode(type); + return new_Const(mode, entity->enum_value.tv); +} + static ir_node *reference_expression_to_firm(const reference_expression_t *ref) { - dbg_info *dbgi = get_dbg_info(&ref->base.source_position); - declaration_t *declaration = ref->declaration; - type_t *type = skip_typeref(declaration->type); + dbg_info *dbgi = get_dbg_info(&ref->base.source_position); + entity_t *entity = ref->entity; + assert(is_declaration(entity)); + type_t *type = skip_typeref(entity->declaration.type); /* make sure the type is constructed */ (void) get_ir_type(type); - switch((declaration_kind_t) declaration->declaration_kind) { - case DECLARATION_KIND_TYPE: + switch ((declaration_kind_t) entity->declaration.kind) { case DECLARATION_KIND_UNKNOWN: break; - case DECLARATION_KIND_ENUM_ENTRY: { - ir_mode *const mode = get_ir_mode(type); - return new_Const(mode, declaration->v.enum_val); - } - case DECLARATION_KIND_LOCAL_VARIABLE: { ir_mode *const mode = get_ir_mode(type); - return get_value(declaration->v.value_number, mode); + return get_value(entity->variable.v.value_number, mode); } case DECLARATION_KIND_FUNCTION: { ir_mode *const mode = get_ir_mode(type); - return create_symconst(dbgi, mode, declaration->v.entity); + return create_symconst(dbgi, mode, entity->function.entity); + } + case DECLARATION_KIND_INNER_FUNCTION: { + ir_mode *const mode = get_ir_mode(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); + } else { + /* TODO: need trampoline here */ + panic("Trampoline code not implemented"); + return create_symconst(dbgi, mode, entity->function.entity); + } } case DECLARATION_KIND_GLOBAL_VARIABLE: { - ir_node *const addr = get_global_var_address(dbgi, declaration); - return deref_address(dbgi, declaration->type, addr); + ir_node *const addr = get_global_var_address(dbgi, entity); + return deref_address(dbgi, entity->declaration.type, addr); } case DECLARATION_KIND_LOCAL_VARIABLE_ENTITY: { - ir_entity *entity = declaration->v.entity; - ir_node *frame = get_local_frame(entity); - ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, entity); - return deref_address(dbgi, declaration->type, sel); + ir_entity *irentity = entity->variable.v.entity; + ir_node *frame = get_local_frame(irentity); + ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, irentity); + return deref_address(dbgi, entity->declaration.type, sel); } case DECLARATION_KIND_VARIABLE_LENGTH_ARRAY: - return declaration->v.vla_base; + return entity->variable.v.vla_base; - case DECLARATION_KIND_COMPOUND_TYPE_INCOMPLETE: - case DECLARATION_KIND_COMPOUND_TYPE_COMPLETE: case DECLARATION_KIND_COMPOUND_MEMBER: - case DECLARATION_KIND_LABEL_BLOCK: panic("not implemented reference type"); } @@ -1369,44 +1484,40 @@ static ir_node *reference_expression_to_firm(const reference_expression_t *ref) static ir_node *reference_addr(const reference_expression_t *ref) { - dbg_info *dbgi = get_dbg_info(&ref->base.source_position); - declaration_t *declaration = ref->declaration; + dbg_info *dbgi = get_dbg_info(&ref->base.source_position); + entity_t *entity = ref->entity; + assert(is_declaration(entity)); - switch((declaration_kind_t) declaration->declaration_kind) { - case DECLARATION_KIND_TYPE: + switch((declaration_kind_t) entity->declaration.kind) { case DECLARATION_KIND_UNKNOWN: break; case DECLARATION_KIND_LOCAL_VARIABLE: /* you can store to a local variable (so we don't panic but return NULL * as an indicator for no real address) */ return NULL; - case DECLARATION_KIND_FUNCTION: { - type_t *const type = skip_typeref(ref->base.type); - ir_mode *const mode = get_ir_mode(type); - return create_symconst(dbgi, mode, declaration->v.entity); - } case DECLARATION_KIND_GLOBAL_VARIABLE: { - ir_node *const addr = get_global_var_address(dbgi, declaration); + ir_node *const addr = get_global_var_address(dbgi, entity); return addr; } case DECLARATION_KIND_LOCAL_VARIABLE_ENTITY: { - ir_entity *entity = declaration->v.entity; - ir_node *frame = get_local_frame(entity); - ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, entity); + ir_entity *irentity = entity->variable.v.entity; + ir_node *frame = get_local_frame(irentity); + ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, irentity); return sel; } case DECLARATION_KIND_VARIABLE_LENGTH_ARRAY: - return declaration->v.vla_base; + return entity->variable.v.vla_base; - case DECLARATION_KIND_ENUM_ENTRY: - panic("trying to reference enum entry"); + 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); + } - case DECLARATION_KIND_COMPOUND_TYPE_INCOMPLETE: - case DECLARATION_KIND_COMPOUND_TYPE_COMPLETE: + case DECLARATION_KIND_INNER_FUNCTION: case DECLARATION_KIND_COMPOUND_MEMBER: - case DECLARATION_KIND_LABEL_BLOCK: panic("not implemented reference type"); } @@ -1446,7 +1557,11 @@ static ir_node *process_builtin_call(const call_expression_t *call) return res; } - case T___builtin_huge_val: { + + 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); tarval *tv = get_mode_infinite(mode); ir_node *res = new_d_Const(dbgi, mode, tv); @@ -1454,7 +1569,7 @@ static ir_node *process_builtin_call(const call_expression_t *call) } case T___builtin_nan: case T___builtin_nanf: - case T___builtin_nand: { + case T___builtin_nanl: { /* Ignore string for now... */ assert(is_type_function(function_type)); ir_mode *mode = get_ir_mode(function_type->function.return_type); @@ -1471,9 +1586,10 @@ static ir_node *process_builtin_call(const call_expression_t *call) /** * Transform a call expression. - * Handles some special cases, like alloca() calls, which must be resolved BEFORE the inlines runs. - * Inlining routines calling alloca() is dangerous, 176.gcc for instance might allocate 2GB instead of - * 256 MB if alloca is not handled right... + * Handles some special cases, like alloca() calls, which must be resolved + * BEFORE the inlines runs. Inlining routines calling alloca() is dangerous, + * 176.gcc for instance might allocate 2GB instead of 256 MB if alloca is not + * handled right... */ static ir_node *call_expression_to_firm(const call_expression_t *call) { @@ -1485,27 +1601,26 @@ static ir_node *call_expression_to_firm(const call_expression_t *call) return process_builtin_call(call); } if (function->kind == EXPR_REFERENCE) { - const reference_expression_t *ref = &function->reference; - declaration_t *declaration = ref->declaration; - - if ((declaration_kind_t)declaration->declaration_kind == DECLARATION_KIND_FUNCTION) { - if (declaration->v.entity == rts_entities[rts_alloca]) { - /* handle alloca() call */ - expression_t *argument = call->arguments->expression; - ir_node *size = expression_to_firm(argument); - - size = create_conv(dbgi, size, get_ir_mode(type_size_t)); - - ir_node *store = get_store(); - dbg_info *dbgi = get_dbg_info(&call->base.source_position); - ir_node *alloca = new_d_Alloc(dbgi, store, size, firm_unknown_type, - stack_alloc); - ir_node *proj_m = new_Proj(alloca, mode_M, pn_Alloc_M); - set_store(proj_m); - ir_node *res = new_Proj(alloca, mode_P_data, pn_Alloc_res); - - return res; - } + const reference_expression_t *ref = &function->reference; + entity_t *entity = ref->entity; + + if (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); + + size = create_conv(dbgi, size, get_ir_mode(type_size_t)); + + ir_node *store = get_store(); + dbg_info *dbgi = get_dbg_info(&call->base.source_position); + ir_node *alloca = new_d_Alloc(dbgi, store, size, firm_unknown_type, + stack_alloc); + ir_node *proj_m = new_Proj(alloca, mode_M, pn_Alloc_M); + set_store(proj_m); + ir_node *res = new_Proj(alloca, mode_P_data, pn_Alloc_res); + + return res; } } ir_node *callee = expression_to_firm(function); @@ -1522,7 +1637,7 @@ static ir_node *call_expression_to_firm(const call_expression_t *call) ir_type *new_method_type = NULL; if (function_type->variadic || function_type->unspecified_parameters) { const call_argument_t *argument = call->arguments; - for( ; argument != NULL; argument = argument->next) { + for ( ; argument != NULL; argument = argument->next) { ++n_parameters; } @@ -1539,12 +1654,12 @@ static ir_node *call_expression_to_firm(const call_expression_t *call) set_method_variadicity(new_method_type, get_method_variadicity(ir_method_type)); - for(int i = 0; i < n_res; ++i) { + for (int i = 0; i < n_res; ++i) { set_method_res_type(new_method_type, i, get_method_res_type(ir_method_type, i)); } argument = call->arguments; - for(int i = 0; i < n_parameters; ++i, argument = argument->next) { + for (int i = 0; i < n_parameters; ++i, argument = argument->next) { expression_t *expression = argument->expression; ir_type *irtype = get_ir_type(expression->base.type); set_method_param_type(new_method_type, i, irtype); @@ -1557,7 +1672,7 @@ static ir_node *call_expression_to_firm(const call_expression_t *call) ir_node *in[n_parameters]; const call_argument_t *argument = call->arguments; - for(int n = 0; n < n_parameters; ++n) { + for (int n = 0; n < n_parameters; ++n) { expression_t *expression = argument->expression; ir_node *arg_node = expression_to_firm(expression); @@ -1588,6 +1703,15 @@ static ir_node *call_expression_to_firm(const call_expression_t *call) result = new_d_Proj(dbgi, resproj, mode, 0); } + if (function->kind == EXPR_REFERENCE && + function->reference.entity->declaration.modifiers & DM_NORETURN) { + /* A dead end: Keep the Call and the Block. Also place all further + * nodes into a new and unreachable block. */ + keep_alive(node); + keep_alive(get_cur_block()); + new_Block(0, NULL); + } + return result; } @@ -1595,9 +1719,9 @@ static void statement_to_firm(statement_t *statement); static ir_node *compound_statement_to_firm(compound_statement_t *compound); static ir_node *expression_to_addr(const expression_t *expression); -static void create_condition_evaluation(const expression_t *expression, - ir_node *true_block, - ir_node *false_block); +static ir_node *create_condition_evaluation(const expression_t *expression, + ir_node *true_block, + ir_node *false_block); static void assign_value(dbg_info *dbgi, ir_node *addr, type_t *type, ir_node *value) @@ -1625,7 +1749,8 @@ static tarval *create_bitfield_mask(ir_mode *mode, int offset, int size) tarval *all_one = get_mode_all_one(mode); int mode_size = get_mode_size_bits(mode); - assert(offset >= 0 && size >= 0); + assert(offset >= 0); + assert(size >= 0); assert(offset + size <= mode_size); if (size == mode_size) { return all_one; @@ -1641,21 +1766,19 @@ static tarval *create_bitfield_mask(ir_mode *mode, int offset, int size) return mask1; } -static void bitfield_store_to_firm(const select_expression_t *expression, - ir_node *addr, ir_node *value) +static void bitfield_store_to_firm(dbg_info *dbgi, + ir_entity *entity, ir_node *addr, ir_node *value, bool set_volatile) { - type_t *type = expression->base.type; - ir_mode *mode = get_ir_mode(type); - - assert(get_irn_mode(value) == mode || is_Bad(value)); + ir_type *entity_type = get_entity_type(entity); + ir_type *base_type = get_primitive_base_type(entity_type); + assert(base_type != NULL); + ir_mode *mode = get_type_mode(base_type); - dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + value = create_conv(dbgi, value, mode); /* kill upper bits of value and shift to right position */ - ir_entity *entity = expression->compound_entry->v.entity; - int bitoffset = get_entity_offset_bits_remainder(entity); - ir_type *entity_type = get_entity_type(entity); - int bitsize = get_mode_size_bits(get_type_mode(entity_type)); + int bitoffset = get_entity_offset_bits_remainder(entity); + int bitsize = get_mode_size_bits(get_type_mode(entity_type)); tarval *mask = create_bitfield_mask(mode, 0, bitsize); ir_node *mask_node = new_d_Const(dbgi, mode, mask); @@ -1680,7 +1803,7 @@ static void bitfield_store_to_firm(const select_expression_t *expression, ir_node *store_mem = new_d_Proj(dbgi, store, mode_M, pn_Store_M); set_store(store_mem); - if (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) { + if (set_volatile) { set_Load_volatility(load, volatility_is_volatile); set_Store_volatility(store, volatility_is_volatile); } @@ -1702,7 +1825,8 @@ static ir_node *bitfield_extract_to_firm(const select_expression_t *expression, set_store(load_mem); /* kill upper bits */ - ir_entity *entity = expression->compound_entry->v.entity; + assert(expression->compound_entry->kind == ENTITY_COMPOUND_MEMBER); + ir_entity *entity = expression->compound_entry->compound_member.entity; int bitoffset = get_entity_offset_bits_remainder(entity); ir_type *entity_type = get_entity_type(entity); int bitsize = get_mode_size_bits(get_type_mode(entity_type)); @@ -1726,6 +1850,16 @@ static ir_node *bitfield_extract_to_firm(const select_expression_t *expression, return create_conv(dbgi, shiftr, mode); } +/* make sure the selected compound type is constructed */ +static void construct_select_compound(const select_expression_t *expression) +{ + type_t *type = skip_typeref(expression->compound->base.type); + if (is_type_pointer(type)) { + type = type->pointer.points_to; + } + (void) get_ir_type(type); +} + static void set_value_for_expression_addr(const expression_t *expression, ir_node *value, ir_node *addr) { @@ -1735,10 +1869,11 @@ static void set_value_for_expression_addr(const expression_t *expression, if (expression->kind == EXPR_REFERENCE) { const reference_expression_t *ref = &expression->reference; - declaration_t *declaration = ref->declaration; - assert(declaration->declaration_kind != DECLARATION_KIND_UNKNOWN); - if (declaration->declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE) { - set_value(declaration->v.value_number, value); + entity_t *entity = ref->entity; + assert(is_declaration(entity)); + assert(entity->declaration.kind != DECLARATION_KIND_UNKNOWN); + if (entity->declaration.kind == DECLARATION_KIND_LOCAL_VARIABLE) { + set_value(entity->variable.v.value_number, value); return; } } @@ -1751,9 +1886,15 @@ static void set_value_for_expression_addr(const expression_t *expression, if (expression->kind == EXPR_SELECT) { const select_expression_t *select = &expression->select; - declaration_t *declaration = select->compound_entry; - if (declaration->type->kind == TYPE_BITFIELD) { - bitfield_store_to_firm(select, addr, value); + construct_select_compound(select); + + entity_t *entity = select->compound_entry; + assert(entity->kind == ENTITY_COMPOUND_MEMBER); + if (entity->declaration.type->kind == TYPE_BITFIELD) { + ir_entity *irentity = entity->compound_member.entity; + bool set_volatile + = select->base.type->base.qualifiers & TYPE_QUALIFIER_VOLATILE; + bitfield_store_to_firm(dbgi, irentity, addr, value, set_volatile); return; } } @@ -1773,12 +1914,13 @@ static ir_node *get_value_from_lvalue(const expression_t *expression, if (expression->kind == EXPR_REFERENCE) { const reference_expression_t *ref = &expression->reference; - declaration_t *declaration = ref->declaration; - assert(declaration->declaration_kind != DECLARATION_KIND_UNKNOWN); - if (declaration->declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE) { + entity_t *entity = ref->entity; + assert(entity->kind == ENTITY_VARIABLE); + assert(entity->declaration.kind != DECLARATION_KIND_UNKNOWN); + if (entity->declaration.kind == DECLARATION_KIND_LOCAL_VARIABLE) { assert(addr == NULL); ir_mode *mode = get_ir_mode(expression->base.type); - return get_value(declaration->v.value_number, mode); + return get_value(entity->variable.v.value_number, mode); } } @@ -1787,7 +1929,8 @@ static ir_node *get_value_from_lvalue(const expression_t *expression, ir_node *value; if (expression->kind == EXPR_SELECT && - expression->select.compound_entry->type->kind == TYPE_BITFIELD){ + expression->select.compound_entry->declaration.type->kind == TYPE_BITFIELD){ + construct_select_compound(&expression->select); value = bitfield_extract_to_firm(&expression->select, addr); } else { value = deref_address(dbgi, expression->base.type, addr); @@ -1848,9 +1991,12 @@ static bool is_local_variable(expression_t *expression) { if (expression->kind != EXPR_REFERENCE) return false; - reference_expression_t *ref_expr = &expression->reference; - declaration_t *declaration = ref_expr->declaration; - return declaration->declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE; + reference_expression_t *ref_expr = &expression->reference; + entity_t *entity = ref_expr->entity; + if (entity->kind != ENTITY_VARIABLE) + return false; + assert(entity->declaration.kind != DECLARATION_KIND_UNKNOWN); + return entity->declaration.kind == DECLARATION_KIND_LOCAL_VARIABLE; } static pn_Cmp get_pnc(const expression_kind_t kind, type_t *const type) @@ -1891,50 +2037,50 @@ static pn_Cmp get_pnc(const expression_kind_t kind, type_t *const type) static ir_node *handle_assume_compare(dbg_info *dbi, const binary_expression_t *expression) { - expression_t *op1 = expression->left; - expression_t *op2 = expression->right; - declaration_t *var2, *var = NULL; - ir_node *res = NULL; - pn_Cmp cmp_val; + expression_t *op1 = expression->left; + expression_t *op2 = expression->right; + entity_t *var2, *var = NULL; + ir_node *res = NULL; + pn_Cmp cmp_val; cmp_val = get_pnc(expression->base.kind, op1->base.type); if (is_local_variable(op1) && is_local_variable(op2)) { - var = op1->reference.declaration; - var2 = op2->reference.declaration; + var = op1->reference.entity; + var2 = op2->reference.entity; - type_t *const type = skip_typeref(var->type); + type_t *const type = skip_typeref(var->declaration.type); ir_mode *const mode = get_ir_mode(type); - ir_node *const irn1 = get_value(var->v.value_number, mode); - ir_node *const irn2 = get_value(var2->v.value_number, mode); + ir_node *const irn1 = get_value(var->variable.v.value_number, mode); + ir_node *const irn2 = get_value(var2->variable.v.value_number, mode); res = new_d_Confirm(dbi, irn2, irn1, get_inversed_pnc(cmp_val)); - set_value(var2->v.value_number, res); + set_value(var2->variable.v.value_number, res); res = new_d_Confirm(dbi, irn1, irn2, cmp_val); - set_value(var->v.value_number, res); + set_value(var->variable.v.value_number, res); return res; } expression_t *con; if (is_local_variable(op1) && is_constant_expression(op2)) { - var = op1->reference.declaration; + var = op1->reference.entity; con = op2; } else if (is_constant_expression(op1) && is_local_variable(op2)) { cmp_val = get_inversed_pnc(cmp_val); - var = op2->reference.declaration; + var = op2->reference.entity; con = op1; } if (var != NULL) { - type_t *const type = skip_typeref(var->type); + type_t *const type = skip_typeref(var->declaration.type); ir_mode *const mode = get_ir_mode(type); - res = get_value(var->v.value_number, mode); + res = get_value(var->variable.v.value_number, mode); res = new_d_Confirm(dbi, res, expression_to_firm(con), cmp_val); - set_value(var->v.value_number, res); + set_value(var->variable.v.value_number, res); } return res; } @@ -2056,10 +2202,8 @@ static ir_node *produce_condition_result(const expression_t *expression, mature_immBlock(one_block); mature_immBlock(zero_block); - ir_node *common_block = new_immBlock(); - add_immBlock_pred(common_block, jmp_one); - add_immBlock_pred(common_block, jmp_zero); - mature_immBlock(common_block); + ir_node *in_cf[2] = { jmp_one, jmp_zero }; + new_Block(2, in_cf); ir_node *in[2] = { one, zero }; ir_node *val = new_d_Phi(dbgi, 2, in, mode); @@ -2071,8 +2215,14 @@ static ir_node *adjust_for_pointer_arithmetic(dbg_info *dbgi, ir_node *value, type_t *type) { pointer_type_t *const pointer_type = &type->pointer; - type_t *const points_to = pointer_type->points_to; - const unsigned elem_size = get_type_size_const(points_to); + type_t *const points_to = skip_typeref(pointer_type->points_to); + unsigned elem_size = get_type_size_const(points_to); + + /* gcc extension: allow arithmetic with void * and function * */ + if ((elem_size == 0 && is_type_atomic(points_to, ATOMIC_TYPE_VOID)) || + is_type_function(points_to)) { + elem_size = 1; + } assert(elem_size >= 1); if (elem_size == 1) @@ -2210,12 +2360,11 @@ static ir_node *create_lazy_op(const binary_expression_t *expression) if (is_constant_expression(expression->left)) { long val = fold_constant(expression->left); expression_kind_t ekind = expression->base.kind; - if ((ekind == EXPR_BINARY_LOGICAL_AND && val != 0) - || (ekind == EXPR_BINARY_LOGICAL_OR && val == 0)) { + assert(ekind == EXPR_BINARY_LOGICAL_AND || ekind == EXPR_BINARY_LOGICAL_OR); + if ((ekind == EXPR_BINARY_LOGICAL_AND && val != 0) || + (ekind == EXPR_BINARY_LOGICAL_OR && val == 0)) { return expression_to_firm(expression->right); } else { - assert((ekind == EXPR_BINARY_LOGICAL_AND && val == 0) - || (ekind == EXPR_BINARY_LOGICAL_OR && val != 0)); return new_Const(mode, get_mode_one(mode)); } } @@ -2231,9 +2380,9 @@ static ir_node *create_assign_binop(const binary_expression_t *expression) dbg_info *const dbgi = get_dbg_info(&expression->base.source_position); const expression_t *left_expr = expression->left; ir_mode *left_mode = get_ir_mode(left_expr->base.type); + ir_node *right = expression_to_firm(expression->right); ir_node *left_addr = expression_to_addr(left_expr); ir_node *left = get_value_from_lvalue(left_expr, left_addr); - ir_node *right = expression_to_firm(expression->right); ir_node *result = create_op(dbgi, expression, left, right); result = create_conv(dbgi, result, left_mode); @@ -2364,7 +2513,7 @@ static long get_offsetof_offset(const offsetof_expression_t *expression) long offset = 0; designator_t *designator = expression->designator; - for( ; designator != NULL; designator = designator->next) { + for ( ; designator != NULL; designator = designator->next) { type_t *type = skip_typeref(orig_type); /* be sure the type is constructed */ (void) get_ir_type(type); @@ -2373,24 +2522,24 @@ static long get_offsetof_offset(const offsetof_expression_t *expression) assert(is_type_compound(type)); symbol_t *symbol = designator->symbol; - declaration_t *declaration = type->compound.declaration; - declaration_t *iter = declaration->scope.declarations; - for( ; iter != NULL; iter = iter->next) { - if (iter->symbol == symbol) { + compound_t *compound = type->compound.compound; + entity_t *iter = compound->members.entities; + for ( ; iter != NULL; iter = iter->base.next) { + if (iter->base.symbol == symbol) { break; } } assert(iter != NULL); - assert(iter->declaration_kind == DECLARATION_KIND_COMPOUND_MEMBER); - offset += get_entity_offset(iter->v.entity); + assert(iter->kind == ENTITY_COMPOUND_MEMBER); + assert(iter->declaration.kind == DECLARATION_KIND_COMPOUND_MEMBER); + offset += get_entity_offset(iter->compound_member.entity); - orig_type = iter->type; + orig_type = iter->declaration.type; } else { expression_t *array_index = designator->array_index; assert(designator->array_index != NULL); assert(is_type_array(type)); - assert(is_type_valid(array_index->base.type)); long index = fold_constant(array_index); ir_type *arr_type = get_ir_type(type); @@ -2476,9 +2625,10 @@ static ir_node *alignof_to_firm(const typeprop_expression_t *expression) /* beware: if expression is a variable reference, return the alignment of the variable. */ const expression_t *tp_expression = expression->tp_expression; - const declaration_t *declaration = expr_is_variable(tp_expression); - if (declaration != NULL) { + const entity_t *entity = expression_is_variable(tp_expression); + if (entity != NULL) { /* TODO: get the alignment of this variable. */ + (void) entity; } type = tp_expression->base.type; assert(type != NULL); @@ -2491,8 +2641,11 @@ static ir_node *alignof_to_firm(const typeprop_expression_t *expression) } static void init_ir_types(void); + long fold_constant(const expression_t *expression) { + assert(is_type_valid(skip_typeref(expression->base.type))); + bool constant_folding_old = constant_folding; constant_folding = true; @@ -2530,7 +2683,10 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression) if (is_constant_expression(expression->condition)) { long val = fold_constant(expression->condition); if (val) { - return expression_to_firm(expression->true_expression); + expression_t *true_expression = expression->true_expression; + if (true_expression == NULL) + true_expression = expression->condition; + return expression_to_firm(true_expression); } else { return expression_to_firm(expression->false_expression); } @@ -2541,7 +2697,8 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression) /* create the true block */ ir_node *true_block = new_immBlock(); - ir_node *true_val = expression_to_firm(expression->true_expression); + ir_node *true_val = expression->true_expression != NULL ? + expression_to_firm(expression->true_expression) : NULL; ir_node *true_jmp = new_Jmp(); /* create the false block */ @@ -2552,15 +2709,23 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression) /* create the condition evaluation */ set_cur_block(cur_block); - create_condition_evaluation(expression->condition, true_block, false_block); + ir_node *const cond_expr = create_condition_evaluation(expression->condition, true_block, false_block); + if (expression->true_expression == NULL) { + if (cond_expr != NULL) { + true_val = cond_expr; + } else { + /* Condition ended with a short circuit (&&, ||, !) operation. + * Generate a "1" as value for the true branch. */ + ir_mode *const mode = mode_Is; + true_val = new_Const(mode, get_mode_one(mode)); + } + } mature_immBlock(true_block); mature_immBlock(false_block); /* create the common block */ - ir_node *common_block = new_immBlock(); - add_immBlock_pred(common_block, true_jmp); - add_immBlock_pred(common_block, false_jmp); - mature_immBlock(common_block); + ir_node *in_cf[2] = { true_jmp, false_jmp }; + new_Block(2, in_cf); /* TODO improve static semantics, so either both or no values are NULL */ if (true_val == NULL || false_val == NULL) @@ -2581,22 +2746,18 @@ static ir_node *select_addr(const select_expression_t *expression) { dbg_info *dbgi = get_dbg_info(&expression->base.source_position); - ir_node *compound_addr = expression_to_firm(expression->compound); + construct_select_compound(expression); - /* make sure the type is constructed */ - type_t *type = skip_typeref(expression->compound->base.type); - if (is_type_pointer(type)) { - type = type->pointer.points_to; - } - (void) get_ir_type(type); + ir_node *compound_addr = expression_to_firm(expression->compound); - declaration_t *entry = expression->compound_entry; - assert(entry->declaration_kind == DECLARATION_KIND_COMPOUND_MEMBER); - ir_entity *entity = entry->v.entity; + entity_t *entry = expression->compound_entry; + assert(entry->kind == ENTITY_COMPOUND_MEMBER); + assert(entry->declaration.kind == DECLARATION_KIND_COMPOUND_MEMBER); + ir_entity *irentity = entry->compound_member.entity; - assert(entity != NULL); + assert(irentity != NULL); - ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), compound_addr, entity); + ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), compound_addr, irentity); return sel; } @@ -2609,8 +2770,9 @@ static ir_node *select_to_firm(const select_expression_t *expression) (const expression_t*) expression); type = skip_typeref(type); - declaration_t *entry = expression->compound_entry; - type_t *entry_type = skip_typeref(entry->type); + entity_t *entry = expression->compound_entry; + assert(entry->kind == ENTITY_COMPOUND_MEMBER); + type_t *entry_type = skip_typeref(entry->declaration.type); if (entry_type->kind == TYPE_BITFIELD) { return bitfield_extract_to_firm(expression, addr); @@ -2726,7 +2888,7 @@ static ir_node *function_name_to_firm( case FUNCNAME_FUNCDNAME: if (current_function_name == NULL) { const source_position_t *const src_pos = &expr->base.source_position; - const char *const name = current_function_decl->symbol->string; + const char *name = current_function_entity->base.symbol->string; const string_t string = { name, strlen(name) + 1 }; current_function_name = string_to_firm(src_pos, "__func__.%u", &string); } @@ -2755,7 +2917,8 @@ static ir_node *statement_expression_to_firm(const statement_expression_t *expr) static ir_node *va_start_expression_to_firm( const va_start_expression_t *const expr) { - ir_type *const method_type = get_ir_type(current_function_decl->type); + type_t *const type = current_function_entity->declaration.type; + ir_type *const method_type = get_ir_type(type); int const n = get_method_n_params(method_type) - 1; ir_entity *const parm_ent = get_method_value_param_ent(method_type, n); ir_node *const arg_base = get_irg_value_param_base(current_ir_graph); @@ -2764,7 +2927,7 @@ static ir_node *va_start_expression_to_firm( ir_node *const arg_sel = new_d_simpleSel(dbgi, no_mem, arg_base, parm_ent); - ir_node *const cnst = get_type_size(expr->parameter->type); + ir_node *const cnst = get_type_size(expr->parameter->base.type); ir_node *const add = new_d_Add(dbgi, arg_sel, cnst, mode_P_data); set_value_for_expression(expr->ap, add); @@ -2840,6 +3003,47 @@ static ir_node *builtin_prefetch_to_firm( return NULL; } +static ir_node *get_label_block(label_t *label) +{ + if (label->block != NULL) + return label->block; + + /* beware: might be called from create initializer with current_ir_graph + * set to const_code_irg. */ + ir_graph *rem = current_ir_graph; + current_ir_graph = current_function; + + ir_node *old_cur_block = get_cur_block(); + ir_node *block = new_immBlock(); + set_cur_block(old_cur_block); + + label->block = block; + + ARR_APP1(label_t *, all_labels, label); + + current_ir_graph = rem; + return block; +} + +/** + * Pointer to a label. This is used for the + * GNU address-of-label extension. + */ +static ir_node *label_address_to_firm( + const label_address_expression_t *label) +{ + ir_node *block = get_label_block(label->label); + ir_label_t nr = get_Block_label(block); + + if (nr == 0) { + nr = get_irp_next_label_nr(); + set_Block_label(block, nr); + } + symconst_symbol value; + value.label = nr; + return new_SymConst(mode_P_code, value, symconst_label); +} + /** * creates firm nodes for an expression. The difference between this function * and expression_to_firm is, that this version might produce mode_b nodes @@ -2854,7 +3058,7 @@ static ir_node *_expression_to_firm(const expression_t *expression) } #endif - switch(expression->kind) { + switch (expression->kind) { case EXPR_CHARACTER_CONSTANT: return character_constant_to_firm(&expression->conste); case EXPR_WIDE_CHARACTER_CONSTANT: @@ -2867,6 +3071,8 @@ static ir_node *_expression_to_firm(const expression_t *expression) return wide_string_literal_to_firm(&expression->wide_string); case EXPR_REFERENCE: return reference_expression_to_firm(&expression->reference); + case EXPR_REFERENCE_ENUM_VALUE: + return reference_expression_enum_value_to_firm(&expression->reference); case EXPR_CALL: return call_expression_to_firm(&expression->call); EXPR_UNARY_CASES @@ -2903,6 +3109,8 @@ static ir_node *_expression_to_firm(const expression_t *expression) return offsetof_to_firm(&expression->offsetofe); case EXPR_COMPOUND_LITERAL: return compound_literal_to_firm(&expression->compound_literal); + case EXPR_LABEL_ADDRESS: + return label_address_to_firm(&expression->label_address); case EXPR_UNKNOWN: case EXPR_INVALID: @@ -2963,28 +3171,20 @@ static ir_node *expression_to_firm(const expression_t *expression) return produce_condition_result(expression, dbgi); } -static ir_node *expression_to_modeb(const expression_t *expression) -{ - ir_node *res = _expression_to_firm(expression); - res = create_conv(NULL, res, mode_b); - - return res; -} - /** * create a short-circuit expression evaluation that tries to construct * efficient control flow structures for &&, || and ! expressions */ -static void create_condition_evaluation(const expression_t *expression, - ir_node *true_block, - ir_node *false_block) +static ir_node *create_condition_evaluation(const expression_t *expression, + ir_node *true_block, + ir_node *false_block) { switch(expression->kind) { case EXPR_UNARY_NOT: { const unary_expression_t *unary_expression = &expression->unary; create_condition_evaluation(unary_expression->value, false_block, true_block); - return; + return NULL; } case EXPR_BINARY_LOGICAL_AND: { const binary_expression_t *binary_expression = &expression->binary; @@ -2998,7 +3198,7 @@ static void create_condition_evaluation(const expression_t *expression, set_cur_block(extra_block); create_condition_evaluation(binary_expression->right, true_block, false_block); - return; + return NULL; } case EXPR_BINARY_LOGICAL_OR: { const binary_expression_t *binary_expression = &expression->binary; @@ -3012,14 +3212,15 @@ static void create_condition_evaluation(const expression_t *expression, set_cur_block(extra_block); create_condition_evaluation(binary_expression->right, true_block, false_block); - return; + return NULL; } default: break; } dbg_info *dbgi = get_dbg_info(&expression->base.source_position); - ir_node *condition = expression_to_modeb(expression); + ir_node *cond_expr = _expression_to_firm(expression); + ir_node *condition = create_conv(dbgi, cond_expr, mode_b); ir_node *cond = new_d_Cond(dbgi, condition); ir_node *true_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_true); ir_node *false_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_false); @@ -3043,36 +3244,34 @@ static void create_condition_evaluation(const expression_t *expression, } set_cur_block(NULL); + return cond_expr; } - -static void create_declaration_entity(declaration_t *declaration, - declaration_kind_t declaration_kind, - ir_type *parent_type) +static void create_variable_entity(entity_t *variable, + declaration_kind_t declaration_kind, + ir_type *parent_type) { - type_t *const type = skip_typeref(declaration->type); - if (is_type_function(type)) { - (void) get_function_entity(declaration); - return; - } + assert(variable->kind == ENTITY_VARIABLE); + type_t *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); - ident *const id = new_id_from_str(declaration->symbol->string); - ir_type *const irtype = get_ir_type(type); - dbg_info *const dbgi = get_dbg_info(&declaration->source_position); - ir_entity *const entity = new_d_entity(parent_type, id, irtype, dbgi); + handle_gnu_attributes_ent(irentity, variable); - declaration->declaration_kind = (unsigned char) declaration_kind; - declaration->v.entity = entity; - set_entity_variability(entity, variability_uninitialized); - set_entity_ld_ident(entity, create_ld_ident(entity, declaration)); + 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(irentity, variable)); if (parent_type == get_tls_type()) - set_entity_allocation(entity, allocation_automatic); + set_entity_allocation(irentity, allocation_automatic); else if (declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE) - set_entity_allocation(entity, allocation_static); + set_entity_allocation(irentity, allocation_static); if (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) { - set_entity_volatility(entity, volatility_is_volatile); + set_entity_volatility(irentity, volatility_is_volatile); } } @@ -3082,7 +3281,7 @@ struct type_path_entry_t { type_t *type; ir_initializer_t *initializer; size_t index; - declaration_t *compound_entry; + entity_t *compound_entry; }; typedef struct type_path_t type_path_t; @@ -3096,14 +3295,14 @@ static __attribute__((unused)) void debug_print_type_path(const type_path_t *pat { size_t len = ARR_LEN(path->path); - for(size_t i = 0; i < len; ++i) { + for (size_t i = 0; i < len; ++i) { const type_path_entry_t *entry = & path->path[i]; type_t *type = skip_typeref(entry->type); if (is_type_compound(type)) { - fprintf(stderr, ".%s", entry->compound_entry->symbol->string); + fprintf(stderr, ".%s", entry->compound_entry->base.symbol->string); } else if (is_type_array(type)) { - fprintf(stderr, "[%zd]", entry->index); + fprintf(stderr, "[%zu]", entry->index); } else { fprintf(stderr, "-INVALID-"); } @@ -3130,17 +3329,16 @@ static type_path_entry_t *append_to_type_path(type_path_t *path) return result; } -static size_t get_compound_size(const compound_type_t *type) +static size_t get_compound_member_count(const compound_type_t *type) { - declaration_t *declaration = type->declaration; - declaration_t *member = declaration->scope.declarations; - size_t size = 0; - for( ; member != NULL; member = member->next) { - ++size; + compound_t *compound = type->compound; + size_t n_members = 0; + entity_t *member = compound->members.entities; + for ( ; member != NULL; member = member->base.next) { + ++n_members; } - /* TODO: cache results? */ - return size; + return n_members; } static ir_initializer_t *get_initializer_entry(type_path_t *path) @@ -3174,14 +3372,16 @@ static void descend_into_subtype(type_path_t *path) size_t len; if (is_type_compound(top_type)) { - declaration_t *declaration = top_type->compound.declaration; - declaration_t *entry = declaration->scope.declarations; + compound_t *compound = top_type->compound.compound; + entity_t *entry = compound->members.entities; top->compound_entry = entry; top->index = 0; - len = get_compound_size(&top_type->compound); - if (entry != NULL) - path->top_type = entry->type; + len = get_compound_member_count(&top_type->compound); + if (entry != NULL) { + assert(entry->kind == ENTITY_COMPOUND_MEMBER); + path->top_type = entry->declaration.type; + } } else { assert(is_type_array(top_type)); assert(top_type->array.size > 0); @@ -3221,7 +3421,7 @@ static void walk_designator(type_path_t *path, const designator_t *designator) /* designators start at current object type */ ARR_RESIZE(type_path_entry_t, path->path, 1); - for( ; designator != NULL; designator = designator->next) { + for ( ; designator != NULL; designator = designator->next) { type_path_entry_t *top = get_type_path_top(path); type_t *orig_type = top->type; type_t *type = skip_typeref(orig_type); @@ -3231,10 +3431,11 @@ static void walk_designator(type_path_t *path, const designator_t *designator) size_t index = 0; symbol_t *symbol = designator->symbol; - declaration_t *declaration = type->compound.declaration; - declaration_t *iter = declaration->scope.declarations; - for( ; iter != NULL; iter = iter->next, ++index) { - if (iter->symbol == symbol) { + compound_t *compound = type->compound.compound; + entity_t *iter = compound->members.entities; + for ( ; iter != NULL; iter = iter->base.next, ++index) { + if (iter->base.symbol == symbol) { + assert(iter->kind == ENTITY_COMPOUND_MEMBER); break; } } @@ -3243,17 +3444,16 @@ static void walk_designator(type_path_t *path, const designator_t *designator) top->type = orig_type; top->compound_entry = iter; top->index = index; - orig_type = iter->type; + orig_type = iter->declaration.type; } else { expression_t *array_index = designator->array_index; assert(designator->array_index != NULL); assert(is_type_array(type)); - assert(is_type_valid(array_index->base.type)); long index = fold_constant(array_index); assert(index >= 0); #ifndef NDEBUG - if (type->array.size_constant == 1) { + if (type->array.size_constant) { long array_size = type->array.size; assert(index < array_size); } @@ -3287,13 +3487,14 @@ static void advance_current_object(type_path_t *path) if (is_type_union(type)) { top->compound_entry = NULL; } else if (is_type_struct(type)) { - declaration_t *entry = top->compound_entry; + entity_t *entry = top->compound_entry; top->index++; - entry = entry->next; + entry = entry->base.next; top->compound_entry = entry; if (entry != NULL) { - path->top_type = entry->type; + assert(entry->kind == ENTITY_COMPOUND_MEMBER); + path->top_type = entry->declaration.type; return; } } else { @@ -3341,7 +3542,7 @@ static ir_initializer_t *create_ir_initializer_list( descend_into_subtype(&path); - for(size_t i = 0; i < initializer->len; ++i) { + for (size_t i = 0; i < initializer->len; ++i) { const initializer_t *sub_initializer = initializer->initializers[i]; if (sub_initializer->kind == INITIALIZER_DESIGNATOR) { @@ -3388,14 +3589,15 @@ static ir_initializer_t *create_ir_initializer_string( type = skip_typeref(type); size_t string_len = initializer->string.size; - assert(type->kind == TYPE_ARRAY && type->array.size_constant); + assert(type->kind == TYPE_ARRAY); + assert(type->array.size_constant); size_t len = type->array.size; ir_initializer_t *irinitializer = create_initializer_compound(len); const char *string = initializer->string.begin; - ir_mode *mode = get_type_mode(ir_type_const_char); + ir_mode *mode = get_ir_mode(type->array.element_type); - for(size_t i = 0; i < len; ++i) { + for (size_t i = 0; i < len; ++i) { char c = 0; if (i < string_len) c = string[i]; @@ -3413,14 +3615,15 @@ static ir_initializer_t *create_ir_initializer_wide_string( const initializer_wide_string_t *initializer, type_t *type) { size_t string_len = initializer->string.size; - assert(type->kind == TYPE_ARRAY && type->array.size_constant); + assert(type->kind == TYPE_ARRAY); + assert(type->array.size_constant); size_t len = type->array.size; ir_initializer_t *irinitializer = create_initializer_compound(len); const wchar_rep_t *string = initializer->string.begin; ir_mode *mode = get_type_mode(ir_type_wchar_t); - for(size_t i = 0; i < len; ++i) { + for (size_t i = 0; i < len; ++i) { wchar_rep_t c = 0; if (i < string_len) { c = string[i]; @@ -3481,7 +3684,7 @@ static void create_dynamic_null_initializer(ir_type *type, dbg_info *dbgi, n_members = get_compound_n_members(type); } - for(int i = 0; i < n_members; ++i) { + for (int i = 0; i < n_members; ++i) { ir_node *addr; ir_type *irtype; if (is_Array_type(type)) { @@ -3504,7 +3707,7 @@ static void create_dynamic_null_initializer(ir_type *type, dbg_info *dbgi, } static void create_dynamic_initializer_sub(ir_initializer_t *initializer, - ir_type *type, dbg_info *dbgi, ir_node *base_addr) + ir_entity *entity, ir_type *type, dbg_info *dbgi, ir_node *base_addr) { switch(get_initializer_kind(initializer)) { case IR_INITIALIZER_NULL: { @@ -3512,11 +3715,18 @@ static void create_dynamic_initializer_sub(ir_initializer_t *initializer, return; } case IR_INITIALIZER_CONST: { - ir_node *node = get_initializer_const_value(initializer); - ir_mode *mode = get_irn_mode(node); - assert(get_type_mode(type) == mode); + ir_node *node = get_initializer_const_value(initializer); + ir_mode *mode = get_irn_mode(node); + ir_type *ent_type = get_entity_type(entity); + + /* is it a bitfield type? */ + if (is_Primitive_type(ent_type) && + get_primitive_base_type(ent_type) != NULL) { + bitfield_store_to_firm(dbgi, entity, base_addr, node, false); + return; + } - /* TODO: bitfields... */ + assert(get_type_mode(type) == mode); ir_node *mem = get_store(); ir_node *store = new_d_Store(dbgi, mem, base_addr, node); ir_node *proj_m = new_Proj(store, mode_M, pn_Store_M); @@ -3524,12 +3734,19 @@ static void create_dynamic_initializer_sub(ir_initializer_t *initializer, return; } case IR_INITIALIZER_TARVAL: { - tarval *tv = get_initializer_tarval_value(initializer); - ir_mode *mode = get_tarval_mode(tv); - ir_node *cnst = new_d_Const(dbgi, mode, tv); - assert(get_type_mode(type) == mode); + tarval *tv = get_initializer_tarval_value(initializer); + ir_mode *mode = get_tarval_mode(tv); + ir_node *cnst = new_d_Const(dbgi, mode, tv); + ir_type *ent_type = get_entity_type(entity); + + /* is it a bitfield type? */ + if (is_Primitive_type(ent_type) && + get_primitive_base_type(ent_type) != NULL) { + bitfield_store_to_firm(dbgi, entity, base_addr, cnst, false); + return; + } - /* TODO: bitfields... */ + assert(get_type_mode(type) == mode); 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); @@ -3550,27 +3767,30 @@ static void create_dynamic_initializer_sub(ir_initializer_t *initializer, != (unsigned) n_members) panic("initializer doesn't match compound type"); - for(int i = 0; i < n_members; ++i) { - ir_node *addr; - ir_type *irtype; + for (int i = 0; i < n_members; ++i) { + ir_node *addr; + ir_type *irtype; + ir_entity *sub_entity; if (is_Array_type(type)) { - ir_entity *entity = get_array_element_entity(type); tarval *index_tv = new_tarval_from_long(i, mode_uint); ir_node *cnst = new_d_Const(dbgi, mode_uint, index_tv); ir_node *in[1] = { cnst }; - irtype = get_array_element_type(type); - addr = new_d_Sel(dbgi, new_NoMem(), base_addr, 1, in, entity); + irtype = get_array_element_type(type); + sub_entity = get_array_element_entity(type); + addr = new_d_Sel(dbgi, new_NoMem(), base_addr, 1, in, + sub_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); + sub_entity = get_compound_member(type, i); + irtype = get_entity_type(sub_entity); + addr = new_d_simpleSel(dbgi, new_NoMem(), base_addr, + sub_entity); } ir_initializer_t *sub_init = get_initializer_compound_value(initializer, i); - create_dynamic_initializer_sub(sub_init, irtype, dbgi, addr); + create_dynamic_initializer_sub(sub_init, sub_entity, irtype, dbgi, + addr); } return; } @@ -3586,7 +3806,7 @@ static void create_dynamic_initializer(ir_initializer_t *initializer, ir_node *base_addr = new_d_simpleSel(dbgi, new_NoMem(), frame, entity); ir_type *type = get_entity_type(entity); - create_dynamic_initializer_sub(initializer, type, dbgi, base_addr); + create_dynamic_initializer_sub(initializer, entity, type, dbgi, base_addr); } static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi, @@ -3643,98 +3863,121 @@ static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi, set_store(copyb_mem); } -static void create_initializer_local_variable_entity(declaration_t *declaration) +static void create_initializer_local_variable_entity(entity_t *entity) { - initializer_t *initializer = declaration->init.initializer; - dbg_info *dbgi = get_dbg_info(&declaration->source_position); - ir_entity *entity = declaration->v.entity; - type_t *type = declaration->type; - create_local_initializer(initializer, dbgi, entity, type); + assert(entity->kind == ENTITY_VARIABLE); + initializer_t *initializer = entity->variable.initializer; + dbg_info *dbgi = get_dbg_info(&entity->base.source_position); + ir_entity *irentity = entity->variable.v.entity; + type_t *type = entity->declaration.type; + create_local_initializer(initializer, dbgi, irentity, type); } -static void create_declaration_initializer(declaration_t *declaration) +static void create_variable_initializer(entity_t *entity) { - initializer_t *initializer = declaration->init.initializer; + assert(entity->kind == ENTITY_VARIABLE); + initializer_t *initializer = entity->variable.initializer; if (initializer == NULL) return; declaration_kind_t declaration_kind - = (declaration_kind_t) declaration->declaration_kind; + = (declaration_kind_t) entity->declaration.kind; if (declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE_ENTITY) { - create_initializer_local_variable_entity(declaration); + create_initializer_local_variable_entity(entity); return; } + type_t *type = entity->declaration.type; + type_qualifiers_t tq = get_type_qualifier(type, true); + if (initializer->kind == INITIALIZER_VALUE) { initializer_value_t *initializer_value = &initializer->value; - dbg_info *dbgi - = get_dbg_info(&declaration->source_position); + dbg_info *dbgi = get_dbg_info(&entity->base.source_position); ir_node *value = expression_to_firm(initializer_value->value); value = do_strict_conv(dbgi, value); if (declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE) { - set_value(declaration->v.value_number, value); + set_value(entity->variable.v.value_number, value); } else { assert(declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE); - ir_entity *entity = declaration->v.entity; + ir_entity *irentity = entity->variable.v.entity; - set_entity_variability(entity, variability_initialized); - set_atomic_ent_value(entity, value); + if (tq & TYPE_QUALIFIER_CONST) { + set_entity_variability(irentity, variability_constant); + } else { + set_entity_variability(irentity, variability_initialized); + } + set_atomic_ent_value(irentity, value); } } else { - assert(declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE_ENTITY - || declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE); + assert(declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE_ENTITY || + declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE); - ir_entity *entity = declaration->v.entity; + ir_entity *irentity = entity->variable.v.entity; ir_initializer_t *irinitializer - = create_ir_initializer(initializer, declaration->type); + = create_ir_initializer(initializer, type); - set_entity_variability(entity, variability_initialized); - set_entity_initializer(entity, irinitializer); + if (tq & TYPE_QUALIFIER_CONST) { + set_entity_variability(irentity, variability_constant); + } else { + set_entity_variability(irentity, variability_initialized); + } + set_entity_initializer(irentity, irinitializer); } } -static void create_variable_length_array(declaration_t *declaration) +static void create_variable_length_array(entity_t *entity) +{ + assert(entity->kind == ENTITY_VARIABLE); + assert(entity->variable.initializer == NULL); + + entity->declaration.kind = DECLARATION_KIND_VARIABLE_LENGTH_ARRAY; + entity->variable.v.vla_base = NULL; + + /* TODO: record VLA somewhere so we create the free node when we leave + * it's scope */ +} + +static void allocate_variable_length_array(entity_t *entity) { - dbg_info *dbgi = get_dbg_info(&declaration->source_position); - type_t *type = declaration->type; - ir_node *mem = get_store(); + assert(entity->kind == ENTITY_VARIABLE); + assert(entity->variable.initializer == NULL); + assert(get_cur_block() != NULL); + + dbg_info *dbgi = get_dbg_info(&entity->base.source_position); + type_t *type = entity->declaration.type; ir_type *el_type = get_ir_type(type->array.element_type); /* make sure size_node is calculated */ get_type_size(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); ir_node *proj_m = new_d_Proj(dbgi, alloc, mode_M, pn_Alloc_M); ir_node *addr = new_d_Proj(dbgi, alloc, mode_P_data, pn_Alloc_res); set_store(proj_m); - /* initializers are not allowed for VLAs */ - assert(declaration->init.initializer == NULL); - - declaration->declaration_kind = DECLARATION_KIND_VARIABLE_LENGTH_ARRAY; - declaration->v.vla_base = addr; - - /* TODO: record VLA somewhere so we create the free node when we leave - * it's scope */ + assert(entity->declaration.kind == DECLARATION_KIND_VARIABLE_LENGTH_ARRAY); + entity->variable.v.vla_base = addr; } /** * Creates a Firm local variable from a declaration. */ -static void create_local_variable(declaration_t *declaration) +static void create_local_variable(entity_t *entity) { - assert(declaration->declaration_kind == DECLARATION_KIND_UNKNOWN); + assert(entity->kind == ENTITY_VARIABLE); + assert(entity->declaration.kind == DECLARATION_KIND_UNKNOWN); - bool needs_entity = declaration->address_taken; - type_t *type = skip_typeref(declaration->type); + bool needs_entity = entity->variable.address_taken; + type_t *type = skip_typeref(entity->declaration.type); /* is it a variable length array? */ if (is_type_array(type) && !type->array.size_constant) { - create_variable_length_array(declaration); + create_variable_length_array(entity); return; } else if (is_type_array(type) || is_type_compound(type)) { needs_entity = true; @@ -3744,48 +3987,50 @@ static void create_local_variable(declaration_t *declaration) if (needs_entity) { ir_type *frame_type = get_irg_frame_type(current_ir_graph); - create_declaration_entity(declaration, - DECLARATION_KIND_LOCAL_VARIABLE_ENTITY, - frame_type); + create_variable_entity(entity, + DECLARATION_KIND_LOCAL_VARIABLE_ENTITY, + frame_type); } else { - declaration->declaration_kind = DECLARATION_KIND_LOCAL_VARIABLE; - declaration->v.value_number = next_value_number_function; - set_irg_loc_description(current_ir_graph, next_value_number_function, declaration); + entity->declaration.kind = DECLARATION_KIND_LOCAL_VARIABLE; + entity->variable.v.value_number = next_value_number_function; + set_irg_loc_description(current_ir_graph, next_value_number_function, + (variable_t*) &entity->variable); ++next_value_number_function; } } -static void create_local_static_variable(declaration_t *declaration) +static void create_local_static_variable(entity_t *entity) { - assert(declaration->declaration_kind == DECLARATION_KIND_UNKNOWN); + assert(entity->kind == ENTITY_VARIABLE); + assert(entity->declaration.kind == DECLARATION_KIND_UNKNOWN); - type_t *const type = skip_typeref(declaration->type); + type_t *const type = skip_typeref(entity->declaration.type); ir_type *const global_type = get_glob_type(); ir_type *const irtype = get_ir_type(type); - dbg_info *const dbgi = get_dbg_info(&declaration->source_position); + dbg_info *const dbgi = get_dbg_info(&entity->base.source_position); - size_t l = strlen(declaration->symbol->string); + size_t l = strlen(entity->base.symbol->string); char buf[l + sizeof(".%u")]; - snprintf(buf, sizeof(buf), "%s.%%u", declaration->symbol->string); + snprintf(buf, sizeof(buf), "%s.%%u", entity->base.symbol->string); ident *const id = id_unique(buf); - ir_entity *const entity = new_d_entity(global_type, id, irtype, dbgi); + ir_entity *const irentity = new_d_entity(global_type, id, irtype, dbgi); if (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) { - set_entity_volatility(entity, volatility_is_volatile); + set_entity_volatility(irentity, volatility_is_volatile); } - declaration->declaration_kind = DECLARATION_KIND_GLOBAL_VARIABLE; - declaration->v.entity = entity; - set_entity_ld_ident(entity, create_ld_ident(entity, declaration)); - set_entity_variability(entity, variability_uninitialized); - set_entity_visibility(entity, visibility_local); - set_entity_allocation(entity, allocation_static); + entity->declaration.kind = DECLARATION_KIND_GLOBAL_VARIABLE; + entity->variable.v.entity = irentity; + set_entity_ld_ident(irentity, create_ld_ident(irentity, entity)); + set_entity_variability(irentity, variability_uninitialized); + set_entity_visibility(irentity, visibility_local); + set_entity_allocation(irentity, allocation_static); ir_graph *const old_current_ir_graph = current_ir_graph; current_ir_graph = get_const_code_irg(); - create_declaration_initializer(declaration); + create_variable_initializer(entity); assert(current_ir_graph == get_const_code_irg()); current_ir_graph = old_current_ir_graph; @@ -3799,7 +4044,8 @@ static void return_statement_to_firm(return_statement_t *statement) return; dbg_info *dbgi = get_dbg_info(&statement->base.source_position); - ir_type *func_irtype = get_ir_type(current_function_decl->type); + type_t *type = current_function_entity->declaration.type; + ir_type *func_irtype = get_ir_type(type); ir_node *in[1]; @@ -3848,14 +4094,17 @@ static ir_node *expression_statement_to_firm(expression_statement_t *statement) static ir_node *compound_statement_to_firm(compound_statement_t *compound) { - declaration_t *declaration = compound->scope.declarations; - for( ; declaration != NULL; declaration = declaration->next) { - create_local_declaration(declaration); + entity_t *entity = compound->scope.entities; + for ( ; entity != NULL; entity = entity->base.next) { + if (!is_declaration(entity)) + continue; + + create_local_declaration(entity); } ir_node *result = NULL; statement_t *statement = compound->statements; - for( ; statement != NULL; statement = statement->base.next) { + for ( ; statement != NULL; statement = statement->base.next) { if (statement->base.next == NULL && statement->kind == STATEMENT_EXPRESSION) { result = expression_statement_to_firm( @@ -3868,11 +4117,13 @@ static ir_node *compound_statement_to_firm(compound_statement_t *compound) return result; } -static void create_global_variable(declaration_t *declaration) +static void create_global_variable(entity_t *entity) { + assert(entity->kind == ENTITY_VARIABLE); + ir_visibility vis; ir_type *var_type; - switch ((storage_class_tag_t)declaration->storage_class) { + switch ((storage_class_tag_t) entity->declaration.storage_class) { case STORAGE_CLASS_STATIC: vis = visibility_local; goto global_var; @@ -3906,64 +4157,68 @@ global_var: goto create_var; create_var: - create_declaration_entity(declaration, - DECLARATION_KIND_GLOBAL_VARIABLE, - var_type); - if (!is_type_function(skip_typeref(declaration->type))) { + create_variable_entity(entity, + DECLARATION_KIND_GLOBAL_VARIABLE, + var_type); + /* Matze: I'm confused, shouldn't we only be here when creating + * variables? */ +#if 0 + if (!is_type_function(skip_typeref(entity->declaration.type))) { set_entity_visibility(declaration->v.entity, vis); } +#else + set_entity_visibility(entity->variable.v.entity, vis); +#endif return; case STORAGE_CLASS_TYPEDEF: case STORAGE_CLASS_AUTO: case STORAGE_CLASS_REGISTER: - case STORAGE_CLASS_ENUM_ENTRY: break; } panic("Invalid storage class for global variable"); } -static void create_local_declaration(declaration_t *declaration) +static void create_local_declaration(entity_t *entity) { - if (declaration->namespc != NAMESPACE_NORMAL) - return; + assert(is_declaration(entity)); + /* construct type */ - (void) get_ir_type(declaration->type); - if (declaration->symbol == NULL) { + (void) get_ir_type(entity->declaration.type); + if (entity->base.symbol == NULL) { return; } - type_t *type = skip_typeref(declaration->type); - - switch ((storage_class_tag_t) declaration->storage_class) { + switch ((storage_class_tag_t) entity->declaration.storage_class) { case STORAGE_CLASS_STATIC: - create_local_static_variable(declaration); + create_local_static_variable(entity); return; case STORAGE_CLASS_EXTERN: - create_global_variable(declaration); - create_declaration_initializer(declaration); + if (entity->kind == ENTITY_FUNCTION) { + assert(entity->function.statement == NULL); + get_function_entity(entity); + } else { + create_global_variable(entity); + create_variable_initializer(entity); + } return; case STORAGE_CLASS_NONE: case STORAGE_CLASS_AUTO: case STORAGE_CLASS_REGISTER: - if (is_type_function(type)) { - if (declaration->init.statement != NULL) { - panic("nested functions not supported yet"); + if (entity->kind == ENTITY_FUNCTION) { + if (entity->function.statement != NULL) { + get_function_entity(entity); + entity->declaration.kind = DECLARATION_KIND_INNER_FUNCTION; + enqueue_inner_function(entity); } else { - get_function_entity(declaration); + get_function_entity(entity); } } else { - create_local_variable(declaration); + create_local_variable(entity); } return; - case STORAGE_CLASS_ENUM_ENTRY: - /* should already be handled */ - assert(declaration->declaration_kind == DECLARATION_KIND_ENUM_ENTRY); - return; case STORAGE_CLASS_TYPEDEF: - declaration->declaration_kind = DECLARATION_KIND_TYPE; - return; case STORAGE_CLASS_THREAD: case STORAGE_CLASS_THREAD_EXTERN: case STORAGE_CLASS_THREAD_STATIC: @@ -3972,42 +4227,41 @@ static void create_local_declaration(declaration_t *declaration) panic("invalid storage class found"); } -static void initialize_local_declaration(declaration_t *declaration) +static void initialize_local_declaration(entity_t *entity) { - if (declaration->symbol == NULL || declaration->namespc != NAMESPACE_NORMAL) + if (entity->base.symbol == NULL) return; - switch ((declaration_kind_t) declaration->declaration_kind) { + switch ((declaration_kind_t) entity->declaration.kind) { case DECLARATION_KIND_LOCAL_VARIABLE: case DECLARATION_KIND_LOCAL_VARIABLE_ENTITY: - create_declaration_initializer(declaration); + create_variable_initializer(entity); + return; + + case DECLARATION_KIND_VARIABLE_LENGTH_ARRAY: + allocate_variable_length_array(entity); return; - case DECLARATION_KIND_LABEL_BLOCK: case DECLARATION_KIND_COMPOUND_MEMBER: case DECLARATION_KIND_GLOBAL_VARIABLE: - case DECLARATION_KIND_VARIABLE_LENGTH_ARRAY: - case DECLARATION_KIND_COMPOUND_TYPE_INCOMPLETE: - case DECLARATION_KIND_COMPOUND_TYPE_COMPLETE: case DECLARATION_KIND_FUNCTION: - case DECLARATION_KIND_TYPE: - case DECLARATION_KIND_ENUM_ENTRY: + case DECLARATION_KIND_INNER_FUNCTION: return; case DECLARATION_KIND_UNKNOWN: - panic("can't initialize unknwon declaration"); + panic("can't initialize unknown declaration"); } panic("invalid declaration kind"); } static void declaration_statement_to_firm(declaration_statement_t *statement) { - declaration_t *declaration = statement->declarations_begin; - declaration_t *end = statement->declarations_end->next; - for( ; declaration != end; declaration = declaration->next) { - if (declaration->namespc != NAMESPACE_NORMAL) + entity_t *entity = statement->declarations_begin; + entity_t *end = statement->declarations_end->base.next; + for ( ; entity != end; entity = entity->base.next) { + if (!is_declaration(entity)) continue; - initialize_local_declaration(declaration); + initialize_local_declaration(entity); } } @@ -4061,7 +4315,7 @@ static void if_statement_to_firm(if_statement_t *statement) } mature_immBlock(true_block); - if (false_block != fallthrough_block) { + if (false_block != fallthrough_block && false_block != NULL) { mature_immBlock(false_block); } if (fallthrough_block != NULL) { @@ -4111,6 +4365,8 @@ static void while_statement_to_firm(while_statement_t *statement) add_immBlock_pred(body_block, header_jmp); keep_alive(body_block); + keep_all_memory(body_block); + set_cur_block(body_block); } else { if (false_block == NULL) { false_block = new_immBlock(); @@ -4188,16 +4444,23 @@ static void for_statement_to_firm(for_statement_t *statement) ir_node *jmp = NULL; /* create declarations */ - declaration_t *declaration = statement->scope.declarations; - for( ; declaration != NULL; declaration = declaration->next) { - create_local_declaration(declaration); - } - declaration = statement->scope.declarations; - for( ; declaration != NULL; declaration = declaration->next) { - initialize_local_declaration(declaration); + entity_t *entity = statement->scope.entities; + for ( ; entity != NULL; entity = entity->base.next) { + if (!is_declaration(entity)) + continue; + + create_local_declaration(entity); } if (get_cur_block() != NULL) { + entity = statement->scope.entities; + for ( ; entity != NULL; entity = entity->base.next) { + if (!is_declaration(entity)) + continue; + + initialize_local_declaration(entity); + } + if (statement->initialisation != NULL) { expression_to_firm(statement->initialisation); } @@ -4254,6 +4517,7 @@ static void for_statement_to_firm(for_statement_t *statement) false_block); } else { keep_alive(header_block); + keep_all_memory(header_block); jmp = new_Jmp(); add_immBlock_pred(body_block, jmp); } @@ -4290,7 +4554,7 @@ static ir_node *get_break_label(void) return break_label; } -static void switch_statement_to_firm(const switch_statement_t *statement) +static void switch_statement_to_firm(switch_statement_t *statement) { dbg_info *dbgi = get_dbg_info(&statement->base.source_position); @@ -4305,6 +4569,61 @@ static void switch_statement_to_firm(const switch_statement_t *statement) saw_default_label = false; current_switch_cond = cond; break_label = NULL; + switch_statement_t *const old_switch = current_switch; + current_switch = statement; + + /* determine a free number for the default label */ + unsigned long num_cases = 0; + long def_nr = 0; + for (case_label_statement_t *l = statement->first_case; l != NULL; l = l->next) { + if (l->expression == NULL) { + /* default case */ + continue; + } + if (l->last_case >= l->first_case) + num_cases += l->last_case - l->first_case + 1; + if (l->last_case > def_nr) + def_nr = l->last_case; + } + + if (def_nr == INT_MAX) { + /* Bad: an overflow will occurr, we cannot be sure that the + * maximum + 1 is a free number. Scan the values a second + * time to find a free number. + */ + unsigned char *bits = xmalloc((num_cases + 7) >> 3); + + memset(bits, 0, (num_cases + 7) >> 3); + for (case_label_statement_t *l = statement->first_case; l != NULL; l = l->next) { + if (l->expression == NULL) { + /* default case */ + continue; + } + unsigned long start = l->first_case > 0 ? (unsigned long)l->first_case : 0; + if (start < num_cases && l->last_case >= 0) { + unsigned long end = (unsigned long)l->last_case < num_cases ? + (unsigned long)l->last_case : num_cases - 1; + for (unsigned long cns = start; cns <= end; ++cns) { + bits[cns >> 3] |= (1 << (cns & 7)); + } + } + } + /* We look at the first num_cases constants: + * Either they are densed, so we took the last (num_cases) + * one, or they are non densed, so we will find one free + * there... + */ + unsigned long i; + for (i = 0; i < num_cases; ++i) + if ((bits[i >> 3] & (1 << (i & 7))) == 0) + break; + + free(bits); + def_nr = i; + } else { + ++def_nr; + } + statement->default_proj_nr = def_nr; if (statement->body != NULL) { statement_to_firm(statement->body); @@ -4318,7 +4637,7 @@ static void switch_statement_to_firm(const switch_statement_t *statement) if (!saw_default_label) { set_cur_block(get_nodes_block(cond)); ir_node *const proj = new_d_defaultProj(dbgi, cond, - MAGIC_DEFAULT_PN_NUMBER); + statement->default_proj_nr); add_immBlock_pred(get_break_label(), proj); } @@ -4328,6 +4647,7 @@ static void switch_statement_to_firm(const switch_statement_t *statement) set_cur_block(break_label); assert(current_switch_cond == cond); + current_switch = old_switch; current_switch_cond = old_switch_cond; break_label = old_break_label; saw_default_label = old_saw_default_label; @@ -4335,37 +4655,31 @@ static void switch_statement_to_firm(const switch_statement_t *statement) static void case_label_to_firm(const case_label_statement_t *statement) { + if (statement->is_empty_range) + return; + dbg_info *dbgi = get_dbg_info(&statement->base.source_position); ir_node *const fallthrough = (get_cur_block() == NULL ? NULL : new_Jmp()); - /* let's create a node and hope firm constant folding creates a Const - * node... */ ir_node *proj; ir_node *old_block = get_nodes_block(current_switch_cond); ir_node *block = new_immBlock(); set_cur_block(old_block); if (statement->expression != NULL) { - long start_pn = fold_constant(statement->expression); - long end_pn = start_pn; - if (statement->end_range != NULL) { - end_pn = fold_constant(statement->end_range); - } - assert(start_pn <= end_pn); + long pn = statement->first_case; + long end_pn = statement->last_case; + assert(pn <= end_pn); /* create jumps for all cases in the given range */ - for (long pn = start_pn; pn <= end_pn; ++pn) { - if (pn == MAGIC_DEFAULT_PN_NUMBER) { - /* oops someone detected our cheating... */ - panic("magic default pn used"); - } + do { proj = new_d_Proj(dbgi, current_switch_cond, mode_X, pn); add_immBlock_pred(block, proj); - } + } while(pn++ < end_pn); } else { saw_default_label = true; proj = new_d_defaultProj(dbgi, current_switch_cond, - MAGIC_DEFAULT_PN_NUMBER); + current_switch->default_proj_nr); add_immBlock_pred(block, proj); } @@ -4381,27 +4695,6 @@ static void case_label_to_firm(const case_label_statement_t *statement) } } -static ir_node *get_label_block(declaration_t *label) -{ - assert(label->namespc == NAMESPACE_LABEL); - - if (label->declaration_kind == DECLARATION_KIND_LABEL_BLOCK) { - return label->v.block; - } - assert(label->declaration_kind == DECLARATION_KIND_UNKNOWN); - - ir_node *old_cur_block = get_cur_block(); - ir_node *block = new_immBlock(); - set_cur_block(old_cur_block); - - label->declaration_kind = DECLARATION_KIND_LABEL_BLOCK; - label->v.block = block; - - ARR_APP1(ir_node *, imature_blocks, block); - - return block; -} - static void label_to_firm(const label_statement_t *statement) { ir_node *block = get_label_block(statement->label); @@ -4413,6 +4706,7 @@ static void label_to_firm(const label_statement_t *statement) set_cur_block(block); keep_alive(block); + keep_all_memory(block); if (statement->statement != NULL) { statement_to_firm(statement->statement); @@ -4424,36 +4718,46 @@ static void goto_to_firm(const goto_statement_t *statement) if (get_cur_block() == NULL) return; - ir_node *block = get_label_block(statement->label); - ir_node *jmp = new_Jmp(); - add_immBlock_pred(block, jmp); + if (statement->expression) { + ir_node *irn = expression_to_firm(statement->expression); + dbg_info *dbgi = get_dbg_info(&statement->base.source_position); + ir_node *ijmp = new_d_IJmp(dbgi, irn); + set_irn_link(ijmp, ijmp_list); + ijmp_list = ijmp; + } else { + ir_node *block = get_label_block(statement->label); + ir_node *jmp = new_Jmp(); + add_immBlock_pred(block, jmp); + } set_cur_block(NULL); } -typedef enum modifier_t { - ASM_MODIFIER_WRITE_ONLY = 1 << 0, - ASM_MODIFIER_READ_WRITE = 1 << 1, - ASM_MODIFIER_COMMUTATIVE = 1 << 2, - ASM_MODIFIER_EARLYCLOBBER = 1 << 3, -} modifier_t; - static void asm_statement_to_firm(const asm_statement_t *statement) { - (void) statement; - fprintf(stderr, "WARNING asm not implemented yet!\n"); -#if 0 bool needs_memory = false; + if (statement->is_volatile) { + needs_memory = true; + } + size_t n_clobbers = 0; asm_clobber_t *clobber = statement->clobbers; - for( ; clobber != NULL; clobber = clobber->next) { - if (strcmp(clobber->clobber, "memory") == 0) { + for ( ; clobber != NULL; clobber = clobber->next) { + const char *clobber_str = clobber->clobber.begin; + + if (!be_is_valid_clobber(clobber_str)) { + errorf(&statement->base.source_position, + "invalid clobber '%s' specified", clobber->clobber); + continue; + } + + if (strcmp(clobber_str, "memory") == 0) { needs_memory = true; continue; } - ident *id = new_id_from_str(clobber->clobber); + ident *id = new_id_from_str(clobber_str); obstack_ptr_grow(&asm_obst, id); ++n_clobbers; } @@ -4463,68 +4767,214 @@ static void asm_statement_to_firm(const asm_statement_t *statement) clobbers = obstack_finish(&asm_obst); } - /* find and count input and output constraints */ - asm_constraint_t *constraint = statement->inputs; - for( ; constraint != NULL; constraint = constraint->next) { - int modifiers = 0; - bool supports_memop = false; - for(const char *c = constraint->constraints; *c != 0; ++c) { - /* TODO: improve error messages */ - switch(*c) { - case '?': - case '!': - panic("multiple alternative assembler constraints not " - "supported"); - case 'm': - case 'o': - case 'V': - case '<': - case '>': - case 'X': - supports_memop = true; - obstack_1grow(&asm_obst, *c); - break; - case '=': - if (modifiers & ASM_MODIFIER_READ_WRITE) - panic("inconsistent register constraints"); - modifiers |= ASM_MODIFIER_WRITE_ONLY; - break; - case '+': - if (modifiers & ASM_MODIFIER_WRITE_ONLY) - panic("inconsistent register constraints"); - modifiers |= ASM_MODIFIER_READ_WRITE; - break; - case '&': - modifiers |= ASM_MODIFIER_EARLYCLOBBER; - panic("early clobber assembler constraint not supported yet"); - break; - case '%': - modifiers |= ASM_MODIFIER_COMMUTATIVE; - panic("commutative assembler constraint not supported yet"); - break; - case '#': - /* skip register preferences stuff... */ - while(*c != 0 && *c != ',') - ++c; - break; - case '*': - /* skip register preferences stuff... */ - ++c; - break; - default: - obstack_1grow(&asm_obst, *c); - break; + size_t n_inputs = 0; + asm_argument_t *argument = statement->inputs; + for ( ; argument != NULL; argument = argument->next) + n_inputs++; + size_t n_outputs = 0; + argument = statement->outputs; + for ( ; argument != NULL; argument = argument->next) + n_outputs++; + + unsigned next_pos = 0; + + ir_node *ins[n_inputs + n_outputs + 1]; + size_t in_size = 0; + + ir_asm_constraint tmp_in_constraints[n_outputs]; + + const expression_t *out_exprs[n_outputs]; + ir_node *out_addrs[n_outputs]; + size_t out_size = 0; + + argument = statement->outputs; + for ( ; argument != NULL; argument = argument->next) { + const char *constraints = argument->constraints.begin; + asm_constraint_flags_t asm_flags + = be_parse_asm_constraints(constraints); + + if (asm_flags & ASM_CONSTRAINT_FLAG_NO_SUPPORT) { + errorf(&statement->base.source_position, + "some constraints in '%s' are not supported", constraints); + continue; + } + if (asm_flags & ASM_CONSTRAINT_FLAG_INVALID) { + errorf(&statement->base.source_position, + "some constraints in '%s' are invalid", constraints); + continue; + } + if (! (asm_flags & ASM_CONSTRAINT_FLAG_MODIFIER_WRITE)) { + errorf(&statement->base.source_position, + "no write flag specified for output constraints '%s'", + constraints); + continue; + } + + unsigned pos = next_pos++; + if ( (asm_flags & ASM_CONSTRAINT_FLAG_SUPPORTS_IMMEDIATE) + || (asm_flags & ASM_CONSTRAINT_FLAG_SUPPORTS_REGISTER) ) { + expression_t *expr = argument->expression; + ir_node *addr = expression_to_addr(expr); + /* in+output, construct an artifical same_as constraint on the + * input */ + if (asm_flags & ASM_CONSTRAINT_FLAG_MODIFIER_READ) { + char buf[64]; + ir_node *value = get_value_from_lvalue(expr, addr); + + snprintf(buf, sizeof(buf), "%u", pos); + + ir_asm_constraint constraint; + constraint.pos = pos; + constraint.constraint = new_id_from_str(buf); + constraint.mode = get_ir_mode(expr->base.type); + tmp_in_constraints[in_size] = constraint; + ins[in_size] = value; + + ++in_size; } + + out_exprs[out_size] = expr; + out_addrs[out_size] = addr; + ++out_size; + } else if (asm_flags & ASM_CONSTRAINT_FLAG_SUPPORTS_MEMOP) { + /* pure memory ops need no input (but we have to make sure we + * attach to the memory) */ + assert(! (asm_flags & + (ASM_CONSTRAINT_FLAG_SUPPORTS_IMMEDIATE + | ASM_CONSTRAINT_FLAG_SUPPORTS_REGISTER))); + needs_memory = true; + + /* we need to attach the address to the inputs */ + expression_t *expr = argument->expression; + + ir_asm_constraint constraint; + constraint.pos = pos; + constraint.constraint = new_id_from_str(constraints); + constraint.mode = NULL; + tmp_in_constraints[in_size] = constraint; + + ins[in_size] = expression_to_addr(expr); + ++in_size; + continue; + } else { + errorf(&statement->base.source_position, + "only modifiers but no place set in constraints '%s'", + constraints); + continue; } - obstack_1grow(&asm_obst, '\0'); - const char *constraint_string = obstack_finish(&asm_obst); - needs_memory |= supports_memop; - if (supports_memop) { + ir_asm_constraint constraint; + constraint.pos = pos; + constraint.constraint = new_id_from_str(constraints); + constraint.mode = get_ir_mode(argument->expression->base.type); + obstack_grow(&asm_obst, &constraint, sizeof(constraint)); + } + assert(obstack_object_size(&asm_obst) + == out_size * sizeof(ir_asm_constraint)); + ir_asm_constraint *output_constraints = obstack_finish(&asm_obst); + + + obstack_grow(&asm_obst, tmp_in_constraints, + in_size * sizeof(tmp_in_constraints[0])); + /* find and count input and output arguments */ + argument = statement->inputs; + for ( ; argument != NULL; argument = argument->next) { + const char *constraints = argument->constraints.begin; + asm_constraint_flags_t asm_flags + = be_parse_asm_constraints(constraints); + + if (asm_flags & ASM_CONSTRAINT_FLAG_NO_SUPPORT) { + errorf(&statement->base.source_position, + "some constraints in '%s' are not supported", constraints); + continue; + } + if (asm_flags & ASM_CONSTRAINT_FLAG_INVALID) { + errorf(&statement->base.source_position, + "some constraints in '%s' are invalid", constraints); + continue; + } + if (asm_flags & ASM_CONSTRAINT_FLAG_MODIFIER_WRITE) { + errorf(&statement->base.source_position, + "write flag specified for input constraints '%s'", + constraints); + continue; } + + ir_node *input; + if ( (asm_flags & ASM_CONSTRAINT_FLAG_SUPPORTS_IMMEDIATE) + || (asm_flags & ASM_CONSTRAINT_FLAG_SUPPORTS_REGISTER) ) { + /* we can treat this as "normal" input */ + input = expression_to_firm(argument->expression); + } else if (asm_flags & ASM_CONSTRAINT_FLAG_SUPPORTS_MEMOP) { + /* pure memory ops need no input (but we have to make sure we + * attach to the memory) */ + assert(! (asm_flags & + (ASM_CONSTRAINT_FLAG_SUPPORTS_IMMEDIATE + | ASM_CONSTRAINT_FLAG_SUPPORTS_REGISTER))); + needs_memory = true; + input = expression_to_addr(argument->expression); + } else { + errorf(&statement->base.source_position, + "only modifiers but no place set in constraints '%s'", + constraints); + continue; + } + + ir_asm_constraint constraint; + constraint.pos = next_pos++; + constraint.constraint = new_id_from_str(constraints); + constraint.mode = get_irn_mode(input); + + obstack_grow(&asm_obst, &constraint, sizeof(constraint)); + ins[in_size++] = input; + } + + if (needs_memory) { + ir_asm_constraint constraint; + constraint.pos = next_pos++; + constraint.constraint = new_id_from_str(""); + constraint.mode = mode_M; + + obstack_grow(&asm_obst, &constraint, sizeof(constraint)); + ins[in_size++] = get_store(); + } + + assert(obstack_object_size(&asm_obst) + == in_size * sizeof(ir_asm_constraint)); + ir_asm_constraint *input_constraints = obstack_finish(&asm_obst); + + /* create asm node */ + dbg_info *dbgi = get_dbg_info(&statement->base.source_position); + + ident *asm_text = new_id_from_str(statement->asm_text.begin); + + ir_node *node = new_d_ASM(dbgi, in_size, ins, input_constraints, + out_size, output_constraints, + n_clobbers, clobbers, asm_text); + + if (statement->is_volatile) { + set_irn_pinned(node, op_pin_state_pinned); + } else { + set_irn_pinned(node, op_pin_state_floats); + } + + /* create output projs & connect them */ + if (needs_memory) { + ir_node *projm = new_Proj(node, mode_M, out_size+1); + set_store(projm); + } + + size_t i; + for (i = 0; i < out_size; ++i) { + const expression_t *out_expr = out_exprs[i]; + long pn = i; + ir_mode *mode = get_ir_mode(out_expr->base.type); + ir_node *proj = new_Proj(node, mode, pn); + ir_node *addr = out_addrs[i]; + + set_value_for_expression_addr(out_expr, proj, addr); } -#endif } static void ms_try_statement_to_firm(ms_try_statement_t *statement) { @@ -4546,7 +4996,7 @@ static void statement_to_firm(statement_t *statement) statement->base.transformed = true; #endif - switch(statement->kind) { + switch (statement->kind) { case STATEMENT_INVALID: panic("invalid statement found"); return; @@ -4592,6 +5042,10 @@ 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; @@ -4608,258 +5062,71 @@ static void statement_to_firm(statement_t *statement) panic("Statement not implemented\n"); } -static int count_decls_in_expression(const expression_t *expression); - -static int count_local_declarations(const declaration_t * decl, - const declaration_t *const end) +static int count_local_variables(const entity_t *entity, + const entity_t *const end) { int count = 0; - for (; decl != end; decl = decl->next) { - if (decl->namespc != NAMESPACE_NORMAL) + for (; entity != end; entity = entity->base.next) { + if (entity->kind != ENTITY_VARIABLE) continue; - const type_t *type = skip_typeref(decl->type); - if (!decl->address_taken && is_type_scalar(type)) + type_t *type = skip_typeref(entity->declaration.type); + + if (!entity->variable.address_taken && is_type_scalar(type)) ++count; - const initializer_t *initializer = decl->init.initializer; - /* FIXME: should walk initializer hierarchies... */ - if (initializer != NULL && initializer->kind == INITIALIZER_VALUE) { - count += count_decls_in_expression(initializer->value.value); - } } return count; } -static int count_decls_in_expression(const expression_t *expression) { - int count = 0; - - if (expression == NULL) - return 0; - - switch((expression_kind_t) expression->base.kind) { - case EXPR_STATEMENT: - return count_decls_in_stmts(expression->statement.statement); - EXPR_BINARY_CASES { - int count_left = count_decls_in_expression(expression->binary.left); - int count_right = count_decls_in_expression(expression->binary.right); - return count_left + count_right; - } - EXPR_UNARY_CASES - return count_decls_in_expression(expression->unary.value); - case EXPR_CALL: { - call_argument_t *argument = expression->call.arguments; - for( ; argument != NULL; argument = argument->next) { - count += count_decls_in_expression(argument->expression); - } - return count; - } - - case EXPR_UNKNOWN: - case EXPR_INVALID: - panic("unexpected expression kind"); +static void count_local_variables_in_stmt(statement_t *stmt, void *const env) +{ + int *const count = env; - case EXPR_COMPOUND_LITERAL: - /* TODO... */ + switch (stmt->kind) { + case STATEMENT_DECLARATION: { + const declaration_statement_t *const decl_stmt = &stmt->declaration; + *count += count_local_variables(decl_stmt->declarations_begin, + decl_stmt->declarations_end->base.next); break; - - case EXPR_CONDITIONAL: - count += count_decls_in_expression(expression->conditional.condition); - count += count_decls_in_expression(expression->conditional.true_expression); - count += count_decls_in_expression(expression->conditional.false_expression); - return count; - - case EXPR_BUILTIN_PREFETCH: - count += count_decls_in_expression(expression->builtin_prefetch.adr); - count += count_decls_in_expression(expression->builtin_prefetch.rw); - count += count_decls_in_expression(expression->builtin_prefetch.locality); - return count; - - case EXPR_BUILTIN_CONSTANT_P: - count += count_decls_in_expression(expression->builtin_constant.value); - return count; - - case EXPR_SELECT: - count += count_decls_in_expression(expression->select.compound); - return count; - - case EXPR_ARRAY_ACCESS: - count += count_decls_in_expression(expression->array_access.array_ref); - count += count_decls_in_expression(expression->array_access.index); - return count; - - case EXPR_CLASSIFY_TYPE: - count += count_decls_in_expression(expression->classify_type.type_expression); - return count; - - case EXPR_SIZEOF: - case EXPR_ALIGNOF: { - expression_t *tp_expression = expression->typeprop.tp_expression; - if (tp_expression != NULL) { - count += count_decls_in_expression(tp_expression); - } - return count; } - case EXPR_OFFSETOF: - case EXPR_REFERENCE: - case EXPR_CONST: - case EXPR_CHARACTER_CONSTANT: - case EXPR_WIDE_CHARACTER_CONSTANT: - case EXPR_STRING_LITERAL: - case EXPR_WIDE_STRING_LITERAL: - case EXPR_FUNCNAME: - case EXPR_BUILTIN_SYMBOL: - case EXPR_VA_START: - case EXPR_VA_ARG: + case STATEMENT_FOR: + *count += count_local_variables(stmt->fors.scope.entities, NULL); break; - } - - /* TODO FIXME: finish/fix that firm patch that allows dynamic value numbers - * (or implement all the missing expressions here/implement a walker) - */ - - return 0; -} - -static int count_decls_in_stmts(const statement_t *stmt) -{ - int count = 0; - for (; stmt != NULL; stmt = stmt->base.next) { - switch (stmt->kind) { - case STATEMENT_EMPTY: - break; - - case STATEMENT_DECLARATION: { - const declaration_statement_t *const decl_stmt = &stmt->declaration; - count += count_local_declarations(decl_stmt->declarations_begin, - decl_stmt->declarations_end->next); - break; - } - - case STATEMENT_COMPOUND: { - const compound_statement_t *const comp = - &stmt->compound; - count += count_decls_in_stmts(comp->statements); - break; - } - - case STATEMENT_IF: { - const if_statement_t *const if_stmt = &stmt->ifs; - count += count_decls_in_expression(if_stmt->condition); - count += count_decls_in_stmts(if_stmt->true_statement); - count += count_decls_in_stmts(if_stmt->false_statement); - break; - } - - case STATEMENT_SWITCH: { - const switch_statement_t *const switch_stmt = &stmt->switchs; - count += count_decls_in_expression(switch_stmt->expression); - count += count_decls_in_stmts(switch_stmt->body); - break; - } - - case STATEMENT_LABEL: { - const label_statement_t *const label_stmt = &stmt->label; - if (label_stmt->statement != NULL) { - count += count_decls_in_stmts(label_stmt->statement); - } - break; - } - - case STATEMENT_WHILE: { - const while_statement_t *const while_stmt = &stmt->whiles; - count += count_decls_in_expression(while_stmt->condition); - count += count_decls_in_stmts(while_stmt->body); - break; - } - - case STATEMENT_DO_WHILE: { - const do_while_statement_t *const do_while_stmt = &stmt->do_while; - count += count_decls_in_expression(do_while_stmt->condition); - count += count_decls_in_stmts(do_while_stmt->body); - break; - } - - case STATEMENT_FOR: { - const for_statement_t *const for_stmt = &stmt->fors; - count += count_local_declarations(for_stmt->scope.declarations, NULL); - count += count_decls_in_expression(for_stmt->initialisation); - count += count_decls_in_expression(for_stmt->condition); - count += count_decls_in_expression(for_stmt->step); - count += count_decls_in_stmts(for_stmt->body); - break; - } - - case STATEMENT_CASE_LABEL: { - const case_label_statement_t *label = &stmt->case_label; - count += count_decls_in_expression(label->expression); - if (label->statement != NULL) { - count += count_decls_in_stmts(label->statement); - } - break; - } - - case STATEMENT_ASM: - case STATEMENT_BREAK: - case STATEMENT_CONTINUE: - break; - case STATEMENT_EXPRESSION: { - const expression_statement_t *expr_stmt = &stmt->expression; - count += count_decls_in_expression(expr_stmt->expression); - break; - } - - case STATEMENT_GOTO: - case STATEMENT_LEAVE: - case STATEMENT_INVALID: - break; - - case STATEMENT_RETURN: { - const return_statement_t *ret_stmt = &stmt->returns; - count += count_decls_in_expression(ret_stmt->value); - break; - } - - case STATEMENT_MS_TRY: { - const ms_try_statement_t *const try_stmt = &stmt->ms_try; - count += count_decls_in_stmts(try_stmt->try_statement); - if (try_stmt->except_expression != NULL) - count += count_decls_in_expression(try_stmt->except_expression); - count += count_decls_in_stmts(try_stmt->final_statement); - break; - } - } + default: + break; } - return count; } -static int get_function_n_local_vars(declaration_t *declaration) +static int get_function_n_local_vars(entity_t *entity) { int count = 0; /* count parameters */ - count += count_local_declarations(declaration->scope.declarations, NULL); + count += count_local_variables(entity->function.parameters.entities, NULL); /* count local variables declared in body */ - count += count_decls_in_stmts(declaration->init.statement); - + walk_statements(entity->function.statement, count_local_variables_in_stmt, + &count); return count; } -static void initialize_function_parameters(declaration_t *declaration) +static void initialize_function_parameters(entity_t *entity) { - ir_graph *irg = current_ir_graph; - ir_node *args = get_irg_args(irg); - ir_node *start_block = get_irg_start_block(irg); - ir_type *function_irtype = get_ir_type(declaration->type); + assert(entity->kind == ENTITY_FUNCTION); + ir_graph *irg = current_ir_graph; + ir_node *args = get_irg_args(irg); + ir_node *start_block = get_irg_start_block(irg); + ir_type *function_irtype = get_ir_type(entity->declaration.type); - int n = 0; - declaration_t *parameter = declaration->scope.declarations; - for( ; parameter != NULL; parameter = parameter->next, ++n) { - assert(parameter->declaration_kind == DECLARATION_KIND_UNKNOWN); - type_t *type = skip_typeref(parameter->type); + int n = 0; + entity_t *parameter = entity->function.parameters.entities; + for ( ; parameter != NULL; parameter = parameter->base.next, ++n) { + assert(parameter->kind == ENTITY_VARIABLE); + assert(parameter->declaration.kind == DECLARATION_KIND_UNKNOWN); + type_t *type = skip_typeref(parameter->declaration.type); - bool needs_entity = parameter->address_taken; + bool needs_entity = parameter->variable.address_taken; assert(!is_type_array(type)); if (is_type_compound(type)) { needs_entity = true; @@ -4867,12 +5134,12 @@ static void initialize_function_parameters(declaration_t *declaration) if (needs_entity) { ir_entity *entity = get_method_value_param_ent(function_irtype, n); - ident *id = new_id_from_str(parameter->symbol->string); + ident *id = new_id_from_str(parameter->base.symbol->string); set_entity_ident(entity, id); - parameter->declaration_kind + parameter->declaration.kind = DECLARATION_KIND_LOCAL_VARIABLE_ENTITY; - parameter->v.entity = entity; + parameter->variable.v.entity = entity; continue; } @@ -4882,16 +5149,17 @@ static void initialize_function_parameters(declaration_t *declaration) long pn = n; ir_node *value = new_r_Proj(irg, start_block, args, param_mode, pn); - ir_mode *mode = get_ir_mode(parameter->type); + ir_mode *mode = get_ir_mode(type); value = create_conv(NULL, value, mode); value = do_strict_conv(NULL, value); - parameter->declaration_kind = DECLARATION_KIND_LOCAL_VARIABLE; - parameter->v.value_number = next_value_number_function; - set_irg_loc_description(current_ir_graph, next_value_number_function, parameter); + parameter->declaration.kind = DECLARATION_KIND_LOCAL_VARIABLE; + parameter->variable.v.value_number = next_value_number_function; + set_irg_loc_description(current_ir_graph, next_value_number_function, + (variable_t*) ¶meter->variable); ++next_value_number_function; - set_value(parameter->v.value_number, value); + set_value(parameter->variable.v.value_number, value); } } @@ -4930,26 +5198,68 @@ static void handle_decl_modifier_irg(ir_graph_ptr irg, decl_modifiers_t decl_mod } } +static void add_function_pointer(ir_type *segment, ir_entity *method, + const char *unique_template) +{ + ir_type *method_type = get_entity_type(method); + ident *id = id_unique(unique_template); + ir_type *ptr_type = new_type_pointer(id, method_type, mode_P_code); + + ident *ide = id_unique(unique_template); + ir_entity *ptr = new_entity(segment, ide, ptr_type); + ir_graph *irg = get_const_code_irg(); + ir_node *val = new_rd_SymConst_addr_ent(NULL, irg, mode_P_code, + method, NULL); + + set_entity_compiler_generated(ptr, 1); + set_entity_variability(ptr, variability_constant); + set_atomic_ent_value(ptr, val); +} + +/** + * Generate possible IJmp branches to a given label block. + */ +static void gen_ijmp_branches(ir_node *block) { + ir_node *ijmp; + for (ijmp = ijmp_list; ijmp != NULL; ijmp = get_irn_link(ijmp)) { + add_immBlock_pred(block, ijmp); + } +} + /** * Create code for a function. */ -static void create_function(declaration_t *declaration) +static void create_function(entity_t *entity) { - ir_entity *function_entity = get_function_entity(declaration); + assert(entity->kind == ENTITY_FUNCTION); + ir_entity *function_entity = get_function_entity(entity); - if (declaration->init.statement == NULL) + if (entity->function.statement == NULL) return; - current_function_decl = declaration; - current_function_name = NULL; - current_funcsig = 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"); + } + if (entity->declaration.modifiers & DM_DESTRUCTOR) { + ir_type *segment = get_segment_type(IR_SEGMENT_DESTRUCTORS); + add_function_pointer(segment, function_entity, "destructor_ptr.%u"); + } + + current_function_entity = entity; + current_function_name = NULL; + current_funcsig = NULL; - assert(imature_blocks == NULL); - imature_blocks = NEW_ARR_F(ir_node*, 0); + assert(all_labels == NULL); + all_labels = NEW_ARR_F(label_t *, 0); + ijmp_list = NULL; - int n_local_vars = get_function_n_local_vars(declaration); + int n_local_vars = get_function_n_local_vars(entity); ir_graph *irg = new_ir_graph(function_entity, n_local_vars); + ir_graph *old_current_function = current_function; + current_function = irg; + set_irg_fp_model(irg, firm_opt.fp_model); tarval_enable_fp_ops((firm_opt.fp_model & fp_strict_algebraic) == 0); set_irn_dbg_info(get_irg_start_block(irg), get_entity_dbg_info(function_entity)); @@ -4957,20 +5267,20 @@ static void create_function(declaration_t *declaration) ir_node *first_block = get_cur_block(); /* set inline flags */ - if (declaration->is_inline) + if (entity->function.is_inline) set_irg_inline_property(irg, irg_inline_recomended); - handle_decl_modifier_irg(irg, declaration->decl_modifiers); + handle_decl_modifier_irg(irg, entity->declaration.modifiers); next_value_number_function = 0; - initialize_function_parameters(declaration); + initialize_function_parameters(entity); - statement_to_firm(declaration->init.statement); + statement_to_firm(entity->function.statement); ir_node *end_block = get_irg_end_block(irg); /* do we have a return statement yet? */ if (get_cur_block() != NULL) { - type_t *type = skip_typeref(declaration->type); + type_t *type = skip_typeref(entity->declaration.type); assert(is_type_function(type)); const function_type_t *func_type = &type->function; const type_t *return_type @@ -4989,26 +5299,37 @@ static void create_function(declaration_t *declaration) ir_node *in[1]; /* §5.1.2.2.3 main implicitly returns 0 */ - if (strcmp(declaration->symbol->string, "main") == 0) { + if (strcmp(entity->base.symbol->string, "main") == 0) { in[0] = new_Const(mode, get_mode_null(mode)); } else { in[0] = new_Unknown(mode); - if (warning.return_type) { - warningf(&declaration->source_position, - "missing return statement at end of non-void function '%Y'", - declaration->symbol); - } } ret = new_Return(get_store(), 1, in); } add_immBlock_pred(end_block, ret); } - for(int i = 0; i < ARR_LEN(imature_blocks); ++i) { - mature_immBlock(imature_blocks[i]); + bool has_computed_gotos = false; + for (int i = ARR_LEN(all_labels) - 1; i >= 0; --i) { + label_t *label = all_labels[i]; + if (label->address_taken) { + gen_ijmp_branches(label->block); + has_computed_gotos = true; + } + mature_immBlock(label->block); + } + if (has_computed_gotos) { + /* if we have computed goto's in the function, we cannot inline it */ + if (get_irg_inline_property(irg) >= irg_inline_recomended) { + warningf(&entity->base.source_position, + "function '%Y' can never be inlined because it contains a computed goto", + entity->base.symbol); + } + set_irg_inline_property(irg, irg_inline_forbidden); } - DEL_ARR_F(imature_blocks); - imature_blocks = NULL; + + DEL_ARR_F(all_labels); + all_labels = NULL; mature_immBlock(first_block); mature_immBlock(end_block); @@ -5020,7 +5341,7 @@ static void create_function(declaration_t *declaration) int n = get_compound_n_members(frame_type); int align_all = 4; int offset = 0; - for(int i = 0; i < n; ++i) { + for (int i = 0; i < n; ++i) { ir_entity *entity = get_compound_member(frame_type, i); ir_type *entity_type = get_entity_type(entity); @@ -5042,52 +5363,54 @@ static void create_function(declaration_t *declaration) set_type_alignment_bytes(frame_type, align_all); irg_vrfy(irg); + current_function = old_current_function; + + /* create inner functions */ + entity_t *inner; + for (inner = next_inner_function(); inner != NULL; + inner = next_inner_function()) { + create_function(inner); + } } static void scope_to_firm(scope_t *scope) { /* first pass: create declarations */ - declaration_t *declaration = scope->declarations; - for( ; declaration != NULL; declaration = declaration->next) { - if (declaration->namespc != NAMESPACE_NORMAL) - continue; - if (declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY - || declaration->storage_class == STORAGE_CLASS_TYPEDEF) - continue; - if (declaration->symbol == NULL) + entity_t *entity = scope->entities; + for ( ; entity != NULL; entity = entity->base.next) { + if (entity->base.symbol == NULL) continue; - type_t *type = skip_typeref(declaration->type); - if (is_type_function(type)) { - get_function_entity(declaration); - } else { - create_global_variable(declaration); + if (entity->kind == ENTITY_FUNCTION) { + get_function_entity(entity); + } else if (entity->kind == ENTITY_VARIABLE) { + create_global_variable(entity); } } /* second pass: create code/initializers */ - declaration = scope->declarations; - for( ; declaration != NULL; declaration = declaration->next) { - if (declaration->namespc != NAMESPACE_NORMAL) - continue; - if (declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY - || declaration->storage_class == STORAGE_CLASS_TYPEDEF) - continue; - if (declaration->symbol == NULL) + entity = scope->entities; + for ( ; entity != NULL; entity = entity->base.next) { + if (entity->base.symbol == NULL) continue; - type_t *type = declaration->type; - if (type->kind == TYPE_FUNCTION) { - create_function(declaration); - } else { - assert(declaration->declaration_kind + if (entity->kind == ENTITY_FUNCTION) { + create_function(entity); + } else if (entity->kind == ENTITY_VARIABLE) { + assert(entity->declaration.kind == DECLARATION_KIND_GLOBAL_VARIABLE); current_ir_graph = get_const_code_irg(); - create_declaration_initializer(declaration); + create_variable_initializer(entity); } } } +static void set_be_option(const char *option) +{ + int res = firm_be_option(option); + assert(res); +} + void init_ast2firm(void) { obstack_init(&asm_obst); @@ -5097,24 +5420,22 @@ void init_ast2firm(void) id_imp = new_id_from_chars("__imp_", 6); /* OS option must be set to the backend */ - const char *s = "ia32-gasmode=linux"; switch (firm_opt.os_support) { case OS_SUPPORT_MINGW: create_ld_ident = create_ld_ident_win32; - s = "ia32-gasmode=mingw"; + set_be_option("ia32-gasmode=mingw"); break; case OS_SUPPORT_LINUX: create_ld_ident = create_ld_ident_linux_elf; - s = "ia32-gasmode=elf"; + set_be_option("ia32-gasmode=elf"); break; case OS_SUPPORT_MACHO: create_ld_ident = create_ld_ident_macho; - s = "ia32-gasmode=macho"; + set_be_option("ia32-gasmode=macho"); + set_be_option("ia32-stackalign=4"); + set_be_option("pic"); break; } - int res = firm_be_option(s); - (void) res; - assert(res); /* create idents for all known runtime functions */ for (size_t i = 0; i < sizeof(rts_data) / sizeof(rts_data[0]); ++i) { @@ -5131,10 +5452,6 @@ static void init_ir_types(void) return; ir_types_initialized = 1; - type_const_char = make_atomic_type(ATOMIC_TYPE_CHAR, TYPE_QUALIFIER_CONST); - type_void = make_atomic_type(ATOMIC_TYPE_VOID, TYPE_QUALIFIER_NONE); - type_int = make_atomic_type(ATOMIC_TYPE_INT, TYPE_QUALIFIER_NONE); - ir_type_int = get_ir_type(type_int); ir_type_const_char = get_ir_type(type_const_char); ir_type_wchar_t = get_ir_type(type_wchar_t); @@ -5147,6 +5464,23 @@ void exit_ast2firm(void) obstack_free(&asm_obst, NULL); } +static void global_asm_to_firm(statement_t *s) +{ + for (; s != NULL; s = s->base.next) { + assert(s->kind == STATEMENT_ASM); + + char const *const text = s->asms.asm_text.begin; + size_t size = s->asms.asm_text.size; + + /* skip the last \0 */ + if (text[size - 1] == '\0') + --size; + + ident *const id = new_id_from_chars(text, size); + add_irp_asm(id); + } +} + void translation_unit_to_firm(translation_unit_t *unit) { /* just to be sure */ @@ -5155,6 +5489,13 @@ void translation_unit_to_firm(translation_unit_t *unit) current_switch_cond = NULL; 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; }