X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fsparc%2Fsparc_transform.c;h=62fd6b7c6d9c4587d493a09743a567302213b519;hb=b7a0d752833eb7fb294ce90a27cbe01d06bbbc50;hp=e3ad9b10944d45c800613086644b5eccc6b6492c;hpb=b24c359be385d38d535efe35df5a937a8ee9cc0c;p=libfirm diff --git a/ir/be/sparc/sparc_transform.c b/ir/be/sparc/sparc_transform.c index e3ad9b109..62fd6b7c6 100644 --- a/ir/be/sparc/sparc_transform.c +++ b/ir/be/sparc/sparc_transform.c @@ -20,11 +20,13 @@ /** * @file * @brief code selection (transform FIRM into SPARC FIRM) + * @author Hannes Rapp, Matthias Braun * @version $Id$ */ #include "config.h" #include +#include #include "irnode_t.h" #include "irgraph_t.h" @@ -38,6 +40,7 @@ #include "iropt_t.h" #include "debug.h" #include "error.h" +#include "util.h" #include "../benode.h" #include "../beirg.h" @@ -68,9 +71,14 @@ static ir_mode *mode_fp2; //static ir_mode *mode_fp4; static pmap *node_to_stack; -static inline int mode_needs_gp_reg(ir_mode *mode) +static inline bool mode_needs_gp_reg(ir_mode *mode) { - return mode_is_int(mode) || mode_is_reference(mode); + if (mode_is_int(mode) || mode_is_reference(mode)) { + /* we should only see 32bit code */ + assert(get_mode_size_bits(mode) <= 32); + return true; + } + return false; } /** @@ -155,17 +163,13 @@ typedef enum { influence the significant lower bit at all (for cases where mode < 32bit) */ } match_flags_t; +ENUM_BITSET(match_flags_t) typedef ir_node* (*new_binop_reg_func) (dbg_info *dbgi, ir_node *block, ir_node *op1, ir_node *op2); typedef ir_node* (*new_binop_fp_func) (dbg_info *dbgi, ir_node *block, ir_node *op1, ir_node *op2, ir_mode *mode); typedef ir_node* (*new_binop_imm_func) (dbg_info *dbgi, ir_node *block, ir_node *op1, ir_entity *entity, int32_t immediate); typedef ir_node* (*new_unop_fp_func) (dbg_info *dbgi, ir_node *block, ir_node *op1, ir_mode *mode); -static bool is_value_imm_encodeable(int32_t value) -{ - return -4096 <= value && value <= 4095; -} - /** * checks if a node's value can be encoded as a immediate */ @@ -176,7 +180,7 @@ static bool is_imm_encodeable(const ir_node *node) return false; value = get_tarval_long(get_Const_tarval(node)); - return is_value_imm_encodeable(value); + return sparc_is_value_imm_encodeable(value); } static bool needs_extension(ir_mode *mode) @@ -241,6 +245,9 @@ static ir_node *gen_helper_binop_args(ir_node *node, } mode1 = get_irn_mode(op1); mode2 = get_irn_mode(op2); + /* we shouldn't see 64bit code */ + assert(get_mode_size_bits(mode1) <= 32); + assert(get_mode_size_bits(mode2) <= 32); if (is_imm_encodeable(op2)) { ir_node *new_op1 = be_transform_node(op1); @@ -374,7 +381,7 @@ static void match_address(ir_node *ptr, address_t *address, bool use_ptr2) ptr2 = be_transform_node(get_Add_right(base)); base = be_transform_node(get_Add_left(base)); } else { - if (is_value_imm_encodeable(offset)) { + if (sparc_is_value_imm_encodeable(offset)) { base = be_transform_node(base); } else { base = be_transform_node(ptr); @@ -407,9 +414,9 @@ static ir_node *gen_Add(ir_node *node) /* special case: + 0x1000 can be represented as - 0x1000 */ right = get_Add_right(node); if (is_Const(right)) { - tarval *tv; - uint32_t val; - ir_node *left = get_Add_left(node); + ir_node *left = get_Add_left(node); + ir_tarval *tv; + uint32_t val; /* is this simple address arithmetic? then we can let the linker do * the calculation. */ if (is_SymConst(left) && get_irn_n_edges(left) == 1) { @@ -513,6 +520,10 @@ static ir_node *gen_Load(ir_node *node) ir_node *new_load = NULL; address_t address; + if (get_Load_unaligned(node) == align_non_aligned) { + panic("sparc: transformation of unaligned Loads not implemented yet"); + } + if (mode_is_float(mode)) { match_address(ptr, &address, false); new_load = create_ldf(dbgi, block, address.ptr, new_mem, mode, @@ -553,12 +564,17 @@ static ir_node *gen_Store(ir_node *node) ir_node *new_store = NULL; address_t address; + if (get_Store_unaligned(node) == align_non_aligned) { + panic("sparc: transformation of unaligned Stores not implemented yet"); + } + if (mode_is_float(mode)) { /* TODO: variants with reg+reg address mode */ match_address(ptr, &address, false); new_store = create_stf(dbgi, block, new_val, address.ptr, new_mem, mode, address.entity, address.offset, false); } else { + assert(get_mode_size_bits(mode) <= 32); match_address(ptr, &address, true); if (address.ptr2 != NULL) { assert(address.entity == NULL && address.offset == 0); @@ -638,7 +654,11 @@ static ir_node *gen_Div(ir_node *node) ir_node *right = get_Div_right(node); ir_node *res; - assert(!mode_is_float(mode)); + if (mode_is_float(mode)) { + return gen_helper_binfpop(node, mode, new_bd_sparc_fdiv_s, + new_bd_sparc_fdiv_d, new_bd_sparc_fdiv_q); + } + if (mode_is_signed(mode)) { ir_node *left_high = gen_sign_extension_value(left); @@ -667,14 +687,6 @@ static ir_node *gen_Div(ir_node *node) return res; } -static ir_node *gen_Quot(ir_node *node) -{ - ir_mode *mode = get_Quot_resmode(node); - assert(mode_is_float(mode)); - return gen_helper_binfpop(node, mode, new_bd_sparc_fdiv_s, - new_bd_sparc_fdiv_d, new_bd_sparc_fdiv_q); -} - #if 0 static ir_node *gen_Abs(ir_node *node) { @@ -709,7 +721,7 @@ static ir_node *gen_Not(ir_node *node) ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *new_op = be_transform_node(op); - /* Note: Not(Eor()) is normalize in firm locatopts already so + /* Note: Not(Eor()) is normalize in firm localopts already so * we don't match it for xnor here */ /* Not can be represented with xnor 0, n */ @@ -808,7 +820,7 @@ static ir_node *gen_Minus(ir_node *node) /** * Create an entity for a given (floating point) tarval */ -static ir_entity *create_float_const_entity(tarval *tv) +static ir_entity *create_float_const_entity(ir_tarval *tv) { const arch_env_t *arch_env = be_get_irg_arch_env(current_ir_graph); sparc_isa_t *isa = (sparc_isa_t*) arch_env; @@ -835,37 +847,39 @@ static ir_entity *create_float_const_entity(tarval *tv) return entity; } +static ir_node *gen_float_const(dbg_info *dbgi, ir_node *block, ir_tarval *tv) +{ + ir_entity *entity = create_float_const_entity(tv); + ir_node *hi = new_bd_sparc_SetHi(dbgi, block, entity, 0); + ir_node *mem = new_r_NoMem(current_ir_graph); + ir_mode *mode = get_tarval_mode(tv); + ir_node *new_op + = create_ldf(dbgi, block, hi, mem, mode, entity, 0, false); + ir_node *proj = new_r_Proj(new_op, mode, pn_sparc_Ldf_res); + + set_irn_pinned(new_op, op_pin_state_floats); + return proj; +} + static ir_node *gen_Const(ir_node *node) { - ir_node *block = be_transform_node(get_nodes_block(node)); - ir_mode *mode = get_irn_mode(node); - dbg_info *dbgi = get_irn_dbg_info(node); - tarval *tv; - long value; + ir_node *block = be_transform_node(get_nodes_block(node)); + ir_mode *mode = get_irn_mode(node); + dbg_info *dbgi = get_irn_dbg_info(node); + ir_tarval *tv = get_Const_tarval(node); + long value; if (mode_is_float(mode)) { - tarval *tv = get_Const_tarval(node); - ir_entity *entity = create_float_const_entity(tv); - ir_node *hi = new_bd_sparc_SetHi(dbgi, block, entity, 0); - ir_node *mem = new_r_NoMem(current_ir_graph); - ir_node *new_op - = create_ldf(dbgi, block, hi, mem, mode, entity, 0, false); - ir_node *proj = new_r_Proj(new_op, mode, pn_sparc_Ldf_res); - be_dep_on_frame(hi); - - set_irn_pinned(new_op, op_pin_state_floats); - return proj; + return gen_float_const(dbgi, block, tv); } - tv = get_Const_tarval(node); value = get_tarval_long(tv); if (value == 0) { return get_g0(); - } else if (-4096 <= value && value <= 4095) { + } else if (sparc_is_value_imm_encodeable(value)) { return new_bd_sparc_Or_imm(dbgi, block, get_g0(), NULL, value); } else { ir_node *hi = new_bd_sparc_SetHi(dbgi, block, NULL, value); - be_dep_on_frame(hi); if ((value & 0x3ff) != 0) { return new_bd_sparc_Or_imm(dbgi, block, hi, NULL, value & 0x3ff); } else { @@ -876,15 +890,11 @@ static ir_node *gen_Const(ir_node *node) static ir_mode *get_cmp_mode(ir_node *b_value) { - ir_node *pred; ir_node *op; - if (!is_Proj(b_value)) - panic("can't determine cond signednes"); - pred = get_Proj_pred(b_value); - if (!is_Cmp(pred)) + if (!is_Cmp(b_value)) panic("can't determine cond signednes (no cmp)"); - op = get_Cmp_left(pred); + op = get_Cmp_left(b_value); return get_irn_mode(op); } @@ -893,7 +903,6 @@ static ir_node *make_address(dbg_info *dbgi, ir_node *block, ir_entity *entity, { ir_node *hi = new_bd_sparc_SetHi(dbgi, block, entity, offset); ir_node *low = new_bd_sparc_Or_imm(dbgi, block, hi, entity, offset); - be_dep_on_frame(hi); return low; } @@ -937,14 +946,14 @@ static ir_node *gen_SwitchJmp(ir_node *node) static ir_node *gen_Cond(ir_node *node) { - ir_node *selector = get_Cond_selector(node); - ir_mode *mode = get_irn_mode(selector); - ir_mode *cmp_mode; - ir_node *block; - ir_node *flag_node; - bool is_unsigned; - pn_Cmp pnc; - dbg_info *dbgi; + ir_node *selector = get_Cond_selector(node); + ir_mode *mode = get_irn_mode(selector); + ir_mode *cmp_mode; + ir_node *block; + ir_node *flag_node; + bool is_unsigned; + ir_relation relation; + dbg_info *dbgi; // switch/case jumps if (mode != mode_b) { @@ -952,21 +961,20 @@ static ir_node *gen_Cond(ir_node *node) } // regular if/else jumps - assert(is_Proj(selector)); - assert(is_Cmp(get_Proj_pred(selector))); + assert(is_Cmp(selector)); cmp_mode = get_cmp_mode(selector); block = be_transform_node(get_nodes_block(node)); dbgi = get_irn_dbg_info(node); - flag_node = be_transform_node(get_Proj_pred(selector)); - pnc = get_Proj_proj(selector); + flag_node = be_transform_node(selector); + relation = get_Cmp_relation(selector); is_unsigned = !mode_is_signed(cmp_mode); if (mode_is_float(cmp_mode)) { assert(!is_unsigned); - return new_bd_sparc_fbfcc(dbgi, block, flag_node, pnc); + return new_bd_sparc_fbfcc(dbgi, block, flag_node, relation); } else { - return new_bd_sparc_Bicc(dbgi, block, flag_node, pnc, is_unsigned); + return new_bd_sparc_Bicc(dbgi, block, flag_node, relation, is_unsigned); } } @@ -1127,14 +1135,18 @@ static ir_node *gen_Conv(ir_node *node) { ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *op = get_Conv_op(node); - ir_node *new_op = be_transform_node(op); ir_mode *src_mode = get_irn_mode(op); ir_mode *dst_mode = get_irn_mode(node); dbg_info *dbg = get_irn_dbg_info(node); + ir_node *new_op; int src_bits = get_mode_size_bits(src_mode); int dst_bits = get_mode_size_bits(dst_mode); + if (src_mode == mode_b) + panic("ConvB not lowered %+F", node); + + new_op = be_transform_node(op); if (src_mode == dst_mode) return new_op; @@ -1160,6 +1172,8 @@ static ir_node *gen_Conv(ir_node *node) } return create_itof(dbg, block, new_op, dst_mode); } + } else if (src_mode == mode_b) { + panic("ConvB not lowered %+F", node); } else { /* complete in gp registers */ int min_bits; ir_mode *min_mode; @@ -1194,9 +1208,8 @@ static ir_node *gen_Unknown(ir_node *node) /* just produce a 0 */ ir_mode *mode = get_irn_mode(node); if (mode_is_float(mode)) { - panic("FP not implemented"); - be_dep_on_frame(node); - return node; + ir_node *block = be_transform_node(get_nodes_block(node)); + return gen_float_const(NULL, block, get_mode_null(mode)); } else if (mode_needs_gp_reg(mode)) { return get_g0(); } @@ -1210,7 +1223,17 @@ static ir_node *gen_Unknown(ir_node *node) */ static ir_type *sparc_get_between_type(void) { - static ir_type *between_type = NULL; + static ir_type *between_type = NULL; + static ir_type *between_type0 = NULL; + + if (cconv->omit_fp) { + if (between_type0 == NULL) { + between_type0 + = new_type_class(new_id_from_str("sparc_between_type")); + set_type_size_bytes(between_type0, 0); + } + return between_type0; + } if (between_type == NULL) { between_type = new_type_class(new_id_from_str("sparc_between_type")); @@ -1257,7 +1280,7 @@ static void create_stacklayout(ir_graph *irg) layout->initial_offset = 0; layout->initial_bias = 0; layout->stack_dir = -1; - layout->sp_relative = false; + layout->sp_relative = cconv->omit_fp; assert(N_FRAME_TYPES == 3); layout->order[0] = layout->frame_type; @@ -1266,7 +1289,7 @@ static void create_stacklayout(ir_graph *irg) } /** - * transform the start node to the prolog code + initial barrier + * transform the start node to the prolog code */ static ir_node *gen_Start(ir_node *node) { @@ -1279,10 +1302,7 @@ static ir_node *gen_Start(ir_node *node) ir_node *mem; ir_node *start; ir_node *sp; - ir_node *fp; - ir_node *barrier; - ir_node *save; - int i; + size_t i; /* stackpointer is important at function prolog */ be_prolog_add_reg(abihelper, sp_reg, @@ -1292,33 +1312,47 @@ static ir_node *gen_Start(ir_node *node) /* function parameters in registers */ for (i = 0; i < get_method_n_params(function_type); ++i) { const reg_or_stackslot_t *param = &cconv->parameters[i]; - if (param->reg0 != NULL) - be_prolog_add_reg(abihelper, param->reg0, 0); - if (param->reg1 != NULL) - be_prolog_add_reg(abihelper, param->reg1, 0); + if (param->reg0 != NULL) { + be_prolog_add_reg(abihelper, param->reg0, + arch_register_req_type_none); + } + if (param->reg1 != NULL) { + be_prolog_add_reg(abihelper, param->reg1, + arch_register_req_type_none); + } + } + /* we need the values of the callee saves (Note: non omit-fp mode has no + * callee saves) */ + if (cconv->omit_fp) { + size_t n_callee_saves = ARRAY_SIZE(omit_fp_callee_saves); + size_t c; + for (c = 0; c < n_callee_saves; ++c) { + be_prolog_add_reg(abihelper, omit_fp_callee_saves[c], + arch_register_req_type_none); + } + } else { + be_prolog_add_reg(abihelper, fp_reg, arch_register_req_type_ignore); } start = be_prolog_create_start(abihelper, dbgi, new_block); + mem = be_prolog_get_memory(abihelper); + sp = be_prolog_get_reg_value(abihelper, sp_reg); - mem = be_prolog_get_memory(abihelper); - sp = be_prolog_get_reg_value(abihelper, sp_reg); - save = new_bd_sparc_Save(NULL, block, sp, mem, SPARC_MIN_STACKSIZE); - fp = new_r_Proj(save, mode_gp, pn_sparc_Save_frame); - sp = new_r_Proj(save, mode_gp, pn_sparc_Save_stack); - mem = new_r_Proj(save, mode_M, pn_sparc_Save_mem); - arch_set_irn_register(fp, fp_reg); - arch_set_irn_register(sp, sp_reg); - - be_prolog_add_reg(abihelper, fp_reg, arch_register_req_type_ignore); - be_prolog_set_reg_value(abihelper, fp_reg, fp); + if (!cconv->omit_fp) { + ir_node *save = new_bd_sparc_Save_imm(NULL, block, sp, NULL, + -SPARC_MIN_STACKSIZE); + arch_irn_add_flags(save, arch_irn_flags_prolog); + arch_set_irn_register(save, sp_reg); + sp = save; + keep_alive(save); + } sp = be_new_IncSP(sp_reg, new_block, sp, BE_STACK_FRAME_SIZE_EXPAND, 0); + arch_irn_add_flags(sp, arch_irn_flags_prolog); be_prolog_set_reg_value(abihelper, sp_reg, sp); be_prolog_set_memory(abihelper, mem); - barrier = be_prolog_create_barrier(abihelper, new_block); - - return barrier; + return start; } static ir_node *get_stack_pointer_for(ir_node *node) @@ -1336,7 +1370,7 @@ static ir_node *get_stack_pointer_for(ir_node *node) } stack_pred_transformed = be_transform_node(stack_pred); - stack = pmap_get(node_to_stack, stack_pred); + stack = (ir_node*)pmap_get(node_to_stack, stack_pred); if (stack == NULL) { return get_stack_pointer_for(stack_pred); } @@ -1349,16 +1383,15 @@ static ir_node *get_stack_pointer_for(ir_node *node) */ static ir_node *gen_Return(ir_node *node) { - ir_node *block = get_nodes_block(node); - ir_node *new_block = be_transform_node(block); - dbg_info *dbgi = get_irn_dbg_info(node); - ir_node *mem = get_Return_mem(node); - ir_node *new_mem = be_transform_node(mem); - ir_node *sp_proj = get_stack_pointer_for(node); - int n_res = get_Return_n_ress(node); + ir_node *block = get_nodes_block(node); + ir_node *new_block = be_transform_node(block); + dbg_info *dbgi = get_irn_dbg_info(node); + ir_node *mem = get_Return_mem(node); + ir_node *new_mem = be_transform_node(mem); + ir_node *sp = get_stack_pointer_for(node); + size_t n_res = get_Return_n_ress(node); ir_node *bereturn; - ir_node *incsp; - int i; + size_t i; be_epilog_begin(abihelper); be_epilog_set_memory(abihelper, new_mem); @@ -1366,7 +1399,7 @@ static ir_node *gen_Return(ir_node *node) will later serialize all stack pointer adjusting nodes */ be_epilog_add_reg(abihelper, sp_reg, arch_register_req_type_produces_sp | arch_register_req_type_ignore, - sp_proj); + sp); /* result values */ for (i = 0; i < n_res; ++i) { @@ -1375,19 +1408,40 @@ static ir_node *gen_Return(ir_node *node) const reg_or_stackslot_t *slot = &cconv->results[i]; const arch_register_t *reg = slot->reg0; assert(slot->reg1 == NULL); - be_epilog_add_reg(abihelper, reg, 0, new_res_value); + be_epilog_add_reg(abihelper, reg, arch_register_req_type_none, + new_res_value); + } + /* callee saves */ + if (cconv->omit_fp) { + size_t n_callee_saves = ARRAY_SIZE(omit_fp_callee_saves); + size_t i; + for (i = 0; i < n_callee_saves; ++i) { + const arch_register_t *reg = omit_fp_callee_saves[i]; + ir_node *value + = be_prolog_get_reg_value(abihelper, reg); + be_epilog_add_reg(abihelper, reg, arch_register_req_type_none, + value); + } } - /* create the barrier before the epilog code */ - be_epilog_create_barrier(abihelper, new_block); - - /* epilog code: an incsp */ - sp_proj = be_epilog_get_reg_value(abihelper, sp_reg); - incsp = be_new_IncSP(sp_reg, new_block, sp_proj, - BE_STACK_FRAME_SIZE_SHRINK, 0); - be_epilog_set_reg_value(abihelper, sp_reg, incsp); + /* we need a restore instruction */ + if (!cconv->omit_fp) { + ir_node *fp = be_prolog_get_reg_value(abihelper, fp_reg); + ir_node *restore = new_bd_sparc_RestoreZero(NULL, block, fp); + arch_irn_add_flags(restore, arch_irn_flags_epilog); + arch_set_irn_register(restore, sp_reg); + be_epilog_set_reg_value(abihelper, sp_reg, restore); + } else { + /* epilog code: an incsp */ + sp = be_epilog_get_reg_value(abihelper, sp_reg); + sp = be_new_IncSP(sp_reg, new_block, sp, + BE_STACK_FRAME_SIZE_SHRINK, 0); + arch_irn_add_flags(sp, arch_irn_flags_epilog); + be_epilog_set_reg_value(abihelper, sp_reg, sp); + } bereturn = be_epilog_create_return(abihelper, dbgi, new_block); + arch_irn_add_flags(bereturn, arch_irn_flags_epilog); return bereturn; } @@ -1447,8 +1501,8 @@ static void bitcast_float_to_int(dbg_info *dbgi, ir_node *block, set_irn_pinned(ld, op_pin_state_floats); result[1] = new_r_Proj(ld2, mode_gp, pn_sparc_Ld_res); - arch_irn_add_flags(ld, sparc_arch_irn_flag_needs_64bit_spillslot); - arch_irn_add_flags(ld2, sparc_arch_irn_flag_needs_64bit_spillslot); + arch_irn_add_flags(ld, (arch_irn_flags_t)sparc_arch_irn_flag_needs_64bit_spillslot); + arch_irn_add_flags(ld2, (arch_irn_flags_t)sparc_arch_irn_flag_needs_64bit_spillslot); } else { assert(bits == 32); result[1] = NULL; @@ -1465,8 +1519,8 @@ static ir_node *gen_Call(ir_node *node) ir_node *new_mem = be_transform_node(mem); dbg_info *dbgi = get_irn_dbg_info(node); ir_type *type = get_Call_type(node); - int n_params = get_Call_n_params(node); - int n_param_regs = sizeof(param_regs)/sizeof(param_regs[0]); + size_t n_params = get_Call_n_params(node); + size_t n_param_regs = sizeof(param_regs)/sizeof(param_regs[0]); /* max inputs: memory, callee, register arguments */ int max_inputs = 2 + n_param_regs; ir_node **in = ALLOCAN(ir_node*, max_inputs); @@ -1475,7 +1529,7 @@ static ir_node *gen_Call(ir_node *node) const arch_register_req_t **in_req = OALLOCNZ(obst, const arch_register_req_t*, max_inputs); calling_convention_t *cconv - = sparc_decide_calling_convention(type, true); + = sparc_decide_calling_convention(type, NULL); int in_arity = 0; int sync_arity = 0; int n_caller_saves @@ -1485,7 +1539,7 @@ static ir_node *gen_Call(ir_node *node) ir_node *incsp; int mem_pos; ir_node *res; - int p; + size_t p; int i; int o; int out_arity; @@ -1791,9 +1845,12 @@ static ir_node *gen_Proj_Div(ir_node *node) ir_node *new_pred = be_transform_node(pred); long pn = get_Proj_proj(node); - assert(is_sparc_SDiv(new_pred) || is_sparc_UDiv(new_pred)); - assert(pn_sparc_SDiv_res == pn_sparc_UDiv_res); - assert(pn_sparc_SDiv_M == pn_sparc_UDiv_M); + assert(is_sparc_SDiv(new_pred) || is_sparc_UDiv(new_pred) + || is_sparc_fdiv(new_pred)); + assert((int)pn_sparc_SDiv_res == (int)pn_sparc_UDiv_res); + assert((int)pn_sparc_SDiv_M == (int)pn_sparc_UDiv_M); + assert((int)pn_sparc_SDiv_res == (int)pn_sparc_fdiv_res); + assert((int)pn_sparc_SDiv_M == (int)pn_sparc_fdiv_M); switch (pn) { case pn_Div_res: return new_r_Proj(new_pred, mode_gp, pn_sparc_SDiv_res); @@ -1805,41 +1862,31 @@ static ir_node *gen_Proj_Div(ir_node *node) panic("Unsupported Proj from Div"); } -static ir_node *gen_Proj_Quot(ir_node *node) +static ir_node *get_frame_base(void) { - ir_node *pred = get_Proj_pred(node); - ir_node *new_pred = be_transform_node(pred); - long pn = get_Proj_proj(node); - - assert(is_sparc_fdiv(new_pred)); - switch (pn) { - case pn_Quot_res: - return new_r_Proj(new_pred, mode_gp, pn_sparc_fdiv_res); - case pn_Quot_M: - return new_r_Proj(new_pred, mode_gp, pn_sparc_fdiv_M); - default: - break; - } - panic("Unsupported Proj from Quot"); + const arch_register_t *reg = cconv->omit_fp ? sp_reg : fp_reg; + return be_prolog_get_reg_value(abihelper, reg); } static ir_node *gen_Proj_Start(ir_node *node) { ir_node *block = get_nodes_block(node); ir_node *new_block = be_transform_node(block); - ir_node *barrier = be_transform_node(get_Proj_pred(node)); long pn = get_Proj_proj(node); + /* make sure prolog is constructed */ + be_transform_node(get_Proj_pred(node)); switch ((pn_Start) pn) { case pn_Start_X_initial_exec: /* exchange ProjX with a jump */ return new_bd_sparc_Ba(NULL, new_block); case pn_Start_M: - return new_r_Proj(barrier, mode_M, 0); + return be_prolog_get_memory(abihelper); case pn_Start_T_args: - return barrier; + /* we should never need this explicitely */ + return new_r_Bad(get_irn_irg(block)); case pn_Start_P_frame_base: - return be_prolog_get_reg_value(abihelper, fp_reg); + return get_frame_base(); case pn_Start_P_tls: return new_r_Bad(current_ir_graph); case pn_Start_max: @@ -1889,18 +1936,18 @@ static ir_node *gen_Proj_Proj_Start(ir_node *node) return value; } else { /* argument transmitted on stack */ - ir_node *fp = be_prolog_get_reg_value(abihelper, fp_reg); ir_node *mem = be_prolog_get_memory(abihelper); ir_mode *mode = get_type_mode(param->type); + ir_node *base = get_frame_base(); ir_node *load; ir_node *value; if (mode_is_float(mode)) { - load = create_ldf(NULL, new_block, fp, mem, mode, + load = create_ldf(NULL, new_block, base, mem, mode, param->entity, 0, true); value = new_r_Proj(load, mode_fp, pn_sparc_Ldf_res); } else { - load = new_bd_sparc_Ld_imm(NULL, new_block, fp, mem, mode, + load = new_bd_sparc_Ld_imm(NULL, new_block, base, mem, mode, param->entity, 0, true); value = new_r_Proj(load, mode_gp, pn_sparc_Ld_res); } @@ -1922,7 +1969,6 @@ static ir_node *gen_Proj_Call(ir_node *node) case pn_Call_X_regular: case pn_Call_X_except: case pn_Call_T_result: - case pn_Call_P_value_res_base: case pn_Call_max: break; } @@ -1953,7 +1999,7 @@ static ir_node *gen_Proj_Proj_Call(ir_node *node) ir_node *new_call = be_transform_node(call); ir_type *function_type = get_Call_type(call); calling_convention_t *cconv - = sparc_decide_calling_convention(function_type, true); + = sparc_decide_calling_convention(function_type, NULL); const reg_or_stackslot_t *res = &cconv->results[pn]; const arch_register_t *reg = res->reg0; ir_mode *mode; @@ -1991,8 +2037,6 @@ static ir_node *gen_Proj(ir_node *node) return be_duplicate_node(node); case iro_Div: return gen_Proj_Div(node); - case iro_Quot: - return gen_Proj_Quot(node); case iro_Start: return gen_Proj_Start(node); case iro_Proj: { @@ -2046,7 +2090,6 @@ static void sparc_register_transformers(void) be_set_transform_function(op_Or, gen_Or); be_set_transform_function(op_Phi, gen_Phi); be_set_transform_function(op_Proj, gen_Proj); - be_set_transform_function(op_Quot, gen_Quot); be_set_transform_function(op_Return, gen_Return); be_set_transform_function(op_Sel, gen_Sel); be_set_transform_function(op_Shl, gen_Shl); @@ -2061,27 +2104,6 @@ static void sparc_register_transformers(void) be_set_transform_function(op_sparc_Save, be_duplicate_node); } -/* hack to avoid unused fp proj at start barrier */ -static void assure_fp_keep(void) -{ - unsigned n_users = 0; - const ir_edge_t *edge; - ir_node *fp_proj = be_prolog_get_reg_value(abihelper, fp_reg); - - foreach_out_edge(fp_proj, edge) { - ir_node *succ = get_edge_src_irn(edge); - if (is_End(succ) || is_Anchor(succ)) - continue; - ++n_users; - } - - if (n_users == 0) { - ir_node *block = get_nodes_block(fp_proj); - ir_node *in[1] = { fp_proj }; - be_new_Keep(block, 1, in); - } -} - /** * Transform a Firm graph into a SPARC graph. */ @@ -2101,11 +2123,10 @@ void sparc_transform_graph(ir_graph *irg) abihelper = be_abihelper_prepare(irg); be_collect_stacknodes(abihelper); - cconv = sparc_decide_calling_convention(get_entity_type(entity), false); + cconv = sparc_decide_calling_convention(get_entity_type(entity), irg); create_stacklayout(irg); be_transform_graph(irg, NULL); - assure_fp_keep(); be_abihelper_finish(abihelper); sparc_free_calling_convention(cconv);