X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast2firm.c;h=3a2e22078c2d92f66a5a880125317918851b5689;hb=4108d31ed34aee3c0841ae01b844420da8a3cdf1;hp=ec29144fd62806fbfabace2f0e239f9dfad9e445;hpb=d63bc459f39d3c7d91c3c3d7cbfa470e8ae825e6;p=cparser diff --git a/ast2firm.c b/ast2firm.c index ec29144..3a2e220 100644 --- a/ast2firm.c +++ b/ast2firm.c @@ -25,6 +25,7 @@ #include #include +#include #include "ast2firm.h" @@ -39,6 +40,7 @@ #include "lang_features.h" #include "types.h" #include "warning.h" +#include "entitymap_t.h" #include "driver/firm_opt.h" #include "driver/firm_cmdline.h" @@ -61,11 +63,14 @@ 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; static const declaration_t *current_function_decl; static ir_node *current_function_name; static ir_node *current_funcsig; +static entitymap_t entitymap; + static struct obstack asm_obst; typedef enum declaration_kind_t { @@ -91,16 +96,18 @@ ir_node *uninitialized_local_var(ir_graph *irg, ir_mode *mode, int pos) { const declaration_t *declaration = get_irg_loc_description(irg, pos); - warningf(&declaration->source_position, - "variable '%#T' might be used uninitialized", - declaration->type, declaration->symbol); + if (declaration != NULL) { + warningf(&declaration->source_position, + "variable '%#T' might be used uninitialized", + declaration->type, declaration->symbol); + } return new_r_Unknown(irg, mode); } unsigned dbg_snprint(char *buf, unsigned len, const dbg_info *dbg) { const source_position_t *pos = (const source_position_t*) dbg; - if(pos == NULL) + if (pos == NULL) return 0; return (unsigned) snprintf(buf, len, "%s:%u", pos->input_name, pos->linenr); @@ -109,9 +116,9 @@ unsigned dbg_snprint(char *buf, unsigned len, const dbg_info *dbg) const char *dbg_retrieve(const dbg_info *dbg, unsigned *line) { const source_position_t *pos = (const source_position_t*) dbg; - if(pos == NULL) + if (pos == NULL) return NULL; - if(line != NULL) + if (line != NULL) *line = pos->linenr; return pos->input_name; } @@ -134,7 +141,7 @@ static ir_mode *init_atomic_ir_mode(atomic_type_kind_t kind) { unsigned flags = get_atomic_type_flags(kind); unsigned size = get_atomic_type_size(kind); - if( (flags & (ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_FLOAT)) + if ( (flags & (ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_FLOAT)) && !(flags & ATOMIC_TYPE_FLAG_COMPLEX)) { char name[64]; ir_mode_sort sort; @@ -143,7 +150,7 @@ static ir_mode *init_atomic_ir_mode(atomic_type_kind_t kind) ir_mode_arithmetic arithmetic; unsigned modulo_shift; - if(flags & ATOMIC_TYPE_FLAG_INTEGER) { + if (flags & ATOMIC_TYPE_FLAG_INTEGER) { assert(! (flags & ATOMIC_TYPE_FLAG_FLOAT)); snprintf(name, sizeof(name), "i%s%d", is_signed?"":"u", bit_size); sort = irms_int_number; @@ -214,8 +221,6 @@ static unsigned get_array_type_size(array_type_t *type) static unsigned get_type_size_const(type_t *type) { - type = skip_typeref(type); - switch(type->kind) { case TYPE_ERROR: panic("error type occurred"); @@ -253,9 +258,9 @@ static ir_node *get_type_size(type_t *type) { type = skip_typeref(type); - if(is_type_array(type) && type->array.is_vla) { + if (is_type_array(type) && type->array.is_vla) { ir_node *size_node = type->array.size_node; - if(size_node == NULL) { + if (size_node == NULL) { size_node = expression_to_firm(type->array.size_expression); assert(!is_Const(size_node)); type->array.size_node = size_node; @@ -334,6 +339,21 @@ static ir_type *create_imaginary_type(const imaginary_type_t *type) 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) { + declaration_t *decl = type->compound.declaration; + type = decl->scope.declarations->type; + } + + return type; +} + static ir_type *create_method_type(const function_type_t *function_type) { type_t *return_type = function_type->return_type; @@ -352,7 +372,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; } @@ -361,6 +382,34 @@ 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. */ + warningf(&function_type->base.source_position, "THISCALL calling convention not supported yet"); + break; + } return irtype; } @@ -387,13 +436,13 @@ static ir_type *create_array_type(array_type_t *type) const int align = get_type_alignment_bytes(ir_element_type); set_type_alignment_bytes(ir_type, align); - if(type->size_constant) { + if (type->size_constant) { int n_elements = type->size; set_array_bounds_int(ir_type, 0, 0, n_elements); size_t elemsize = get_type_size_bytes(ir_element_type); - if(elemsize % align > 0) { + if (elemsize % align > 0) { elemsize += align - (elemsize % align); } set_type_size_bytes(ir_type, n_elements * elemsize); @@ -479,13 +528,13 @@ 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); assert(!is_type_float(base)); - if(is_type_signed(base)) { + if (is_type_signed(base)) { return get_signed_int_type_for_bit_size(irbase, size); } else { return get_unsigned_int_type_for_bit_size(irbase, size); @@ -513,7 +562,7 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype, declaration_t *declaration = type->declaration; declaration_kind_t kind = (declaration_kind_t)declaration->declaration_kind; - if(kind == DECLARATION_KIND_COMPOUND_TYPE_COMPLETE + if (kind == DECLARATION_KIND_COMPOUND_TYPE_COMPLETE || (kind == DECLARATION_KIND_COMPOUND_TYPE_INCOMPLETE && incomplete)) return declaration->v.irtype; @@ -523,10 +572,10 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype, size_t bit_offset = 0; size_t size = 0; - if(irtype == NULL) { + if (irtype == NULL) { symbol_t *symbol = declaration->symbol; ident *id; - if(symbol != NULL) { + if (symbol != NULL) { id = new_id_from_str(symbol->string); } else { if (is_union) { @@ -552,14 +601,14 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype, align_all = *outer_align; } - if(incomplete) + if (incomplete) return irtype; declaration->declaration_kind = DECLARATION_KIND_COMPOUND_TYPE_COMPLETE; declaration_t *entry = declaration->scope.declarations; for( ; entry != NULL; entry = entry->next) { - if(entry->namespc != NAMESPACE_NORMAL) + if (entry->namespc != NAMESPACE_NORMAL) continue; size_t prev_offset = offset; @@ -569,14 +618,14 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype, dbg_info *dbgi = get_dbg_info(&entry->source_position); ident *ident; - if(symbol != NULL) { + if (symbol != NULL) { ident = new_id_from_str(symbol->string); } else { - if(entry_type->kind == TYPE_COMPOUND_STRUCT) { + if (entry_type->kind == TYPE_COMPOUND_STRUCT) { create_compound_type(&entry_type->compound, irtype, &offset, &align_all, false, COMPOUND_IS_STRUCT); goto finished_member; - } else if(entry_type->kind == TYPE_COMPOUND_UNION) { + } else if (entry_type->kind == TYPE_COMPOUND_UNION) { create_compound_type(&entry_type->compound, irtype, &offset, &align_all, false, COMPOUND_IS_UNION); goto finished_member; @@ -587,7 +636,7 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype, } ir_type *base_irtype; - if(entry_type->kind == TYPE_BITFIELD) { + if (entry_type->kind == TYPE_BITFIELD) { base_irtype = get_ir_type(entry_type->bitfield.base_type); } else { base_irtype = get_ir_type(entry_type); @@ -601,11 +650,11 @@ 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) { + if (entry_type->kind == TYPE_BITFIELD) { size_t size_bits = fold_constant(entry_type->bitfield.size); size_t rest_size_bits = (entry_alignment - misalign)*8 - bit_offset; - if(size_bits > rest_size_bits) { + if (size_bits > rest_size_bits) { /* start a new bucket */ offset += entry_alignment - misalign; bit_offset = 0; @@ -622,7 +671,7 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype, bit_offset = bit_offset + (size_bits % 8); } else { size_t entry_size = get_type_size_bytes(base_irtype); - if(misalign > 0 || bit_offset > 0) + if (misalign > 0 || bit_offset > 0) offset += entry_alignment - misalign; base = offset; @@ -631,8 +680,8 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype, bit_offset = 0; } - if(entry_alignment > align_all) { - if(entry_alignment % align_all != 0) { + if (entry_alignment > align_all) { + if (entry_alignment % align_all != 0) { panic("uneven alignments not supported yet"); } align_all = entry_alignment; @@ -662,11 +711,11 @@ finished_member: } size_t misalign = offset % align_all; - if(misalign > 0 || bit_offset > 0) { + if (misalign > 0 || bit_offset > 0) { size += align_all - misalign; } - if(outer_offset != NULL) { + if (outer_offset != NULL) { if (!is_union) { *outer_offset = offset; } else { @@ -674,7 +723,7 @@ finished_member: } if (align_all > *outer_align) { - if(align_all % *outer_align != 0) { + if (align_all % *outer_align != 0) { panic("uneven alignments not supported yet"); } *outer_align = align_all; @@ -696,6 +745,9 @@ static ir_type *create_enum_type(enum_type_t *const type) tarval *const one = get_mode_one(mode); tarval * tv_next = get_tarval_null(mode); + 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) @@ -715,6 +767,8 @@ static ir_type *create_enum_type(enum_type_t *const type) tv_next = tarval_add(tv_next, one); } + constant_folding = constant_folding_old; + return ir_type_int; } @@ -732,7 +786,6 @@ static ir_type *get_ir_type_incomplete(type_t *type) case TYPE_COMPOUND_STRUCT: return create_compound_type(&type->compound, NULL, NULL, NULL, true, COMPOUND_IS_STRUCT); - break; case TYPE_COMPOUND_UNION: return create_compound_type(&type->compound, NULL, NULL, NULL, true, COMPOUND_IS_UNION); @@ -797,7 +850,7 @@ static ir_type *get_ir_type(type_t *type) case TYPE_INVALID: break; } - if(firm_type == NULL) + if (firm_type == NULL) panic("unknown type found"); type->base.firm_type = firm_type; @@ -809,7 +862,7 @@ static inline ir_mode *get_ir_mode(type_t *type) ir_type *irtype = get_ir_type(type); /* firm doesn't report a mode for arrays somehow... */ - if(is_Array_type(irtype)) { + if (is_Array_type(irtype)) { return mode_P_data; } @@ -919,7 +972,7 @@ static ident *create_ld_ident_win32(ir_entity *ent, declaration_t *declaration) id = mangle(id_underscore, get_entity_ident(ent)); } - decl_modifiers_t decl_modifiers = declaration->decl_modifiers; + decl_modifiers_t decl_modifiers = declaration->modifiers; if (decl_modifiers & DM_DLLIMPORT) { /* add prefix for imported symbols */ id = mangle(id_imp, id); @@ -957,6 +1010,26 @@ typedef ident* (*create_ld_ident_func)(ir_entity *entity, declaration_t *declaration); 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 *ent, declaration_t *decl) +{ + if (decl->modifiers & DM_PURE) { + /* TRUE if the declaration includes the GNU + __attribute__((pure)) specifier. */ + set_entity_additional_property(ent, mtp_property_pure); + } + if (decl->modifiers & DM_USED) { + /* TRUE if the declaration includes the GNU + __attribute__((used)) specifier. */ + set_entity_stickyness(ent, stickyness_sticky); + } +} + /** * Creates an entity representing a function. * @@ -964,7 +1037,7 @@ create_ld_ident_func create_ld_ident = create_ld_ident_linux_elf; */ static ir_entity *get_function_entity(declaration_t *declaration) { - if(declaration->declaration_kind == DECLARATION_KIND_FUNCTION) + if (declaration->declaration_kind == DECLARATION_KIND_FUNCTION) return declaration->v.entity; assert(declaration->declaration_kind == DECLARATION_KIND_UNKNOWN); @@ -975,27 +1048,45 @@ static ir_entity *get_function_entity(declaration_t *declaration) ir_type *ir_type_method = get_ir_type(declaration->type); assert(is_Method_type(ir_type_method)); - dbg_info *const dbgi = get_dbg_info(&declaration->source_position); - ir_entity *const 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); + /* 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); + } + goto entity_created; } - if(declaration->storage_class == STORAGE_CLASS_STATIC - || declaration->is_inline) { + + 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)); + + handle_gnu_attributes_ent(entity, declaration); + + /* static inline => local + * extern inline => local + * inline without definition => local + * inline with definition => external_visible */ + storage_class_tag_t const storage_class = declaration->storage_class; + bool const is_inline = declaration->is_inline; + bool const has_body = declaration->init.statement != NULL; + if (is_inline && storage_class == STORAGE_CLASS_NONE && has_body) { + set_entity_visibility(entity, visibility_external_visible); + } else if (storage_class == STORAGE_CLASS_STATIC || + (is_inline && has_body)) { + if (!has_body) { + /* this entity was declared, but is defined nowhere */ + set_entity_peculiarity(entity, peculiarity_description); + } set_entity_visibility(entity, visibility_local); - } else if(declaration->init.statement != NULL) { + } else if (has_body) { set_entity_visibility(entity, visibility_external_visible); } else { set_entity_visibility(entity, visibility_external_allocated); } set_entity_allocation(entity, allocation_static); - declaration->declaration_kind = DECLARATION_KIND_FUNCTION; - declaration->v.entity = entity; - /* We should check for file scope here, but as long as we compile C only this is not needed. */ if (! firm_opt.freestanding) { @@ -1012,6 +1103,12 @@ static ir_entity *get_function_entity(declaration_t *declaration) } } + entitymap_insert(&entitymap, symbol, entity); + +entity_created: + declaration->declaration_kind = DECLARATION_KIND_FUNCTION; + declaration->v.entity = entity; + return entity; } @@ -1026,10 +1123,10 @@ static ir_node *const_to_firm(const const_expression_t *cnst) char buf[128]; tarval *tv; size_t len; - if(mode_is_float(mode)) { + if (mode_is_float(mode)) { tv = new_tarval_from_double(cnst->v.float_value, mode); } else { - if(mode_is_signed(mode)) { + if (mode_is_signed(mode)) { len = snprintf(buf, sizeof(buf), "%lld", cnst->v.int_value); } else { len = snprintf(buf, sizeof(buf), "%llu", @@ -1210,7 +1307,7 @@ static ir_node *deref_address(dbg_info *const dbgi, type_t *const type, ir_node *const load_mem = new_d_Proj(dbgi, load, mode_M, pn_Load_M); ir_node *const load_res = new_d_Proj(dbgi, load, mode, pn_Load_res); - if(type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) { + if (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) { set_Load_volatility(load, volatility_is_volatile); } @@ -1284,7 +1381,7 @@ static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode) if (value_mode == dest_mode || is_Bad(value)) return value; - if(dest_mode == mode_b) { + if (dest_mode == mode_b) { ir_node *zero = new_Const(value_mode, get_mode_null(value_mode)); ir_node *cmp = new_d_Cmp(dbgi, value, zero); ir_node *proj = new_d_Proj(dbgi, cmp, mode_b, pn_Cmp_Lg); @@ -1410,7 +1507,7 @@ static ir_node *process_builtin_call(const call_expression_t *call) switch(symbol->ID) { case T___builtin_alloca: { - if(call->arguments == NULL || call->arguments->next != NULL) { + if (call->arguments == NULL || call->arguments->next != NULL) { panic("invalid number of parameters on __builtin_alloca"); } expression_t *argument = call->arguments->expression; @@ -1450,28 +1547,32 @@ 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) { + dbg_info *dbgi = get_dbg_info(&call->base.source_position); assert(get_cur_block() != NULL); expression_t *function = call->function; - if(function->kind == EXPR_BUILTIN_SYMBOL) { + if (function->kind == EXPR_BUILTIN_SYMBOL) { return process_builtin_call(call); } - if(function->kind == EXPR_REFERENCE) { + 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_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, @@ -1493,12 +1594,10 @@ static ir_node *call_expression_to_firm(const call_expression_t *call) assert(is_type_function(points_to)); function_type_t *function_type = &points_to->function; - dbg_info *dbgi = get_dbg_info(&call->base.source_position); - int n_parameters = 0; ir_type *ir_method_type = get_ir_type((type_t*) function_type); ir_type *new_method_type = NULL; - if(function_type->variadic || function_type->unspecified_parameters) { + if (function_type->variadic || function_type->unspecified_parameters) { const call_argument_t *argument = call->arguments; for( ; argument != NULL; argument = argument->next) { ++n_parameters; @@ -1555,9 +1654,9 @@ static ir_node *call_expression_to_firm(const call_expression_t *call) type_t *return_type = skip_typeref(function_type->return_type); ir_node *result = NULL; - if(!is_type_atomic(return_type, ATOMIC_TYPE_VOID)) { + if (!is_type_atomic(return_type, ATOMIC_TYPE_VOID)) { ir_mode *mode; - if(is_type_scalar(return_type)) { + if (is_type_scalar(return_type)) { mode = get_ir_mode(return_type); } else { mode = mode_P_data; @@ -1584,10 +1683,10 @@ static void assign_value(dbg_info *dbgi, ir_node *addr, type_t *type, ir_node *memory = get_store(); - if(is_type_scalar(type)) { + if (is_type_scalar(type)) { ir_node *store = new_d_Store(dbgi, memory, addr, value); ir_node *store_mem = new_d_Proj(dbgi, store, mode_M, pn_Store_M); - if(type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) + if (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) set_Store_volatility(store, volatility_is_volatile); set_store(store_mem); } else { @@ -1605,7 +1704,7 @@ static tarval *create_bitfield_mask(ir_mode *mode, int offset, int size) assert(offset >= 0 && size >= 0); assert(offset + size <= mode_size); - if(size == mode_size) { + if (size == mode_size) { return all_one; } @@ -1658,7 +1757,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 (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) { set_Load_volatility(load, volatility_is_volatile); set_Store_volatility(store, volatility_is_volatile); } @@ -1695,7 +1794,7 @@ static ir_node *bitfield_extract_to_firm(const select_expression_t *expression, tarval *tvr = new_tarval_from_long(shift_bitsr, mode_uint); ir_node *countr = new_d_Const(dbgi, mode_uint, tvr); ir_node *shiftr; - if(mode_is_signed(mode)) { + if (mode_is_signed(mode)) { shiftr = new_d_Shrs(dbgi, shiftl, countr, mode_int); } else { shiftr = new_d_Shr(dbgi, shiftl, countr, mode_int); @@ -1786,7 +1885,7 @@ static ir_node *create_incdec(const unary_expression_t *expression) ir_mode *mode = get_ir_mode(expression->base.type); ir_node *offset; - if(is_type_pointer(type)) { + if (is_type_pointer(type)) { pointer_type_t *pointer_type = &type->pointer; offset = get_type_size(pointer_type->points_to); } else { @@ -1942,7 +2041,7 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression) dbg_info *dbgi = get_dbg_info(&expression->base.source_position); type_t *type = skip_typeref(expression->base.type); - if(expression->base.kind == EXPR_UNARY_TAKE_ADDRESS) + if (expression->base.kind == EXPR_UNARY_TAKE_ADDRESS) return expression_to_addr(expression->value); const expression_t *value = expression->value; @@ -1980,7 +2079,7 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression) return create_incdec(expression); case EXPR_UNARY_CAST: { ir_node *value_node = expression_to_firm(value); - if(is_type_scalar(type)) { + if (is_type_scalar(type)) { ir_mode *mode = get_ir_mode(type); ir_node *node = create_conv(dbgi, value_node, mode); node = do_strict_conv(dbgi, node); @@ -1993,7 +2092,7 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression) } case EXPR_UNARY_CAST_IMPLICIT: { ir_node *value_node = expression_to_firm(value); - if(is_type_scalar(type)) { + if (is_type_scalar(type)) { ir_mode *mode = get_ir_mode(type); return create_conv(dbgi, value_node, mode); } else { @@ -2001,7 +2100,7 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression) } } case EXPR_UNARY_ASSUME: - if(firm_opt.confirm) + if (firm_opt.confirm) return handle_assume(dbgi, value); else return NULL; @@ -2049,8 +2148,13 @@ 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 */ + if (elem_size == 0 && is_type_atomic(points_to, ATOMIC_TYPE_VOID)) { + elem_size = 1; + } assert(elem_size >= 1); if (elem_size == 1) @@ -2156,7 +2260,7 @@ normal_node: ir_node *pin = new_Pin(new_NoMem()); ir_node *op; ir_node *res; - if(mode_is_float(mode)) { + if (mode_is_float(mode)) { op = new_d_Quot(dbgi, pin, left, right, mode, op_pin_state_floats); res = new_d_Proj(dbgi, op, mode, pn_Quot_res); } else { @@ -2185,10 +2289,10 @@ static ir_node *create_lazy_op(const binary_expression_t *expression) type_t *type = expression->base.type; ir_mode *mode = get_ir_mode(type); - if(is_constant_expression(expression->left)) { + 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) + if ((ekind == EXPR_BINARY_LOGICAL_AND && val != 0) || (ekind == EXPR_BINARY_LOGICAL_OR && val == 0)) { return expression_to_firm(expression->right); } else { @@ -2248,8 +2352,9 @@ static ir_node *binary_expression_to_firm(const binary_expression_t *expression) return proj; } case EXPR_BINARY_ASSIGN: { + ir_node *addr = expression_to_addr(expression->left); ir_node *right = expression_to_firm(expression->right); - set_value_for_expression(expression->left, right); + set_value_for_expression_addr(expression->left, right, addr); return right; } @@ -2346,14 +2451,14 @@ static long get_offsetof_offset(const offsetof_expression_t *expression) /* be sure the type is constructed */ (void) get_ir_type(type); - if(designator->symbol != NULL) { + if (designator->symbol != NULL) { 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) { + if (iter->symbol == symbol) { break; } } @@ -2428,14 +2533,14 @@ static ir_node *compound_literal_to_firm( static ir_node *sizeof_to_firm(const typeprop_expression_t *expression) { type_t *type = expression->type; - if(type == NULL) { + if (type == NULL) { type = expression->tp_expression->base.type; assert(type != NULL); } type = skip_typeref(type); /* § 6.5.3.4 (2) if the type is a VLA, evaluate the expression. */ - if(is_type_array(type) && type->array.is_vla + if (is_type_array(type) && type->array.is_vla && expression->tp_expression != NULL) { expression_to_firm(expression->tp_expression); } @@ -2449,7 +2554,7 @@ static ir_node *sizeof_to_firm(const typeprop_expression_t *expression) static ir_node *alignof_to_firm(const typeprop_expression_t *expression) { type_t *type = expression->type; - if(type == NULL) { + if (type == NULL) { /* beware: if expression is a variable reference, return the alignment of the variable. */ const expression_t *tp_expression = expression->tp_expression; @@ -2467,8 +2572,6 @@ static ir_node *alignof_to_firm(const typeprop_expression_t *expression) return new_SymConst(mode, sym, symconst_type_align); } -static bool constant_folding; - static void init_ir_types(void); long fold_constant(const expression_t *expression) { @@ -2480,19 +2583,19 @@ long fold_constant(const expression_t *expression) assert(is_constant_expression(expression)); ir_graph *old_current_ir_graph = current_ir_graph; - if(current_ir_graph == NULL) { + if (current_ir_graph == NULL) { current_ir_graph = get_const_code_irg(); } ir_node *cnst = expression_to_firm(expression); current_ir_graph = old_current_ir_graph; - if(!is_Const(cnst)) { + if (!is_Const(cnst)) { panic("couldn't fold constant\n"); } tarval *tv = get_Const_tarval(cnst); - if(!tarval_is_long(tv)) { + if (!tarval_is_long(tv)) { panic("result of constant folding is not integer\n"); } @@ -2506,9 +2609,9 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression) dbg_info *const dbgi = get_dbg_info(&expression->base.source_position); /* first try to fold a constant condition */ - if(is_constant_expression(expression->condition)) { + if (is_constant_expression(expression->condition)) { long val = fold_constant(expression->condition); - if(val) { + if (val) { return expression_to_firm(expression->true_expression); } else { return expression_to_firm(expression->false_expression); @@ -3004,11 +3107,11 @@ static void create_condition_evaluation(const expression_t *expression, ir_node *false_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_false); /* set branch prediction info based on __builtin_expect */ - if(expression->kind == EXPR_BINARY_BUILTIN_EXPECT) { + if (expression->kind == EXPR_BINARY_BUILTIN_EXPECT) { long cnst = fold_constant(expression->binary.right); cond_jmp_predicate pred; - if(cnst == 0) { + if (cnst == 0) { pred = COND_JMP_PRED_FALSE; } else { pred = COND_JMP_PRED_TRUE; @@ -3017,7 +3120,9 @@ static void create_condition_evaluation(const expression_t *expression, } add_immBlock_pred(true_block, true_proj); - add_immBlock_pred(false_block, false_proj); + if (false_block != NULL) { + add_immBlock_pred(false_block, false_proj); + } set_cur_block(NULL); } @@ -3028,8 +3133,13 @@ static void create_declaration_entity(declaration_t *declaration, declaration_kind_t declaration_kind, ir_type *parent_type) { - ident *const id = new_id_from_str(declaration->symbol->string); type_t *const type = skip_typeref(declaration->type); + if (is_type_function(type)) { + (void) get_function_entity(declaration); + return; + } + + 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); @@ -3038,12 +3148,12 @@ static void create_declaration_entity(declaration_t *declaration, declaration->v.entity = entity; set_entity_variability(entity, variability_uninitialized); set_entity_ld_ident(entity, create_ld_ident(entity, declaration)); - if(parent_type == get_tls_type()) + if (parent_type == get_tls_type()) set_entity_allocation(entity, allocation_automatic); - else if(declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE) + else if (declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE) set_entity_allocation(entity, allocation_static); - if(type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) { + if (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) { set_entity_volatility(entity, volatility_is_volatile); } } @@ -3072,9 +3182,9 @@ static __attribute__((unused)) void debug_print_type_path(const type_path_t *pat const type_path_entry_t *entry = & path->path[i]; type_t *type = skip_typeref(entry->type); - if(is_type_compound(type)) { + if (is_type_compound(type)) { fprintf(stderr, ".%s", entry->compound_entry->symbol->string); - } else if(is_type_array(type)) { + } else if (is_type_array(type)) { fprintf(stderr, "[%zd]", entry->index); } else { fprintf(stderr, "-INVALID-"); @@ -3122,7 +3232,7 @@ static ir_initializer_t *get_initializer_entry(type_path_t *path) assert(is_type_compound(top_type) || is_type_array(top_type)); - if(ARR_LEN(path->path) == 0) { + if (ARR_LEN(path->path) == 0) { return NULL; } else { type_path_entry_t *top = get_type_path_top(path); @@ -3145,14 +3255,14 @@ static void descend_into_subtype(type_path_t *path) size_t len; - if(is_type_compound(top_type)) { + if (is_type_compound(top_type)) { declaration_t *declaration = top_type->compound.declaration; declaration_t *entry = declaration->scope.declarations; top->compound_entry = entry; top->index = 0; len = get_compound_size(&top_type->compound); - if(entry != NULL) + if (entry != NULL) path->top_type = entry->type; } else { assert(is_type_array(top_type)); @@ -3162,13 +3272,13 @@ static void descend_into_subtype(type_path_t *path) path->top_type = top_type->array.element_type; len = top_type->array.size; } - if(initializer == NULL + if (initializer == NULL || get_initializer_kind(initializer) == IR_INITIALIZER_NULL) { initializer = create_initializer_compound(len); /* we have to set the entry at the 2nd latest path entry... */ size_t path_len = ARR_LEN(path->path); assert(path_len >= 1); - if(path_len > 1) { + if (path_len > 1) { type_path_entry_t *entry = & path->path[path_len-2]; ir_initializer_t *tinitializer = entry->initializer; set_initializer_compound_value(tinitializer, entry->index, @@ -3198,7 +3308,7 @@ static void walk_designator(type_path_t *path, const designator_t *designator) type_t *orig_type = top->type; type_t *type = skip_typeref(orig_type); - if(designator->symbol != NULL) { + if (designator->symbol != NULL) { assert(is_type_compound(type)); size_t index = 0; symbol_t *symbol = designator->symbol; @@ -3206,7 +3316,7 @@ static void walk_designator(type_path_t *path, const designator_t *designator) declaration_t *declaration = type->compound.declaration; declaration_t *iter = declaration->scope.declarations; for( ; iter != NULL; iter = iter->next, ++index) { - if(iter->symbol == symbol) { + if (iter->symbol == symbol) { break; } } @@ -3225,7 +3335,7 @@ static void walk_designator(type_path_t *path, const designator_t *designator) long index = fold_constant(array_index); assert(index >= 0); #ifndef NDEBUG - if(type->array.size_constant == 1) { + if (type->array.size_constant == 1) { long array_size = type->array.size; assert(index < array_size); } @@ -3237,7 +3347,7 @@ static void walk_designator(type_path_t *path, const designator_t *designator) } path->top_type = orig_type; - if(designator->next != NULL) { + if (designator->next != NULL) { descend_into_subtype(path); } } @@ -3247,7 +3357,7 @@ static void walk_designator(type_path_t *path, const designator_t *designator) static void advance_current_object(type_path_t *path) { - if(path->invalid) { + if (path->invalid) { /* TODO: handle this... */ panic("invalid initializer in ast2firm (excessive elements)"); return; @@ -3256,15 +3366,15 @@ static void advance_current_object(type_path_t *path) type_path_entry_t *top = get_type_path_top(path); type_t *type = skip_typeref(top->type); - if(is_type_union(type)) { + if (is_type_union(type)) { top->compound_entry = NULL; - } else if(is_type_struct(type)) { + } else if (is_type_struct(type)) { declaration_t *entry = top->compound_entry; top->index++; entry = entry->next; top->compound_entry = entry; - if(entry != NULL) { + if (entry != NULL) { path->top_type = entry->type; return; } @@ -3272,7 +3382,7 @@ static void advance_current_object(type_path_t *path) assert(is_type_array(type)); top->index++; - if(!type->array.size_constant || top->index < type->array.size) { + if (!type->array.size_constant || top->index < type->array.size) { return; } } @@ -3281,7 +3391,7 @@ static void advance_current_object(type_path_t *path) * can ascend in the type hierarchy and continue with another subobject */ size_t len = ARR_LEN(path->path); - if(len > 1) { + if (len > 1) { ascend_from_subtype(path); advance_current_object(path); } else { @@ -3316,19 +3426,19 @@ static ir_initializer_t *create_ir_initializer_list( for(size_t i = 0; i < initializer->len; ++i) { const initializer_t *sub_initializer = initializer->initializers[i]; - if(sub_initializer->kind == INITIALIZER_DESIGNATOR) { + if (sub_initializer->kind == INITIALIZER_DESIGNATOR) { walk_designator(&path, sub_initializer->designator.designator); continue; } - if(sub_initializer->kind == INITIALIZER_VALUE) { + if (sub_initializer->kind == INITIALIZER_VALUE) { /* we might have to descend into types until we're at a scalar * type */ while(true) { type_t *orig_top_type = path.top_type; type_t *top_type = skip_typeref(orig_top_type); - if(is_type_scalar(top_type)) + if (is_type_scalar(top_type)) break; descend_into_subtype(&path); } @@ -3365,11 +3475,11 @@ static ir_initializer_t *create_ir_initializer_string( ir_initializer_t *irinitializer = create_initializer_compound(len); const char *string = initializer->string.begin; - ir_mode *mode = get_type_mode(ir_type_const_char); + ir_mode *mode = get_ir_mode(type->array.element_type); for(size_t i = 0; i < len; ++i) { char c = 0; - if(i < string_len) + if (i < string_len) c = string[i]; tarval *tv = new_tarval_from_long(c, mode); @@ -3394,7 +3504,7 @@ static ir_initializer_t *create_ir_initializer_wide_string( for(size_t i = 0; i < len; ++i) { wchar_rep_t c = 0; - if(i < string_len) { + if (i < string_len) { c = string[i]; } tarval *tv = new_tarval_from_long(c, mode); @@ -3446,7 +3556,7 @@ static void create_dynamic_null_initializer(ir_type *type, dbg_info *dbgi, assert(is_compound_type(type)); int n_members; - if(is_Array_type(type)) { + if (is_Array_type(type)) { assert(has_array_upper_bound(type, 0)); n_members = get_array_upper_bound_int(type, 0); } else { @@ -3456,7 +3566,7 @@ static void create_dynamic_null_initializer(ir_type *type, dbg_info *dbgi, for(int i = 0; i < n_members; ++i) { ir_node *addr; ir_type *irtype; - if(is_Array_type(type)) { + 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); @@ -3511,21 +3621,21 @@ static void create_dynamic_initializer_sub(ir_initializer_t *initializer, case IR_INITIALIZER_COMPOUND: { assert(is_compound_type(type)); int n_members; - if(is_Array_type(type)) { + if (is_Array_type(type)) { assert(has_array_upper_bound(type, 0)); n_members = get_array_upper_bound_int(type, 0); } else { n_members = get_compound_n_members(type); } - if(get_initializer_compound_n_entries(initializer) + if (get_initializer_compound_n_entries(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; - if(is_Array_type(type)) { + 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); @@ -3569,7 +3679,7 @@ static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi, ir_node *frame = get_irg_frame(current_ir_graph); ir_node *addr = new_d_simpleSel(dbgi, nomem, frame, entity); - if(initializer->kind == INITIALIZER_VALUE) { + if (initializer->kind == INITIALIZER_VALUE) { initializer_value_t *initializer_value = &initializer->value; ir_node *value = expression_to_firm(initializer_value->value); @@ -3578,7 +3688,7 @@ static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi, return; } - if(!is_constant_initializer(initializer)) { + if (!is_constant_initializer(initializer)) { ir_initializer_t *irinitializer = create_ir_initializer(initializer, type); @@ -3627,17 +3737,19 @@ static void create_initializer_local_variable_entity(declaration_t *declaration) static void create_declaration_initializer(declaration_t *declaration) { initializer_t *initializer = declaration->init.initializer; - if(initializer == NULL) + if (initializer == NULL) return; declaration_kind_t declaration_kind = (declaration_kind_t) declaration->declaration_kind; - if(declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE_ENTITY) { + if (declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE_ENTITY) { create_initializer_local_variable_entity(declaration); return; } - if(initializer->kind == INITIALIZER_VALUE) { + type_t *type = skip_typeref(declaration->type); + + if (initializer->kind == INITIALIZER_VALUE) { initializer_value_t *initializer_value = &initializer->value; dbg_info *dbgi = get_dbg_info(&declaration->source_position); @@ -3645,14 +3757,18 @@ static void create_declaration_initializer(declaration_t *declaration) ir_node *value = expression_to_firm(initializer_value->value); value = do_strict_conv(dbgi, value); - if(declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE) { + if (declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE) { set_value(declaration->v.value_number, value); } else { assert(declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE); ir_entity *entity = declaration->v.entity; - set_entity_variability(entity, variability_initialized); + if (type->base.qualifiers & TYPE_QUALIFIER_CONST) { + set_entity_variability(entity, variability_constant); + } else { + set_entity_variability(entity, variability_initialized); + } set_atomic_ent_value(entity, value); } } else { @@ -3661,37 +3777,52 @@ static void create_declaration_initializer(declaration_t *declaration) ir_entity *entity = declaration->v.entity; ir_initializer_t *irinitializer - = create_ir_initializer(initializer, declaration->type); + = create_ir_initializer(initializer, type); - set_entity_variability(entity, variability_initialized); + if (type->base.qualifiers & TYPE_QUALIFIER_CONST) { + set_entity_variability(entity, variability_constant); + } else { + set_entity_variability(entity, variability_initialized); + } set_entity_initializer(entity, irinitializer); } } static void create_variable_length_array(declaration_t *declaration) { + /* initializers are not allowed for VLAs */ + assert(declaration->init.initializer == NULL); + + declaration->declaration_kind = DECLARATION_KIND_VARIABLE_LENGTH_ARRAY; + declaration->v.vla_base = NULL; + + /* TODO: record VLA somewhere so we create the free node when we leave + * it's scope */ +} + +static void allocate_variable_length_array(declaration_t *declaration) +{ + /* initializers are not allowed for VLAs */ + assert(declaration->init.initializer == NULL); + assert(get_cur_block() != NULL); + dbg_info *dbgi = get_dbg_info(&declaration->source_position); type_t *type = declaration->type; - ir_node *mem = get_store(); 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; + assert(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 */ } /** @@ -3705,16 +3836,16 @@ static void create_local_variable(declaration_t *declaration) type_t *type = skip_typeref(declaration->type); /* is it a variable length array? */ - if(is_type_array(type) && !type->array.size_constant) { + if (is_type_array(type) && !type->array.size_constant) { create_variable_length_array(declaration); return; - } else if(is_type_array(type) || is_type_compound(type)) { + } else if (is_type_array(type) || is_type_compound(type)) { needs_entity = true; - } else if(type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) { + } else if (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) { needs_entity = true; } - if(needs_entity) { + if (needs_entity) { ir_type *frame_type = get_irg_frame_type(current_ir_graph); create_declaration_entity(declaration, DECLARATION_KIND_LOCAL_VARIABLE_ENTITY, @@ -3743,7 +3874,7 @@ static void create_local_static_variable(declaration_t *declaration) ir_entity *const entity = new_d_entity(global_type, id, irtype, dbgi); - if(type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) { + if (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) { set_entity_volatility(entity, volatility_is_volatile); } @@ -3767,7 +3898,7 @@ static void create_local_static_variable(declaration_t *declaration) static void return_statement_to_firm(return_statement_t *statement) { - if(get_cur_block() == NULL) + if (get_cur_block() == NULL) return; dbg_info *dbgi = get_dbg_info(&statement->base.source_position); @@ -3776,16 +3907,16 @@ static void return_statement_to_firm(return_statement_t *statement) ir_node *in[1]; int in_len; - if(get_method_n_ress(func_irtype) > 0) { + if (get_method_n_ress(func_irtype) > 0) { ir_type *res_type = get_method_res_type(func_irtype, 0); - if(statement->value != NULL) { + if (statement->value != NULL) { ir_node *node = expression_to_firm(statement->value); node = do_strict_conv(dbgi, node); in[0] = node; } else { ir_mode *mode; - if(is_compound_type(res_type)) { + if (is_compound_type(res_type)) { mode = mode_P_data; } else { mode = get_type_mode(res_type); @@ -3795,7 +3926,7 @@ static void return_statement_to_firm(return_statement_t *statement) in_len = 1; } else { /* build return_value for its side effects */ - if(statement->value != NULL) { + if (statement->value != NULL) { expression_to_firm(statement->value); } in_len = 0; @@ -3812,7 +3943,7 @@ static void return_statement_to_firm(return_statement_t *statement) static ir_node *expression_statement_to_firm(expression_statement_t *statement) { - if(get_cur_block() == NULL) + if (get_cur_block() == NULL) return NULL; return expression_to_firm(statement->expression); @@ -3828,7 +3959,7 @@ static ir_node *compound_statement_to_firm(compound_statement_t *compound) ir_node *result = NULL; statement_t *statement = compound->statements; for( ; statement != NULL; statement = statement->base.next) { - if(statement->base.next == NULL + if (statement->base.next == NULL && statement->kind == STATEMENT_EXPRESSION) { result = expression_statement_to_firm( &statement->expression); @@ -3881,7 +4012,9 @@ create_var: create_declaration_entity(declaration, DECLARATION_KIND_GLOBAL_VARIABLE, var_type); - set_entity_visibility(declaration->v.entity, vis); + if (!is_type_function(skip_typeref(declaration->type))) { + set_entity_visibility(declaration->v.entity, vis); + } return; @@ -3917,8 +4050,8 @@ static void create_local_declaration(declaration_t *declaration) case STORAGE_CLASS_NONE: case STORAGE_CLASS_AUTO: case STORAGE_CLASS_REGISTER: - if(is_type_function(type)) { - if(declaration->init.statement != NULL) { + if (is_type_function(type)) { + if (declaration->init.statement != NULL) { panic("nested functions not supported yet"); } else { get_function_entity(declaration); @@ -3944,7 +4077,7 @@ static void create_local_declaration(declaration_t *declaration) static void initialize_local_declaration(declaration_t *declaration) { - if(declaration->symbol == NULL || declaration->namespc != NAMESPACE_NORMAL) + if (declaration->symbol == NULL || declaration->namespc != NAMESPACE_NORMAL) return; switch ((declaration_kind_t) declaration->declaration_kind) { @@ -3953,10 +4086,13 @@ static void initialize_local_declaration(declaration_t *declaration) create_declaration_initializer(declaration); return; + case DECLARATION_KIND_VARIABLE_LENGTH_ARRAY: + allocate_variable_length_array(declaration); + 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: @@ -3975,7 +4111,7 @@ 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) + if (declaration->namespc != NAMESPACE_NORMAL) continue; initialize_local_declaration(declaration); } @@ -4044,50 +4180,60 @@ static void if_statement_to_firm(if_statement_t *statement) static void while_statement_to_firm(while_statement_t *statement) { ir_node *jmp = NULL; - if(get_cur_block() != NULL) { + if (get_cur_block() != NULL) { jmp = new_Jmp(); } /* create the header block */ ir_node *header_block = new_immBlock(); - if(jmp != NULL) { + if (jmp != NULL) { add_immBlock_pred(header_block, jmp); } - /* the false block */ - ir_node *false_block = new_immBlock(); - /* the loop body */ - ir_node *body_block; - if (statement->body != NULL) { - ir_node *old_continue_label = continue_label; - ir_node *old_break_label = break_label; - continue_label = header_block; - break_label = false_block; + ir_node *old_continue_label = continue_label; + ir_node *old_break_label = break_label; + continue_label = header_block; + break_label = NULL; - body_block = new_immBlock(); - statement_to_firm(statement->body); + ir_node *body_block = new_immBlock(); + statement_to_firm(statement->body); + ir_node *false_block = break_label; - assert(continue_label == header_block); - assert(break_label == false_block); - continue_label = old_continue_label; - break_label = old_break_label; + assert(continue_label == header_block); + continue_label = old_continue_label; + break_label = old_break_label; - if(get_cur_block() != NULL) { - jmp = new_Jmp(); - add_immBlock_pred(header_block, jmp); - } - } else { - body_block = header_block; + if (get_cur_block() != NULL) { + jmp = new_Jmp(); + add_immBlock_pred(header_block, jmp); } - /* create the condition */ - set_cur_block(header_block); + /* shortcut for while(true) */ + if (is_constant_expression(statement->condition) + && fold_constant(statement->condition) != 0) { + set_cur_block(header_block); + ir_node *header_jmp = new_Jmp(); + add_immBlock_pred(body_block, header_jmp); + + keep_alive(body_block); + } else { + if (false_block == NULL) { + false_block = new_immBlock(); + } + + /* create the condition */ + set_cur_block(header_block); + + create_condition_evaluation(statement->condition, body_block, + false_block); + } - create_condition_evaluation(statement->condition, body_block, false_block); mature_immBlock(body_block); - mature_immBlock(false_block); mature_immBlock(header_block); + if (false_block != NULL) { + mature_immBlock(false_block); + } set_cur_block(false_block); } @@ -4095,54 +4241,50 @@ static void while_statement_to_firm(while_statement_t *statement) static void do_while_statement_to_firm(do_while_statement_t *statement) { ir_node *jmp = NULL; - if(get_cur_block() != NULL) { + if (get_cur_block() != NULL) { jmp = new_Jmp(); } /* create the header block */ ir_node *header_block = new_immBlock(); - /* the false block */ - ir_node *false_block = new_immBlock(); - /* the loop body */ ir_node *body_block = new_immBlock(); - if(jmp != NULL) { + if (jmp != NULL) { add_immBlock_pred(body_block, jmp); } - if (statement->body != NULL) { - ir_node *old_continue_label = continue_label; - ir_node *old_break_label = break_label; - continue_label = header_block; - break_label = false_block; + ir_node *old_continue_label = continue_label; + ir_node *old_break_label = break_label; + continue_label = header_block; + break_label = NULL; - statement_to_firm(statement->body); + statement_to_firm(statement->body); + ir_node *false_block = break_label; - assert(continue_label == header_block); - assert(break_label == false_block); - continue_label = old_continue_label; - break_label = old_break_label; + assert(continue_label == header_block); + continue_label = old_continue_label; + break_label = old_break_label; - if (get_cur_block() == NULL) { - mature_immBlock(header_block); - mature_immBlock(body_block); - mature_immBlock(false_block); - return; - } + if (get_cur_block() != NULL) { + ir_node *body_jmp = new_Jmp(); + add_immBlock_pred(header_block, body_jmp); + mature_immBlock(header_block); } - ir_node *body_jmp = new_Jmp(); - add_immBlock_pred(header_block, body_jmp); - mature_immBlock(header_block); + if (false_block == NULL) { + false_block = new_immBlock(); + } /* create the condition */ set_cur_block(header_block); create_condition_evaluation(statement->condition, body_block, false_block); mature_immBlock(body_block); - mature_immBlock(false_block); mature_immBlock(header_block); + if (false_block != NULL) { + mature_immBlock(false_block); + } set_cur_block(false_block); } @@ -4162,7 +4304,7 @@ static void for_statement_to_firm(for_statement_t *statement) } if (get_cur_block() != NULL) { - if(statement->initialisation != NULL) { + if (statement->initialisation != NULL) { expression_to_firm(statement->initialisation); } @@ -4234,7 +4376,7 @@ static void for_statement_to_firm(for_statement_t *statement) static void create_jump_statement(const statement_t *statement, ir_node *target_block) { - if(get_cur_block() == NULL) + if (get_cur_block() == NULL) return; dbg_info *dbgi = get_dbg_info(&statement->base.source_position); @@ -4310,7 +4452,7 @@ static void case_label_to_firm(const case_label_statement_t *statement) ir_node *block = new_immBlock(); set_cur_block(old_block); - if(statement->expression != NULL) { + if (statement->expression != NULL) { long start_pn = fold_constant(statement->expression); long end_pn = start_pn; if (statement->end_range != NULL) { @@ -4319,7 +4461,7 @@ static void case_label_to_firm(const case_label_statement_t *statement) assert(start_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) { + if (pn == MAGIC_DEFAULT_PN_NUMBER) { /* oops someone detected our cheating... */ panic("magic default pn used"); } @@ -4340,7 +4482,7 @@ static void case_label_to_firm(const case_label_statement_t *statement) mature_immBlock(block); set_cur_block(block); - if(statement->statement != NULL) { + if (statement->statement != NULL) { statement_to_firm(statement->statement); } } @@ -4349,7 +4491,7 @@ static ir_node *get_label_block(declaration_t *label) { assert(label->namespc == NAMESPACE_LABEL); - if(label->declaration_kind == DECLARATION_KIND_LABEL_BLOCK) { + if (label->declaration_kind == DECLARATION_KIND_LABEL_BLOCK) { return label->v.block; } assert(label->declaration_kind == DECLARATION_KIND_UNKNOWN); @@ -4370,7 +4512,7 @@ static void label_to_firm(const label_statement_t *statement) { ir_node *block = get_label_block(statement->label); - if(get_cur_block() != NULL) { + if (get_cur_block() != NULL) { ir_node *jmp = new_Jmp(); add_immBlock_pred(block, jmp); } @@ -4378,14 +4520,14 @@ static void label_to_firm(const label_statement_t *statement) set_cur_block(block); keep_alive(block); - if(statement->statement != NULL) { + if (statement->statement != NULL) { statement_to_firm(statement->statement); } } static void goto_to_firm(const goto_statement_t *statement) { - if(get_cur_block() == NULL) + if (get_cur_block() == NULL) return; ir_node *block = get_label_block(statement->label); @@ -4395,100 +4537,250 @@ static void goto_to_firm(const goto_statement_t *statement) 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) { + 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; } assert(obstack_object_size(&asm_obst) == n_clobbers * sizeof(ident*)); ident **clobbers = NULL; - if(n_clobbers > 0) { + if (n_clobbers > 0) { 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 + = xmalloc(n_outputs * sizeof(tmp_in_constraints[0])); + + 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), "%d", 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])); + free(tmp_in_constraints); + /* 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) { @@ -4579,14 +4871,15 @@ static int count_local_declarations(const declaration_t * decl, { int count = 0; for (; decl != end; decl = decl->next) { - if(decl->namespc != NAMESPACE_NORMAL) + if (decl->namespc != NAMESPACE_NORMAL) continue; - const type_t *type = skip_typeref(decl->type); + type_t *type = skip_typeref(decl->type); + if (!decl->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) { + if (initializer != NULL && initializer->kind == INITIALIZER_VALUE) { count += count_decls_in_expression(initializer->value.value); } } @@ -4596,7 +4889,7 @@ static int count_local_declarations(const declaration_t * decl, static int count_decls_in_expression(const expression_t *expression) { int count = 0; - if(expression == NULL) + if (expression == NULL) return 0; switch((expression_kind_t) expression->base.kind) { @@ -4723,7 +5016,7 @@ static int count_decls_in_stmts(const statement_t *stmt) case STATEMENT_LABEL: { const label_statement_t *const label_stmt = &stmt->label; - if(label_stmt->statement != NULL) { + if (label_stmt->statement != NULL) { count += count_decls_in_stmts(label_stmt->statement); } break; @@ -4756,7 +5049,7 @@ static int count_decls_in_stmts(const statement_t *stmt) case STATEMENT_CASE_LABEL: { const case_label_statement_t *label = &stmt->case_label; count += count_decls_in_expression(label->expression); - if(label->statement != NULL) { + if (label->statement != NULL) { count += count_decls_in_stmts(label->statement); } break; @@ -4787,7 +5080,7 @@ static int count_decls_in_stmts(const statement_t *stmt) 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) + 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; @@ -4825,11 +5118,11 @@ static void initialize_function_parameters(declaration_t *declaration) bool needs_entity = parameter->address_taken; assert(!is_type_array(type)); - if(is_type_compound(type)) { + if (is_type_compound(type)) { needs_entity = true; } - if(needs_entity) { + if (needs_entity) { ir_entity *entity = get_method_value_param_ent(function_irtype, n); ident *id = new_id_from_str(parameter->symbol->string); set_entity_ident(entity, id); @@ -4846,7 +5139,7 @@ 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); @@ -4894,6 +5187,24 @@ 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); +} + /** * Create code for a function. */ @@ -4901,9 +5212,18 @@ static void create_function(declaration_t *declaration) { ir_entity *function_entity = get_function_entity(declaration); - if(declaration->init.statement == NULL) + if (declaration->init.statement == NULL) return; + if (declaration->modifiers & DM_CONSTRUCTOR) { + ir_type *segment = get_segment_type(IR_SEGMENT_CONSTRUCTORS); + add_function_pointer(segment, function_entity, "constructor_ptr.%u"); + } + if (declaration->modifiers & DM_DESTRUCTOR) { + ir_type *segment = get_segment_type(IR_SEGMENT_DESTRUCTORS); + add_function_pointer(segment, function_entity, "destructor_ptr.%u"); + } + current_function_decl = declaration; current_function_name = NULL; current_funcsig = NULL; @@ -4923,7 +5243,7 @@ static void create_function(declaration_t *declaration) /* set inline flags */ if (declaration->is_inline) set_irg_inline_property(irg, irg_inline_recomended); - handle_decl_modifier_irg(irg, declaration->decl_modifiers); + handle_decl_modifier_irg(irg, declaration->modifiers); next_value_number_function = 0; initialize_function_parameters(declaration); @@ -4933,7 +5253,7 @@ static void create_function(declaration_t *declaration) ir_node *end_block = get_irg_end_block(irg); /* do we have a return statement yet? */ - if(get_cur_block() != NULL) { + if (get_cur_block() != NULL) { type_t *type = skip_typeref(declaration->type); assert(is_type_function(type)); const function_type_t *func_type = &type->function; @@ -4945,7 +5265,7 @@ static void create_function(declaration_t *declaration) ret = new_Return(get_store(), 0, NULL); } else { ir_mode *mode; - if(is_type_scalar(return_type)) { + if (is_type_scalar(return_type)) { mode = get_ir_mode(func_type->return_type); } else { mode = mode_P_data; @@ -4957,7 +5277,7 @@ static void create_function(declaration_t *declaration) in[0] = new_Const(mode, get_mode_null(mode)); } else { in[0] = new_Unknown(mode); - if(warning.return_type) { + if (warning.return_type) { warningf(&declaration->source_position, "missing return statement at end of non-void function '%Y'", declaration->symbol); @@ -4989,12 +5309,12 @@ static void create_function(declaration_t *declaration) ir_type *entity_type = get_entity_type(entity); int align = get_type_alignment_bytes(entity_type); - if(align > align_all) + if (align > align_all) align_all = align; int misalign = 0; - if(align > 0) { + if (align > 0) { misalign = offset % align; - if(misalign > 0) { + if (misalign > 0) { offset += align - misalign; } } @@ -5013,16 +5333,16 @@ 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) + if (declaration->namespc != NAMESPACE_NORMAL) continue; - if(declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY + if (declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY || declaration->storage_class == STORAGE_CLASS_TYPEDEF) continue; - if(declaration->symbol == NULL) + if (declaration->symbol == NULL) continue; type_t *type = skip_typeref(declaration->type); - if(is_type_function(type)) { + if (is_type_function(type)) { get_function_entity(declaration); } else { create_global_variable(declaration); @@ -5032,16 +5352,16 @@ static void scope_to_firm(scope_t *scope) /* second pass: create code/initializers */ declaration = scope->declarations; for( ; declaration != NULL; declaration = declaration->next) { - if(declaration->namespc != NAMESPACE_NORMAL) + if (declaration->namespc != NAMESPACE_NORMAL) continue; - if(declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY + if (declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY || declaration->storage_class == STORAGE_CLASS_TYPEDEF) continue; - if(declaration->symbol == NULL) + if (declaration->symbol == NULL) continue; type_t *type = declaration->type; - if(type->kind == TYPE_FUNCTION) { + if (type->kind == TYPE_FUNCTION) { create_function(declaration); } else { assert(declaration->declaration_kind @@ -5069,25 +5389,29 @@ void init_ast2firm(void) break; case OS_SUPPORT_LINUX: create_ld_ident = create_ld_ident_linux_elf; - s = "ia32-gasmode=linux"; break; + s = "ia32-gasmode=elf"; break; case OS_SUPPORT_MACHO: create_ld_ident = create_ld_ident_macho; - s = "ia32-gasmode=macho"; break; + s = "ia32-gasmode=macho"; break; } - firm_be_option(s); + 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) { rts_idents[i] = new_id_from_str(rts_data[i].name); } + + entitymap_init(&entitymap); } static void init_ir_types(void) { static int ir_types_initialized = 0; - if(ir_types_initialized) + if (ir_types_initialized) return; ir_types_initialized = 1; @@ -5103,9 +5427,27 @@ static void init_ir_types(void) void exit_ast2firm(void) { + entitymap_destroy(&entitymap); 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 */ @@ -5116,4 +5458,5 @@ void translation_unit_to_firm(translation_unit_t *unit) init_ir_types(); scope_to_firm(&unit->scope); + global_asm_to_firm(unit->global_asm); }