X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast2firm.c;h=c3a1e6926b687a6c80a793532d331e775e7892f8;hb=2fb66fd8bd2a5956ab2cad26978ccfb7e105d45f;hp=32344b5d48de99396c049af6c2520a639fb45f10;hpb=362796175c2b4547b3dbd392ec7cac9216383fce;p=cparser diff --git a/ast2firm.c b/ast2firm.c index 32344b5..c3a1e69 100644 --- a/ast2firm.c +++ b/ast2firm.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -32,6 +33,7 @@ #include "adt/error.h" #include "adt/array.h" +#include "adt/strutil.h" #include "adt/util.h" #include "symbol_t.h" #include "token_t.h" @@ -44,12 +46,11 @@ #include "types.h" #include "type_hash.h" #include "mangle.h" -#include "walk_statements.h" +#include "walk.h" #include "warning.h" #include "printer.h" #include "entitymap_t.h" #include "driver/firm_opt.h" -#include "driver/firm_cmdline.h" typedef struct trampoline_region trampoline_region; struct trampoline_region { @@ -57,13 +58,12 @@ struct trampoline_region { ir_entity *region; /**< created region for the trampoline */ }; +fp_model_t firm_fp_model = fp_model_precise; + static const backend_params *be_params; static ir_type *ir_type_char; -static ir_type *ir_type_const_char; static ir_type *ir_type_wchar_t; -static ir_type *ir_type_void; -static ir_type *ir_type_int; /* architecture specific floating point arithmetic mode (if any) */ static ir_mode *mode_float_arithmetic; @@ -74,26 +74,22 @@ static unsigned stack_param_align; static int next_value_number_function; static ir_node *continue_label; static ir_node *break_label; -static ir_node *current_switch_cond; +static ir_node *current_switch; 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 bool initializer_use_bitfield_basetype; - -extern bool have_const_functions; static const entity_t *current_function_entity; static ir_node *current_function_name; static ir_node *current_funcsig; -static switch_statement_t *current_switch; static ir_graph *current_function; static translation_unit_t *current_translation_unit; static trampoline_region *current_trampolines; static ir_type *current_outer_frame; -static ir_type *current_outer_value_type; static ir_node *current_static_link; +static ir_entity *current_vararg_entity; static entitymap_t entitymap; @@ -112,14 +108,6 @@ typedef enum declaration_kind_t { DECLARATION_KIND_INNER_FUNCTION } declaration_kind_t; -static ir_mode *get_ir_mode_storage(type_t *type); -/* - * get arithmetic mode for a type. This is different from get_ir_mode_storage, - * int that it returns bigger modes for floating point on some platforms - * (x87 internally does arithemtic with 80bits) - */ -static ir_mode *get_ir_mode_arithmetic(type_t *type); - static ir_type *get_ir_type_incomplete(type_t *type); static void enqueue_inner_function(entity_t *entity) @@ -129,27 +117,25 @@ static void enqueue_inner_function(entity_t *entity) ARR_APP1(entity_t*, inner_functions, entity); } -ir_node *uninitialized_local_var(ir_graph *irg, ir_mode *mode, int pos) +static ir_node *uninitialized_local_var(ir_graph *irg, ir_mode *mode, int pos) { const entity_t *entity = get_irg_loc_description(irg, pos); if (entity != NULL) { - warningf(&entity->base.source_position, - "%s '%#T' might be used uninitialized", - get_entity_kind_name(entity->kind), - entity->declaration.type, entity->base.symbol); + source_position_t const *const pos = &entity->base.source_position; + warningf(WARN_UNINITIALIZED, pos, "'%N' might be used uninitialized", entity); } return new_r_Unknown(irg, mode); } -static const char *dbg_retrieve(const dbg_info *dbg, unsigned *line) +static src_loc_t dbg_retrieve(const dbg_info *dbg) { - const source_position_t *pos = (const source_position_t*) dbg; - if (pos == NULL) - return NULL; - if (line != NULL) - *line = pos->linenr; - return pos->input_name; + source_position_t const *const pos = (source_position_t const*)dbg; + if (pos) { + return (src_loc_t){ pos->input_name, pos->lineno, pos->colno }; + } else { + return (src_loc_t){ NULL, 0, 0 }; + } } static dbg_info *get_dbg_info(const source_position_t *pos) @@ -172,43 +158,52 @@ static type_dbg_info *get_type_dbg_info_(const type_t *type) return (type_dbg_info*) type; } -static ir_mode *atomic_modes[ATOMIC_TYPE_LAST+1]; +/* is the current block a reachable one? */ +static bool currently_reachable(void) +{ + ir_node *const block = get_cur_block(); + return block != NULL && !is_Bad(block); +} + +static void set_unreachable_now(void) +{ + set_cur_block(NULL); +} -static ir_mode *mode_int, *mode_uint; +ir_mode *atomic_modes[ATOMIC_TYPE_LAST+1]; static ir_node *_expression_to_firm(const expression_t *expression); static ir_node *expression_to_firm(const expression_t *expression); -static void create_local_declaration(entity_t *entity); + +static unsigned decide_modulo_shift(unsigned type_size) +{ + if (architecture_modulo_shift == 0) + return 0; + if (type_size < architecture_modulo_shift) + return architecture_modulo_shift; + return type_size; +} 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)) - && !(flags & ATOMIC_TYPE_FLAG_COMPLEX)) { + if ((flags & ATOMIC_TYPE_FLAG_FLOAT) + && !(flags & ATOMIC_TYPE_FLAG_COMPLEX)) { + switch (size) { + case 4: return get_modeF(); + case 8: return get_modeD(); + default: panic("unexpected kind"); + } + } else if (flags & ATOMIC_TYPE_FLAG_INTEGER) { char name[64]; - ir_mode_sort sort; unsigned bit_size = size * 8; bool is_signed = (flags & ATOMIC_TYPE_FLAG_SIGNED) != 0; - unsigned modulo_shift; - ir_mode_arithmetic arithmetic; - - if (flags & ATOMIC_TYPE_FLAG_INTEGER) { - assert(! (flags & ATOMIC_TYPE_FLAG_FLOAT)); - snprintf(name, sizeof(name), "%s%u", is_signed ? "I" : "U", - bit_size); - sort = irms_int_number; - arithmetic = irma_twos_complement; - modulo_shift = bit_size < machine_size ? machine_size : bit_size; - } else { - assert(flags & ATOMIC_TYPE_FLAG_FLOAT); - snprintf(name, sizeof(name), "F%u", bit_size); - sort = irms_float_number; - arithmetic = irma_ieee754; - modulo_shift = 0; - } - return new_ir_mode(name, sort, bit_size, is_signed, arithmetic, - modulo_shift); + unsigned modulo_shift = decide_modulo_shift(bit_size); + + snprintf(name, sizeof(name), "%s%u", is_signed ? "I" : "U", bit_size); + return new_int_mode(name, irma_twos_complement, bit_size, is_signed, + modulo_shift); } return NULL; @@ -219,34 +214,12 @@ static ir_mode *init_atomic_ir_mode(atomic_type_kind_t kind) */ static void init_atomic_modes(void) { + atomic_modes[ATOMIC_TYPE_VOID] = mode_ANY; for (int i = 0; i <= ATOMIC_TYPE_LAST; ++i) { + if (atomic_modes[i] != NULL) + continue; atomic_modes[i] = init_atomic_ir_mode((atomic_type_kind_t) i); } - mode_int = atomic_modes[ATOMIC_TYPE_INT]; - mode_uint = atomic_modes[ATOMIC_TYPE_UINT]; - - /* there's no real void type in firm */ - atomic_modes[ATOMIC_TYPE_VOID] = atomic_modes[ATOMIC_TYPE_CHAR]; - - /* initialize pointer modes */ - char name[64]; - ir_mode_sort sort = irms_reference; - unsigned bit_size = machine_size; - bool is_signed = 0; - ir_mode_arithmetic arithmetic = irma_twos_complement; - unsigned modulo_shift - = bit_size < machine_size ? machine_size : bit_size; - - snprintf(name, sizeof(name), "p%u", machine_size); - ir_mode *ptr_mode = new_ir_mode(name, sort, bit_size, is_signed, arithmetic, - modulo_shift); - - set_reference_mode_signed_eq(ptr_mode, atomic_modes[get_intptr_kind()]); - set_reference_mode_unsigned_eq(ptr_mode, atomic_modes[get_uintptr_kind()]); - - /* Hmm, pointers should be machine size */ - set_modeP_data(ptr_mode); - set_modeP_code(ptr_mode); } ir_mode *get_atomic_mode(atomic_type_kind_t kind) @@ -265,27 +238,6 @@ static ir_node *get_vla_size(array_type_t *const type) return size_node; } -/** - * Return a node representing the size of a type. - */ -static ir_node *get_type_size_node(type_t *type) -{ - type = skip_typeref(type); - - if (is_type_array(type) && type->array.is_vla) { - ir_node *size_node = get_vla_size(&type->array); - ir_node *elem_size = get_type_size_node(type->array.element_type); - ir_mode *mode = get_irn_mode(size_node); - ir_node *real_size = new_d_Mul(NULL, size_node, elem_size, mode); - return real_size; - } - - ir_mode *mode = get_ir_mode_storage(type_size_t); - symconst_symbol sym; - sym.type_p = get_ir_type(type); - return new_SymConst(mode, sym, symconst_type_size); -} - static unsigned count_parameters(const function_type_t *function_type) { unsigned count = 0; @@ -308,6 +260,7 @@ static ir_type *create_atomic_type(atomic_type_kind_t akind, const type_t *type) ir_type *irtype = new_d_type_primitive(mode, dbgi); il_alignment_t alignment = get_atomic_type_alignment(akind); + set_type_size_bytes(irtype, get_atomic_type_size(akind)); set_type_alignment_bytes(irtype, alignment); return irtype; @@ -316,7 +269,7 @@ static ir_type *create_atomic_type(atomic_type_kind_t akind, const type_t *type) /** * Creates a Firm type for a complex type */ -static ir_type *create_complex_type(const complex_type_t *type) +static ir_type *create_complex_type(const atomic_type_t *type) { atomic_type_kind_t kind = type->akind; ir_mode *mode = atomic_modes[kind]; @@ -331,9 +284,9 @@ static ir_type *create_complex_type(const complex_type_t *type) /** * Creates a Firm type for an imaginary type */ -static ir_type *create_imaginary_type(imaginary_type_t *type) +static ir_type *create_imaginary_type(const atomic_type_t *type) { - return create_atomic_type(type->akind, (const type_t*) type); + return create_atomic_type(type->akind, (const type_t*)type); } /** @@ -358,11 +311,11 @@ static ir_type *create_method_type(const function_type_t *function_type, bool fo int n_parameters = count_parameters(function_type) + (for_closure ? 1 : 0); - int n_results = return_type == type_void ? 0 : 1; + int n_results = is_type_void(return_type) ? 0 : 1; type_dbg_info *dbgi = get_type_dbg_info_((const type_t*) function_type); ir_type *irtype = new_d_type_method(n_parameters, n_results, dbgi); - if (return_type != type_void) { + if (!is_type_void(return_type)) { ir_type *restype = get_ir_type(return_type); set_method_res_type(irtype, 0, restype); } @@ -417,6 +370,20 @@ is_cdecl: if (for_closure) set_method_calling_convention(irtype, get_method_calling_convention(irtype) | cc_this_call); + const decl_modifiers_t modifiers = function_type->modifiers; + if (modifiers & DM_CONST) + add_method_additional_properties(irtype, mtp_property_const); + if (modifiers & DM_PURE) + add_method_additional_properties(irtype, mtp_property_pure); + if (modifiers & DM_RETURNS_TWICE) + add_method_additional_properties(irtype, mtp_property_returns_twice); + if (modifiers & DM_NORETURN) + add_method_additional_properties(irtype, mtp_property_noreturn); + if (modifiers & DM_NOTHROW) + add_method_additional_properties(irtype, mtp_property_nothrow); + if (modifiers & DM_MALLOC) + add_method_additional_properties(irtype, mtp_property_malloc); + return irtype; } @@ -425,9 +392,9 @@ static ir_type *create_pointer_type(pointer_type_t *type) type_dbg_info *dbgi = get_type_dbg_info_((const type_t*) type); type_t *points_to = type->points_to; ir_type *ir_points_to = get_ir_type_incomplete(points_to); - ir_type *ir_type = new_d_type_pointer(ir_points_to, dbgi); + ir_type *irtype = new_d_type_pointer(ir_points_to, dbgi); - return ir_type; + return irtype; } static ir_type *create_reference_type(reference_type_t *type) @@ -435,9 +402,9 @@ static ir_type *create_reference_type(reference_type_t *type) type_dbg_info *dbgi = get_type_dbg_info_((const type_t*) type); type_t *refers_to = type->refers_to; ir_type *ir_refers_to = get_ir_type_incomplete(refers_to); - ir_type *ir_type = new_d_type_pointer(ir_refers_to, dbgi); + ir_type *irtype = new_d_type_pointer(ir_refers_to, dbgi); - return ir_type; + return irtype; } static ir_type *create_array_type(array_type_t *type) @@ -445,27 +412,27 @@ static ir_type *create_array_type(array_type_t *type) type_dbg_info *dbgi = get_type_dbg_info_((const type_t*) type); type_t *element_type = type->element_type; ir_type *ir_element_type = get_ir_type(element_type); - ir_type *ir_type = new_d_type_array(1, ir_element_type, dbgi); + ir_type *irtype = new_d_type_array(1, ir_element_type, dbgi); const int align = get_type_alignment_bytes(ir_element_type); - set_type_alignment_bytes(ir_type, align); + set_type_alignment_bytes(irtype, align); if (type->size_constant) { int n_elements = type->size; - set_array_bounds_int(ir_type, 0, 0, n_elements); + set_array_bounds_int(irtype, 0, 0, n_elements); size_t elemsize = get_type_size_bytes(ir_element_type); if (elemsize % align > 0) { elemsize += align - (elemsize % align); } - set_type_size_bytes(ir_type, n_elements * elemsize); + set_type_size_bytes(irtype, n_elements * elemsize); } else { - set_array_lower_bound_int(ir_type, 0, 0); + set_array_lower_bound_int(irtype, 0, 0); } - set_type_state(ir_type, layout_fixed); + set_type_state(irtype, layout_fixed); - return ir_type; + return irtype; } /** @@ -489,8 +456,7 @@ static ir_type *get_signed_int_type_for_bit_size(ir_type *base_tp, char name[32]; snprintf(name, sizeof(name), "bf_I%u", size); - mode = new_ir_mode(name, irms_int_number, size, 1, irma_twos_complement, - size <= 32 ? 32 : size ); + mode = new_int_mode(name, irma_twos_complement, size, 1, 0); s_modes[size] = mode; } @@ -522,8 +488,7 @@ static ir_type *get_unsigned_int_type_for_bit_size(ir_type *base_tp, char name[32]; snprintf(name, sizeof(name), "bf_U%u", size); - mode = new_ir_mode(name, irms_int_number, size, 0, irma_twos_complement, - size <= 32 ? 32 : size ); + mode = new_int_mode(name, irma_twos_complement, size, 0, 0); u_modes[size] = mode; } @@ -534,36 +499,26 @@ static ir_type *get_unsigned_int_type_for_bit_size(ir_type *base_tp, return res; } -static ir_type *create_bitfield_type(bitfield_type_t *const type) +static ir_type *create_bitfield_type(const entity_t *entity) { - type_t *base = skip_typeref(type->base_type); - assert(base->kind == TYPE_ATOMIC || base->kind == TYPE_ENUM); + assert(entity->kind == ENTITY_COMPOUND_MEMBER); + type_t *base = skip_typeref(entity->declaration.type); + assert(is_type_integer(base)); ir_type *irbase = get_ir_type(base); - unsigned size = type->bit_size; + unsigned bit_size = entity->compound_member.bit_size; - assert(!is_type_float(base)); if (is_type_signed(base)) { - return get_signed_int_type_for_bit_size(irbase, size, - (const type_t*) type); + return get_signed_int_type_for_bit_size(irbase, bit_size, base); } else { - return get_unsigned_int_type_for_bit_size(irbase, size, - (const type_t*) type); + return get_unsigned_int_type_for_bit_size(irbase, bit_size, base); } } -#define INVALID_TYPE ((ir_type_ptr)-1) - -enum { - COMPOUND_IS_STRUCT = false, - COMPOUND_IS_UNION = true -}; - /** * Construct firm type from ast struct type. */ -static ir_type *create_compound_type(compound_type_t *type, - bool incomplete, bool is_union) +static ir_type *create_compound_type(compound_type_t *const type, bool const incomplete) { compound_t *compound = type->compound; @@ -571,10 +526,12 @@ static ir_type *create_compound_type(compound_type_t *type, return compound->irtype; } - symbol_t *symbol = compound->base.symbol; + bool const is_union = type->base.kind == TYPE_COMPOUND_UNION; + + symbol_t *type_symbol = compound->base.symbol; ident *id; - if (symbol != NULL) { - id = new_id_from_str(symbol->string); + if (type_symbol != NULL) { + id = new_id_from_str(type_symbol->string); } else { if (is_union) { id = id_unique("__anonymous_union.%u"); @@ -614,10 +571,9 @@ static ir_type *create_compound_type(compound_type_t *type, ident *ident; if (symbol == NULL) { /* anonymous bitfield member, skip */ - if (entry_type->kind == TYPE_BITFIELD) + if (entry->compound_member.bitfield) continue; - assert(entry_type->kind == TYPE_COMPOUND_STRUCT - || entry_type->kind == TYPE_COMPOUND_UNION); + assert(is_type_compound(entry_type)); ident = id_unique("anon.%u"); } else { ident = new_id_from_str(symbol->string); @@ -625,7 +581,12 @@ static ir_type *create_compound_type(compound_type_t *type, dbg_info *dbgi = get_dbg_info(&entry->base.source_position); - ir_type *entry_irtype = get_ir_type(entry_type); + ir_type *entry_irtype; + if (entry->compound_member.bitfield) { + entry_irtype = create_bitfield_type(entry); + } else { + entry_irtype = get_ir_type(entry_type); + } ir_entity *entity = new_d_entity(irtype, ident, entry_irtype, dbgi); set_entity_offset(entity, entry->compound_member.offset); @@ -644,16 +605,13 @@ static ir_type *create_compound_type(compound_type_t *type, return irtype; } -static ir_type *create_enum_type(enum_type_t *const type) -{ - type->base.firm_type = ir_type_int; - - ir_mode *const mode = mode_int; - tarval *const one = get_mode_one(mode); - tarval * tv_next = get_tarval_null(mode); +static ir_tarval *fold_constant_to_tarval(expression_t const *); - bool constant_folding_old = constant_folding; - constant_folding = true; +static void determine_enum_values(enum_type_t *const type) +{ + ir_mode *const mode = atomic_modes[type->base.akind]; + ir_tarval *const one = get_mode_one(mode); + ir_tarval * tv_next = get_mode_null(mode); enum_t *enume = type->enume; entity_t *entry = enume->base.next; @@ -663,66 +621,52 @@ static ir_type *create_enum_type(enum_type_t *const type) expression_t *const init = entry->enum_value.value; if (init != NULL) { - ir_node *const cnst = expression_to_firm(init); - if (!is_Const(cnst)) { - panic("couldn't fold constant"); - } - tv_next = get_Const_tarval(cnst); + tv_next = fold_constant_to_tarval(init); } + assert(entry->enum_value.tv == NULL || entry->enum_value.tv == tv_next); entry->enum_value.tv = tv_next; tv_next = tarval_add(tv_next, one); } +} - constant_folding = constant_folding_old; - - return create_atomic_type(type->akind, (const type_t*) type); +static ir_type *create_enum_type(enum_type_t *const type) +{ + return create_atomic_type(type->base.akind, (const type_t*) type); } static ir_type *get_ir_type_incomplete(type_t *type) { - assert(type != NULL); type = skip_typeref(type); if (type->base.firm_type != NULL) { - assert(type->base.firm_type != INVALID_TYPE); return type->base.firm_type; } - switch (type->kind) { - case TYPE_COMPOUND_STRUCT: - return create_compound_type(&type->compound, true, COMPOUND_IS_STRUCT); - case TYPE_COMPOUND_UNION: - return create_compound_type(&type->compound, true, COMPOUND_IS_UNION); - default: + if (is_type_compound(type)) { + return create_compound_type(&type->compound, true); + } else { return get_ir_type(type); } } ir_type *get_ir_type(type_t *type) { - assert(type != NULL); - type = skip_typeref(type); if (type->base.firm_type != NULL) { - assert(type->base.firm_type != INVALID_TYPE); return type->base.firm_type; } ir_type *firm_type = NULL; switch (type->kind) { - case TYPE_ERROR: - /* Happens while constant folding, when there was an error */ - return create_atomic_type(ATOMIC_TYPE_VOID, NULL); - case TYPE_ATOMIC: firm_type = create_atomic_type(type->atomic.akind, type); break; case TYPE_COMPLEX: - firm_type = create_complex_type(&type->complex); + firm_type = create_complex_type(&type->atomic); break; case TYPE_IMAGINARY: - firm_type = create_imaginary_type(&type->imaginary); + firm_type = create_imaginary_type(&type->atomic); break; case TYPE_FUNCTION: firm_type = create_method_type(&type->function, false); @@ -737,24 +681,16 @@ ir_type *get_ir_type(type_t *type) firm_type = create_array_type(&type->array); break; case TYPE_COMPOUND_STRUCT: - firm_type = create_compound_type(&type->compound, false, COMPOUND_IS_STRUCT); - break; case TYPE_COMPOUND_UNION: - firm_type = create_compound_type(&type->compound, false, COMPOUND_IS_UNION); + firm_type = create_compound_type(&type->compound, false); break; case TYPE_ENUM: firm_type = create_enum_type(&type->enumt); break; - case TYPE_BUILTIN: - firm_type = get_ir_type(type->builtin.real_type); - break; - case TYPE_BITFIELD: - firm_type = create_bitfield_type(&type->bitfield); - break; + case TYPE_ERROR: case TYPE_TYPEOF: case TYPE_TYPEDEF: - case TYPE_INVALID: break; } if (firm_type == NULL) @@ -766,18 +702,24 @@ ir_type *get_ir_type(type_t *type) static ir_mode *get_ir_mode_storage(type_t *type) { - ir_type *irtype = get_ir_type(type); + type = skip_typeref(type); - /* firm doesn't report a mode for arrays somehow... */ - if (is_Array_type(irtype)) { + /* Firm doesn't report a mode for arrays and structs/unions. */ + if (!is_type_scalar(type)) { return mode_P_data; } - ir_mode *mode = get_type_mode(irtype); + ir_type *const irtype = get_ir_type(type); + ir_mode *const mode = get_type_mode(irtype); assert(mode != NULL); return mode; } +/* + * get arithmetic mode for a type. This is different from get_ir_mode_storage, + * int that it returns bigger modes for floating point on some platforms + * (x87 internally does arithemtic with 80bits) + */ static ir_mode *get_ir_mode_arithmetic(type_t *type) { ir_mode *mode = get_ir_mode_storage(type); @@ -788,6 +730,26 @@ static ir_mode *get_ir_mode_arithmetic(type_t *type) return mode; } +/** + * Return a node representing the size of a type. + */ +static ir_node *get_type_size_node(type_t *type) +{ + unsigned size; + ir_mode *mode = get_ir_mode_arithmetic(type_size_t); + type = skip_typeref(type); + + if (is_type_array(type) && type->array.is_vla) { + ir_node *size_node = get_vla_size(&type->array); + ir_node *elem_size = get_type_size_node(type->array.element_type); + ir_node *real_size = new_d_Mul(NULL, size_node, elem_size, mode); + return real_size; + } + + size = get_type_size(type); + return new_Const_long(mode, size); +} + /** Names of the runtime functions. */ static const struct { int id; /**< the rts id */ @@ -868,16 +830,42 @@ static const struct { { rts_strncmp, 1, "strncmp", 3, _C89 }, { rts_strcpy, 1, "strcpy", 2, _C89 }, { rts_strlen, 1, "strlen", 1, _C89 }, - { rts_memcpy, 1, "memcpy", 3, _C89 }, /* HMM, man say its C99 */ + { rts_memcpy, 1, "memcpy", 3, _C89 }, { rts_mempcpy, 1, "mempcpy", 3, _GNUC }, - { rts_memmove, 1, "memmove", 3, _C89 }, /* HMM, man say its C99 */ - { rts_memset, 1, "memset", 3, _C89 }, /* HMM, man say its C99 */ - { rts_memcmp, 1, "memcmp", 3, _C89 }, /* HMM, man say its C99 */ + { rts_memmove, 1, "memmove", 3, _C89 }, + { rts_memset, 1, "memset", 3, _C89 }, + { rts_memcmp, 1, "memcmp", 3, _C89 }, }; static ident *rts_idents[lengthof(rts_data)]; -static ident* (*create_ld_ident)(entity_t*) = create_name_linux_elf; +static create_ld_ident_func create_ld_ident = create_name_linux_elf; + +void set_create_ld_ident(ident *(*func)(entity_t*)) +{ + create_ld_ident = func; +} + +static bool declaration_is_definition(const entity_t *entity) +{ + switch (entity->kind) { + case ENTITY_VARIABLE: + return entity->declaration.storage_class != STORAGE_CLASS_EXTERN; + case ENTITY_FUNCTION: + return entity->function.statement != NULL; + case ENTITY_PARAMETER: + case ENTITY_COMPOUND_MEMBER: + return false; + case ENTITY_TYPEDEF: + case ENTITY_ENUM: + case ENTITY_ENUM_VALUE: + case ENTITY_NAMESPACE: + case ENTITY_LABEL: + case ENTITY_LOCAL_LABEL: + break; + } + panic("declaration_is_definition called on non-declaration"); +} /** * Handle GNU attributes for entities @@ -892,17 +880,17 @@ static void handle_decl_modifiers(ir_entity *irentity, entity_t *entity) if (is_method_entity(irentity)) { if (modifiers & DM_PURE) { - set_entity_additional_property(irentity, mtp_property_pure); + set_entity_additional_properties(irentity, mtp_property_pure); } if (modifiers & DM_CONST) { - set_entity_additional_property(irentity, mtp_property_const); - have_const_functions = true; + add_entity_additional_properties(irentity, mtp_property_const); } } - if (modifiers & DM_USED) { + if ((modifiers & DM_USED) && declaration_is_definition(entity)) { add_entity_linkage(irentity, IR_LINKAGE_HIDDEN_USER); } - if (modifiers & DM_WEAK) { + if ((modifiers & DM_WEAK) && declaration_is_definition(entity) + && entity->declaration.storage_class != STORAGE_CLASS_EXTERN) { add_entity_linkage(irentity, IR_LINKAGE_WEAK); } } @@ -926,41 +914,32 @@ static bool is_main(entity_t *entity) /** * Creates an entity representing a function. * - * @param declaration the function declaration + * @param entity the function declaration/definition * @param owner_type the owner type of this function, NULL * for global functions */ static ir_entity *get_function_entity(entity_t *entity, ir_type *owner_type) { assert(entity->kind == ENTITY_FUNCTION); - if (entity->function.irentity != NULL) { + if (entity->function.irentity != NULL) return entity->function.irentity; - } - if (is_main(entity)) { - /* force main to C linkage */ - type_t *type = entity->declaration.type; - assert(is_type_function(type)); - if (type->function.linkage != LINKAGE_C) { - type_t *new_type = duplicate_type(type); - new_type->function.linkage = LINKAGE_C; - type = identify_new_type(new_type); - entity->declaration.type = type; - } + switch (entity->function.btk) { + case BUILTIN_NONE: + case BUILTIN_LIBC: + case BUILTIN_LIBC_CHECK: + break; + default: + return NULL; } symbol_t *symbol = entity->base.symbol; ident *id = new_id_from_str(symbol->string); - /* already an entity defined? */ ir_entity *irentity = entitymap_get(&entitymap, symbol); bool const has_body = entity->function.statement != NULL; if (irentity != NULL) { - if (get_entity_visibility(irentity) == ir_visibility_external - && has_body) { - set_entity_visibility(irentity, ir_visibility_default); - } goto entity_created; } @@ -977,7 +956,7 @@ static ir_entity *get_function_entity(entity_t *entity, ir_type *owner_type) nested_function = true; dbg_info *const dbgi = get_dbg_info(&entity->base.source_position); - irentity = new_d_entity(owner_type, id, ir_type_method, dbgi); + irentity = new_d_entity(owner_type, id, ir_type_method, dbgi); ident *ld_id; if (nested_function) @@ -989,37 +968,51 @@ static ir_entity *get_function_entity(entity_t *entity, ir_type *owner_type) handle_decl_modifiers(irentity, entity); if (! nested_function) { - /* static inline => local - * extern inline => local - * inline without definition => local - * inline with definition => external_visible */ storage_class_tag_t const storage_class = (storage_class_tag_t) entity->declaration.storage_class; - bool const is_inline = entity->function.is_inline; - - if (is_inline && storage_class == STORAGE_CLASS_NONE && has_body) { - set_entity_visibility(irentity, ir_visibility_default); - } else if (storage_class == STORAGE_CLASS_STATIC || - (is_inline && has_body)) { + if (storage_class == STORAGE_CLASS_STATIC) { set_entity_visibility(irentity, ir_visibility_local); - } else if (has_body) { - set_entity_visibility(irentity, ir_visibility_default); } else { set_entity_visibility(irentity, ir_visibility_external); } + + bool const is_inline = entity->function.is_inline; + if (is_inline && has_body) { + if (((c_mode & _C99) && storage_class == STORAGE_CLASS_NONE) + || ((c_mode & _C99) == 0 + && storage_class == STORAGE_CLASS_EXTERN)) { + add_entity_linkage(irentity, IR_LINKAGE_NO_CODEGEN); + } + } } else { /* nested functions are always local */ - set_entity_visibility(irentity, ir_visibility_local); + set_entity_visibility(irentity, ir_visibility_local); } /* We should check for file scope here, but as long as we compile C only this is not needed. */ - if (! firm_opt.freestanding && !has_body) { + if (!freestanding && !has_body) { /* check for a known runtime function */ for (size_t i = 0; i < lengthof(rts_data); ++i) { if (id != rts_idents[i]) continue; + function_type_t *function_type + = &entity->declaration.type->function; + /* rts_entities code can't handle a "wrong" number of parameters */ + if (function_type->unspecified_parameters) + continue; + + /* check number of parameters */ + int n_params = count_parameters(function_type); + if (n_params != rts_data[i].n_params) + continue; + + type_t *return_type = skip_typeref(function_type->return_type); + int n_res = is_type_void(return_type) ? 0 : 1; + if (n_res != rts_data[i].n_res) + continue; + /* ignore those rts functions not necessary needed for current mode */ if ((c_mode & rts_data[i].flags) == 0) continue; @@ -1037,92 +1030,296 @@ entity_created: return irentity; } +/** + * Creates a SymConst for a given entity. + * + * @param dbgi debug info + * @param entity the entity + */ +static ir_node *create_symconst(dbg_info *dbgi, ir_entity *entity) +{ + assert(entity != NULL); + union symconst_symbol sym; + sym.entity_p = entity; + return new_d_SymConst(dbgi, mode_P, sym, symconst_addr_ent); +} + +static ir_node *create_Const_from_bool(ir_mode *const mode, bool const v) +{ + return new_Const((v ? get_mode_one : get_mode_null)(mode)); +} + +static ir_node *create_conv_from_b(dbg_info *dbgi, ir_node *value, + ir_mode *dest_mode) +{ + if (is_Const(value)) { + return create_Const_from_bool(dest_mode, !is_Const_null(value)); + } + + ir_node *cond = new_d_Cond(dbgi, value); + ir_node *proj_true = new_Proj(cond, mode_X, pn_Cond_true); + ir_node *proj_false = new_Proj(cond, mode_X, pn_Cond_false); + ir_node *tblock = new_Block(1, &proj_true); + ir_node *fblock = new_Block(1, &proj_false); + set_cur_block(tblock); + ir_node *const1 = new_Const(get_mode_one(dest_mode)); + ir_node *tjump = new_Jmp(); + set_cur_block(fblock); + ir_node *const0 = new_Const(get_mode_null(dest_mode)); + ir_node *fjump = new_Jmp(); + + ir_node *in[2] = { tjump, fjump }; + ir_node *mergeblock = new_Block(2, in); + set_cur_block(mergeblock); + ir_node *phi_in[2] = { const1, const0 }; + ir_node *phi = new_Phi(2, phi_in, dest_mode); + return phi; +} + static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode) { ir_mode *value_mode = get_irn_mode(value); - if (value_mode == dest_mode || is_Bad(value)) + if (value_mode == dest_mode) return value; if (dest_mode == mode_b) { ir_node *zero = new_Const(get_mode_null(value_mode)); - ir_node *cmp = new_d_Cmp(dbgi, value, zero); - ir_node *proj = new_d_Proj(dbgi, cmp, mode_b, pn_Cmp_Lg); - return proj; + ir_node *cmp = new_d_Cmp(dbgi, value, zero, ir_relation_unordered_less_greater); + return cmp; + } else if (value_mode == mode_b) { + return create_conv_from_b(dbgi, value, dest_mode); } return new_d_Conv(dbgi, value, dest_mode); } /** - * Creates a Const node representing a constant. + * Creates a SymConst node representing a string constant. + * + * @param src_pos the source position of the string constant + * @param id_prefix a prefix for the name of the generated string constant + * @param value the value of the string constant */ -static ir_node *const_to_firm(const const_expression_t *cnst) +static ir_node *string_to_firm(source_position_t const *const src_pos, char const *const id_prefix, string_t const *const value) +{ + size_t const slen = get_string_len(value) + 1; + ir_initializer_t *const initializer = create_initializer_compound(slen); + ir_type * elem_type; + switch (value->encoding) { + case STRING_ENCODING_CHAR: { + elem_type = ir_type_char; + + ir_mode *const mode = get_type_mode(elem_type); + char const *p = value->begin; + for (size_t i = 0; i < slen; ++i) { + ir_tarval *tv = new_tarval_from_long(*p++, mode); + ir_initializer_t *val = create_initializer_tarval(tv); + set_initializer_compound_value(initializer, i, val); + } + goto finish; + } + + case STRING_ENCODING_WIDE: { + elem_type = ir_type_wchar_t; + + ir_mode *const mode = get_type_mode(elem_type); + char const *p = value->begin; + for (size_t i = 0; i < slen; ++i) { + assert(p <= value->begin + value->size); + utf32 v = read_utf8_char(&p); + ir_tarval *tv = new_tarval_from_long(v, mode); + ir_initializer_t *val = create_initializer_tarval(tv); + set_initializer_compound_value(initializer, i, val); + } + goto finish; + } + } + panic("invalid string encoding"); + +finish:; + ir_type *const type = new_type_array(1, elem_type); + set_array_bounds_int(type, 0, 0, slen); + set_type_size_bytes( type, slen * get_type_size_bytes(elem_type)); + set_type_state( type, layout_fixed); + + ir_type *const global_type = get_glob_type(); + ident *const id = id_unique(id_prefix); + dbg_info *const dbgi = get_dbg_info(src_pos); + ir_entity *const entity = new_d_entity(global_type, id, type, dbgi); + set_entity_ld_ident( entity, id); + set_entity_visibility( entity, ir_visibility_private); + add_entity_linkage( entity, IR_LINKAGE_CONSTANT); + set_entity_initializer(entity, initializer); + + return create_symconst(dbgi, entity); +} + +static bool try_create_integer(literal_expression_t *literal, type_t *type) { - dbg_info *dbgi = get_dbg_info(&cnst->base.source_position); - type_t *type = skip_typeref(cnst->base.type); - ir_mode *mode = get_ir_mode_storage(type); + const char *string = literal->value.begin; + size_t size = literal->value.size; - char buf[128]; - tarval *tv; - size_t len; - if (mode_is_float(mode)) { - tv = new_tarval_from_double(cnst->v.float_value, mode); - } else { - if (mode_is_signed(mode)) { - len = snprintf(buf, sizeof(buf), "%lld", cnst->v.int_value); - } else { - len = snprintf(buf, sizeof(buf), "%llu", - (unsigned long long) cnst->v.int_value); + assert(type->kind == TYPE_ATOMIC); + atomic_type_kind_t akind = type->atomic.akind; + + ir_mode *const mode = atomic_modes[akind]; + ir_tarval *const tv = new_tarval_from_str(string, size, mode); + if (tv == tarval_bad) + return false; + + literal->base.type = type; + literal->target_value = tv; + return true; +} + +static void create_integer_tarval(literal_expression_t *literal) +{ + /* -1: signed only, 0: any, 1: unsigned only */ + int sign = literal->value.begin[0] != '0' /* decimal */ ? -1 : 0; + unsigned ls = 0; + const string_t *suffix = &literal->suffix; + /* parse suffix */ + if (suffix->size > 0) { + for (const char *c = suffix->begin; *c != '\0'; ++c) { + if (*c == 'u' || *c == 'U') sign = 1; + if (*c == 'l' || *c == 'L') { ++ls; } } - tv = new_tarval_from_str(buf, len, mode); } - ir_node *res = new_d_Const(dbgi, tv); - ir_mode *mode_arith = get_ir_mode_arithmetic(type); - return create_conv(dbgi, res, mode_arith); + tarval_int_overflow_mode_t old_mode = tarval_get_integer_overflow_mode(); + + /* now try if the constant is small enough for some types */ + tarval_set_integer_overflow_mode(TV_OVERFLOW_BAD); + if (ls < 1) { + if (sign <= 0 && try_create_integer(literal, type_int)) + goto finished; + if (sign >= 0 && try_create_integer(literal, type_unsigned_int)) + goto finished; + } + if (ls < 2) { + if (sign <= 0 && try_create_integer(literal, type_long)) + goto finished; + if (sign >= 0 && try_create_integer(literal, type_unsigned_long)) + goto finished; + } + /* last try? then we should not report tarval_bad */ + if (sign < 0) + tarval_set_integer_overflow_mode(TV_OVERFLOW_WRAP); + if (sign <= 0 && try_create_integer(literal, type_long_long)) + goto finished; + + /* last try */ + assert(sign >= 0); + tarval_set_integer_overflow_mode(TV_OVERFLOW_WRAP); + bool res = try_create_integer(literal, type_unsigned_long_long); + if (!res) + panic("internal error when parsing number literal"); + +finished: + tarval_set_integer_overflow_mode(old_mode); +} + +void determine_literal_type(literal_expression_t *literal) +{ + switch (literal->base.kind) { + case EXPR_LITERAL_INTEGER: + create_integer_tarval(literal); + return; + default: + break; + } } /** - * Creates a Const node representing a character constant. + * Creates a Const node representing a constant. */ -static ir_node *character_constant_to_firm(const const_expression_t *cnst) -{ - dbg_info *dbgi = get_dbg_info(&cnst->base.source_position); - ir_mode *mode = get_ir_mode_arithmetic(cnst->base.type); +static ir_node *literal_to_firm(const literal_expression_t *literal) +{ + type_t *type = skip_typeref(literal->base.type); + ir_mode *mode = get_ir_mode_storage(type); + const char *string = literal->value.begin; + size_t size = literal->value.size; + ir_tarval *tv; + + switch (literal->base.kind) { + case EXPR_LITERAL_INTEGER: + assert(literal->target_value != NULL); + tv = literal->target_value; + break; - long long int v; - size_t const size = cnst->v.character.size; - if (size == 1 && char_is_signed) { - v = (signed char)cnst->v.character.begin[0]; - } else { - v = 0; - for (size_t i = 0; i < size; ++i) { - v = (v << 8) | ((unsigned char)cnst->v.character.begin[i]); + case EXPR_LITERAL_FLOATINGPOINT: + tv = new_tarval_from_str(string, size, mode); + break; + + case EXPR_LITERAL_BOOLEAN: + if (string[0] == 't') { + tv = get_mode_one(mode); + } else { + assert(string[0] == 'f'); + case EXPR_LITERAL_MS_NOOP: + tv = get_mode_null(mode); } + break; + + default: + panic("Invalid literal kind found"); } - char buf[128]; - size_t len = snprintf(buf, sizeof(buf), "%lld", v); - tarval *tv = new_tarval_from_str(buf, len, mode); - return new_d_Const(dbgi, tv); + dbg_info *dbgi = get_dbg_info(&literal->base.source_position); + ir_node *res = new_d_Const(dbgi, tv); + ir_mode *mode_arith = get_ir_mode_arithmetic(type); + return create_conv(dbgi, res, mode_arith); } /** - * Creates a Const node representing a wide character constant. + * Creates a Const node representing a character constant. */ -static ir_node *wide_character_constant_to_firm(const const_expression_t *cnst) +static ir_node *char_literal_to_firm(string_literal_expression_t const *literal) { - dbg_info *dbgi = get_dbg_info(&cnst->base.source_position); - ir_mode *mode = get_ir_mode_arithmetic(cnst->base.type); + type_t *type = skip_typeref(literal->base.type); + ir_mode *mode = get_ir_mode_storage(type); + const char *string = literal->value.begin; + size_t size = literal->value.size; + ir_tarval *tv; + + switch (literal->value.encoding) { + case STRING_ENCODING_WIDE: { + utf32 v = read_utf8_char(&string); + char buf[128]; + size_t len = snprintf(buf, sizeof(buf), UTF32_PRINTF_FORMAT, v); - long long int v = cnst->v.wide_character.begin[0]; + tv = new_tarval_from_str(buf, len, mode); + break; + } - char buf[128]; - size_t len = snprintf(buf, sizeof(buf), "%lld", v); - tarval *tv = new_tarval_from_str(buf, len, mode); + case STRING_ENCODING_CHAR: { + long long int v; + bool char_is_signed + = get_atomic_type_flags(ATOMIC_TYPE_CHAR) & ATOMIC_TYPE_FLAG_SIGNED; + if (size == 1 && char_is_signed) { + v = (signed char)string[0]; + } else { + v = 0; + for (size_t i = 0; i < size; ++i) { + v = (v << 8) | ((unsigned char)string[i]); + } + } + char buf[128]; + size_t len = snprintf(buf, sizeof(buf), "%lld", v); - return new_d_Const(dbgi, tv); + tv = new_tarval_from_str(buf, len, mode); + break; + } + + default: + panic("Invalid literal kind found"); + } + + dbg_info *dbgi = get_dbg_info(&literal->base.source_position); + ir_node *res = new_d_Const(dbgi, tv); + ir_mode *mode_arith = get_ir_mode_arithmetic(type); + return create_conv(dbgi, res, mode_arith); } /* @@ -1186,23 +1383,6 @@ static ir_node *get_trampoline_region(dbg_info *dbgi, ir_entity *entity) region); } - -/** - * Creates a SymConst for a given entity. - * - * @param dbgi debug info - * @param mode the (reference) mode for the SymConst - * @param entity the entity - */ -static ir_node *create_symconst(dbg_info *dbgi, ir_mode *mode, - ir_entity *entity) -{ - assert(entity != NULL); - union symconst_symbol sym; - sym.entity_p = entity; - return new_d_SymConst(dbgi, mode, sym, symconst_addr_ent); -} - /** * Creates a trampoline for a function represented by an entity. * @@ -1216,127 +1396,36 @@ static ir_node *create_trampoline(dbg_info *dbgi, ir_mode *mode, assert(entity != NULL); ir_node *in[3]; in[0] = get_trampoline_region(dbgi, entity); - in[1] = create_symconst(dbgi, mode, entity); + in[1] = create_symconst(dbgi, entity); in[2] = get_irg_frame(current_ir_graph); ir_node *irn = new_d_Builtin(dbgi, get_store(), 3, in, ir_bk_inner_trampoline, get_unknown_type()); set_store(new_Proj(irn, mode_M, pn_Builtin_M)); - return new_Proj(irn, mode, pn_Builtin_1_result); + return new_Proj(irn, mode, pn_Builtin_max+1); } /** - * Creates a SymConst node representing a string constant. + * Dereference an address. * - * @param src_pos the source position of the string constant - * @param id_prefix a prefix for the name of the generated string constant - * @param value the value of the string constant + * @param dbgi debug info + * @param type the type of the dereferenced result (the points_to type) + * @param addr the address to dereference */ -static ir_node *string_to_firm(const source_position_t *const src_pos, - const char *const id_prefix, - const string_t *const value) +static ir_node *deref_address(dbg_info *const dbgi, type_t *const type, + ir_node *const addr) { - ir_type *const global_type = get_glob_type(); - dbg_info *const dbgi = get_dbg_info(src_pos); - ir_type *const type = new_type_array(1, ir_type_const_char); - - ident *const id = id_unique(id_prefix); - ir_entity *const entity = new_d_entity(global_type, id, type, dbgi); - set_entity_ld_ident(entity, id); - set_entity_visibility(entity, ir_visibility_local); - add_entity_linkage(entity, IR_LINKAGE_CONSTANT); + type_t *skipped = skip_typeref(type); + if (is_type_incomplete(skipped)) + return addr; - ir_type *const elem_type = ir_type_const_char; - ir_mode *const mode = get_type_mode(elem_type); - - const char* const string = value->begin; - const size_t slen = value->size; - - set_array_lower_bound_int(type, 0, 0); - set_array_upper_bound_int(type, 0, slen); - set_type_size_bytes(type, slen); - set_type_state(type, layout_fixed); - - ir_initializer_t *initializer = create_initializer_compound(slen); - for (size_t i = 0; i < slen; ++i) { - tarval *tv = new_tarval_from_long(string[i], mode); - ir_initializer_t *val = create_initializer_tarval(tv); - set_initializer_compound_value(initializer, i, val); - } - set_entity_initializer(entity, initializer); - - return create_symconst(dbgi, mode_P_data, entity); -} - -/** - * Creates a SymConst node representing a string literal. - * - * @param literal the string literal - */ -static ir_node *string_literal_to_firm( - const string_literal_expression_t* literal) -{ - return string_to_firm(&literal->base.source_position, "Lstr.%u", - &literal->value); -} - -/** - * Creates a SymConst node representing a wide string literal. - * - * @param literal the wide string literal - */ -static ir_node *wide_string_literal_to_firm( - const wide_string_literal_expression_t* const literal) -{ - ir_type *const global_type = get_glob_type(); - ir_type *const elem_type = ir_type_wchar_t; - dbg_info *const dbgi = get_dbg_info(&literal->base.source_position); - ir_type *const type = new_type_array(1, elem_type); - - ident *const id = id_unique("Lstr.%u"); - ir_entity *const entity = new_d_entity(global_type, id, type, dbgi); - set_entity_ld_ident(entity, id); - set_entity_visibility(entity, ir_visibility_local); - add_entity_linkage(entity, IR_LINKAGE_CONSTANT); - - ir_mode *const mode = get_type_mode(elem_type); - - const wchar_rep_t *const string = literal->value.begin; - const size_t slen = literal->value.size; - - set_array_lower_bound_int(type, 0, 0); - set_array_upper_bound_int(type, 0, slen); - set_type_size_bytes(type, slen * get_mode_size_bytes(mode)); - set_type_state(type, layout_fixed); - - ir_initializer_t *initializer = create_initializer_compound(slen); - for (size_t i = 0; i < slen; ++i) { - tarval *tv = new_tarval_from_long(string[i], mode); - ir_initializer_t *val = create_initializer_tarval(tv); - set_initializer_compound_value(initializer, i, val); - } - set_entity_initializer(entity, initializer); - - return create_symconst(dbgi, mode_P_data, entity); -} - -/** - * Dereference an address. - * - * @param dbgi debug info - * @param type the type of the dereferenced result (the points_to type) - * @param addr the address to dereference - */ -static ir_node *deref_address(dbg_info *const dbgi, type_t *const type, - ir_node *const addr) -{ - ir_type *irtype = get_ir_type(type); + ir_type *irtype = get_ir_type(skipped); if (is_compound_type(irtype) - || is_Method_type(irtype) - || is_Array_type(irtype)) { + || is_Method_type(irtype) + || is_Array_type(irtype)) { return addr; } - ir_cons_flags flags = type->base.qualifiers & TYPE_QUALIFIER_VOLATILE + ir_cons_flags flags = skipped->base.qualifiers & TYPE_QUALIFIER_VOLATILE ? cons_volatile : cons_none; ir_mode *const mode = get_type_mode(irtype); ir_node *const memory = get_store(); @@ -1346,7 +1435,7 @@ static ir_node *deref_address(dbg_info *const dbgi, type_t *const type, set_store(load_mem); - ir_mode *const mode_arithmetic = get_ir_mode_arithmetic(type); + ir_mode *const mode_arithmetic = get_ir_mode_arithmetic(skipped); return create_conv(dbgi, load_res, mode_arithmetic); } @@ -1376,25 +1465,6 @@ static ir_node *do_strict_conv(dbg_info *dbgi, ir_node *node) return new_d_strictConv(dbgi, node, mode); } -/** - * Returns the address of a global variable. - * - * @param dbgi debug info - * @param variable the variable - */ -static ir_node *get_global_var_address(dbg_info *const dbgi, - const variable_t *const variable) -{ - ir_entity *const irentity = variable->v.entity; - if (variable->thread_local) { - ir_node *const no_mem = new_NoMem(); - ir_node *const tls = get_irg_tls(current_ir_graph); - return new_d_simpleSel(dbgi, no_mem, tls, irentity); - } else { - return create_symconst(dbgi, mode_P_data, irentity); - } -} - /** * Returns the correct base address depending on whether it is a parameter or a * normal local variable. @@ -1403,7 +1473,7 @@ static ir_node *get_local_frame(ir_entity *const ent) { ir_graph *const irg = current_ir_graph; const ir_type *const owner = get_entity_owner(ent); - if (owner == current_outer_frame || owner == current_outer_value_type) { + if (owner == current_outer_frame) { assert(current_static_link != NULL); return current_static_link; } else { @@ -1424,104 +1494,40 @@ static void keep_all_memory(ir_node *block) set_cur_block(old); } -static ir_node *reference_expression_enum_value_to_firm( - const reference_expression_t *ref) +static ir_node *enum_constant_to_firm(reference_expression_t const *const 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); + if (entity->enum_value.tv == NULL) { + type_t *type = skip_typeref(entity->enum_value.enum_type); + assert(type->kind == TYPE_ENUM); + determine_enum_values(&type->enumt); + } return new_Const(entity->enum_value.tv); } -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); 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); - - /* for gcc compatibility we have to produce (dummy) addresses for some - * builtins */ - if (entity->kind == ENTITY_FUNCTION && entity->function.btk != bk_none) { - if (warning.other) { - warningf(&ref->base.source_position, - "taking address of builtin '%Y'", ref->entity->base.symbol); - } - - /* simply create a NULL pointer */ - ir_mode *mode = get_ir_mode_arithmetic(type_void_ptr); - ir_node *res = new_Const_long(mode, 0); - return res; - } + if (entity->kind == ENTITY_FUNCTION + && entity->function.btk != BUILTIN_NONE) { + ir_entity *irentity = get_function_entity(entity, NULL); + /* for gcc compatibility we have to produce (dummy) addresses for some + * builtins which don't have entities */ + if (irentity == NULL) { + source_position_t const *const pos = &ref->base.source_position; + warningf(WARN_OTHER, pos, "taking address of builtin '%N'", ref->entity); - switch ((declaration_kind_t) entity->declaration.kind) { - case DECLARATION_KIND_UNKNOWN: - break; + /* simply create a NULL pointer */ + ir_mode *mode = get_ir_mode_arithmetic(type_void_ptr); + ir_node *res = new_Const(get_mode_null(mode)); - case DECLARATION_KIND_LOCAL_VARIABLE: { - ir_mode *const mode = get_ir_mode_storage(type); - ir_node *const value = get_value(entity->variable.v.value_number, mode); - return create_conv(NULL, value, get_ir_mode_arithmetic(type)); - } - case DECLARATION_KIND_PARAMETER: { - ir_mode *const mode = get_ir_mode_storage(type); - ir_node *const value = get_value(entity->parameter.v.value_number,mode); - return create_conv(NULL, value, get_ir_mode_arithmetic(type)); - } - case DECLARATION_KIND_FUNCTION: { - ir_mode *const mode = get_ir_mode_storage(type); - return create_symconst(dbgi, mode, entity->function.irentity); - } - case DECLARATION_KIND_INNER_FUNCTION: { - ir_mode *const mode = get_ir_mode_storage(type); - if (!entity->function.goto_to_outer && !entity->function.need_closure) { - /* inner function not using the closure */ - return create_symconst(dbgi, mode, entity->function.irentity); - } else { - /* need trampoline here */ - return create_trampoline(dbgi, mode, entity->function.irentity); + return res; } } - case DECLARATION_KIND_GLOBAL_VARIABLE: { - const variable_t *variable = &entity->variable; - ir_node *const addr = get_global_var_address(dbgi, variable); - return deref_address(dbgi, variable->base.type, addr); - } - - case DECLARATION_KIND_LOCAL_VARIABLE_ENTITY: { - ir_entity *irentity = entity->variable.v.entity; - ir_node *frame = get_local_frame(irentity); - ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, irentity); - return deref_address(dbgi, entity->declaration.type, sel); - } - case DECLARATION_KIND_PARAMETER_ENTITY: { - ir_entity *irentity = entity->parameter.v.entity; - ir_node *frame = get_local_frame(irentity); - ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, irentity); - return deref_address(dbgi, entity->declaration.type, sel); - } - - case DECLARATION_KIND_VARIABLE_LENGTH_ARRAY: - return entity->variable.v.vla_base; - - case DECLARATION_KIND_COMPOUND_MEMBER: - panic("not implemented reference type"); - } - - panic("reference to declaration with unknown type found"); -} - -static ir_node *reference_addr(const reference_expression_t *ref) -{ - dbg_info *dbgi = get_dbg_info(&ref->base.source_position); - entity_t *entity = ref->entity; - assert(is_declaration(entity)); switch((declaration_kind_t) entity->declaration.kind) { case DECLARATION_KIND_UNKNOWN: @@ -1532,21 +1538,15 @@ static ir_node *reference_addr(const reference_expression_t *ref) * as an indicator for no real address) */ return NULL; case DECLARATION_KIND_GLOBAL_VARIABLE: { - ir_node *const addr = get_global_var_address(dbgi, &entity->variable); + ir_node *const addr = create_symconst(dbgi, entity->variable.v.entity); return addr; } - case DECLARATION_KIND_LOCAL_VARIABLE_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_LOCAL_VARIABLE_ENTITY: case DECLARATION_KIND_PARAMETER_ENTITY: { - ir_entity *irentity = entity->parameter.v.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; } @@ -1554,9 +1554,7 @@ static ir_node *reference_addr(const reference_expression_t *ref) return entity->variable.v.vla_base; case DECLARATION_KIND_FUNCTION: { - type_t *const type = skip_typeref(entity->declaration.type); - ir_mode *const mode = get_ir_mode_storage(type); - return create_symconst(dbgi, mode, entity->function.irentity); + return create_symconst(dbgi, entity->function.irentity); } case DECLARATION_KIND_INNER_FUNCTION: { @@ -1564,7 +1562,7 @@ static ir_node *reference_addr(const reference_expression_t *ref) ir_mode *const mode = get_ir_mode_storage(type); if (!entity->function.goto_to_outer && !entity->function.need_closure) { /* inner function not using the closure */ - return create_symconst(dbgi, mode, entity->function.irentity); + return create_symconst(dbgi, entity->function.irentity); } else { /* need trampoline here */ return create_trampoline(dbgi, mode, entity->function.irentity); @@ -1578,69 +1576,26 @@ static ir_node *reference_addr(const reference_expression_t *ref) panic("reference to declaration with unknown type found"); } -/** - * Generate an unary builtin. - * - * @param kind the builtin kind to generate - * @param op the operand - * @param function_type the function type for the GNU builtin routine - * @param db debug info - */ -static ir_node *gen_unary_builtin(ir_builtin_kind kind, expression_t *op, type_t *function_type, dbg_info *db) -{ - ir_node *in[1]; - in[0] = expression_to_firm(op); - - ir_type *tp = get_ir_type(function_type); - ir_type *res = get_method_res_type(tp, 0); - ir_node *irn = new_d_Builtin(db, get_irg_no_mem(current_ir_graph), 1, in, kind, tp); - set_irn_pinned(irn, op_pin_state_floats); - return new_Proj(irn, get_type_mode(res), pn_Builtin_1_result); -} - -/** - * Generate a pinned unary builtin. - * - * @param kind the builtin kind to generate - * @param op the operand - * @param function_type the function type for the GNU builtin routine - * @param db debug info - */ -static ir_node *gen_unary_builtin_pinned(ir_builtin_kind kind, expression_t *op, type_t *function_type, dbg_info *db) +static ir_node *reference_expression_to_firm(const reference_expression_t *ref) { - ir_node *in[1]; - in[0] = expression_to_firm(op); - - ir_type *tp = get_ir_type(function_type); - ir_type *res = get_method_res_type(tp, 0); - ir_node *mem = get_store(); - ir_node *irn = new_d_Builtin(db, mem, 1, in, kind, tp); - set_store(new_Proj(irn, mode_M, pn_Builtin_M)); - return new_Proj(irn, get_type_mode(res), pn_Builtin_1_result); -} - + dbg_info *const dbgi = get_dbg_info(&ref->base.source_position); + entity_t *const entity = ref->entity; + assert(is_declaration(entity)); -/** - * Generate an binary-void-return builtin. - * - * @param kind the builtin kind to generate - * @param op1 the first operand - * @param op2 the second operand - * @param function_type the function type for the GNU builtin routine - * @param db debug info - */ -static ir_node *gen_binary_builtin_mem(ir_builtin_kind kind, expression_t *op1, expression_t *op2, - type_t *function_type, dbg_info *db) -{ - ir_node *in[2]; - in[0] = expression_to_firm(op1); - in[1] = expression_to_firm(op2); + switch ((declaration_kind_t)entity->declaration.kind) { + case DECLARATION_KIND_LOCAL_VARIABLE: + case DECLARATION_KIND_PARAMETER: { + type_t *const type = skip_typeref(entity->declaration.type); + ir_mode *const mode = get_ir_mode_storage(type); + ir_node *const value = get_value(entity->variable.v.value_number, mode); + return create_conv(dbgi, value, get_ir_mode_arithmetic(type)); + } - ir_type *tp = get_ir_type(function_type); - ir_node *mem = get_store(); - ir_node *irn = new_d_Builtin(db, mem, 2, in, kind, tp); - set_store(new_Proj(irn, mode_M, pn_Builtin_M)); - return NULL; + default: { + ir_node *const addr = reference_addr(ref); + return deref_address(dbgi, entity->declaration.type, addr); + } + } } /** @@ -1653,21 +1608,20 @@ static ir_node *process_builtin_call(const call_expression_t *call) assert(call->function->kind == EXPR_REFERENCE); reference_expression_t *builtin = &call->function->reference; - type_t *type = skip_typeref(builtin->base.type); - assert(is_type_pointer(type)); + type_t *expr_type = skip_typeref(builtin->base.type); + assert(is_type_pointer(expr_type)); - type_t *function_type = skip_typeref(type->pointer.points_to); + type_t *function_type = skip_typeref(expr_type->pointer.points_to); switch (builtin->entity->function.btk) { - case bk_gnu_builtin_alloca: { - if (call->arguments == NULL || call->arguments->next != NULL) { - panic("invalid number of parameters on __builtin_alloca"); - } + case BUILTIN_NONE: + break; + case BUILTIN_ALLOCA: { expression_t *argument = call->arguments->expression; ir_node *size = expression_to_firm(argument); ir_node *store = get_store(); - ir_node *alloca = new_d_Alloc(dbgi, store, size, firm_unknown_type, + ir_node *alloca = new_d_Alloc(dbgi, store, size, get_unknown_type(), stack_alloc); ir_node *proj_m = new_Proj(alloca, mode_M, pn_Alloc_M); set_store(proj_m); @@ -1675,157 +1629,65 @@ static ir_node *process_builtin_call(const call_expression_t *call) return res; } - - case bk_gnu_builtin_huge_val: - case bk_gnu_builtin_inf: - case bk_gnu_builtin_inff: - case bk_gnu_builtin_infl: { - type_t *type = function_type->function.return_type; - ir_mode *mode = get_ir_mode_arithmetic(type); - tarval *tv = get_mode_infinite(mode); - ir_node *res = new_d_Const(dbgi, tv); - return res; + case BUILTIN_INF: { + type_t *type = function_type->function.return_type; + ir_mode *mode = get_ir_mode_arithmetic(type); + ir_tarval *tv = get_mode_infinite(mode); + ir_node *res = new_d_Const(dbgi, tv); + return res; } - case bk_gnu_builtin_nan: - case bk_gnu_builtin_nanf: - case bk_gnu_builtin_nanl: { + case BUILTIN_NAN: { /* Ignore string for now... */ assert(is_type_function(function_type)); - type_t *type = function_type->function.return_type; - ir_mode *mode = get_ir_mode_arithmetic(type); - tarval *tv = get_mode_NAN(mode); - ir_node *res = new_d_Const(dbgi, tv); + type_t *type = function_type->function.return_type; + ir_mode *mode = get_ir_mode_arithmetic(type); + ir_tarval *tv = get_mode_NAN(mode); + ir_node *res = new_d_Const(dbgi, tv); return res; } - case bk_gnu_builtin_expect: { + case BUILTIN_EXPECT: { expression_t *argument = call->arguments->expression; return _expression_to_firm(argument); } - case bk_gnu_builtin_va_end: + case BUILTIN_VA_END: /* evaluate the argument of va_end for its side effects */ _expression_to_firm(call->arguments->expression); return NULL; - case bk_gnu_builtin_frame_address: { - expression_t *const expression = call->arguments->expression; - bool val = fold_constant_to_bool(expression); - if (!val) { - /* the nice case */ - return get_irg_frame(current_ir_graph); - } else { - /* get the argument */ - ir_node *in[2]; - - in[0] = expression_to_firm(expression); - in[1] = get_irg_frame(current_ir_graph); - ir_type *tp = get_ir_type(function_type); - ir_node *irn = new_d_Builtin(dbgi, get_irg_no_mem(current_ir_graph), 2, in, ir_bk_frame_address, tp); - return new_Proj(irn, mode_P_data, pn_Builtin_1_result); - } - } - case bk_gnu_builtin_return_address: { - - expression_t *const expression = call->arguments->expression; - ir_node *in[2]; - - in[0] = expression_to_firm(expression); - in[1] = get_irg_frame(current_ir_graph); - ir_type *tp = get_ir_type(function_type); - ir_node *irn = new_d_Builtin(dbgi, get_irg_no_mem(current_ir_graph), 2, in, ir_bk_return_address, tp); - return new_Proj(irn, mode_P_data, pn_Builtin_1_result); - } - case bk_gnu_builtin_ffs: - return gen_unary_builtin(ir_bk_ffs, call->arguments->expression, function_type, dbgi); - case bk_gnu_builtin_clz: - return gen_unary_builtin(ir_bk_clz, call->arguments->expression, function_type, dbgi); - case bk_gnu_builtin_ctz: - return gen_unary_builtin(ir_bk_ctz, call->arguments->expression, function_type, dbgi); - case bk_gnu_builtin_popcount: - case bk_ms__popcount: - return gen_unary_builtin(ir_bk_popcount, call->arguments->expression, function_type, dbgi); - case bk_gnu_builtin_parity: - return gen_unary_builtin(ir_bk_parity, call->arguments->expression, function_type, dbgi); - case bk_gnu_builtin_prefetch: { - call_argument_t *const args = call->arguments; - expression_t *const addr = args->expression; - ir_node *in[3]; - - in[0] = _expression_to_firm(addr); - if (args->next != NULL) { - expression_t *const rw = args->next->expression; - - in[1] = _expression_to_firm(rw); - - if (args->next->next != NULL) { - expression_t *const locality = args->next->next->expression; - - in[2] = expression_to_firm(locality); - } else { - in[2] = new_Const_long(mode_int, 3); - } - } else { - in[1] = new_Const_long(mode_int, 0); - in[2] = new_Const_long(mode_int, 3); - } - ir_type *tp = get_ir_type(function_type); - ir_node *irn = new_d_Builtin(dbgi, get_store(), 3, in, ir_bk_prefetch, tp); - set_store(new_Proj(irn, mode_M, pn_Builtin_M)); - return NULL; - } - case bk_gnu_builtin_trap: - case bk_ms__ud2: - { - ir_type *tp = get_ir_type(function_type); - ir_node *irn = new_d_Builtin(dbgi, get_store(), 0, NULL, ir_bk_trap, tp); - set_store(new_Proj(irn, mode_M, pn_Builtin_M)); - return NULL; - } - case bk_ms__debugbreak: { - ir_type *tp = get_ir_type(function_type); - ir_node *irn = new_d_Builtin(dbgi, get_store(), 0, NULL, ir_bk_debugbreak, tp); - set_store(new_Proj(irn, mode_M, pn_Builtin_M)); - return NULL; - } - case bk_ms_ReturnAddress: { - ir_node *in[2]; - - in[0] = new_Const_long(mode_int, 0); - in[1] = get_irg_frame(current_ir_graph); - ir_type *tp = get_ir_type(function_type); - ir_node *irn = new_d_Builtin(dbgi, get_irg_no_mem(current_ir_graph), 2, in, ir_bk_return_address, tp); - return new_Proj(irn, mode_P_data, pn_Builtin_1_result); - } - case bk_ms_rotl: - case bk_ms_rotl64: { + case BUILTIN_OBJECT_SIZE: { + /* determine value of "type" */ + expression_t *type_expression = call->arguments->next->expression; + long type_val = fold_constant_to_int(type_expression); + type_t *type = function_type->function.return_type; + ir_mode *mode = get_ir_mode_arithmetic(type); + /* just produce a "I don't know" result */ + ir_tarval *result = type_val & 2 ? get_mode_null(mode) : + get_mode_minus_one(mode); + + return new_d_Const(dbgi, result); + } + case BUILTIN_ROTL: { ir_node *val = expression_to_firm(call->arguments->expression); ir_node *shf = expression_to_firm(call->arguments->next->expression); ir_mode *mode = get_irn_mode(val); + ir_mode *mode_uint = atomic_modes[ATOMIC_TYPE_UINT]; return new_d_Rotl(dbgi, val, create_conv(dbgi, shf, mode_uint), mode); } - case bk_ms_rotr: - case bk_ms_rotr64: { + case BUILTIN_ROTR: { ir_node *val = expression_to_firm(call->arguments->expression); ir_node *shf = expression_to_firm(call->arguments->next->expression); ir_mode *mode = get_irn_mode(val); + ir_mode *mode_uint = atomic_modes[ATOMIC_TYPE_UINT]; ir_node *c = new_Const_long(mode_uint, get_mode_size_bits(mode)); ir_node *sub = new_d_Sub(dbgi, c, create_conv(dbgi, shf, mode_uint), mode_uint); return new_d_Rotl(dbgi, val, sub, mode); } - case bk_ms_byteswap_ushort: - case bk_ms_byteswap_ulong: - case bk_ms_byteswap_uint64: - return gen_unary_builtin(ir_bk_bswap, call->arguments->expression, function_type, dbgi); - case bk_ms__inbyte: - case bk_ms__inword: - case bk_ms__indword: - return gen_unary_builtin_pinned(ir_bk_inport, call->arguments->expression, function_type, dbgi); - case bk_ms__outbyte: - case bk_ms__outword: - case bk_ms__outdword: - return gen_binary_builtin_mem(ir_bk_outport, call->arguments->expression, - call->arguments->next->expression, function_type, dbgi); - default: - panic("unsupported builtin found"); + case BUILTIN_FIRM: + break; + case BUILTIN_LIBC: + case BUILTIN_LIBC_CHECK: + panic("builtin did not produce an entity"); } + panic("invalid builtin found"); } /** @@ -1838,42 +1700,29 @@ static ir_node *process_builtin_call(const call_expression_t *call) static ir_node *call_expression_to_firm(const call_expression_t *const call) { dbg_info *const dbgi = get_dbg_info(&call->base.source_position); - assert(get_cur_block() != NULL); + assert(currently_reachable()); - expression_t *function = call->function; + expression_t *function = call->function; + ir_node *callee = NULL; + bool firm_builtin = false; + ir_builtin_kind firm_builtin_kind = ir_bk_trap; if (function->kind == EXPR_REFERENCE) { const reference_expression_t *ref = &function->reference; entity_t *entity = ref->entity; if (entity->kind == ENTITY_FUNCTION) { - if (entity->function.btk != bk_none) { + builtin_kind_t builtin = entity->function.btk; + if (builtin == BUILTIN_FIRM) { + firm_builtin = true; + firm_builtin_kind = entity->function.b.firm_builtin_kind; + } else if (builtin != BUILTIN_NONE && builtin != BUILTIN_LIBC + && builtin != BUILTIN_LIBC_CHECK) { return process_builtin_call(call); } - - ir_entity *irentity = entity->function.irentity; - if (irentity == NULL) - irentity = get_function_entity(entity, NULL); - - if (irentity == rts_entities[rts_alloca]) { - /* handle alloca() call */ - expression_t *argument = call->arguments->expression; - ir_node *size = expression_to_firm(argument); - ir_mode *mode = get_ir_mode_arithmetic(type_size_t); - - size = create_conv(dbgi, size, mode); - - ir_node *store = get_store(); - ir_node *alloca = new_d_Alloc(dbgi, store, size, - firm_unknown_type, stack_alloc); - ir_node *proj_m = new_Proj(alloca, mode_M, pn_Alloc_M); - set_store(proj_m); - ir_node *res = new_Proj(alloca, mode_P_data, pn_Alloc_res); - - return res; - } } } - ir_node *callee = expression_to_firm(function); + if (!firm_builtin) + callee = expression_to_firm(function); type_t *type = skip_typeref(function->base.type); assert(is_type_pointer(type)); @@ -1882,7 +1731,7 @@ static ir_node *call_expression_to_firm(const call_expression_t *const call) assert(is_type_function(points_to)); function_type_t *function_type = &points_to->function; - int n_parameters = 0; + 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) { @@ -1925,11 +1774,11 @@ static ir_node *call_expression_to_firm(const call_expression_t *const call) expression_t *expression = argument->expression; ir_node *arg_node = expression_to_firm(expression); - type_t *type = skip_typeref(expression->base.type); - if (!is_type_compound(type)) { - ir_mode *mode = get_ir_mode_storage(expression->base.type); - arg_node = create_conv(dbgi, arg_node, mode); - arg_node = do_strict_conv(dbgi, arg_node); + type_t *arg_type = skip_typeref(expression->base.type); + if (!is_type_compound(arg_type)) { + ir_mode *const mode = get_ir_mode_storage(arg_type); + arg_node = create_conv(dbgi, arg_node, mode); + arg_node = do_strict_conv(dbgi, arg_node); } in[n] = arg_node; @@ -1937,42 +1786,60 @@ static ir_node *call_expression_to_firm(const call_expression_t *const call) argument = argument->next; } - ir_node *store = get_store(); - ir_node *node = new_d_Call(dbgi, store, callee, n_parameters, in, - ir_method_type); - ir_node *mem = new_d_Proj(dbgi, node, mode_M, pn_Call_M); - set_store(mem); + ir_node *store; + if (function_type->modifiers & DM_CONST) { + store = get_irg_no_mem(current_ir_graph); + } else { + store = get_store(); + } + ir_node *node; type_t *return_type = skip_typeref(function_type->return_type); ir_node *result = NULL; + if (firm_builtin) { + node = new_d_Builtin(dbgi, store, n_parameters, in, firm_builtin_kind, + ir_method_type); + if (! (function_type->modifiers & DM_CONST)) { + ir_node *mem = new_Proj(node, mode_M, pn_Builtin_M); + set_store(mem); + } - if (!is_type_atomic(return_type, ATOMIC_TYPE_VOID)) { - ir_node *resproj = new_d_Proj(dbgi, node, mode_T, pn_Call_T_result); - - if (is_type_scalar(return_type)) { - ir_mode *mode = get_ir_mode_storage(return_type); - result = new_d_Proj(dbgi, resproj, mode, 0); + if (!is_type_void(return_type)) { + assert(is_type_scalar(return_type)); + ir_mode *mode = get_ir_mode_storage(return_type); + result = new_Proj(node, mode, pn_Builtin_max+1); ir_mode *mode_arith = get_ir_mode_arithmetic(return_type); result = create_conv(NULL, result, mode_arith); - } else { - ir_mode *mode = mode_P_data; - result = new_d_Proj(dbgi, resproj, mode, 0); + } + } else { + node = new_d_Call(dbgi, store, callee, n_parameters, in, ir_method_type); + if (! (function_type->modifiers & DM_CONST)) { + ir_node *mem = new_Proj(node, mode_M, pn_Call_M); + set_store(mem); + } + + if (!is_type_void(return_type)) { + ir_node *const resproj = new_Proj(node, mode_T, pn_Call_T_result); + ir_mode *const mode = get_ir_mode_storage(return_type); + result = new_Proj(resproj, mode, 0); + ir_mode *const mode_arith = get_ir_mode_arithmetic(return_type); + result = create_conv(NULL, result, mode_arith); } } - if (function->kind == EXPR_REFERENCE && - function->reference.entity->declaration.modifiers & DM_NORETURN) { + if (function_type->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); + ir_node *block = new_Block(0, NULL); + set_cur_block(block); } return result; } -static void statement_to_firm(statement_t *statement); +static ir_node *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); @@ -2005,10 +1872,11 @@ static void assign_value(dbg_info *dbgi, ir_node *addr, type_t *type, } } -static tarval *create_bitfield_mask(ir_mode *mode, int offset, int size) +static ir_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); + ir_tarval *all_one = get_mode_all_one(mode); + int mode_size = get_mode_size_bits(mode); + ir_mode *mode_uint = atomic_modes[ATOMIC_TYPE_UINT]; assert(offset >= 0); assert(size >= 0); @@ -2017,97 +1885,118 @@ static tarval *create_bitfield_mask(ir_mode *mode, int offset, int size) return all_one; } - long shiftr = get_mode_size_bits(mode) - size; - long shiftl = offset; - tarval *tv_shiftr = new_tarval_from_long(shiftr, mode_uint); - tarval *tv_shiftl = new_tarval_from_long(shiftl, mode_uint); - tarval *mask0 = tarval_shr(all_one, tv_shiftr); - tarval *mask1 = tarval_shl(mask0, tv_shiftl); + long shiftr = get_mode_size_bits(mode) - size; + long shiftl = offset; + ir_tarval *tv_shiftr = new_tarval_from_long(shiftr, mode_uint); + ir_tarval *tv_shiftl = new_tarval_from_long(shiftl, mode_uint); + ir_tarval *mask0 = tarval_shr(all_one, tv_shiftr); + ir_tarval *mask1 = tarval_shl(mask0, tv_shiftl); return mask1; } static ir_node *bitfield_store_to_firm(dbg_info *dbgi, - ir_entity *entity, ir_node *addr, ir_node *value, bool set_volatile) + ir_entity *entity, ir_node *addr, ir_node *value, bool set_volatile, + bool need_return) { 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); + ir_mode *mode_uint = atomic_modes[ATOMIC_TYPE_UINT]; value = create_conv(dbgi, value, mode); /* kill upper bits of value and shift to right position */ - int bitoffset = get_entity_offset_bits_remainder(entity); - int bitsize = get_mode_size_bits(get_type_mode(entity_type)); + unsigned bitoffset = get_entity_offset_bits_remainder(entity); + unsigned bitsize = get_mode_size_bits(get_type_mode(entity_type)); + unsigned base_bits = get_mode_size_bits(mode); + unsigned shiftwidth = base_bits - bitsize; - tarval *mask = create_bitfield_mask(mode, 0, bitsize); - ir_node *mask_node = new_d_Const(dbgi, mask); - ir_node *value_masked = new_d_And(dbgi, value, mask_node, mode); - tarval *shiftl = new_tarval_from_long(bitoffset, mode_uint); - ir_node *shiftcount = new_d_Const(dbgi, shiftl); - ir_node *value_maskshift = new_d_Shl(dbgi, value_masked, shiftcount, mode); + ir_node *shiftcount = new_Const_long(mode_uint, shiftwidth); + ir_node *shiftl = new_d_Shl(dbgi, value, shiftcount, mode); + + unsigned shrwidth = base_bits - bitsize - bitoffset; + ir_node *shrconst = new_Const_long(mode_uint, shrwidth); + ir_node *shiftr = new_d_Shr(dbgi, shiftl, shrconst, mode); /* load current value */ - ir_node *mem = get_store(); - ir_node *load = new_d_Load(dbgi, mem, addr, mode, - set_volatile ? cons_volatile : cons_none); - ir_node *load_mem = new_d_Proj(dbgi, load, mode_M, pn_Load_M); - ir_node *load_res = new_d_Proj(dbgi, load, mode, pn_Load_res); - tarval *shift_mask = create_bitfield_mask(mode, bitoffset, bitsize); - tarval *inv_mask = tarval_not(shift_mask); - ir_node *inv_mask_node = new_d_Const(dbgi, inv_mask); - ir_node *load_res_masked = new_d_And(dbgi, load_res, inv_mask_node, mode); + ir_node *mem = get_store(); + ir_node *load = new_d_Load(dbgi, mem, addr, mode, + set_volatile ? cons_volatile : cons_none); + ir_node *load_mem = new_d_Proj(dbgi, load, mode_M, pn_Load_M); + ir_node *load_res = new_d_Proj(dbgi, load, mode, pn_Load_res); + ir_tarval *shift_mask = create_bitfield_mask(mode, bitoffset, bitsize); + ir_tarval *inv_mask = tarval_not(shift_mask); + ir_node *inv_mask_node = new_d_Const(dbgi, inv_mask); + ir_node *load_res_masked = new_d_And(dbgi, load_res, inv_mask_node, mode); /* construct new value and store */ - ir_node *new_val = new_d_Or(dbgi, load_res_masked, value_maskshift, mode); + ir_node *new_val = new_d_Or(dbgi, load_res_masked, shiftr, mode); ir_node *store = new_d_Store(dbgi, load_mem, addr, new_val, set_volatile ? cons_volatile : cons_none); ir_node *store_mem = new_d_Proj(dbgi, store, mode_M, pn_Store_M); set_store(store_mem); - return value_masked; + if (!need_return) + return NULL; + + ir_node *res_shr; + ir_node *count_res_shr = new_Const_long(mode_uint, base_bits - bitsize); + if (mode_is_signed(mode)) { + res_shr = new_d_Shrs(dbgi, shiftl, count_res_shr, mode); + } else { + res_shr = new_d_Shr(dbgi, shiftl, count_res_shr, mode); + } + return res_shr; } static ir_node *bitfield_extract_to_firm(const select_expression_t *expression, - ir_node *addr) -{ - dbg_info *dbgi = get_dbg_info(&expression->base.source_position); - type_t *type = expression->base.type; - ir_mode *mode = get_ir_mode_storage(type); - ir_node *mem = get_store(); - ir_node *load = new_d_Load(dbgi, mem, addr, mode, cons_none); - ir_node *load_mem = new_d_Proj(dbgi, load, mode_M, pn_Load_M); - ir_node *load_res = new_d_Proj(dbgi, load, mode, pn_Load_res); - - load_res = create_conv(dbgi, load_res, mode_int); + ir_node *addr) +{ + dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + entity_t *entity = expression->compound_entry; + type_t *base_type = entity->declaration.type; + ir_mode *mode = get_ir_mode_storage(base_type); + ir_node *mem = get_store(); + ir_node *load = new_d_Load(dbgi, mem, addr, mode, cons_none); + ir_node *load_mem = new_d_Proj(dbgi, load, mode_M, pn_Load_M); + ir_node *load_res = new_d_Proj(dbgi, load, mode, pn_Load_res); + ir_mode *mode_uint = atomic_modes[ATOMIC_TYPE_UINT]; + + ir_mode *amode = mode; + /* optimisation, since shifting in modes < machine_size is usually + * less efficient */ + if (get_mode_size_bits(amode) < get_mode_size_bits(mode_uint)) { + amode = mode_uint; + } + unsigned amode_size = get_mode_size_bits(amode); + load_res = create_conv(dbgi, load_res, amode); set_store(load_mem); /* kill upper bits */ assert(expression->compound_entry->kind == ENTITY_COMPOUND_MEMBER); - ir_entity *entity = expression->compound_entry->compound_member.entity; - int bitoffset = get_entity_offset_bits_remainder(entity); - ir_type *entity_type = get_entity_type(entity); - int bitsize = get_mode_size_bits(get_type_mode(entity_type)); - long shift_bitsl = machine_size - bitoffset - bitsize; - assert(shift_bitsl >= 0); - tarval *tvl = new_tarval_from_long(shift_bitsl, mode_uint); - ir_node *countl = new_d_Const(dbgi, tvl); - ir_node *shiftl = new_d_Shl(dbgi, load_res, countl, mode_int); - - long shift_bitsr = bitoffset + shift_bitsl; - assert(shift_bitsr <= (long) machine_size); - tarval *tvr = new_tarval_from_long(shift_bitsr, mode_uint); - ir_node *countr = new_d_Const(dbgi, tvr); + unsigned bitoffset = entity->compound_member.bit_offset; + unsigned bitsize = entity->compound_member.bit_size; + unsigned shift_bitsl = amode_size - bitoffset - bitsize; + ir_tarval *tvl = new_tarval_from_long((long)shift_bitsl, mode_uint); + ir_node *countl = new_d_Const(dbgi, tvl); + ir_node *shiftl = new_d_Shl(dbgi, load_res, countl, amode); + + unsigned shift_bitsr = bitoffset + shift_bitsl; + assert(shift_bitsr <= amode_size); + ir_tarval *tvr = new_tarval_from_long((long)shift_bitsr, mode_uint); + ir_node *countr = new_d_Const(dbgi, tvr); ir_node *shiftr; if (mode_is_signed(mode)) { - shiftr = new_d_Shrs(dbgi, shiftl, countr, mode_int); + shiftr = new_d_Shrs(dbgi, shiftl, countr, amode); } else { - shiftr = new_d_Shr(dbgi, shiftl, countr, mode_int); + shiftr = new_d_Shr(dbgi, shiftl, countr, amode); } - return create_conv(dbgi, shiftr, mode); + type_t *type = expression->base.type; + ir_mode *resmode = get_ir_mode_arithmetic(type); + return create_conv(dbgi, shiftr, resmode); } /* make sure the selected compound type is constructed */ @@ -2138,12 +2027,10 @@ static ir_node *set_value_for_expression_addr(const expression_t *expression, entity_t *entity = ref->entity; assert(is_declaration(entity)); assert(entity->declaration.kind != DECLARATION_KIND_UNKNOWN); - if (entity->declaration.kind == DECLARATION_KIND_LOCAL_VARIABLE) { + if (entity->declaration.kind == DECLARATION_KIND_LOCAL_VARIABLE || + entity->declaration.kind == DECLARATION_KIND_PARAMETER) { set_value(entity->variable.v.value_number, value); return value; - } else if (entity->declaration.kind == DECLARATION_KIND_PARAMETER) { - set_value(entity->parameter.v.value_number, value); - return value; } } @@ -2158,12 +2045,12 @@ static ir_node *set_value_for_expression_addr(const expression_t *expression, entity_t *entity = select->compound_entry; assert(entity->kind == ENTITY_COMPOUND_MEMBER); - if (entity->declaration.type->kind == TYPE_BITFIELD) { + if (entity->compound_member.bitfield) { ir_entity *irentity = entity->compound_member.entity; bool set_volatile = select->base.type->base.qualifiers & TYPE_QUALIFIER_VOLATILE; value = bitfield_store_to_firm(dbgi, irentity, addr, value, - set_volatile); + set_volatile, true); return value; } } @@ -2189,20 +2076,14 @@ static ir_node *get_value_from_lvalue(const expression_t *expression, || entity->kind == ENTITY_PARAMETER); assert(entity->declaration.kind != DECLARATION_KIND_UNKNOWN); int value_number; - if (entity->declaration.kind == DECLARATION_KIND_LOCAL_VARIABLE) { + if (entity->declaration.kind == DECLARATION_KIND_LOCAL_VARIABLE || + entity->declaration.kind == DECLARATION_KIND_PARAMETER) { value_number = entity->variable.v.value_number; assert(addr == NULL); type_t *type = skip_typeref(expression->base.type); ir_mode *mode = get_ir_mode_storage(type); ir_node *res = get_value(value_number, mode); return create_conv(NULL, res, get_ir_mode_arithmetic(type)); - } else if (entity->declaration.kind == DECLARATION_KIND_PARAMETER) { - value_number = entity->parameter.v.value_number; - assert(addr == NULL); - type_t *type = skip_typeref(expression->base.type); - ir_mode *mode = get_ir_mode_storage(type); - ir_node *res = get_value(value_number, mode); - return create_conv(NULL, res, get_ir_mode_arithmetic(type)); } } @@ -2211,7 +2092,7 @@ static ir_node *get_value_from_lvalue(const expression_t *expression, ir_node *value; if (expression->kind == EXPR_SELECT && - expression->select.compound_entry->declaration.type->kind == TYPE_BITFIELD){ + expression->select.compound_entry->compound_member.bitfield) { construct_select_compound(&expression->select); value = bitfield_extract_to_firm(&expression->select, addr); } else { @@ -2281,27 +2162,26 @@ static bool is_local_variable(expression_t *expression) return entity->declaration.kind == DECLARATION_KIND_LOCAL_VARIABLE; } -static pn_Cmp get_pnc(const expression_kind_t kind, type_t *const type) +static ir_relation get_relation(const expression_kind_t kind) { switch(kind) { - case EXPR_BINARY_EQUAL: return pn_Cmp_Eq; - case EXPR_BINARY_ISLESSGREATER: return pn_Cmp_Lg; - case EXPR_BINARY_NOTEQUAL: - return is_type_float(skip_typeref(type)) ? pn_Cmp_Ne : pn_Cmp_Lg; + case EXPR_BINARY_EQUAL: return ir_relation_equal; + case EXPR_BINARY_ISLESSGREATER: return ir_relation_less_greater; + case EXPR_BINARY_NOTEQUAL: return ir_relation_unordered_less_greater; case EXPR_BINARY_ISLESS: - case EXPR_BINARY_LESS: return pn_Cmp_Lt; + case EXPR_BINARY_LESS: return ir_relation_less; case EXPR_BINARY_ISLESSEQUAL: - case EXPR_BINARY_LESSEQUAL: return pn_Cmp_Le; + case EXPR_BINARY_LESSEQUAL: return ir_relation_less_equal; case EXPR_BINARY_ISGREATER: - case EXPR_BINARY_GREATER: return pn_Cmp_Gt; + case EXPR_BINARY_GREATER: return ir_relation_greater; case EXPR_BINARY_ISGREATEREQUAL: - case EXPR_BINARY_GREATEREQUAL: return pn_Cmp_Ge; - case EXPR_BINARY_ISUNORDERED: return pn_Cmp_Uo; + case EXPR_BINARY_GREATEREQUAL: return ir_relation_greater_equal; + case EXPR_BINARY_ISUNORDERED: return ir_relation_unordered; default: break; } - panic("trying to get pn_Cmp from non-comparison binexpr type"); + panic("trying to get ir_relation from non-comparison binexpr type"); } /** @@ -2322,13 +2202,11 @@ static ir_node *handle_assume_compare(dbg_info *dbi, 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); + ir_node *res = NULL; + ir_relation relation = get_relation(expression->base.kind); if (is_local_variable(op1) && is_local_variable(op2)) { - var = op1->reference.entity; + var = op1->reference.entity; var2 = op2->reference.entity; type_t *const type = skip_typeref(var->declaration.type); @@ -2337,21 +2215,21 @@ static ir_node *handle_assume_compare(dbg_info *dbi, 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)); + res = new_d_Confirm(dbi, irn2, irn1, get_inversed_relation(relation)); set_value(var2->variable.v.value_number, res); - res = new_d_Confirm(dbi, irn1, irn2, cmp_val); + res = new_d_Confirm(dbi, irn1, irn2, relation); set_value(var->variable.v.value_number, res); return res; } - expression_t *con; - if (is_local_variable(op1) && is_constant_expression(op2)) { + expression_t *con = NULL; + if (is_local_variable(op1) && is_constant_expression(op2) == EXPR_CLASS_CONSTANT) { var = op1->reference.entity; con = op2; - } else if (is_constant_expression(op1) && is_local_variable(op2)) { - cmp_val = get_inversed_pnc(cmp_val); + } else if (is_constant_expression(op1) == EXPR_CLASS_CONSTANT && is_local_variable(op2)) { + relation = get_inversed_relation(relation); var = op2->reference.entity; con = op1; } @@ -2361,7 +2239,7 @@ static ir_node *handle_assume_compare(dbg_info *dbi, ir_mode *const mode = get_ir_mode_storage(type); res = get_value(var->variable.v.value_number, mode); - res = new_d_Confirm(dbi, res, expression_to_firm(con), cmp_val); + res = new_d_Confirm(dbi, res, expression_to_firm(con), relation); set_value(var->variable.v.value_number, res); } return res; @@ -2388,10 +2266,15 @@ static ir_node *handle_assume(dbg_info *dbi, const expression_t *expression) } } -static ir_node *create_cast(dbg_info *dbgi, ir_node *value_node, +static ir_node *create_cast(dbg_info *dbgi, ir_node *value_node, type_t *from_type, type_t *type) { type = skip_typeref(type); + if (is_type_void(type)) { + /* make sure firm type is constructed */ + (void) get_ir_type(type); + return NULL; + } if (!is_type_scalar(type)) { /* make sure firm type is constructed */ (void) get_ir_type(type); @@ -2406,12 +2289,12 @@ static ir_node *create_cast(dbg_info *dbgi, ir_node *value_node, const variable_t *to_var = type->pointer.base_variable; if (from_var != to_var) { if (from_var != NULL) { - ir_node *const addr = get_global_var_address(dbgi, from_var); + ir_node *const addr = create_symconst(dbgi, from_var->v.entity); ir_node *const base = deref_address(dbgi, from_var->base.type, addr); - value_node = new_d_Add(dbgi, value_node, base, get_ir_mode_storage(from_type)); + value_node = new_d_Add(dbgi, value_node, base, mode); } if (to_var != NULL) { - ir_node *const addr = get_global_var_address(dbgi, to_var); + ir_node *const addr = create_symconst(dbgi, to_var->v.entity); ir_node *const base = deref_address(dbgi, to_var->base.type, addr); value_node = new_d_Sub(dbgi, value_node, base, mode); } @@ -2437,12 +2320,12 @@ 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) - return expression_to_addr(expression->value); - const expression_t *value = expression->value; switch(expression->base.kind) { + case EXPR_UNARY_TAKE_ADDRESS: + return expression_to_addr(value); + case EXPR_UNARY_NEGATE: { ir_node *value_node = expression_to_firm(value); ir_mode *mode = get_ir_mode_arithmetic(type); @@ -2469,7 +2352,7 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression) /* check for __based */ const variable_t *const base_var = value_type->pointer.base_variable; if (base_var != NULL) { - ir_node *const addr = get_global_var_address(dbgi, base_var); + ir_node *const addr = create_symconst(dbgi, base_var->v.entity); ir_node *const base = deref_address(dbgi, base_var->base.type, addr); value_node = new_d_Add(dbgi, value_node, base, get_ir_mode_storage(value_type)); } @@ -2481,17 +2364,13 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression) case EXPR_UNARY_PREFIX_INCREMENT: case EXPR_UNARY_PREFIX_DECREMENT: return create_incdec(expression); - case EXPR_UNARY_CAST_IMPLICIT: case EXPR_UNARY_CAST: { ir_node *value_node = expression_to_firm(value); type_t *from_type = value->base.type; return create_cast(dbgi, value_node, from_type, type); } case EXPR_UNARY_ASSUME: - if (firm_opt.confirm) - return handle_assume(dbgi, value); - else - return NULL; + return handle_assume(dbgi, value); default: break; @@ -2505,28 +2384,22 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression) static ir_node *produce_condition_result(const expression_t *expression, ir_mode *mode, dbg_info *dbgi) { - ir_node *cur_block = get_cur_block(); - - ir_node *one_block = new_immBlock(); - set_cur_block(one_block); - ir_node *one = new_Const(get_mode_one(mode)); - ir_node *jmp_one = new_d_Jmp(dbgi); - - ir_node *zero_block = new_immBlock(); - set_cur_block(zero_block); - ir_node *zero = new_Const(get_mode_null(mode)); - ir_node *jmp_zero = new_d_Jmp(dbgi); - - set_cur_block(cur_block); + ir_node *const one_block = new_immBlock(); + ir_node *const zero_block = new_immBlock(); create_condition_evaluation(expression, one_block, zero_block); mature_immBlock(one_block); mature_immBlock(zero_block); - ir_node *in_cf[2] = { jmp_one, jmp_zero }; - new_Block(2, in_cf); + ir_node *const jmp_one = new_rd_Jmp(dbgi, one_block); + ir_node *const jmp_zero = new_rd_Jmp(dbgi, zero_block); + ir_node *const in_cf[2] = { jmp_one, jmp_zero }; + ir_node *const block = new_Block(lengthof(in_cf), in_cf); + set_cur_block(block); - ir_node *in[2] = { one, zero }; - ir_node *val = new_d_Phi(dbgi, 2, in, mode); + ir_node *const one = new_Const(get_mode_one(mode)); + ir_node *const zero = new_Const(get_mode_null(mode)); + ir_node *const in[2] = { one, zero }; + ir_node *const val = new_d_Phi(dbgi, lengthof(in), in, mode); return val; } @@ -2559,8 +2432,8 @@ static ir_node *create_op(dbg_info *dbgi, const binary_expression_t *expression, case EXPR_BINARY_SHIFTRIGHT: case EXPR_BINARY_SHIFTLEFT_ASSIGN: case EXPR_BINARY_SHIFTRIGHT_ASSIGN: - mode = get_irn_mode(left); - right = create_conv(dbgi, right, mode_uint); + mode = get_ir_mode_arithmetic(expression->base.type); + right = create_conv(dbgi, right, atomic_modes[ATOMIC_TYPE_UINT]); break; case EXPR_BINARY_SUB: @@ -2637,21 +2510,14 @@ normal_node: case EXPR_BINARY_DIV: case EXPR_BINARY_DIV_ASSIGN: { ir_node *pin = new_Pin(new_NoMem()); - ir_node *op; - ir_node *res; - 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 { - op = new_d_Div(dbgi, pin, left, right, mode, op_pin_state_floats); - res = new_d_Proj(dbgi, op, mode, pn_Div_res); - } + ir_node *op = new_d_Div(dbgi, pin, left, right, mode, + op_pin_state_floats); + ir_node *res = new_d_Proj(dbgi, op, mode, pn_Div_res); return res; } case EXPR_BINARY_MOD: case EXPR_BINARY_MOD_ASSIGN: { ir_node *pin = new_Pin(new_NoMem()); - assert(!mode_is_float(mode)); ir_node *op = new_d_Mod(dbgi, pin, left, right, mode, op_pin_state_floats); ir_node *res = new_d_Proj(dbgi, op, mode, pn_Mod_res); @@ -2668,7 +2534,7 @@ static ir_node *create_lazy_op(const binary_expression_t *expression) type_t *type = skip_typeref(expression->base.type); ir_mode *mode = get_ir_mode_arithmetic(type); - if (is_constant_expression(expression->left)) { + if (is_constant_expression(expression->left) == EXPR_CLASS_CONSTANT) { bool val = fold_constant_to_bool(expression->left); expression_kind_t ekind = expression->base.kind; assert(ekind == EXPR_BINARY_LOGICAL_AND || ekind == EXPR_BINARY_LOGICAL_OR); @@ -2682,11 +2548,9 @@ static ir_node *create_lazy_op(const binary_expression_t *expression) } } - if (is_constant_expression(expression->right)) { + if (is_constant_expression(expression->right) == EXPR_CLASS_CONSTANT) { bool valr = fold_constant_to_bool(expression->right); - return valr ? - new_Const(get_mode_one(mode)) : - new_Const(get_mode_null(mode)); + return create_Const_from_bool(mode, valr); } return produce_condition_result(expression->right, mode, dbgi); @@ -2738,13 +2602,12 @@ static ir_node *binary_expression_to_firm(const binary_expression_t *expression) case EXPR_BINARY_ISLESSEQUAL: case EXPR_BINARY_ISLESSGREATER: case EXPR_BINARY_ISUNORDERED: { - dbg_info *dbgi = get_dbg_info(&expression->base.source_position); - ir_node *left = expression_to_firm(expression->left); - ir_node *right = expression_to_firm(expression->right); - ir_node *cmp = new_d_Cmp(dbgi, left, right); - long pnc = get_pnc(kind, expression->left->base.type); - ir_node *proj = new_d_Proj(dbgi, cmp, mode_b, pnc); - return proj; + dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + ir_node *left = expression_to_firm(expression->left); + ir_node *right = expression_to_firm(expression->right); + ir_relation relation = get_relation(kind); + ir_node *cmp = new_d_Cmp(dbgi, left, right, relation); + return cmp; } case EXPR_BINARY_ASSIGN: { ir_node *addr = expression_to_addr(expression->left); @@ -2795,7 +2658,7 @@ static ir_node *binary_expression_to_firm(const binary_expression_t *expression) case EXPR_BINARY_SHIFTRIGHT_ASSIGN: return create_assign_binop(expression); default: - panic("TODO binexpr type"); + panic("invalid binexpr type"); } } @@ -2840,12 +2703,7 @@ static long get_offsetof_offset(const offsetof_expression_t *expression) 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); + for (; iter->base.symbol != symbol; iter = iter->base.next) {} assert(iter->kind == ENTITY_COMPOUND_MEMBER); assert(iter->declaration.kind == DECLARATION_KIND_COMPOUND_MEMBER); @@ -2873,39 +2731,77 @@ static long get_offsetof_offset(const offsetof_expression_t *expression) static ir_node *offsetof_to_firm(const offsetof_expression_t *expression) { - ir_mode *mode = get_ir_mode_arithmetic(expression->base.type); - long offset = get_offsetof_offset(expression); - tarval *tv = new_tarval_from_long(offset, mode); - dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + ir_mode *mode = get_ir_mode_arithmetic(expression->base.type); + long offset = get_offsetof_offset(expression); + ir_tarval *tv = new_tarval_from_long(offset, mode); + dbg_info *dbgi = get_dbg_info(&expression->base.source_position); return new_d_Const(dbgi, tv); } static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi, ir_entity *entity, type_t *type); +static ir_initializer_t *create_ir_initializer( + const initializer_t *initializer, type_t *type); -static ir_node *compound_literal_to_firm( - const compound_literal_expression_t *expression) +static ir_entity *create_initializer_entity(dbg_info *dbgi, + initializer_t *initializer, + type_t *type) { - type_t *type = expression->type; + /* create the ir_initializer */ + ir_graph *const old_current_ir_graph = current_ir_graph; + current_ir_graph = get_const_code_irg(); + + ir_initializer_t *irinitializer = create_ir_initializer(initializer, type); - /* create an entity on the stack */ - ir_type *frame_type = get_irg_frame_type(current_ir_graph); + assert(current_ir_graph == get_const_code_irg()); + current_ir_graph = old_current_ir_graph; - ident *const id = id_unique("CompLit.%u"); - ir_type *const irtype = get_ir_type(type); - dbg_info *const dbgi = get_dbg_info(&expression->base.source_position); - ir_entity *const entity = new_d_entity(frame_type, id, irtype, dbgi); + ident *const id = id_unique("initializer.%u"); + ir_type *const irtype = get_ir_type(type); + ir_type *const global_type = get_glob_type(); + ir_entity *const entity = new_d_entity(global_type, id, irtype, dbgi); set_entity_ld_ident(entity, id); + set_entity_visibility(entity, ir_visibility_private); + add_entity_linkage(entity, IR_LINKAGE_CONSTANT); + set_entity_initializer(entity, irinitializer); + return entity; +} - /* create initialisation code */ +static ir_node *compound_literal_addr(compound_literal_expression_t const *const expression) +{ + dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + type_t *type = expression->type; initializer_t *initializer = expression->initializer; - create_local_initializer(initializer, dbgi, entity, type); - /* create a sel for the compound literal address */ - ir_node *frame = get_irg_frame(current_ir_graph); - ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, entity); - return sel; + if (is_constant_initializer(initializer) == EXPR_CLASS_CONSTANT) { + ir_entity *entity = create_initializer_entity(dbgi, initializer, type); + return create_symconst(dbgi, entity); + } else { + /* create an entity on the stack */ + ident *const id = id_unique("CompLit.%u"); + ir_type *const irtype = get_ir_type(type); + ir_type *frame_type = get_irg_frame_type(current_ir_graph); + + ir_entity *const entity = new_d_entity(frame_type, id, irtype, dbgi); + set_entity_ld_ident(entity, id); + + /* create initialisation code */ + create_local_initializer(initializer, dbgi, entity, type); + + /* create a sel for the compound literal address */ + ir_node *frame = get_irg_frame(current_ir_graph); + ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, entity); + return sel; + } +} + +static ir_node *compound_literal_to_firm(compound_literal_expression_t const* const expr) +{ + dbg_info *const dbgi = get_dbg_info(&expr->base.source_position); + type_t *const type = expr->type; + ir_node *const addr = compound_literal_addr(expr); + return deref_address(dbgi, type, addr); } /** @@ -2934,7 +2830,7 @@ static entity_t *get_expression_entity(const expression_t *expression) static unsigned get_cparser_entity_alignment(const entity_t *entity) { switch(entity->kind) { - DECLARATION_KIND_CASES + case DECLARATION_KIND_CASES: return entity->declaration.alignment; case ENTITY_STRUCT: case ENTITY_UNION: @@ -2967,30 +2863,35 @@ static ir_node *alignof_to_firm(const typeprop_expression_t *expression) alignment = get_type_alignment(type); } - dbg_info *dbgi = get_dbg_info(&expression->base.source_position); - ir_mode *mode = get_ir_mode_arithmetic(expression->base.type); - tarval *tv = new_tarval_from_long(alignment, mode); + dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + ir_mode *mode = get_ir_mode_arithmetic(expression->base.type); + ir_tarval *tv = new_tarval_from_long(alignment, mode); return new_d_Const(dbgi, tv); } static void init_ir_types(void); -static tarval *fold_constant_to_tarval(const expression_t *expression) +static ir_tarval *fold_constant_to_tarval(const expression_t *expression) { - assert(is_type_valid(skip_typeref(expression->base.type))); + assert(is_constant_expression(expression) == EXPR_CLASS_CONSTANT); bool constant_folding_old = constant_folding; constant_folding = true; + int old_optimize = get_optimize(); + int old_constant_folding = get_opt_constant_folding(); + set_optimize(1); + set_opt_constant_folding(1); init_ir_types(); - assert(is_constant_expression(expression)); - ir_graph *old_current_ir_graph = current_ir_graph; current_ir_graph = get_const_code_irg(); - ir_node *cnst = expression_to_firm(expression); + ir_node *const cnst = _expression_to_firm(expression); + current_ir_graph = old_current_ir_graph; + set_optimize(old_optimize); + set_opt_constant_folding(old_constant_folding); if (!is_Const(cnst)) { panic("couldn't fold constant"); @@ -2998,16 +2899,21 @@ static tarval *fold_constant_to_tarval(const expression_t *expression) constant_folding = constant_folding_old; - tarval *tv = get_Const_tarval(cnst); - return tv; + ir_tarval *const tv = get_Const_tarval(cnst); + ir_mode *const mode = get_ir_mode_arithmetic(skip_typeref(expression->base.type)); + return tarval_convert_to(tv, mode); } -long fold_constant_to_int(const expression_t *expression) +/* this function is only used in parser.c, but it relies on libfirm functionality */ +bool constant_is_negative(const expression_t *expression) { - if (expression->kind == EXPR_INVALID) - return 0; + ir_tarval *tv = fold_constant_to_tarval(expression); + return tarval_is_negative(tv); +} - tarval *tv = fold_constant_to_tarval(expression); +long fold_constant_to_int(const expression_t *expression) +{ + ir_tarval *tv = fold_constant_to_tarval(expression); if (!tarval_is_long(tv)) { panic("result of constant folding is not integer"); } @@ -3017,9 +2923,7 @@ long fold_constant_to_int(const expression_t *expression) bool fold_constant_to_bool(const expression_t *expression) { - if (expression->kind == EXPR_INVALID) - return false; - tarval *tv = fold_constant_to_tarval(expression); + ir_tarval *tv = fold_constant_to_tarval(expression); return !tarval_is_null(tv); } @@ -3028,7 +2932,7 @@ 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) == EXPR_CLASS_CONSTANT) { bool val = fold_constant_to_bool(expression->condition); if (val) { expression_t *true_expression = expression->true_expression; @@ -3040,50 +2944,42 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression) } } - ir_node *cur_block = get_cur_block(); + ir_node *const true_block = new_immBlock(); + ir_node *const false_block = new_immBlock(); + ir_node *const cond_expr = create_condition_evaluation(expression->condition, true_block, false_block); + mature_immBlock(true_block); + mature_immBlock(false_block); - /* create the true block */ - ir_node *true_block = new_immBlock(); set_cur_block(true_block); + ir_node *true_val; + if (expression->true_expression != NULL) { + true_val = expression_to_firm(expression->true_expression); + } else if (cond_expr != NULL && get_irn_mode(cond_expr) != mode_b) { + true_val = cond_expr; + } else { + /* Condition ended with a short circuit (&&, ||, !) operation or a + * comparison. Generate a "1" as value for the true branch. */ + true_val = new_Const(get_mode_one(mode_Is)); + } + ir_node *const true_jmp = new_d_Jmp(dbgi); - 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 */ - ir_node *false_block = new_immBlock(); set_cur_block(false_block); - - ir_node *false_val = expression_to_firm(expression->false_expression); - ir_node *false_jmp = new_Jmp(); - - /* create the condition evaluation */ - set_cur_block(cur_block); - ir_node *const cond_expr = create_condition_evaluation(expression->condition, true_block, false_block); - if (expression->true_expression == NULL) { - if (cond_expr != NULL && get_irn_mode(cond_expr) != mode_b) { - true_val = cond_expr; - } else { - /* Condition ended with a short circuit (&&, ||, !) operation or a - * comparison. Generate a "1" as value for the true branch. */ - true_val = new_Const(get_mode_one(mode_Is)); - } - } - mature_immBlock(true_block); - mature_immBlock(false_block); + ir_node *const false_val = expression_to_firm(expression->false_expression); + ir_node *const false_jmp = new_d_Jmp(dbgi); /* create the common block */ - ir_node *in_cf[2] = { true_jmp, false_jmp }; - new_Block(2, in_cf); + ir_node *const in_cf[2] = { true_jmp, false_jmp }; + ir_node *const block = new_Block(lengthof(in_cf), in_cf); + set_cur_block(block); /* TODO improve static semantics, so either both or no values are NULL */ if (true_val == NULL || false_val == NULL) return NULL; - ir_node *in[2] = { true_val, false_val }; - ir_mode *mode = get_irn_mode(true_val); - assert(get_irn_mode(false_val) == mode); - ir_node *val = new_d_Phi(dbgi, 2, in, mode); + ir_node *const in[2] = { true_val, false_val }; + type_t *const type = skip_typeref(expression->base.type); + ir_mode *const mode = get_ir_mode_arithmetic(type); + ir_node *const val = new_d_Phi(dbgi, lengthof(in), in, mode); return val; } @@ -3104,9 +3000,9 @@ static ir_node *select_addr(const select_expression_t *expression) assert(entry->declaration.kind == DECLARATION_KIND_COMPOUND_MEMBER); if (constant_folding) { - ir_mode *mode = get_irn_mode(compound_addr); - /* FIXME: here, we need an integer mode with the same number of bits as mode */ - ir_node *ofs = new_Const_long(mode_uint, entry->compound_member.offset); + ir_mode *mode = get_irn_mode(compound_addr); + ir_mode *mode_uint = get_reference_mode_unsigned_eq(mode); + ir_node *ofs = new_Const_long(mode_uint, entry->compound_member.offset); return new_d_Add(dbgi, compound_addr, ofs, mode); } else { ir_entity *irentity = entry->compound_member.entity; @@ -3123,11 +3019,10 @@ static ir_node *select_to_firm(const select_expression_t *expression) (const expression_t*) expression); type = skip_typeref(type); - entity_t *entry = expression->compound_entry; + 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) { + if (entry->compound_member.bitfield) { return bitfield_extract_to_firm(expression, addr); } @@ -3209,7 +3104,6 @@ static ir_node *classify_type_to_firm(const classify_type_expression_t *const ex case TYPE_COMPLEX: tc = complex_type_class; goto make_const; case TYPE_IMAGINARY: tc = complex_type_class; goto make_const; - case TYPE_BITFIELD: tc = integer_type_class; goto make_const; case TYPE_ARRAY: /* gcc handles this as pointer */ case TYPE_FUNCTION: /* gcc handles this as pointer */ case TYPE_POINTER: tc = pointer_type_class; goto make_const; @@ -3222,11 +3116,9 @@ static ir_node *classify_type_to_firm(const classify_type_expression_t *const ex /* gcc classifies the referenced type */ case TYPE_REFERENCE: type = type->reference.refers_to; continue; - case TYPE_BUILTIN: /* typedef/typeof should be skipped already */ case TYPE_TYPEDEF: case TYPE_TYPEOF: - case TYPE_INVALID: case TYPE_ERROR: break; } @@ -3234,8 +3126,9 @@ static ir_node *classify_type_to_firm(const classify_type_expression_t *const ex } make_const:; - dbg_info *const dbgi = get_dbg_info(&expr->base.source_position); - tarval *const tv = new_tarval_from_long(tc, mode_int); + dbg_info *const dbgi = get_dbg_info(&expr->base.source_position); + ir_mode *const mode = atomic_modes[ATOMIC_TYPE_INT]; + ir_tarval *const tv = new_tarval_from_long(tc, mode); return new_d_Const(dbgi, tv); } @@ -3247,18 +3140,18 @@ static ir_node *function_name_to_firm( case FUNCNAME_PRETTY_FUNCTION: case FUNCNAME_FUNCDNAME: if (current_function_name == NULL) { - const source_position_t *const src_pos = &expr->base.source_position; - const char *name = current_function_entity->base.symbol->string; - const string_t string = { name, strlen(name) + 1 }; + source_position_t const *const src_pos = &expr->base.source_position; + char const *const name = current_function_entity->base.symbol->string; + string_t const string = { name, strlen(name), STRING_ENCODING_CHAR }; current_function_name = string_to_firm(src_pos, "__func__.%u", &string); } return current_function_name; case FUNCNAME_FUNCSIG: if (current_funcsig == NULL) { - const source_position_t *const src_pos = &expr->base.source_position; - ir_entity *ent = get_irg_entity(current_ir_graph); - const char *const name = get_entity_ld_name(ent); - const string_t string = { name, strlen(name) + 1 }; + source_position_t const *const src_pos = &expr->base.source_position; + ir_entity *const ent = get_irg_entity(current_ir_graph); + char const *const name = get_entity_ld_name(ent); + string_t const string = { name, strlen(name), STRING_ENCODING_CHAR }; current_funcsig = string_to_firm(src_pos, "__FUNCSIG__.%u", &string); } return current_funcsig; @@ -3277,25 +3170,21 @@ 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) { - 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 frame = get_irg_frame(current_ir_graph); - dbg_info *const dbgi = get_dbg_info(&expr->base.source_position); - ir_node *const no_mem = new_NoMem(); - ir_node *const arg_sel = - new_d_simpleSel(dbgi, no_mem, frame, parm_ent); - - type_t *const param_type = expr->parameter->base.type; - ir_node *const cnst = get_type_size_node(param_type); - ir_mode *const mode = get_irn_mode(cnst); - ir_node *const c1 = new_Const_long(mode, stack_param_align - 1); - ir_node *const c2 = new_d_Add(dbgi, cnst, c1, mode); - ir_node *const c3 = new_Const_long(mode, -(long)stack_param_align); - ir_node *const c4 = new_d_And(dbgi, c2, c3, mode); - ir_node *const add = new_d_Add(dbgi, arg_sel, c4, mode_P_data); - set_value_for_expression(expr->ap, add); + ir_entity *param_ent = current_vararg_entity; + if (param_ent == NULL) { + size_t const n = IR_VA_START_PARAMETER_NUMBER; + ir_type *const frame_type = get_irg_frame_type(current_ir_graph); + ir_type *const param_type = get_unknown_type(); + param_ent = new_parameter_entity(frame_type, n, param_type); + current_vararg_entity = param_ent; + } + + ir_node *const frame = get_irg_frame(current_ir_graph); + dbg_info *const dbgi = get_dbg_info(&expr->base.source_position); + ir_node *const no_mem = new_NoMem(); + ir_node *const arg_sel = new_d_simpleSel(dbgi, no_mem, frame, param_ent); + + set_value_for_expression(expr->ap, arg_sel); return NULL; } @@ -3349,7 +3238,7 @@ static ir_node *expression_to_addr(const expression_t *expression) case EXPR_CALL: return call_expression_to_firm(&expression->call); case EXPR_COMPOUND_LITERAL: - return compound_literal_to_firm(&expression->compound_literal); + return compound_literal_addr(&expression->compound_literal); case EXPR_REFERENCE: return reference_addr(&expression->reference); case EXPR_SELECT: @@ -3365,15 +3254,9 @@ static ir_node *expression_to_addr(const expression_t *expression) static ir_node *builtin_constant_to_firm( const builtin_constant_expression_t *expression) { - ir_mode *mode = get_ir_mode_arithmetic(expression->base.type); - long v; - - if (is_constant_expression(expression->value)) { - v = 1; - } else { - v = 0; - } - return new_Const_long(mode, v); + ir_mode *const mode = get_ir_mode_arithmetic(expression->base.type); + bool const v = is_constant_expression(expression->value) == EXPR_CLASS_CONSTANT; + return create_Const_from_bool(mode, v); } static ir_node *builtin_types_compatible_to_firm( @@ -3381,9 +3264,9 @@ static ir_node *builtin_types_compatible_to_firm( { type_t *const left = get_unqualified_type(skip_typeref(expression->left)); type_t *const right = get_unqualified_type(skip_typeref(expression->right)); - long const value = types_compatible(left, right) ? 1 : 0; + bool const value = types_compatible(left, right); ir_mode *const mode = get_ir_mode_arithmetic(expression->base.type); - return new_Const_long(mode, value); + return create_Const_from_bool(mode, value); } static ir_node *get_label_block(label_t *label) @@ -3426,72 +3309,43 @@ static ir_node *label_address_to_firm(const label_address_expression_t *label) * and expression_to_firm is, that this version might produce mode_b nodes * instead of mode_Is. */ -static ir_node *_expression_to_firm(const expression_t *expression) +static ir_node *_expression_to_firm(expression_t const *const expr) { #ifndef NDEBUG if (!constant_folding) { - assert(!expression->base.transformed); - ((expression_t*) expression)->base.transformed = true; + assert(!expr->base.transformed); + ((expression_t*)expr)->base.transformed = true; } #endif - switch (expression->kind) { - case EXPR_CHARACTER_CONSTANT: - return character_constant_to_firm(&expression->conste); - case EXPR_WIDE_CHARACTER_CONSTANT: - return wide_character_constant_to_firm(&expression->conste); - case EXPR_CONST: - return const_to_firm(&expression->conste); - case EXPR_STRING_LITERAL: - return string_literal_to_firm(&expression->string); - case EXPR_WIDE_STRING_LITERAL: - 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 - return unary_expression_to_firm(&expression->unary); - EXPR_BINARY_CASES - return binary_expression_to_firm(&expression->binary); - case EXPR_ARRAY_ACCESS: - return array_access_to_firm(&expression->array_access); - case EXPR_SIZEOF: - return sizeof_to_firm(&expression->typeprop); - case EXPR_ALIGNOF: - return alignof_to_firm(&expression->typeprop); - case EXPR_CONDITIONAL: - return conditional_to_firm(&expression->conditional); - case EXPR_SELECT: - return select_to_firm(&expression->select); - case EXPR_CLASSIFY_TYPE: - return classify_type_to_firm(&expression->classify_type); - case EXPR_FUNCNAME: - return function_name_to_firm(&expression->funcname); - case EXPR_STATEMENT: - return statement_expression_to_firm(&expression->statement); - case EXPR_VA_START: - return va_start_expression_to_firm(&expression->va_starte); - case EXPR_VA_ARG: - return va_arg_expression_to_firm(&expression->va_arge); - case EXPR_VA_COPY: - return va_copy_expression_to_firm(&expression->va_copye); - case EXPR_BUILTIN_CONSTANT_P: - return builtin_constant_to_firm(&expression->builtin_constant); - case EXPR_BUILTIN_TYPES_COMPATIBLE_P: - return builtin_types_compatible_to_firm(&expression->builtin_types_compatible); - case EXPR_OFFSETOF: - return offsetof_to_firm(&expression->offsetofe); - case EXPR_COMPOUND_LITERAL: - 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: - break; + switch (expr->kind) { + case EXPR_ALIGNOF: return alignof_to_firm( &expr->typeprop); + case EXPR_ARRAY_ACCESS: return array_access_to_firm( &expr->array_access); + case EXPR_BINARY_CASES: return binary_expression_to_firm( &expr->binary); + case EXPR_BUILTIN_CONSTANT_P: return builtin_constant_to_firm( &expr->builtin_constant); + case EXPR_BUILTIN_TYPES_COMPATIBLE_P: return builtin_types_compatible_to_firm(&expr->builtin_types_compatible); + case EXPR_CALL: return call_expression_to_firm( &expr->call); + case EXPR_CLASSIFY_TYPE: return classify_type_to_firm( &expr->classify_type); + case EXPR_COMPOUND_LITERAL: return compound_literal_to_firm( &expr->compound_literal); + case EXPR_CONDITIONAL: return conditional_to_firm( &expr->conditional); + case EXPR_FUNCNAME: return function_name_to_firm( &expr->funcname); + case EXPR_LABEL_ADDRESS: return label_address_to_firm( &expr->label_address); + case EXPR_LITERAL_CASES: return literal_to_firm( &expr->literal); + case EXPR_LITERAL_CHARACTER: return char_literal_to_firm( &expr->string_literal); + case EXPR_OFFSETOF: return offsetof_to_firm( &expr->offsetofe); + case EXPR_REFERENCE: return reference_expression_to_firm( &expr->reference); + case EXPR_ENUM_CONSTANT: return enum_constant_to_firm( &expr->reference); + case EXPR_SELECT: return select_to_firm( &expr->select); + case EXPR_SIZEOF: return sizeof_to_firm( &expr->typeprop); + case EXPR_STATEMENT: return statement_expression_to_firm( &expr->statement); + case EXPR_UNARY_CASES: return unary_expression_to_firm( &expr->unary); + case EXPR_VA_ARG: return va_arg_expression_to_firm( &expr->va_arge); + case EXPR_VA_COPY: return va_copy_expression_to_firm( &expr->va_copye); + case EXPR_VA_START: return va_start_expression_to_firm( &expr->va_starte); + + case EXPR_STRING_LITERAL: return string_to_firm(&expr->base.source_position, "str.%u", &expr->string_literal.value); + + case EXPR_ERROR: break; } panic("invalid expression found"); } @@ -3509,7 +3363,7 @@ static bool is_builtin_expect(const expression_t *expression) return false; reference_expression_t *ref = &function->reference; if (ref->entity->kind != ENTITY_FUNCTION || - ref->entity->function.btk != bk_gnu_builtin_expect) + ref->entity->function.btk != BUILTIN_EXPECT) return false; return true; @@ -3555,15 +3409,8 @@ static ir_node *expression_to_firm(const expression_t *expression) return res; } - if (is_constant_expression(expression)) { - ir_node *res = _expression_to_firm(expression); - ir_mode *mode = get_ir_mode_arithmetic(expression->base.type); - assert(is_Const(res)); - if (is_Const_null(res)) { - return new_Const_long(mode, 0); - } else { - return new_Const_long(mode, 1); - } + if (is_constant_expression(expression) == EXPR_CLASS_CONSTANT) { + return new_Const(fold_constant_to_tarval(expression)); } /* we have to produce a 0/1 from the mode_b expression */ @@ -3625,15 +3472,9 @@ static ir_node *create_condition_evaluation(const expression_t *expression, /* set branch prediction info based on __builtin_expect */ if (is_builtin_expect(expression) && is_Cond(cond)) { call_argument_t *argument = expression->call.arguments->next; - if (is_constant_expression(argument->expression)) { - bool cnst = fold_constant_to_bool(argument->expression); - cond_jmp_predicate pred; - - if (cnst == false) { - pred = COND_JMP_PRED_FALSE; - } else { - pred = COND_JMP_PRED_TRUE; - } + if (is_constant_expression(argument->expression) == EXPR_CLASS_CONSTANT) { + bool const cnst = fold_constant_to_bool(argument->expression); + cond_jmp_predicate const pred = cnst ? COND_JMP_PRED_TRUE : COND_JMP_PRED_FALSE; set_Cond_jmp_pred(cond, pred); } } @@ -3641,7 +3482,7 @@ static ir_node *create_condition_evaluation(const expression_t *expression, add_immBlock_pred(true_block, true_proj); add_immBlock_pred(false_block, false_proj); - set_cur_block(NULL); + set_unreachable_now(); return cond_expr; } @@ -3768,8 +3609,8 @@ static void descend_into_subtype(type_path_t *path) size_t len; if (is_type_compound(top_type)) { - compound_t *compound = top_type->compound.compound; - entity_t *entry = compound->members.entities; + compound_t *const compound = top_type->compound.compound; + entity_t *const entry = skip_unnamed_bitfields(compound->members.entities); top->compound_entry = entry; top->index = 0; @@ -3829,13 +3670,8 @@ static void walk_designator(type_path_t *path, const designator_t *designator) 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; - } - } - assert(iter != NULL); + for (; iter->base.symbol != symbol; iter = iter->base.next, ++index) {} + assert(iter->kind == ENTITY_COMPOUND_MEMBER); /* revert previous initialisations of other union elements */ if (type->kind == TYPE_COMPOUND_UNION) { @@ -3864,17 +3700,10 @@ static void walk_designator(type_path_t *path, const designator_t *designator) orig_type = iter->declaration.type; } else { expression_t *array_index = designator->array_index; - assert(designator->array_index != NULL); assert(is_type_array(type)); long index = fold_constant_to_int(array_index); - assert(index >= 0); -#ifndef NDEBUG - if (type->array.size_constant) { - long array_size = type->array.size; - assert(index < array_size); - } -#endif + assert(0 <= index && (!type->array.size_constant || (size_t)index < type->array.size)); top->type = orig_type; top->index = (size_t) index; @@ -3907,7 +3736,7 @@ static void advance_current_object(type_path_t *path) entity_t *entry = top->compound_entry; top->index++; - entry = entry->base.next; + entry = skip_unnamed_bitfields(entry->base.next); top->compound_entry = entry; if (entry != NULL) { assert(entry->kind == ENTITY_COMPOUND_MEMBER); @@ -3925,7 +3754,7 @@ static void advance_current_object(type_path_t *path) /* we're past the last member of the current sub-aggregate, try if we * can ascend in the type hierarchy and continue with another subobject */ - size_t len = ARR_LEN(path->path); + size_t len = ARR_LEN(path->path); if (len > 1) { ascend_from_subtype(path); @@ -3936,9 +3765,6 @@ static void advance_current_object(type_path_t *path) } -static ir_initializer_t *create_ir_initializer( - const initializer_t *initializer, type_t *type); - static ir_initializer_t *create_ir_initializer_value( const initializer_value_t *initializer) { @@ -3947,15 +3773,6 @@ static ir_initializer_t *create_ir_initializer_value( } type_t *type = initializer->value->base.type; expression_t *expr = initializer->value; - if (initializer_use_bitfield_basetype) { - type_t *skipped = skip_typeref(type); - if (skipped->kind == TYPE_BITFIELD) { - /* remove the bitfield cast... */ - assert(expr->kind == EXPR_UNARY_CAST_IMPLICIT); - expr = expr->unary.value; - type = skipped->bitfield.base_type; - } - } ir_node *value = expression_to_firm(expr); ir_mode *mode = get_ir_mode_storage(type); value = create_conv(NULL, value, mode); @@ -3965,15 +3782,10 @@ static ir_initializer_t *create_ir_initializer_value( /** test wether type can be initialized by a string constant */ static bool is_string_type(type_t *type) { - type_t *inner; - if (is_type_pointer(type)) { - inner = skip_typeref(type->pointer.points_to); - } else if(is_type_array(type)) { - inner = skip_typeref(type->array.element_type); - } else { + if (!is_type_array(type)) return false; - } + type_t *const inner = skip_typeref(type->array.element_type); return is_type_integer(inner); } @@ -4006,8 +3818,7 @@ static ir_initializer_t *create_ir_initializer_list( break; descend_into_subtype(&path); } - } else if (sub_initializer->kind == INITIALIZER_STRING - || sub_initializer->kind == INITIALIZER_WIDE_STRING) { + } else if (sub_initializer->kind == INITIALIZER_STRING) { /* we might have to descend into types until we're at a scalar * type */ while (true) { @@ -4040,58 +3851,39 @@ static ir_initializer_t *create_ir_initializer_list( return result; } -static ir_initializer_t *create_ir_initializer_string( - const initializer_string_t *initializer, type_t *type) +static ir_initializer_t *create_ir_initializer_string(initializer_t const *const init, type_t *type) { type = skip_typeref(type); - size_t string_len = initializer->string.size; - 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_ir_mode_storage(type->array.element_type); - - for (size_t i = 0; i < len; ++i) { - char c = 0; - if (i < string_len) - c = string[i]; - - tarval *tv = new_tarval_from_long(c, mode); - ir_initializer_t *char_initializer = create_initializer_tarval(tv); - - set_initializer_compound_value(irinitializer, i, char_initializer); - } - - return irinitializer; -} - -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); 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) { - wchar_rep_t c = 0; - if (i < string_len) { - c = string[i]; + string_literal_expression_t const *const str = get_init_string(init); + size_t const str_len = str->value.size; + size_t const arr_len = type->array.size; + ir_initializer_t *const irinit = create_initializer_compound(arr_len); + ir_mode *const mode = get_ir_mode_storage(type->array.element_type); + char const * p = str->value.begin; + switch (str->value.encoding) { + case STRING_ENCODING_CHAR: + for (size_t i = 0; i != arr_len; ++i) { + char const c = i < str_len ? *p++ : 0; + ir_tarval *const tv = new_tarval_from_long(c, mode); + ir_initializer_t *const tvinit = create_initializer_tarval(tv); + set_initializer_compound_value(irinit, i, tvinit); } - tarval *tv = new_tarval_from_long(c, mode); - ir_initializer_t *char_initializer = create_initializer_tarval(tv); + break; - set_initializer_compound_value(irinitializer, i, char_initializer); + case STRING_ENCODING_WIDE: + for (size_t i = 0; i != arr_len; ++i) { + utf32 const c = i < str_len ? read_utf8_char(&p) : 0; + ir_tarval *const tv = new_tarval_from_long(c, mode); + ir_initializer_t *const tvinit = create_initializer_tarval(tv); + set_initializer_compound_value(irinit, i, tvinit); + } + break; } - return irinitializer; + return irinit; } static ir_initializer_t *create_ir_initializer( @@ -4099,11 +3891,7 @@ static ir_initializer_t *create_ir_initializer( { switch(initializer->kind) { case INITIALIZER_STRING: - return create_ir_initializer_string(&initializer->string, type); - - case INITIALIZER_WIDE_STRING: - return create_ir_initializer_wide_string(&initializer->wide_string, - type); + return create_ir_initializer_string(initializer, type); case INITIALIZER_LIST: return create_ir_initializer_list(&initializer->list, type); @@ -4117,27 +3905,81 @@ static ir_initializer_t *create_ir_initializer( panic("unknown initializer"); } +/** ANSI C §6.7.8:21: If there are fewer initializers [..] than there + * are elements [...] the remainder of the aggregate shall be initialized + * implicitly the same as objects that have static storage duration. */ +static void create_dynamic_null_initializer(ir_entity *entity, dbg_info *dbgi, + ir_node *base_addr) +{ + /* for unions we must NOT do anything for null initializers */ + ir_type *owner = get_entity_owner(entity); + if (is_Union_type(owner)) { + return; + } + + ir_type *ent_type = get_entity_type(entity); + /* create sub-initializers for a compound type */ + if (is_compound_type(ent_type)) { + unsigned n_members = get_compound_n_members(ent_type); + for (unsigned n = 0; n < n_members; ++n) { + ir_entity *member = get_compound_member(ent_type, n); + ir_node *addr = new_d_simpleSel(dbgi, new_NoMem(), base_addr, + member); + create_dynamic_null_initializer(member, dbgi, addr); + } + return; + } + if (is_Array_type(ent_type)) { + assert(has_array_upper_bound(ent_type, 0)); + long n = get_array_upper_bound_int(ent_type, 0); + for (long i = 0; i < n; ++i) { + ir_mode *mode_uint = atomic_modes[ATOMIC_TYPE_UINT]; + ir_tarval *index_tv = new_tarval_from_long(i, mode_uint); + ir_node *cnst = new_d_Const(dbgi, index_tv); + ir_node *in[1] = { cnst }; + ir_entity *arrent = get_array_element_entity(ent_type); + ir_node *addr = new_d_Sel(dbgi, new_NoMem(), base_addr, 1, in, + arrent); + create_dynamic_null_initializer(arrent, dbgi, addr); + } + return; + } + + ir_mode *value_mode = get_type_mode(ent_type); + ir_node *node = new_Const(get_mode_null(value_mode)); + + /* 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, false); + return; + } + + ir_node *mem = get_store(); + ir_node *store = new_d_Store(dbgi, mem, base_addr, node, cons_none); + ir_node *proj_m = new_Proj(store, mode_M, pn_Store_M); + set_store(proj_m); +} + static void create_dynamic_initializer_sub(ir_initializer_t *initializer, ir_entity *entity, ir_type *type, dbg_info *dbgi, ir_node *base_addr) { switch(get_initializer_kind(initializer)) { - case IR_INITIALIZER_NULL: { - /* NULL is undefined for dynamic initializers */ + case IR_INITIALIZER_NULL: + create_dynamic_null_initializer(entity, dbgi, base_addr); return; - } case IR_INITIALIZER_CONST: { 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); + bitfield_store_to_firm(dbgi, entity, base_addr, node, false, false); return; } - assert(get_type_mode(type) == mode); + assert(get_type_mode(type) == get_irn_mode(node)); ir_node *mem = get_store(); ir_node *store = new_d_Store(dbgi, mem, base_addr, node, cons_none); ir_node *proj_m = new_Proj(store, mode_M, pn_Store_M); @@ -4145,19 +3987,18 @@ 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, tv); - ir_type *ent_type = get_entity_type(entity); + ir_tarval *tv = get_initializer_tarval_value(initializer); + ir_node *cnst = new_d_Const(dbgi, 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); + bitfield_store_to_firm(dbgi, entity, base_addr, cnst, false, false); return; } - assert(get_type_mode(type) == mode); + assert(get_type_mode(type) == get_tarval_mode(tv)); ir_node *mem = get_store(); ir_node *store = new_d_Store(dbgi, mem, base_addr, cnst, cons_none); ir_node *proj_m = new_Proj(store, mode_M, pn_Store_M); @@ -4165,7 +4006,7 @@ static void create_dynamic_initializer_sub(ir_initializer_t *initializer, return; } case IR_INITIALIZER_COMPOUND: { - assert(is_compound_type(type)); + assert(is_compound_type(type) || is_Array_type(type)); int n_members; if (is_Array_type(type)) { assert(has_array_upper_bound(type, 0)); @@ -4183,7 +4024,8 @@ static void create_dynamic_initializer_sub(ir_initializer_t *initializer, ir_type *irtype; ir_entity *sub_entity; if (is_Array_type(type)) { - tarval *index_tv = new_tarval_from_long(i, mode_uint); + ir_mode *mode_uint = atomic_modes[ATOMIC_TYPE_UINT]; + ir_tarval *index_tv = new_tarval_from_long(i, mode_uint); ir_node *cnst = new_d_Const(dbgi, index_tv); ir_node *in[1] = { cnst }; irtype = get_array_element_type(type); @@ -4237,41 +4079,19 @@ static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi, return; } - if (!is_constant_initializer(initializer)) { - bool old_initializer_use_bitfield_basetype - = initializer_use_bitfield_basetype; - initializer_use_bitfield_basetype = true; + if (is_constant_initializer(initializer) == EXPR_CLASS_VARIABLE) { ir_initializer_t *irinitializer = create_ir_initializer(initializer, type); - initializer_use_bitfield_basetype - = old_initializer_use_bitfield_basetype; create_dynamic_initializer(irinitializer, dbgi, entity); return; } - /* create the ir_initializer */ - ir_graph *const old_current_ir_graph = current_ir_graph; - current_ir_graph = get_const_code_irg(); - - ir_initializer_t *irinitializer = create_ir_initializer(initializer, type); - - assert(current_ir_graph == get_const_code_irg()); - current_ir_graph = old_current_ir_graph; - /* create a "template" entity which is copied to the entity on the stack */ - ident *const id = id_unique("initializer.%u"); - ir_type *const irtype = get_ir_type(type); - ir_type *const global_type = get_glob_type(); - ir_entity *const init_entity = new_d_entity(global_type, id, irtype, dbgi); - set_entity_ld_ident(init_entity, id); - - set_entity_visibility(init_entity, ir_visibility_local); - add_entity_linkage(init_entity, IR_LINKAGE_CONSTANT); - - set_entity_initializer(init_entity, irinitializer); - - ir_node *const src_addr = create_symconst(dbgi, mode_P_data, init_entity); + ir_entity *const init_entity + = create_initializer_entity(dbgi, initializer, type); + ir_node *const src_addr = create_symconst(dbgi, init_entity); + ir_type *const irtype = get_ir_type(type); ir_node *const copyb = new_d_CopyB(dbgi, memory, addr, src_addr, irtype); ir_node *const copyb_mem = new_Proj(copyb, mode_M, pn_CopyB_M); @@ -4307,29 +4127,41 @@ static void create_variable_initializer(entity_t *entity) 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(&entity->base.source_position); - - ir_node *value = expression_to_firm(initializer_value->value); + expression_t * value = initializer->value.value; + type_t *const init_type = skip_typeref(value->base.type); + + if (!is_type_scalar(init_type)) { + /* skip convs */ + while (value->kind == EXPR_UNARY_CAST) + value = value->unary.value; + + if (value->kind != EXPR_COMPOUND_LITERAL) + panic("expected non-scalar initializer to be a compound literal"); + initializer = value->compound_literal.initializer; + goto have_initializer; + } - type_t *type = initializer_value->value->base.type; - ir_mode *mode = get_ir_mode_storage(type); - value = create_conv(dbgi, value, mode); - value = do_strict_conv(dbgi, value); + ir_node * node = expression_to_firm(value); + dbg_info *const dbgi = get_dbg_info(&entity->base.source_position); + ir_mode *const mode = get_ir_mode_storage(init_type); + node = create_conv(dbgi, node, mode); + node = do_strict_conv(dbgi, node); if (declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE) { - set_value(entity->variable.v.value_number, value); + set_value(entity->variable.v.value_number, node); } else { assert(declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE); ir_entity *irentity = entity->variable.v.entity; - if (tq & TYPE_QUALIFIER_CONST) { + if (tq & TYPE_QUALIFIER_CONST + && get_entity_owner(irentity) != get_tls_type()) { add_entity_linkage(irentity, IR_LINKAGE_CONSTANT); } - set_atomic_ent_value(irentity, value); + set_atomic_ent_value(irentity, node); } } else { +have_initializer: assert(declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE_ENTITY || declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE); @@ -4360,7 +4192,7 @@ static void allocate_variable_length_array(entity_t *entity) { assert(entity->kind == ENTITY_VARIABLE); assert(entity->variable.initializer == NULL); - assert(get_cur_block() != NULL); + assert(currently_reachable()); dbg_info *dbgi = get_dbg_info(&entity->base.source_position); type_t *type = entity->declaration.type; @@ -4429,8 +4261,7 @@ static void create_local_static_variable(entity_t *entity) size_t l = strlen(entity->base.symbol->string); char buf[l + sizeof(".%u")]; snprintf(buf, sizeof(buf), "%s.%%u", entity->base.symbol->string); - ident *const id = id_unique(buf); - + ident *const id = id_unique(buf); ir_entity *const irentity = new_d_entity(var_type, id, irtype, dbgi); if (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) { @@ -4443,6 +4274,11 @@ static void create_local_static_variable(entity_t *entity) set_entity_ld_ident(irentity, id); set_entity_visibility(irentity, ir_visibility_local); + if (entity->variable.initializer == NULL) { + ir_initializer_t *null_init = get_initializer_null(); + set_entity_initializer(irentity, null_init); + } + ir_graph *const old_current_ir_graph = current_ir_graph; current_ir_graph = get_const_code_irg(); @@ -4454,85 +4290,58 @@ static void create_local_static_variable(entity_t *entity) -static void return_statement_to_firm(return_statement_t *statement) +static ir_node *return_statement_to_firm(return_statement_t *statement) { - if (get_cur_block() == NULL) - return; + if (!currently_reachable()) + return NULL; - dbg_info *dbgi = get_dbg_info(&statement->base.source_position); - type_t *type = current_function_entity->declaration.type; - ir_type *func_irtype = get_ir_type(type); - - - ir_node *in[1]; - int in_len; - if (get_method_n_ress(func_irtype) > 0) { - ir_type *res_type = get_method_res_type(func_irtype, 0); - - if (statement->value != NULL) { - ir_node *node = expression_to_firm(statement->value); - if (!is_compound_type(res_type)) { - type_t *type = statement->value->base.type; - ir_mode *mode = get_ir_mode_storage(type); - node = create_conv(dbgi, node, mode); - node = do_strict_conv(dbgi, node); - } - in[0] = node; + dbg_info *const dbgi = get_dbg_info(&statement->base.source_position); + type_t *const type = skip_typeref(current_function_entity->declaration.type->function.return_type); + ir_node * res = statement->value ? expression_to_firm(statement->value) : NULL; + + int in_len; + if (!is_type_void(type)) { + ir_mode *const mode = get_ir_mode_storage(type); + if (res) { + res = create_conv(dbgi, res, mode); + res = do_strict_conv(dbgi, res); } else { - ir_mode *mode; - if (is_compound_type(res_type)) { - mode = mode_P_data; - } else { - mode = get_type_mode(res_type); - } - in[0] = new_Unknown(mode); + res = new_Unknown(mode); } in_len = 1; } else { - /* build return_value for its side effects */ - if (statement->value != NULL) { - expression_to_firm(statement->value); - } in_len = 0; } - ir_node *store = get_store(); - ir_node *ret = new_d_Return(dbgi, store, in_len, in); + ir_node *const in[1] = { res }; + ir_node *const store = get_store(); + ir_node *const ret = new_d_Return(dbgi, store, in_len, in); ir_node *end_block = get_irg_end_block(current_ir_graph); add_immBlock_pred(end_block, ret); - set_cur_block(NULL); + set_unreachable_now(); + return NULL; } static ir_node *expression_statement_to_firm(expression_statement_t *statement) { - if (get_cur_block() == NULL) + if (!currently_reachable()) return NULL; return expression_to_firm(statement->expression); } +static void create_local_declarations(entity_t*); + static ir_node *compound_statement_to_firm(compound_statement_t *compound) { - entity_t *entity = compound->scope.entities; - for ( ; entity != NULL; entity = entity->base.next) { - if (!is_declaration(entity)) - continue; - - create_local_declaration(entity); - } + create_local_declarations(compound->scope.entities); ir_node *result = NULL; statement_t *statement = compound->statements; for ( ; statement != NULL; statement = statement->base.next) { - if (statement->base.next == NULL - && statement->kind == STATEMENT_EXPRESSION) { - result = expression_statement_to_firm( - &statement->expression); - break; - } - statement_to_firm(statement); + result = statement_to_firm(statement); } return result; @@ -4540,32 +4349,44 @@ static ir_node *compound_statement_to_firm(compound_statement_t *compound) static void create_global_variable(entity_t *entity) { - ir_linkage linkage = 0; - ir_visibility visibility = ir_visibility_default; - ir_entity *irentity; + ir_linkage linkage = IR_LINKAGE_DEFAULT; + ir_visibility visibility = ir_visibility_external; + storage_class_tag_t storage + = (storage_class_tag_t)entity->declaration.storage_class; + decl_modifiers_t modifiers = entity->declaration.modifiers; assert(entity->kind == ENTITY_VARIABLE); - switch ((storage_class_tag_t)entity->declaration.storage_class) { - case STORAGE_CLASS_STATIC: visibility = ir_visibility_local; break; + switch (storage) { case STORAGE_CLASS_EXTERN: visibility = ir_visibility_external; break; - case STORAGE_CLASS_NONE: - visibility = ir_visibility_default; - /* uninitialized globals get merged in C */ - if (entity->variable.initializer == NULL) - linkage |= IR_LINKAGE_MERGE; - break; + case STORAGE_CLASS_STATIC: visibility = ir_visibility_local; break; + case STORAGE_CLASS_NONE: visibility = ir_visibility_external; break; case STORAGE_CLASS_TYPEDEF: case STORAGE_CLASS_AUTO: case STORAGE_CLASS_REGISTER: panic("invalid storage class for global var"); } - ir_type *var_type = entity->variable.thread_local ? - get_tls_type() : get_glob_type(); + /* "common" symbols */ + if (storage == STORAGE_CLASS_NONE + && entity->variable.initializer == NULL + && !entity->variable.thread_local + && (modifiers & DM_WEAK) == 0) { + linkage |= IR_LINKAGE_MERGE; + } + + ir_type *var_type = get_glob_type(); + if (entity->variable.thread_local) { + var_type = get_tls_type(); + } create_variable_entity(entity, DECLARATION_KIND_GLOBAL_VARIABLE, var_type); - irentity = entity->variable.v.entity; + ir_entity *irentity = entity->variable.v.entity; add_entity_linkage(irentity, linkage); set_entity_visibility(irentity, visibility); + if (entity->variable.initializer == NULL + && storage != STORAGE_CLASS_EXTERN) { + ir_initializer_t *null_init = get_initializer_null(); + set_entity_initializer(irentity, null_init); + } } static void create_local_declaration(entity_t *entity) @@ -4617,6 +4438,14 @@ static void create_local_declaration(entity_t *entity) panic("invalid storage class found"); } +static void create_local_declarations(entity_t *e) +{ + for (; e; e = e->base.next) { + if (is_declaration(e)) + create_local_declaration(e); + } +} + static void initialize_local_declaration(entity_t *entity) { if (entity->base.symbol == NULL) @@ -4624,7 +4453,7 @@ static void initialize_local_declaration(entity_t *entity) // no need to emit code in dead blocks if (entity->declaration.storage_class != STORAGE_CLASS_STATIC - && get_cur_block() == NULL) + && !currently_reachable()) return; switch ((declaration_kind_t) entity->declaration.kind) { @@ -4653,11 +4482,11 @@ static void initialize_local_declaration(entity_t *entity) panic("invalid declaration kind"); } -static void declaration_statement_to_firm(declaration_statement_t *statement) +static ir_node *declaration_statement_to_firm(declaration_statement_t *statement) { entity_t *entity = statement->declarations_begin; if (entity == NULL) - return; + return NULL; entity_t *const last = statement->declarations_end; for ( ;; entity = entity->base.next) { @@ -4674,149 +4503,146 @@ static void declaration_statement_to_firm(declaration_statement_t *statement) if (entity == last) break; } + + return NULL; } -static void if_statement_to_firm(if_statement_t *statement) +static ir_node *if_statement_to_firm(if_statement_t *statement) { - ir_node *cur_block = get_cur_block(); + create_local_declarations(statement->scope.entities); - ir_node *fallthrough_block = NULL; - - /* the true (blocks) */ - ir_node *true_block = NULL; - if (statement->true_statement != NULL) { - true_block = new_immBlock(); - set_cur_block(true_block); - statement_to_firm(statement->true_statement); - if (get_cur_block() != NULL) { - ir_node *jmp = new_Jmp(); - if (fallthrough_block == NULL) - fallthrough_block = new_immBlock(); - add_immBlock_pred(fallthrough_block, jmp); - } - } - - /* the false (blocks) */ + /* Create the condition. */ + ir_node *true_block = NULL; ir_node *false_block = NULL; - if (statement->false_statement != NULL) { + if (currently_reachable()) { + true_block = new_immBlock(); false_block = new_immBlock(); - set_cur_block(false_block); - - statement_to_firm(statement->false_statement); - if (get_cur_block() != NULL) { - ir_node *jmp = new_Jmp(); - if (fallthrough_block == NULL) - fallthrough_block = new_immBlock(); - add_immBlock_pred(fallthrough_block, jmp); - } + create_condition_evaluation(statement->condition, true_block, false_block); + mature_immBlock(true_block); + mature_immBlock(false_block); } - /* create the condition */ - if (cur_block != NULL) { - if (true_block == NULL || false_block == NULL) { - if (fallthrough_block == NULL) - fallthrough_block = new_immBlock(); - if (true_block == NULL) - true_block = fallthrough_block; - if (false_block == NULL) - false_block = fallthrough_block; - } + /* Create the true statement. */ + set_cur_block(true_block); + statement_to_firm(statement->true_statement); + ir_node *fallthrough_block = get_cur_block(); - set_cur_block(cur_block); - create_condition_evaluation(statement->condition, true_block, - false_block); + /* Create the false statement. */ + set_cur_block(false_block); + if (statement->false_statement != NULL) { + statement_to_firm(statement->false_statement); } - mature_immBlock(true_block); - if (false_block != fallthrough_block && false_block != NULL) { - mature_immBlock(false_block); - } - if (fallthrough_block != NULL) { - mature_immBlock(fallthrough_block); + /* Handle the block after the if-statement. Minor simplification and + * optimisation: Reuse the false/true block as fallthrough block, if the + * true/false statement does not pass control to the fallthrough block, e.g. + * in the typical if (x) return; pattern. */ + if (fallthrough_block) { + if (currently_reachable()) { + ir_node *const t_jump = new_r_Jmp(fallthrough_block); + ir_node *const f_jump = new_Jmp(); + ir_node *const in[] = { t_jump, f_jump }; + fallthrough_block = new_Block(2, in); + } + set_cur_block(fallthrough_block); } - set_cur_block(fallthrough_block); + return NULL; } -static void while_statement_to_firm(while_statement_t *statement) +/** + * Add an unconditional jump to the target block. If the source block is not + * reachable, then a Bad predecessor is created to prevent Phi-less unreachable + * loops. This is necessary if the jump potentially enters a loop. + */ +static void jump_to(ir_node *const target_block) { - ir_node *jmp = NULL; - if (get_cur_block() != NULL) { - jmp = new_Jmp(); - } - - /* create the header block */ - ir_node *header_block = new_immBlock(); - if (jmp != NULL) { - add_immBlock_pred(header_block, jmp); - } - - /* the loop body */ - ir_node *old_continue_label = continue_label; - ir_node *old_break_label = break_label; - continue_label = header_block; - break_label = NULL; - - ir_node *body_block = new_immBlock(); - set_cur_block(body_block); - statement_to_firm(statement->body); - ir_node *false_block = break_label; + ir_node *const pred = currently_reachable() ? new_Jmp() : new_Bad(mode_X); + add_immBlock_pred(target_block, pred); +} - assert(continue_label == header_block); - continue_label = old_continue_label; - break_label = old_break_label; +/** + * Add an unconditional jump to the target block, if the current block is + * reachable and do nothing otherwise. This is only valid if the jump does not + * enter a loop (a back edge is ok). + */ +static void jump_if_reachable(ir_node *const target_block) +{ + if (currently_reachable()) + add_immBlock_pred(target_block, new_Jmp()); +} - if (get_cur_block() != NULL) { - jmp = new_Jmp(); - add_immBlock_pred(header_block, jmp); - } +static ir_node *while_statement_to_firm(while_statement_t *statement) +{ + create_local_declarations(statement->scope.entities); - /* shortcut for while(true) */ - if (is_constant_expression(statement->condition) - && fold_constant_to_bool(statement->condition) != 0) { - set_cur_block(header_block); - ir_node *header_jmp = new_Jmp(); - add_immBlock_pred(body_block, header_jmp); + /* Create the header block */ + ir_node *const header_block = new_immBlock(); + jump_to(header_block); + + /* Create the condition. */ + ir_node * body_block; + ir_node * false_block; + expression_t *const cond = statement->condition; + if (is_constant_expression(cond) == EXPR_CLASS_CONSTANT && + fold_constant_to_bool(cond)) { + /* Shortcut for while (true). */ + body_block = header_block; + false_block = NULL; - keep_alive(body_block); - keep_all_memory(body_block); - set_cur_block(body_block); + keep_alive(header_block); + keep_all_memory(header_block); } else { - if (false_block == NULL) { - false_block = new_immBlock(); - } + body_block = new_immBlock(); + false_block = new_immBlock(); - /* create the condition */ set_cur_block(header_block); - - create_condition_evaluation(statement->condition, body_block, - false_block); + create_condition_evaluation(cond, body_block, false_block); + mature_immBlock(body_block); } - mature_immBlock(body_block); + ir_node *const old_continue_label = continue_label; + ir_node *const old_break_label = break_label; + continue_label = header_block; + break_label = false_block; + + /* Create the loop body. */ + set_cur_block(body_block); + statement_to_firm(statement->body); + jump_if_reachable(header_block); + mature_immBlock(header_block); + assert(false_block == NULL || false_block == break_label); + false_block = break_label; if (false_block != NULL) { mature_immBlock(false_block); } - set_cur_block(false_block); + + assert(continue_label == header_block); + continue_label = old_continue_label; + break_label = old_break_label; + return NULL; } -static void do_while_statement_to_firm(do_while_statement_t *statement) +static ir_node *get_break_label(void) { - ir_node *jmp = NULL; - if (get_cur_block() != NULL) { - jmp = new_Jmp(); + if (break_label == NULL) { + break_label = new_immBlock(); } + return break_label; +} + +static ir_node *do_while_statement_to_firm(do_while_statement_t *statement) +{ + create_local_declarations(statement->scope.entities); /* create the header block */ ir_node *header_block = new_immBlock(); /* the loop body */ ir_node *body_block = new_immBlock(); - if (jmp != NULL) { - add_immBlock_pred(body_block, jmp); - } + jump_to(body_block); ir_node *old_continue_label = continue_label; ir_node *old_break_label = break_label; @@ -4825,48 +4651,32 @@ static void do_while_statement_to_firm(do_while_statement_t *statement) set_cur_block(body_block); statement_to_firm(statement->body); - ir_node *false_block = break_label; + ir_node *const false_block = get_break_label(); assert(continue_label == header_block); continue_label = old_continue_label; break_label = old_break_label; - if (get_cur_block() != NULL) { - 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(); - } + jump_if_reachable(header_block); /* create the condition */ + mature_immBlock(header_block); set_cur_block(header_block); create_condition_evaluation(statement->condition, body_block, false_block); mature_immBlock(body_block); - mature_immBlock(header_block); mature_immBlock(false_block); set_cur_block(false_block); + return NULL; } -static void for_statement_to_firm(for_statement_t *statement) +static ir_node *for_statement_to_firm(for_statement_t *statement) { - ir_node *jmp = NULL; - - /* create declarations */ - entity_t *entity = statement->scope.entities; - for ( ; entity != NULL; entity = entity->base.next) { - if (!is_declaration(entity)) - continue; - - create_local_declaration(entity); - } + create_local_declarations(statement->scope.entities); - if (get_cur_block() != NULL) { - entity = statement->scope.entities; + if (currently_reachable()) { + entity_t *entity = statement->scope.entities; for ( ; entity != NULL; entity = entity->base.next) { if (!is_declaration(entity)) continue; @@ -4877,186 +4687,148 @@ static void for_statement_to_firm(for_statement_t *statement) if (statement->initialisation != NULL) { expression_to_firm(statement->initialisation); } - - jmp = new_Jmp(); } - - /* create the step block */ - ir_node *const step_block = new_immBlock(); - set_cur_block(step_block); - if (statement->step != NULL) { - expression_to_firm(statement->step); - } - ir_node *const step_jmp = new_Jmp(); - - /* create the header block */ + /* Create the header block */ ir_node *const header_block = new_immBlock(); - set_cur_block(header_block); - if (jmp != NULL) { - add_immBlock_pred(header_block, jmp); - } - add_immBlock_pred(header_block, step_jmp); - - /* the false block */ - ir_node *const false_block = new_immBlock(); + jump_to(header_block); - /* the loop body */ + /* Create the condition. */ ir_node *body_block; - if (statement->body != NULL) { - ir_node *const old_continue_label = continue_label; - ir_node *const old_break_label = break_label; - continue_label = step_block; - break_label = false_block; - - body_block = new_immBlock(); - set_cur_block(body_block); - statement_to_firm(statement->body); - - assert(continue_label == step_block); - assert(break_label == false_block); - continue_label = old_continue_label; - break_label = old_break_label; - - if (get_cur_block() != NULL) { - jmp = new_Jmp(); - add_immBlock_pred(step_block, jmp); - } - } else { - body_block = step_block; - } - - /* create the condition */ - set_cur_block(header_block); + ir_node *false_block; if (statement->condition != NULL) { - create_condition_evaluation(statement->condition, body_block, - false_block); + body_block = new_immBlock(); + false_block = new_immBlock(); + + set_cur_block(header_block); + create_condition_evaluation(statement->condition, body_block, false_block); + mature_immBlock(body_block); } else { + /* for-ever. */ + body_block = header_block; + false_block = NULL; + keep_alive(header_block); keep_all_memory(header_block); - jmp = new_Jmp(); - add_immBlock_pred(body_block, jmp); } - mature_immBlock(body_block); - mature_immBlock(false_block); - mature_immBlock(step_block); - mature_immBlock(header_block); - mature_immBlock(false_block); + /* Create the step block, if necessary. */ + ir_node * step_block = header_block; + expression_t *const step = statement->step; + if (step != NULL) { + step_block = new_immBlock(); + } + + ir_node *const old_continue_label = continue_label; + ir_node *const old_break_label = break_label; + continue_label = step_block; + break_label = false_block; + + /* Create the loop body. */ + set_cur_block(body_block); + statement_to_firm(statement->body); + jump_if_reachable(step_block); + + /* Create the step code. */ + if (step != NULL) { + mature_immBlock(step_block); + set_cur_block(step_block); + expression_to_firm(step); + jump_if_reachable(header_block); + } + mature_immBlock(header_block); + assert(false_block == NULL || false_block == break_label); + false_block = break_label; + if (false_block != NULL) { + mature_immBlock(false_block); + } set_cur_block(false_block); + + assert(continue_label == step_block); + continue_label = old_continue_label; + break_label = old_break_label; + return NULL; } -static void create_jump_statement(const statement_t *statement, - ir_node *target_block) +static ir_node *create_jump_statement(const statement_t *statement, ir_node *target_block) { - if (get_cur_block() == NULL) - return; + if (!currently_reachable()) + return NULL; dbg_info *dbgi = get_dbg_info(&statement->base.source_position); ir_node *jump = new_d_Jmp(dbgi); add_immBlock_pred(target_block, jump); - set_cur_block(NULL); + set_unreachable_now(); + return NULL; } -static ir_node *get_break_label(void) +static ir_switch_table *create_switch_table(const switch_statement_t *statement) { - if (break_label == NULL) { - break_label = new_immBlock(); + /* determine number of cases */ + size_t n_cases = 0; + for (case_label_statement_t *l = statement->first_case; l != NULL; + l = l->next) { + /* default case */ + if (l->expression == NULL) + continue; + if (l->is_empty_range) + continue; + ++n_cases; } - return break_label; + + ir_switch_table *res = ir_new_switch_table(current_ir_graph, n_cases); + size_t i = 0; + for (case_label_statement_t *l = statement->first_case; l != NULL; + l = l->next) { + if (l->expression == NULL) { + l->pn = pn_Switch_default; + continue; + } + if (l->is_empty_range) + continue; + ir_tarval *min = fold_constant_to_tarval(l->expression); + ir_tarval *max = min; + long pn = (long) i+1; + if (l->end_range != NULL) + max = fold_constant_to_tarval(l->end_range); + ir_switch_table_set(res, i++, min, max, pn); + l->pn = pn; + } + return res; } -static void switch_statement_to_firm(switch_statement_t *statement) +static ir_node *switch_statement_to_firm(switch_statement_t *statement) { - ir_node *first_block = NULL; dbg_info *dbgi = get_dbg_info(&statement->base.source_position); - ir_node *cond = NULL; + ir_node *switch_node = NULL; - if (get_cur_block() != NULL) { + if (currently_reachable()) { ir_node *expression = expression_to_firm(statement->expression); - cond = new_d_Cond(dbgi, expression); - first_block = get_cur_block(); + ir_switch_table *table = create_switch_table(statement); + unsigned n_outs = (unsigned)ir_switch_table_get_n_entries(table) + 1; + + switch_node = new_d_Switch(dbgi, expression, n_outs, table); } - set_cur_block(NULL); + set_unreachable_now(); - ir_node *const old_switch_cond = current_switch_cond; + ir_node *const old_switch = current_switch; ir_node *const old_break_label = break_label; const bool old_saw_default_label = saw_default_label; saw_default_label = false; - current_switch_cond = cond; + current_switch = switch_node; 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 occur, 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 dense, so we took the last (num_cases) - * one, or they are not dense, 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); - } + statement_to_firm(statement->body); - if (get_cur_block() != NULL) { - ir_node *jmp = new_Jmp(); - add_immBlock_pred(get_break_label(), jmp); + if (currently_reachable()) { + add_immBlock_pred(get_break_label(), new_Jmp()); } - if (!saw_default_label && first_block != NULL) { - set_cur_block(first_block); - ir_node *const proj = new_d_defaultProj(dbgi, cond, - statement->default_proj_nr); + if (!saw_default_label && switch_node) { + ir_node *proj = new_d_Proj(dbgi, switch_node, mode_X, pn_Switch_default); add_immBlock_pred(get_break_label(), proj); } @@ -5065,95 +4837,64 @@ static void switch_statement_to_firm(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; + assert(current_switch == switch_node); + current_switch = old_switch; + break_label = old_break_label; + saw_default_label = old_saw_default_label; + return NULL; } -static void case_label_to_firm(const case_label_statement_t *statement) +static ir_node *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()); + return NULL; - ir_node *proj; - ir_node *block = new_immBlock(); + if (current_switch != NULL) { + ir_node *block = new_immBlock(); + /* Fallthrough from previous case */ + jump_if_reachable(block); - if (current_switch_cond != NULL) { - set_cur_block(get_nodes_block(current_switch_cond)); - if (statement->expression != NULL) { - long pn = statement->first_case; - long end_pn = statement->last_case; - assert(pn <= end_pn); - /* create jumps for all cases in the given range */ - do { - proj = new_d_Proj(dbgi, current_switch_cond, mode_X, pn); - add_immBlock_pred(block, proj); - } while (pn++ < end_pn); - } else { + ir_node *const proj = new_Proj(current_switch, mode_X, statement->pn); + add_immBlock_pred(block, proj); + if (statement->expression == NULL) saw_default_label = true; - proj = new_d_defaultProj(dbgi, current_switch_cond, - current_switch->default_proj_nr); - add_immBlock_pred(block, proj); - } + mature_immBlock(block); + set_cur_block(block); } - if (fallthrough != NULL) { - add_immBlock_pred(block, fallthrough); - } - mature_immBlock(block); - set_cur_block(block); - - if (statement->statement != NULL) { - statement_to_firm(statement->statement); - } + return statement_to_firm(statement->statement); } -static void label_to_firm(const label_statement_t *statement) +static ir_node *label_to_firm(const label_statement_t *statement) { ir_node *block = get_label_block(statement->label); - - if (get_cur_block() != NULL) { - ir_node *jmp = new_Jmp(); - add_immBlock_pred(block, jmp); - } + jump_to(block); set_cur_block(block); keep_alive(block); keep_all_memory(block); - if (statement->statement != NULL) { - statement_to_firm(statement->statement); - } + return statement_to_firm(statement->statement); } -static void goto_to_firm(const goto_statement_t *statement) +static ir_node *computed_goto_to_firm(computed_goto_statement_t const *const statement) { - if (get_cur_block() == NULL) - return; + if (!currently_reachable()) + return NULL; - 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); + ir_node *const irn = expression_to_firm(statement->expression); + dbg_info *const dbgi = get_dbg_info(&statement->base.source_position); + ir_node *const 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); + set_irn_link(ijmp, ijmp_list); + ijmp_list = ijmp; + + set_unreachable_now(); + return NULL; } -static void asm_statement_to_firm(const asm_statement_t *statement) +static ir_node *asm_statement_to_firm(const asm_statement_t *statement) { bool needs_memory = false; @@ -5172,7 +4913,7 @@ static void asm_statement_to_firm(const asm_statement_t *statement) continue; } - if (strcmp(clobber_str, "memory") == 0) { + if (streq(clobber_str, "memory")) { needs_memory = true; continue; } @@ -5213,20 +4954,19 @@ static void asm_statement_to_firm(const asm_statement_t *statement) asm_constraint_flags_t asm_flags = be_parse_asm_constraints(constraints); - if (asm_flags & ASM_CONSTRAINT_FLAG_NO_SUPPORT) { - warningf(&statement->base.source_position, - "some constraints in '%s' are not supported", constraints); - } - 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; + { + source_position_t const *const pos = &statement->base.source_position; + if (asm_flags & ASM_CONSTRAINT_FLAG_NO_SUPPORT) { + warningf(WARN_OTHER, pos, "some constraints in '%s' are not supported", constraints); + } + if (asm_flags & ASM_CONSTRAINT_FLAG_INVALID) { + errorf(pos, "some constraints in '%s' are invalid", constraints); + continue; + } + if (! (asm_flags & ASM_CONSTRAINT_FLAG_MODIFIER_WRITE)) { + errorf(pos, "no write flag specified for output constraints '%s'", constraints); + continue; + } } unsigned pos = next_pos++; @@ -5269,7 +5009,7 @@ static void asm_statement_to_firm(const asm_statement_t *statement) ir_asm_constraint constraint; constraint.pos = pos; constraint.constraint = new_id_from_str(constraints); - constraint.mode = NULL; + constraint.mode = mode_M; tmp_in_constraints[in_size] = constraint; ins[in_size] = expression_to_addr(expr); @@ -5380,7 +5120,7 @@ static void asm_statement_to_firm(const asm_statement_t *statement) /* create output projs & connect them */ if (needs_memory) { - ir_node *projm = new_Proj(node, mode_M, out_size+1); + ir_node *projm = new_Proj(node, mode_M, out_size); set_store(projm); } @@ -5394,86 +5134,57 @@ static void asm_statement_to_firm(const asm_statement_t *statement) set_value_for_expression_addr(out_expr, proj, addr); } + + return NULL; } -static void ms_try_statement_to_firm(ms_try_statement_t *statement) +static ir_node *ms_try_statement_to_firm(ms_try_statement_t *statement) { statement_to_firm(statement->try_statement); - warningf(&statement->base.source_position, "structured exception handling ignored"); + source_position_t const *const pos = &statement->base.source_position; + warningf(WARN_OTHER, pos, "structured exception handling ignored"); + return NULL; } -static void leave_statement_to_firm(leave_statement_t *statement) +static ir_node *leave_statement_to_firm(leave_statement_t *statement) { errorf(&statement->base.source_position, "__leave not supported yet"); + return NULL; } /** * Transform a statement. */ -static void statement_to_firm(statement_t *statement) +static ir_node *statement_to_firm(statement_t *const stmt) { #ifndef NDEBUG - assert(!statement->base.transformed); - statement->base.transformed = true; + assert(!stmt->base.transformed); + stmt->base.transformed = true; #endif - switch (statement->kind) { - case STATEMENT_INVALID: - panic("invalid statement found"); - case STATEMENT_EMPTY: - /* nothing */ - return; - case STATEMENT_COMPOUND: - compound_statement_to_firm(&statement->compound); - return; - case STATEMENT_RETURN: - return_statement_to_firm(&statement->returns); - return; - case STATEMENT_EXPRESSION: - expression_statement_to_firm(&statement->expression); - return; - case STATEMENT_IF: - if_statement_to_firm(&statement->ifs); - return; - case STATEMENT_WHILE: - while_statement_to_firm(&statement->whiles); - return; - case STATEMENT_DO_WHILE: - do_while_statement_to_firm(&statement->do_while); - return; - case STATEMENT_DECLARATION: - declaration_statement_to_firm(&statement->declaration); - return; - case STATEMENT_BREAK: - create_jump_statement(statement, get_break_label()); - return; - case STATEMENT_CONTINUE: - create_jump_statement(statement, continue_label); - return; - case STATEMENT_SWITCH: - switch_statement_to_firm(&statement->switchs); - return; - case STATEMENT_CASE_LABEL: - case_label_to_firm(&statement->case_label); - return; - case STATEMENT_FOR: - for_statement_to_firm(&statement->fors); - return; - case STATEMENT_LABEL: - label_to_firm(&statement->label); - return; - case STATEMENT_GOTO: - goto_to_firm(&statement->gotos); - return; - case STATEMENT_ASM: - asm_statement_to_firm(&statement->asms); - return; - case STATEMENT_MS_TRY: - ms_try_statement_to_firm(&statement->ms_try); - return; - case STATEMENT_LEAVE: - leave_statement_to_firm(&statement->leave); - return; + switch (stmt->kind) { + case STATEMENT_ASM: return asm_statement_to_firm( &stmt->asms); + case STATEMENT_CASE_LABEL: return case_label_to_firm( &stmt->case_label); + case STATEMENT_COMPOUND: return compound_statement_to_firm( &stmt->compound); + case STATEMENT_COMPUTED_GOTO: return computed_goto_to_firm( &stmt->computed_goto); + case STATEMENT_DECLARATION: return declaration_statement_to_firm(&stmt->declaration); + case STATEMENT_DO_WHILE: return do_while_statement_to_firm( &stmt->do_while); + case STATEMENT_EMPTY: return NULL; /* nothing */ + case STATEMENT_EXPRESSION: return expression_statement_to_firm( &stmt->expression); + case STATEMENT_FOR: return for_statement_to_firm( &stmt->fors); + case STATEMENT_IF: return if_statement_to_firm( &stmt->ifs); + case STATEMENT_LABEL: return label_to_firm( &stmt->label); + case STATEMENT_LEAVE: return leave_statement_to_firm( &stmt->leave); + case STATEMENT_MS_TRY: return ms_try_statement_to_firm( &stmt->ms_try); + case STATEMENT_RETURN: return return_statement_to_firm( &stmt->returns); + case STATEMENT_SWITCH: return switch_statement_to_firm( &stmt->switchs); + case STATEMENT_WHILE: return while_statement_to_firm( &stmt->whiles); + + case STATEMENT_BREAK: return create_jump_statement(stmt, get_break_label()); + case STATEMENT_CONTINUE: return create_jump_statement(stmt, continue_label); + case STATEMENT_GOTO: return create_jump_statement(stmt, get_label_block(stmt->gotos.label)); + + case STATEMENT_ERROR: panic("error statement found"); } panic("statement not implemented"); } @@ -5484,20 +5195,9 @@ static int count_local_variables(const entity_t *entity, int count = 0; entity_t const *const end = last != NULL ? last->base.next : NULL; for (; entity != end; entity = entity->base.next) { - type_t *type; - bool address_taken; - - if (entity->kind == ENTITY_VARIABLE) { - type = skip_typeref(entity->declaration.type); - address_taken = entity->variable.address_taken; - } else if (entity->kind == ENTITY_PARAMETER) { - type = skip_typeref(entity->declaration.type); - address_taken = entity->parameter.address_taken; - } else { - continue; - } - - if (!address_taken && is_type_scalar(type)) + if ((entity->kind == ENTITY_VARIABLE || entity->kind == ENTITY_PARAMETER) && + !entity->variable.address_taken && + is_type_scalar(skip_typeref(entity->declaration.type))) ++count; } return count; @@ -5548,17 +5248,23 @@ static void initialize_function_parameters(entity_t *entity) 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 first_param_nr = 0; + int n = 0; + ir_type *function_irtype; if (entity->function.need_closure) { /* add an extra parameter for the static link */ - entity->function.static_link = new_r_Proj(start_block, args, mode_P_data, 0); - ++first_param_nr; + entity->function.static_link = new_r_Proj(args, mode_P_data, 0); + ++n; + + /* Matze: IMO this is wrong, nested functions should have an own + * type and not rely on strange parameters... */ + function_irtype = create_method_type(&entity->declaration.type->function, true); + } else { + function_irtype = get_ir_type(entity->declaration.type); } - int n = 0; + + entity_t *parameter = entity->function.parameters.entities; for ( ; parameter != NULL; parameter = parameter->base.next, ++n) { if (parameter->kind != ENTITY_PARAMETER) @@ -5567,40 +5273,34 @@ static void initialize_function_parameters(entity_t *entity) assert(parameter->declaration.kind == DECLARATION_KIND_UNKNOWN); type_t *type = skip_typeref(parameter->declaration.type); - bool needs_entity = parameter->parameter.address_taken; assert(!is_type_array(type)); - if (is_type_compound(type)) { - needs_entity = true; - } + bool const needs_entity = parameter->variable.address_taken || is_type_compound(type); + ir_type *param_irtype = get_method_param_type(function_irtype, n); if (needs_entity) { - ir_entity *entity = get_method_value_param_ent(function_irtype, n); - ident *id = new_id_from_str(parameter->base.symbol->string); - set_entity_ident(entity, id); - - parameter->declaration.kind - = DECLARATION_KIND_PARAMETER_ENTITY; - parameter->parameter.v.entity = entity; + ir_type *frame_type = get_irg_frame_type(irg); + ir_entity *param + = new_parameter_entity(frame_type, n, param_irtype); + parameter->declaration.kind = DECLARATION_KIND_PARAMETER_ENTITY; + parameter->variable.v.entity = param; continue; } - ir_type *param_irtype = get_method_param_type(function_irtype, n); - ir_mode *param_mode = get_type_mode(param_irtype); - - long pn = n + first_param_nr; - ir_node *value = new_r_Proj(start_block, args, param_mode, pn); + ir_mode *param_mode = get_type_mode(param_irtype); + long pn = n; + ir_node *value = new_r_Proj(args, param_mode, pn); ir_mode *mode = get_ir_mode_storage(type); value = create_conv(NULL, value, mode); value = do_strict_conv(NULL, value); - parameter->declaration.kind = DECLARATION_KIND_PARAMETER; - parameter->parameter.v.value_number = next_value_number_function; + parameter->declaration.kind = DECLARATION_KIND_PARAMETER; + parameter->variable.v.value_number = next_value_number_function; set_irg_loc_description(current_ir_graph, next_value_number_function, parameter); ++next_value_number_function; - set_value(parameter->parameter.v.value_number, value); + set_value(parameter->variable.v.value_number, value); } } @@ -5610,27 +5310,13 @@ static void initialize_function_parameters(entity_t *entity) * @param irg the IR-graph * @param dec_modifiers additional modifiers */ -static void handle_decl_modifier_irg(ir_graph_ptr irg, +static void handle_decl_modifier_irg(ir_graph *irg, decl_modifiers_t decl_modifiers) { - if (decl_modifiers & DM_RETURNS_TWICE) { - /* TRUE if the declaration includes __attribute__((returns_twice)) */ - set_irg_additional_property(irg, mtp_property_returns_twice); - } - if (decl_modifiers & DM_NORETURN) { - /* TRUE if the declaration includes the Microsoft - __declspec(noreturn) specifier. */ - set_irg_additional_property(irg, mtp_property_noreturn); - } - if (decl_modifiers & DM_NOTHROW) { - /* TRUE if the declaration includes the Microsoft - __declspec(nothrow) specifier. */ - set_irg_additional_property(irg, mtp_property_nothrow); - } if (decl_modifiers & DM_NAKED) { /* TRUE if the declaration includes the Microsoft __declspec(naked) specifier. */ - set_irg_additional_property(irg, mtp_property_naked); + add_irg_additional_properties(irg, mtp_property_naked); } if (decl_modifiers & DM_FORCEINLINE) { /* TRUE if the declaration includes the @@ -5650,15 +5336,20 @@ static void add_function_pointer(ir_type *segment, ir_entity *method, ir_type *method_type = get_entity_type(method); ir_type *ptr_type = new_type_pointer(method_type); + /* these entities don't really have a name but firm only allows + * "" in ld_ident. + * Note that we mustn't give these entities a name since for example + * Mach-O doesn't allow them. */ 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); + method); + set_entity_ld_ident(ptr, new_id_from_chars("", 0)); set_entity_compiler_generated(ptr, 1); - set_entity_visibility(ptr, ir_visibility_local); - add_entity_linkage(ptr, IR_LINKAGE_CONSTANT); + set_entity_visibility(ptr, ir_visibility_private); + add_entity_linkage(ptr, IR_LINKAGE_CONSTANT|IR_LINKAGE_HIDDEN_USER); set_atomic_ent_value(ptr, val); } @@ -5686,10 +5377,6 @@ static void create_function(entity_t *entity) if (entity->function.statement == NULL) return; - if (is_main(entity) && firm_opt.os_support == OS_SUPPORT_MINGW) { - prepare_main_collect2(entity); - } - inner_functions = NULL; current_trampolines = NULL; @@ -5712,15 +5399,18 @@ static void create_function(entity_t *entity) int n_local_vars = get_function_n_local_vars(entity); ir_graph *irg = new_ir_graph(function_entity, n_local_vars); + current_ir_graph = irg; ir_graph *old_current_function = current_function; current_function = irg; - set_irg_fp_model(irg, firm_opt.fp_model); - tarval_enable_fp_ops(1); - set_irn_dbg_info(get_irg_start_block(irg), get_entity_dbg_info(function_entity)); + ir_entity *const old_current_vararg_entity = current_vararg_entity; + current_vararg_entity = NULL; - ir_node *first_block = get_cur_block(); + set_irg_fp_model(irg, firm_fp_model); + tarval_enable_fp_ops(1); + set_irn_dbg_info(get_irg_start_block(irg), + get_entity_dbg_info(function_entity)); /* set inline flags */ if (entity->function.is_inline) @@ -5736,23 +5426,16 @@ static void create_function(entity_t *entity) ir_node *end_block = get_irg_end_block(irg); /* do we have a return statement yet? */ - if (get_cur_block() != NULL) { + if (currently_reachable()) { 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 - = skip_typeref(func_type->return_type); + type_t *const return_type = skip_typeref(type->function.return_type); ir_node *ret; - if (is_type_atomic(return_type, ATOMIC_TYPE_VOID)) { + if (is_type_void(return_type)) { ret = new_Return(get_store(), 0, NULL); } else { - ir_mode *mode; - if (is_type_scalar(return_type)) { - mode = get_ir_mode_storage(func_type->return_type); - } else { - mode = mode_P_data; - } + ir_mode *const mode = get_ir_mode_storage(return_type); ir_node *in[1]; /* §5.1.2.2.3 main implicitly returns 0 */ @@ -5766,31 +5449,17 @@ static void create_function(entity_t *entity) add_immBlock_pred(end_block, ret); } - 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(all_labels); all_labels = NULL; - mature_immBlock(first_block); - mature_immBlock(end_block); - irg_finalize_cons(irg); /* finalize the frame type */ @@ -5799,8 +5468,8 @@ static void create_function(entity_t *entity) int align_all = 4; int offset = 0; for (int i = 0; i < n; ++i) { - ir_entity *entity = get_compound_member(frame_type, i); - ir_type *entity_type = get_entity_type(entity); + ir_entity *member = get_compound_member(frame_type, i); + ir_type *entity_type = get_entity_type(member); int align = get_type_alignment_bytes(entity_type); if (align > align_all) @@ -5813,14 +5482,15 @@ static void create_function(entity_t *entity) } } - set_entity_offset(entity, offset); + set_entity_offset(member, offset); offset += get_type_size_bytes(entity_type); } set_type_size_bytes(frame_type, offset); set_type_alignment_bytes(frame_type, align_all); - irg_vrfy(irg); - current_function = old_current_function; + irg_verify(irg, VERIFY_ENFORCE_SSA); + current_vararg_entity = old_current_vararg_entity; + current_function = old_current_function; if (current_trampolines != NULL) { DEL_ARR_F(current_trampolines); @@ -5832,14 +5502,11 @@ static void create_function(entity_t *entity) if (inner != NULL) { ir_type *rem_outer_frame = current_outer_frame; current_outer_frame = get_irg_frame_type(current_ir_graph); - ir_type *rem_outer_value_type = current_outer_value_type; - current_outer_value_type = get_irg_value_param_type(current_ir_graph); for (int i = ARR_LEN(inner) - 1; i >= 0; --i) { create_function(inner[i]); } DEL_ARR_F(inner); - current_outer_value_type = rem_outer_value_type; current_outer_frame = rem_outer_frame; } } @@ -5853,7 +5520,7 @@ static void scope_to_firm(scope_t *scope) continue; if (entity->kind == ENTITY_FUNCTION) { - if (entity->function.btk != bk_none) { + if (entity->function.btk != BUILTIN_NONE) { /* builtins have no representation */ continue; } @@ -5872,7 +5539,7 @@ static void scope_to_firm(scope_t *scope) continue; if (entity->kind == ENTITY_FUNCTION) { - if (entity->function.btk != bk_none) { + if (entity->function.btk != BUILTIN_NONE) { /* builtins have no representation */ continue; } @@ -5894,21 +5561,6 @@ void init_ast2firm(void) ir_set_debug_retrieve(dbg_retrieve); ir_set_type_debug_retrieve(dbg_print_type_dbg_info); - /* OS option must be set to the backend */ - switch (firm_opt.os_support) { - case OS_SUPPORT_MINGW: - create_ld_ident = create_name_win32; - break; - case OS_SUPPORT_LINUX: - create_ld_ident = create_name_linux_elf; - break; - case OS_SUPPORT_MACHO: - create_ld_ident = create_name_macho; - break; - default: - panic("unexpected OS support mode"); - } - /* create idents for all known runtime functions */ for (size_t i = 0; i < lengthof(rts_data); ++i) { rts_idents[i] = new_id_from_str(rts_data[i].name); @@ -5924,11 +5576,8 @@ static void init_ir_types(void) return; ir_types_initialized = 1; - ir_type_int = get_ir_type(type_int); - ir_type_char = get_ir_type(type_char); - ir_type_const_char = get_ir_type(type_const_char); - ir_type_wchar_t = get_ir_type(type_wchar_t); - ir_type_void = get_ir_type(type_void); + ir_type_char = get_ir_type(type_char); + ir_type_wchar_t = get_ir_type(type_wchar_t); be_params = be_get_backend_param(); mode_float_arithmetic = be_params->mode_float_arithmetic; @@ -5948,23 +5597,41 @@ static void global_asm_to_firm(statement_t *s) 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); + size_t const size = s->asms.asm_text.size; + ident *const id = new_id_from_chars(text, size); add_irp_asm(id); } } +static const char *get_cwd(void) +{ + static char buf[1024]; + if (buf[0] == '\0') + getcwd(buf, sizeof(buf)); + return buf; +} + void translation_unit_to_firm(translation_unit_t *unit) { + if (c_mode & _CXX) { + be_dwarf_set_source_language(DW_LANG_C_plus_plus); + } else if (c_mode & _C99) { + be_dwarf_set_source_language(DW_LANG_C99); + } else if (c_mode & _C89) { + be_dwarf_set_source_language(DW_LANG_C89); + } else { + be_dwarf_set_source_language(DW_LANG_C); + } + be_dwarf_set_compilation_directory(get_cwd()); + + /* initialize firm arithmetic */ + tarval_set_integer_overflow_mode(TV_OVERFLOW_WRAP); + ir_set_uninitialized_local_variable_func(uninitialized_local_var); + /* just to be sure */ continue_label = NULL; break_label = NULL; - current_switch_cond = NULL; + current_switch = NULL; current_translation_unit = unit; init_ir_types();