X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast2firm.c;h=71172df7aa08c7594907ff9300c2453076674832;hb=d094a9b8a3a4d7270de63a7eb94114b544f8ea14;hp=2c7e1bb44b18a2968787ac89da9a1b9e2b869d67;hpb=83388b4286651b2d54a20d1ef1ecf3af3ae6487c;p=cparser diff --git a/ast2firm.c b/ast2firm.c index 2c7e1bb..71172df 100644 --- a/ast2firm.c +++ b/ast2firm.c @@ -32,6 +32,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" @@ -75,7 +76,7 @@ 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; @@ -85,12 +86,12 @@ static bool constant_folding; 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_node *current_static_link; +static ir_entity *current_vararg_entity; static entitymap_t entitymap; @@ -109,8 +110,6 @@ typedef enum declaration_kind_t { DECLARATION_KIND_INNER_FUNCTION } declaration_kind_t; -static ir_mode *get_ir_mode_storage(type_t *type); - static ir_type *get_ir_type_incomplete(type_t *type); static void enqueue_inner_function(entity_t *entity) @@ -173,9 +172,7 @@ static void set_unreachable_now(void) set_cur_block(NULL); } -static ir_mode *atomic_modes[ATOMIC_TYPE_LAST+1]; - -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); @@ -194,30 +191,24 @@ 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)) { + if (size == 4) { + return get_modeF(); + } else if (size == 8) { + return get_modeD(); + } else { + 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 = 0; - 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 = decide_modulo_shift(bit_size); - } else { - assert(flags & ATOMIC_TYPE_FLAG_FLOAT); - snprintf(name, sizeof(name), "F%u", bit_size); - sort = irms_float_number; - arithmetic = irma_ieee754; - } - 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; @@ -228,14 +219,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]; } ir_mode *get_atomic_mode(atomic_type_kind_t kind) @@ -254,27 +243,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; @@ -297,6 +265,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; @@ -305,7 +274,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]; @@ -320,9 +289,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); } /** @@ -406,6 +375,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; } @@ -478,8 +461,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; } @@ -511,8 +493,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; } @@ -637,11 +618,9 @@ static ir_type *create_compound_type(compound_type_t *type, return irtype; } -static ir_type *create_enum_type(enum_type_t *const type) +static void determine_enum_values(enum_type_t *const type) { - type->base.firm_type = ir_type_int; - - ir_mode *const mode = mode_int; + 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); @@ -662,13 +641,17 @@ static ir_type *create_enum_type(enum_type_t *const type) } tv_next = get_Const_tarval(cnst); } + 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) @@ -712,10 +695,10 @@ ir_type *get_ir_type(type_t *type) 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); @@ -741,7 +724,6 @@ ir_type *get_ir_type(type_t *type) case TYPE_TYPEOF: case TYPE_TYPEDEF: - case TYPE_INVALID: break; } if (firm_type == NULL) @@ -780,6 +762,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 */ @@ -929,15 +931,16 @@ static bool is_main(entity_t *entity) 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; - } - entity_t *original_entity = entity; - if (entity->function.btk != bk_none) { - entity = get_builtin_replacement(entity); - if (entity == NULL) - return NULL; + switch (entity->function.btk) { + case BUILTIN_NONE: + case BUILTIN_LIBC: + case BUILTIN_LIBC_CHECK: + break; + default: + return NULL; } if (is_main(entity)) { @@ -979,7 +982,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) @@ -1049,8 +1052,8 @@ static ir_entity *get_function_entity(entity_t *entity, ir_type *owner_type) entitymap_insert(&entitymap, symbol, irentity); entity_created: - original_entity->declaration.kind = DECLARATION_KIND_FUNCTION; - original_entity->function.irentity = irentity; + entity->declaration.kind = DECLARATION_KIND_FUNCTION; + entity->function.irentity = irentity; return irentity; } @@ -1069,6 +1072,37 @@ static ir_node *create_symconst(dbg_info *dbgi, ir_entity *entity) return new_d_SymConst(dbgi, mode_P, sym, symconst_addr_ent); } +static ir_node *create_conv_from_b(dbg_info *dbgi, ir_node *value, + ir_mode *dest_mode) +{ + if (is_Const(value)) { + if (is_Const_null(value)) { + return new_Const(get_mode_null(dest_mode)); + } else { + return new_Const(get_mode_one(dest_mode)); + } + } + + 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); @@ -1080,6 +1114,8 @@ static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode) ir_node *zero = new_Const(get_mode_null(value_mode)); ir_node *cmp = new_d_Cmp(dbgi, value, zero, ir_relation_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); @@ -1418,7 +1454,7 @@ static ir_node *create_trampoline(dbg_info *dbgi, ir_mode *mode, 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); } /** @@ -1431,14 +1467,18 @@ static ir_node *create_trampoline(dbg_info *dbgi, ir_mode *mode, static ir_node *deref_address(dbg_info *const dbgi, type_t *const type, ir_node *const addr) { - ir_type *irtype = get_ir_type(type); + type_t *skipped = skip_typeref(type); + if (is_type_incomplete(skipped)) + return addr; + + 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(); @@ -1448,7 +1488,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); } @@ -1511,9 +1551,11 @@ static ir_node *reference_expression_enum_value_to_firm( const reference_expression_t *ref) { entity_t *entity = ref->entity; - type_t *type = skip_typeref(entity->enum_value.enum_type); - /* make sure the type is constructed */ - (void) get_ir_type(type); + 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); } @@ -1528,7 +1570,8 @@ static ir_node *reference_expression_to_firm(const reference_expression_t *ref) /* make sure the type is constructed */ (void) get_ir_type(type); - if (entity->kind == ENTITY_FUNCTION && entity->function.btk != bk_none) { + 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 */ @@ -1660,72 +1703,6 @@ static ir_node *reference_addr(const reference_expression_t *ref) panic("reference to declaration with unknown type found"); } -/** - * Generate an unary builtin. - * - * @param kind the builtin kind to generate - * @param op the operand - * @param function_type the function type for the GNU builtin routine - * @param db debug info - */ -static ir_node *gen_unary_builtin(ir_builtin_kind kind, expression_t *op, type_t *function_type, dbg_info *db) -{ - ir_node *in[1]; - in[0] = expression_to_firm(op); - - ir_type *tp = get_ir_type(function_type); - ir_type *res = get_method_res_type(tp, 0); - ir_node *irn = new_d_Builtin(db, get_irg_no_mem(current_ir_graph), 1, in, kind, tp); - set_irn_pinned(irn, op_pin_state_floats); - return new_Proj(irn, get_type_mode(res), pn_Builtin_1_result); -} - -/** - * Generate a pinned unary builtin. - * - * @param kind the builtin kind to generate - * @param op the operand - * @param function_type the function type for the GNU builtin routine - * @param db debug info - */ -static ir_node *gen_unary_builtin_pinned(ir_builtin_kind kind, expression_t *op, - type_t *function_type, dbg_info *db) -{ - ir_node *in[1]; - in[0] = expression_to_firm(op); - - ir_type *tp = get_ir_type(function_type); - ir_type *res = get_method_res_type(tp, 0); - ir_node *mem = get_store(); - ir_node *irn = new_d_Builtin(db, mem, 1, in, kind, tp); - set_store(new_Proj(irn, mode_M, pn_Builtin_M)); - return new_Proj(irn, get_type_mode(res), pn_Builtin_1_result); -} - -/** - * Generate an binary-void-return builtin. - * - * @param kind the builtin kind to generate - * @param op1 the first operand - * @param op2 the second operand - * @param function_type the function type for the GNU builtin routine - * @param db debug info - */ -static ir_node *gen_binary_builtin_mem(ir_builtin_kind kind, expression_t *op1, - expression_t *op2, type_t *function_type, - dbg_info *db) -{ - ir_node *in[2]; - in[0] = expression_to_firm(op1); - in[1] = expression_to_firm(op2); - - ir_type *tp = get_ir_type(function_type); - ir_node *mem = get_store(); - ir_node *irn = new_d_Builtin(db, mem, 2, in, kind, tp); - set_store(new_Proj(irn, mode_M, pn_Builtin_M)); - return NULL; -} - /** * Transform calls to builtin functions. */ @@ -1742,10 +1719,9 @@ static ir_node *process_builtin_call(const call_expression_t *call) 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); @@ -1758,22 +1734,14 @@ static ir_node *process_builtin_call(const call_expression_t *call) return res; } - - case bk_gnu_builtin_huge_val: - case bk_gnu_builtin_huge_valf: - case bk_gnu_builtin_huge_vall: - case bk_gnu_builtin_inf: - case bk_gnu_builtin_inff: - case bk_gnu_builtin_infl: { + 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; @@ -1782,80 +1750,15 @@ static ir_node *process_builtin_call(const call_expression_t *call) 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_object_size: { + 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); @@ -1867,61 +1770,29 @@ static ir_node *process_builtin_call(const call_expression_t *call) return new_d_Const(dbgi, result); } - 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(get_mode_null(mode_int)); - 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_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"); } /** @@ -1936,42 +1807,27 @@ 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(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) { - ir_entity *irentity = entity->function.irentity; - if (irentity == NULL) - irentity = get_function_entity(entity, NULL); - - if (irentity == NULL && 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); } - -#if 0 - 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; - } -#endif } } - 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)); @@ -1980,7 +1836,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) { @@ -2035,31 +1891,54 @@ 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_atomic(return_type, ATOMIC_TYPE_VOID)) { + 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_atomic(return_type, ATOMIC_TYPE_VOID)) { + ir_node *resproj = new_Proj(node, mode_T, pn_Call_T_result); + + if (is_type_scalar(return_type)) { + ir_mode *mode = get_ir_mode_storage(return_type); + result = new_Proj(resproj, mode, 0); + 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_Proj(resproj, mode, 0); + } } } - 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); @@ -2108,6 +1987,7 @@ static ir_tarval *create_bitfield_mask(ir_mode *mode, int offset, int size) { 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); @@ -2127,24 +2007,28 @@ static ir_tarval *create_bitfield_mask(ir_mode *mode, int offset, int size) } 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)); - ir_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); - ir_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); + 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; + + 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(); @@ -2158,13 +2042,23 @@ static ir_node *bitfield_store_to_firm(dbg_info *dbgi, 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, @@ -2178,6 +2072,7 @@ static ir_node *bitfield_extract_to_firm(const select_expression_t *expression, 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 @@ -2192,8 +2087,8 @@ static ir_node *bitfield_extract_to_firm(const select_expression_t *expression, /* kill upper bits */ assert(expression->compound_entry->kind == ENTITY_COMPOUND_MEMBER); - int bitoffset = entity->compound_member.bit_offset; - int bitsize = entity->compound_member.bit_size; + 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); @@ -2268,7 +2163,7 @@ static ir_node *set_value_for_expression_addr(const expression_t *expression, 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; } } @@ -2657,7 +2552,7 @@ static ir_node *create_op(dbg_info *dbgi, const binary_expression_t *expression, case EXPR_BINARY_SHIFTLEFT_ASSIGN: case EXPR_BINARY_SHIFTRIGHT_ASSIGN: mode = get_ir_mode_arithmetic(expression->base.type); - right = create_conv(dbgi, right, mode_uint); + right = create_conv(dbgi, right, atomic_modes[ATOMIC_TYPE_UINT]); break; case EXPR_BINARY_SUB: @@ -3109,7 +3004,7 @@ bool constant_is_negative(const expression_t *expression) long fold_constant_to_int(const expression_t *expression) { - if (expression->kind == EXPR_INVALID) + if (expression->kind == EXPR_ERROR) return 0; ir_tarval *tv = fold_constant_to_tarval(expression); @@ -3122,7 +3017,7 @@ long fold_constant_to_int(const expression_t *expression) bool fold_constant_to_bool(const expression_t *expression) { - if (expression->kind == EXPR_INVALID) + if (expression->kind == EXPR_ERROR) return false; ir_tarval *tv = fold_constant_to_tarval(expression); return !tarval_is_null(tv); @@ -3206,9 +3101,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; @@ -3325,7 +3220,6 @@ static ir_node *classify_type_to_firm(const classify_type_expression_t *const ex /* typedef/typeof should be skipped already */ case TYPE_TYPEDEF: case TYPE_TYPEOF: - case TYPE_INVALID: case TYPE_ERROR: break; } @@ -3334,7 +3228,8 @@ 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); - ir_tarval *const tv = new_tarval_from_long(tc, mode_int); + 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); } @@ -3376,29 +3271,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) { - ir_graph *const irg = current_ir_graph; - type_t *const type = current_function_entity->declaration.type; - ir_type *const method_type = get_ir_type(type); - size_t const n = get_method_n_params(method_type) - 1; - ir_type *frame_type = get_irg_frame_type(irg); - ir_type *param_irtype = get_method_param_type(method_type, n); - ir_entity *const param_ent = - new_parameter_entity(frame_type, n, param_irtype); - ir_node *const frame = get_irg_frame(irg); - 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); - - 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; } @@ -3518,6 +3405,12 @@ static ir_node *label_address_to_firm(const label_address_expression_t *label) return new_d_SymConst(dbgi, mode_P_code, value, symconst_addr_ent); } +static ir_node *error_to_firm(const expression_t *expression) +{ + ir_mode *mode = get_ir_mode_arithmetic(expression->base.type); + return new_Bad(mode); +} + /** * creates firm nodes for an expression. The difference between this function * and expression_to_firm is, that this version might produce mode_b nodes @@ -3583,8 +3476,8 @@ static ir_node *_expression_to_firm(const expression_t *expression) case EXPR_LABEL_ADDRESS: return label_address_to_firm(&expression->label_address); - case EXPR_INVALID: - break; + case EXPR_ERROR: + return error_to_firm(expression); } panic("invalid expression found"); } @@ -3602,7 +3495,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; @@ -3854,8 +3747,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; @@ -3993,7 +3886,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); @@ -4222,6 +4115,7 @@ static void create_dynamic_null_initializer(ir_entity *entity, dbg_info *dbgi, 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 }; @@ -4239,7 +4133,7 @@ static void create_dynamic_null_initializer(ir_entity *entity, dbg_info *dbgi, /* 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; } @@ -4263,7 +4157,7 @@ static void create_dynamic_initializer_sub(ir_initializer_t *initializer, /* 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; } @@ -4282,7 +4176,7 @@ static void create_dynamic_initializer_sub(ir_initializer_t *initializer, /* 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; } @@ -4312,6 +4206,7 @@ static void create_dynamic_initializer_sub(ir_initializer_t *initializer, ir_type *irtype; ir_entity *sub_entity; if (is_Array_type(type)) { + 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 }; @@ -5050,85 +4945,64 @@ static void create_jump_statement(const statement_t *statement, set_unreachable_now(); } +static ir_switch_table *create_switch_table(const switch_statement_t *statement) +{ + /* 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; + } + + 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) { 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 (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); + first_block = get_cur_block(); } 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 default_proj_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 > default_proj_nr) - default_proj_nr = l->last_case; - } - - if (default_proj_nr == LONG_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); - default_proj_nr = i; - } else { - ++default_proj_nr; - } - statement->default_proj_nr = default_proj_nr; - /* safety check: cond might already be folded to a Bad */ - if (cond != NULL && is_Cond(cond)) { - set_Cond_default_proj(cond, default_proj_nr); - } statement_to_firm(statement->body); @@ -5136,7 +5010,7 @@ static void switch_statement_to_firm(switch_statement_t *statement) if (!saw_default_label && first_block != NULL) { set_cur_block(first_block); - ir_node *const proj = new_d_Proj(dbgi, cond, mode_X, default_proj_nr); + ir_node *proj = new_d_Proj(dbgi, switch_node, mode_X, pn_Switch_default); add_immBlock_pred(get_break_label(), proj); } @@ -5145,11 +5019,10 @@ 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; } static void case_label_to_firm(const case_label_statement_t *statement) @@ -5157,32 +5030,19 @@ static void case_label_to_firm(const case_label_statement_t *statement) if (statement->is_empty_range) return; - ir_node *block = new_immBlock(); - /* Fallthrough from previous case */ - jump_if_reachable(block); + 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)); - dbg_info *const dbgi = get_dbg_info(&statement->base.source_position); - 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 { - ir_node *const 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; - ir_node *const proj = new_d_Proj(dbgi, current_switch_cond, mode_X, - current_switch->default_proj_nr); - add_immBlock_pred(block, proj); - } - } - mature_immBlock(block); - set_cur_block(block); + mature_immBlock(block); + set_cur_block(block); + } statement_to_firm(statement->statement); } @@ -5238,7 +5098,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; } @@ -5484,8 +5344,8 @@ static void statement_to_firm(statement_t *statement) #endif switch (statement->kind) { - case STATEMENT_INVALID: - panic("invalid statement found"); + case STATEMENT_ERROR: + panic("error statement found"); case STATEMENT_EMPTY: /* nothing */ return; @@ -5683,20 +5543,6 @@ static void initialize_function_parameters(entity_t *entity) static void handle_decl_modifier_irg(ir_graph_ptr irg, decl_modifiers_t decl_modifiers) { - if (decl_modifiers & DM_RETURNS_TWICE) { - /* TRUE if the declaration includes __attribute__((returns_twice)) */ - add_irg_additional_properties(irg, mtp_property_returns_twice); - } - if (decl_modifiers & DM_NORETURN) { - /* TRUE if the declaration includes the Microsoft - __declspec(noreturn) specifier. */ - add_irg_additional_properties(irg, mtp_property_noreturn); - } - if (decl_modifiers & DM_NOTHROW) { - /* TRUE if the declaration includes the Microsoft - __declspec(nothrow) specifier. */ - add_irg_additional_properties(irg, mtp_property_nothrow); - } if (decl_modifiers & DM_NAKED) { /* TRUE if the declaration includes the Microsoft __declspec(naked) specifier. */ @@ -5761,10 +5607,6 @@ static void create_function(entity_t *entity) if (entity->function.statement == NULL) return; - if (is_main(entity) && enable_main_collect2_hack) { - prepare_main_collect2(entity); - } - inner_functions = NULL; current_trampolines = NULL; @@ -5792,6 +5634,9 @@ static void create_function(entity_t *entity) ir_graph *old_current_function = current_function; current_function = irg; + ir_entity *const old_current_vararg_entity = current_vararg_entity; + current_vararg_entity = NULL; + set_irg_fp_model(irg, firm_fp_model); tarval_enable_fp_ops(1); set_irn_dbg_info(get_irg_start_block(irg), @@ -5896,7 +5741,8 @@ static void create_function(entity_t *entity) set_type_alignment_bytes(frame_type, align_all); irg_verify(irg, VERIFY_ENFORCE_SSA); - current_function = old_current_function; + current_vararg_entity = old_current_vararg_entity; + current_function = old_current_function; if (current_trampolines != NULL) { DEL_ARR_F(current_trampolines); @@ -5926,7 +5772,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; } @@ -5945,7 +5791,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; } @@ -6026,7 +5872,7 @@ void translation_unit_to_firm(translation_unit_t *unit) /* just to be sure */ continue_label = NULL; break_label = NULL; - current_switch_cond = NULL; + current_switch = NULL; current_translation_unit = unit; init_ir_types();