X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fsparc%2Fsparc_transform.c;h=0f726f4c8c89518b0de5797503d5fee00134493f;hb=1b3cdecf879a62c32a40b4df17562b6eea4ec498;hp=15972451389156235b3ac74e16a29a8036305ec7;hpb=2525d4c5bb62570c19c471a43ecd132f06e50ff6;p=libfirm diff --git a/ir/be/sparc/sparc_transform.c b/ir/be/sparc/sparc_transform.c index 159724513..0f726f4c8 100644 --- a/ir/be/sparc/sparc_transform.c +++ b/ir/be/sparc/sparc_transform.c @@ -69,9 +69,6 @@ static ir_mode *mode_fp2; //static ir_mode *mode_fp4; static pmap *node_to_stack; -static ir_node *gen_SymConst(ir_node *node); - - static inline int mode_needs_gp_reg(ir_mode *mode) { return mode_is_int(mode) || mode_is_reference(mode); @@ -89,10 +86,10 @@ static ir_node *gen_zero_extension(dbg_info *dbgi, ir_node *block, ir_node *op, int src_bits) { if (src_bits == 8) { - return new_bd_sparc_And_imm(dbgi, block, op, 0xFF); + return new_bd_sparc_And_imm(dbgi, block, op, NULL, 0xFF); } else if (src_bits == 16) { - ir_node *lshift = new_bd_sparc_Sll_imm(dbgi, block, op, 16); - ir_node *rshift = new_bd_sparc_Slr_imm(dbgi, block, lshift, 16); + ir_node *lshift = new_bd_sparc_Sll_imm(dbgi, block, op, NULL, 16); + ir_node *rshift = new_bd_sparc_Slr_imm(dbgi, block, lshift, NULL, 16); return rshift; } else { panic("zero extension only supported for 8 and 16 bits"); @@ -111,8 +108,8 @@ static ir_node *gen_sign_extension(dbg_info *dbgi, ir_node *block, ir_node *op, int src_bits) { int shift_width = 32 - src_bits; - ir_node *lshift_node = new_bd_sparc_Sll_imm(dbgi, block, op, shift_width); - ir_node *rshift_node = new_bd_sparc_Sra_imm(dbgi, block, lshift_node, shift_width); + ir_node *lshift_node = new_bd_sparc_Sll_imm(dbgi, block, op, NULL, shift_width); + ir_node *rshift_node = new_bd_sparc_Sra_imm(dbgi, block, lshift_node, NULL, shift_width); return rshift_node; } @@ -154,17 +151,24 @@ static ir_node *gen_extension(dbg_info *dbgi, ir_node *block, ir_node *op, typedef enum { MATCH_NONE = 0, - MATCH_COMMUTATIVE = 1 << 0, /**< commutative operation. */ + MATCH_COMMUTATIVE = 1U << 0, /**< commutative operation. */ + MATCH_MODE_NEUTRAL = 1U << 1, /**< the higher bits of the inputs don't + influence the significant lower bit at + all (for cases where mode < 32bit) */ } 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, int32_t immediate); +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 - * */ static bool is_imm_encodeable(const ir_node *node) { @@ -173,7 +177,44 @@ static bool is_imm_encodeable(const ir_node *node) return false; value = get_tarval_long(get_Const_tarval(node)); - return -4096 <= value && value <= 4095; + return is_value_imm_encodeable(value); +} + +static bool needs_extension(ir_mode *mode) +{ + return get_mode_size_bits(mode) < get_mode_size_bits(mode_gp); +} + +/** + * Check, if a given node is a Down-Conv, ie. a integer Conv + * from a mode with a mode with more bits to a mode with lesser bits. + * Moreover, we return only true if the node has not more than 1 user. + * + * @param node the node + * @return non-zero if node is a Down-Conv + */ +static bool is_downconv(const ir_node *node) +{ + ir_mode *src_mode; + ir_mode *dest_mode; + + if (!is_Conv(node)) + return false; + + src_mode = get_irn_mode(get_Conv_op(node)); + dest_mode = get_irn_mode(node); + return + mode_needs_gp_reg(src_mode) && + mode_needs_gp_reg(dest_mode) && + get_mode_size_bits(dest_mode) <= get_mode_size_bits(src_mode); +} + +static ir_node *sparc_skip_downconv(ir_node *node) +{ + while (is_downconv(node)) { + node = get_Conv_op(node); + } + return node; } /** @@ -188,22 +229,42 @@ static ir_node *gen_helper_binop_args(ir_node *node, new_binop_reg_func new_reg, new_binop_imm_func new_imm) { - dbg_info *dbgi = get_irn_dbg_info(node); - ir_node *block = be_transform_node(get_nodes_block(node)); + dbg_info *dbgi = get_irn_dbg_info(node); + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *new_op1; ir_node *new_op2; + ir_mode *mode1; + ir_mode *mode2; + + if (flags & MATCH_MODE_NEUTRAL) { + op1 = sparc_skip_downconv(op1); + op2 = sparc_skip_downconv(op2); + } + mode1 = get_irn_mode(op1); + mode2 = get_irn_mode(op2); if (is_imm_encodeable(op2)) { - ir_node *new_op1 = be_transform_node(op1); - return new_imm(dbgi, block, new_op1, get_tarval_long(get_Const_tarval(op2))); + ir_node *new_op1 = be_transform_node(op1); + int32_t immediate = get_tarval_long(get_Const_tarval(op2)); + if (! (flags & MATCH_MODE_NEUTRAL) && needs_extension(mode1)) { + new_op1 = gen_extension(dbgi, block, new_op1, mode1); + } + return new_imm(dbgi, block, new_op1, NULL, immediate); } new_op2 = be_transform_node(op2); + if (! (flags & MATCH_MODE_NEUTRAL) && needs_extension(mode2)) { + new_op2 = gen_extension(dbgi, block, new_op2, mode2); + } if ((flags & MATCH_COMMUTATIVE) && is_imm_encodeable(op1)) { - return new_imm(dbgi, block, new_op2, get_tarval_long(get_Const_tarval(op1)) ); + int32_t immediate = get_tarval_long(get_Const_tarval(op1)); + return new_imm(dbgi, block, new_op2, NULL, immediate); } - new_op1 = be_transform_node(op1); + new_op1 = be_transform_node(op1); + if (! (flags & MATCH_MODE_NEUTRAL) && needs_extension(mode1)) { + new_op1 = gen_extension(dbgi, block, new_op1, mode1); + } return new_reg(dbgi, block, new_op1, new_op2); } @@ -269,6 +330,65 @@ static ir_node *gen_helper_unfpop(ir_node *node, ir_mode *mode, panic("unsupported mode %+F for float op", mode); } +static ir_node *get_g0(void) +{ + return be_prolog_get_reg_value(abihelper, &sparc_gp_regs[REG_G0]); +} + +typedef struct address_t { + ir_node *ptr; + ir_node *ptr2; + ir_entity *entity; + int32_t offset; +} address_t; + +/** + * Match a load/store address + */ +static void match_address(ir_node *ptr, address_t *address, bool use_ptr2) +{ + ir_node *base = ptr; + ir_node *ptr2 = NULL; + int32_t offset = 0; + ir_entity *entity = NULL; + + if (is_Add(base)) { + ir_node *add_right = get_Add_right(base); + if (is_Const(add_right)) { + base = get_Add_left(base); + offset += get_tarval_long(get_Const_tarval(add_right)); + } + } + /* Note that we don't match sub(x, Const) or chains of adds/subs + * because this should all be normalized by now */ + + /* we only use the symconst if we're the only user otherwise we probably + * won't save anything but produce multiple sethi+or combinations with + * just different offsets */ + if (is_SymConst(base) && get_irn_n_edges(base) == 1) { + dbg_info *dbgi = get_irn_dbg_info(ptr); + ir_node *block = get_nodes_block(ptr); + ir_node *new_block = be_transform_node(block); + entity = get_SymConst_entity(base); + base = new_bd_sparc_SetHi(dbgi, new_block, entity, offset); + } else if (use_ptr2 && is_Add(base) && entity == NULL && offset == 0) { + ptr2 = be_transform_node(get_Add_right(base)); + base = be_transform_node(get_Add_left(base)); + } else { + if (is_value_imm_encodeable(offset)) { + base = be_transform_node(base); + } else { + base = be_transform_node(ptr); + offset = 0; + } + } + + address->ptr = base; + address->ptr2 = ptr2; + address->entity = entity; + address->offset = offset; +} + /** * Creates an sparc Add. * @@ -277,8 +397,8 @@ static ir_node *gen_helper_unfpop(ir_node *node, ir_mode *mode, */ static ir_node *gen_Add(ir_node *node) { - ir_mode *mode = get_irn_mode(node); - ir_node *right = get_Add_right(node); + ir_mode *mode = get_irn_mode(node); + ir_node *right; if (mode_is_float(mode)) { return gen_helper_binfpop(node, mode, new_bd_sparc_fadd_s, @@ -286,19 +406,38 @@ 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 = get_Const_tarval(right); - uint32_t val = get_tarval_long(tv); + tarval *tv; + uint32_t val; + ir_node *left = get_Add_left(node); + /* is this simple address arithmetic? then we can let the linker do + * the calculation. */ + if (is_SymConst(left)) { + dbg_info *dbgi = get_irn_dbg_info(node); + ir_node *block = be_transform_node(get_nodes_block(node)); + address_t address; + + /* the value of use_ptr2 shouldn't matter here */ + match_address(node, &address, false); + assert(is_sparc_SetHi(address.ptr)); + return new_bd_sparc_Or_imm(dbgi, block, address.ptr, + address.entity, address.offset); + } + + tv = get_Const_tarval(right); + val = get_tarval_long(tv); if (val == 0x1000) { dbg_info *dbgi = get_irn_dbg_info(node); ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *op = get_Add_left(node); ir_node *new_op = be_transform_node(op); - return new_bd_sparc_Sub_imm(dbgi, block, new_op, -0x1000); + return new_bd_sparc_Sub_imm(dbgi, block, new_op, NULL, -0x1000); } } - return gen_helper_binop(node, MATCH_COMMUTATIVE, new_bd_sparc_Add_reg, new_bd_sparc_Add_imm); + return gen_helper_binop(node, MATCH_COMMUTATIVE | MATCH_MODE_NEUTRAL, + new_bd_sparc_Add_reg, new_bd_sparc_Add_imm); } /** @@ -321,40 +460,40 @@ static ir_node *gen_Sub(ir_node *node) static ir_node *create_ldf(dbg_info *dbgi, ir_node *block, ir_node *ptr, ir_node *mem, ir_mode *mode, ir_entity *entity, - int entity_sign, long offset, bool is_frame_entity) + long offset, bool is_frame_entity) { unsigned bits = get_mode_size_bits(mode); assert(mode_is_float(mode)); if (bits == 32) { return new_bd_sparc_Ldf_s(dbgi, block, ptr, mem, mode, entity, - entity_sign, offset, is_frame_entity); + offset, is_frame_entity); } else if (bits == 64) { return new_bd_sparc_Ldf_d(dbgi, block, ptr, mem, mode, entity, - entity_sign, offset, is_frame_entity); + offset, is_frame_entity); } else { assert(bits == 128); return new_bd_sparc_Ldf_q(dbgi, block, ptr, mem, mode, entity, - entity_sign, offset, is_frame_entity); + offset, is_frame_entity); } } -static ir_node *create_stf(dbg_info *dbgi, ir_node *block, ir_node *ptr, - ir_node *value, ir_node *mem, ir_mode *mode, - ir_entity *entity, int entity_sign, long offset, +static ir_node *create_stf(dbg_info *dbgi, ir_node *block, ir_node *value, + ir_node *ptr, ir_node *mem, ir_mode *mode, + ir_entity *entity, long offset, bool is_frame_entity) { unsigned bits = get_mode_size_bits(mode); assert(mode_is_float(mode)); if (bits == 32) { - return new_bd_sparc_Stf_s(dbgi, block, ptr, value, mem, mode, entity, - entity_sign, offset, is_frame_entity); + return new_bd_sparc_Stf_s(dbgi, block, value, ptr, mem, mode, entity, + offset, is_frame_entity); } else if (bits == 64) { - return new_bd_sparc_Stf_d(dbgi, block, ptr, value, mem, mode, entity, - entity_sign, offset, is_frame_entity); + return new_bd_sparc_Stf_d(dbgi, block, value, ptr, mem, mode, entity, + offset, is_frame_entity); } else { assert(bits == 128); - return new_bd_sparc_Stf_q(dbgi, block, ptr, value, mem, mode, entity, - entity_sign, offset, is_frame_entity); + return new_bd_sparc_Stf_q(dbgi, block, value, ptr, mem, mode, entity, + offset, is_frame_entity); } } @@ -366,19 +505,30 @@ static ir_node *create_stf(dbg_info *dbgi, ir_node *block, ir_node *ptr, */ static ir_node *gen_Load(ir_node *node) { + dbg_info *dbgi = get_irn_dbg_info(node); ir_mode *mode = get_Load_mode(node); ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *ptr = get_Load_ptr(node); - ir_node *new_ptr = be_transform_node(ptr); ir_node *mem = get_Load_mem(node); ir_node *new_mem = be_transform_node(mem); - dbg_info *dbgi = get_irn_dbg_info(node); ir_node *new_load = NULL; + address_t address; if (mode_is_float(mode)) { - new_load = create_ldf(dbgi, block, new_ptr, new_mem, mode, NULL, 0, 0, false); + match_address(ptr, &address, false); + new_load = create_ldf(dbgi, block, address.ptr, new_mem, mode, + address.entity, address.offset, false); } else { - new_load = new_bd_sparc_Ld(dbgi, block, new_ptr, new_mem, mode, NULL, 0, 0, false); + match_address(ptr, &address, true); + if (address.ptr2 != NULL) { + assert(address.entity == NULL && address.offset == 0); + new_load = new_bd_sparc_Ld_reg(dbgi, block, address.ptr, + address.ptr2, new_mem, mode); + } else { + new_load = new_bd_sparc_Ld_imm(dbgi, block, address.ptr, new_mem, + mode, address.entity, address.offset, + false); + } } set_irn_pinned(new_load, get_irn_pinned(node)); @@ -395,19 +545,31 @@ static ir_node *gen_Store(ir_node *node) { ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *ptr = get_Store_ptr(node); - ir_node *new_ptr = be_transform_node(ptr); ir_node *mem = get_Store_mem(node); ir_node *new_mem = be_transform_node(mem); ir_node *val = get_Store_value(node); ir_node *new_val = be_transform_node(val); ir_mode *mode = get_irn_mode(val); dbg_info *dbgi = get_irn_dbg_info(node); - ir_node *new_store = NULL; + ir_node *new_store = NULL; + address_t address; if (mode_is_float(mode)) { - new_store = create_stf(dbgi, block, new_ptr, new_val, new_mem, mode, NULL, 0, 0, false); + /* 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 { - new_store = new_bd_sparc_St(dbgi, block, new_ptr, new_val, new_mem, mode, NULL, 0, 0, false); + match_address(ptr, &address, true); + if (address.ptr2 != NULL) { + assert(address.entity == NULL && address.offset == 0); + new_store = new_bd_sparc_St_reg(dbgi, block, new_val, address.ptr, + address.ptr2, new_mem, mode); + } else { + new_store = new_bd_sparc_St_imm(dbgi, block, new_val, address.ptr, + new_mem, mode, address.entity, + address.offset, false); + } } set_irn_pinned(new_store, get_irn_pinned(node)); @@ -428,8 +590,7 @@ static ir_node *gen_Mul(ir_node *node) new_bd_sparc_fmul_d, new_bd_sparc_fmul_q); } - assert(mode_is_data(mode)); - return gen_helper_binop(node, MATCH_COMMUTATIVE, + return gen_helper_binop(node, MATCH_COMMUTATIVE | MATCH_MODE_NEUTRAL, new_bd_sparc_Mul_reg, new_bd_sparc_Mul_imm); } @@ -443,17 +604,23 @@ static ir_node *gen_Mulh(ir_node *node) { ir_mode *mode = get_irn_mode(node); ir_node *mul; - ir_node *proj_res_hi; if (mode_is_float(mode)) panic("FP not supported yet"); - - assert(mode_is_data(mode)); mul = gen_helper_binop(node, MATCH_COMMUTATIVE, new_bd_sparc_Mulh_reg, new_bd_sparc_Mulh_imm); - //arch_irn_add_flags(mul, arch_irn_flags_modify_flags); - proj_res_hi = new_r_Proj(mul, mode_gp, pn_sparc_Mulh_low); - return proj_res_hi; + return new_r_Proj(mul, mode_gp, pn_sparc_Mulh_low); +} + +static ir_node *gen_sign_extension_value(ir_node *node) +{ + ir_node *block = get_nodes_block(node); + ir_node *new_block = be_transform_node(block); + ir_node *new_node = be_transform_node(node); + /* TODO: we could do some shortcuts for some value types probably. + * (For constants or other cases where we know the sign bit in + * advance) */ + return new_bd_sparc_Sra_imm(NULL, new_block, new_node, NULL, 31); } /** @@ -463,17 +630,41 @@ static ir_node *gen_Mulh(ir_node *node) */ static ir_node *gen_Div(ir_node *node) { - ir_mode *mode = get_Div_resmode(node); - ir_node *res; + dbg_info *dbgi = get_irn_dbg_info(node); + ir_node *block = get_nodes_block(node); + ir_node *new_block = be_transform_node(block); + ir_mode *mode = get_Div_resmode(node); + ir_node *left = get_Div_left(node); + ir_node *left_low = be_transform_node(left); + ir_node *right = get_Div_right(node); + ir_node *res; assert(!mode_is_float(mode)); if (mode_is_signed(mode)) { - res = gen_helper_binop(node, 0, new_bd_sparc_SDiv_reg, - new_bd_sparc_SDiv_imm); + ir_node *left_high = gen_sign_extension_value(left); + + if (is_imm_encodeable(right)) { + int32_t immediate = get_tarval_long(get_Const_tarval(right)); + res = new_bd_sparc_SDiv_imm(dbgi, new_block, left_high, left_low, + NULL, immediate); + } else { + ir_node *new_right = be_transform_node(right); + res = new_bd_sparc_SDiv_reg(dbgi, new_block, left_high, left_low, + new_right); + } } else { - res = gen_helper_binop(node, 0, new_bd_sparc_UDiv_reg, - new_bd_sparc_UDiv_imm); + ir_node *left_high = get_g0(); + if (is_imm_encodeable(right)) { + int32_t immediate = get_tarval_long(get_Const_tarval(right)); + res = new_bd_sparc_UDiv_imm(dbgi, new_block, left_high, left_low, + NULL, immediate); + } else { + ir_node *new_right = be_transform_node(right); + res = new_bd_sparc_UDiv_reg(dbgi, new_block, left_high, left_low, + new_right); + } } + return res; } @@ -497,18 +688,13 @@ static ir_node *gen_Abs(ir_node *node) dbg_info *const dbgi = get_irn_dbg_info(node); ir_node *const op = get_Abs_op(node); ir_node *const new_op = be_transform_node(op); - ir_node *const sra = new_bd_sparc_Sra_imm(dbgi, block, new_op, 31); + ir_node *const sra = new_bd_sparc_Sra_imm(dbgi, block, new_op, NULL, 31); ir_node *const xor = new_bd_sparc_Xor_reg(dbgi, block, new_op, sra); ir_node *const sub = new_bd_sparc_Sub_reg(dbgi, block, xor, sra); return sub; } } -static ir_node *get_g0(void) -{ - return be_prolog_get_reg_value(abihelper, &sparc_gp_regs[REG_G0]); -} - /** * Transforms a Not node. * @@ -536,19 +722,19 @@ static ir_node *gen_And(ir_node *node) if (is_Not(right)) { ir_node *not_op = get_Not_op(right); - return gen_helper_binop_args(node, left, not_op, MATCH_NONE, + return gen_helper_binop_args(node, left, not_op, MATCH_MODE_NEUTRAL, new_bd_sparc_AndN_reg, new_bd_sparc_AndN_imm); } if (is_Not(left)) { ir_node *not_op = get_Not_op(left); - return gen_helper_binop_args(node, right, not_op, MATCH_NONE, + return gen_helper_binop_args(node, right, not_op, MATCH_MODE_NEUTRAL, new_bd_sparc_AndN_reg, new_bd_sparc_AndN_imm); } - return gen_helper_binop(node, MATCH_COMMUTATIVE, new_bd_sparc_And_reg, - new_bd_sparc_And_imm); + return gen_helper_binop(node, MATCH_COMMUTATIVE | MATCH_MODE_NEUTRAL, + new_bd_sparc_And_reg, new_bd_sparc_And_imm); } static ir_node *gen_Or(ir_node *node) @@ -558,19 +744,19 @@ static ir_node *gen_Or(ir_node *node) if (is_Not(right)) { ir_node *not_op = get_Not_op(right); - return gen_helper_binop_args(node, left, not_op, MATCH_NONE, + return gen_helper_binop_args(node, left, not_op, MATCH_MODE_NEUTRAL, new_bd_sparc_OrN_reg, new_bd_sparc_OrN_imm); } if (is_Not(left)) { ir_node *not_op = get_Not_op(left); - return gen_helper_binop_args(node, right, not_op, MATCH_NONE, + return gen_helper_binop_args(node, right, not_op, MATCH_MODE_NEUTRAL, new_bd_sparc_OrN_reg, new_bd_sparc_OrN_imm); } - return gen_helper_binop(node, MATCH_COMMUTATIVE, new_bd_sparc_Or_reg, - new_bd_sparc_Or_imm); + return gen_helper_binop(node, MATCH_COMMUTATIVE | MATCH_MODE_NEUTRAL, + new_bd_sparc_Or_reg, new_bd_sparc_Or_imm); } static ir_node *gen_Eor(ir_node *node) @@ -580,7 +766,8 @@ static ir_node *gen_Eor(ir_node *node) if (is_Not(right)) { ir_node *not_op = get_Not_op(right); - return gen_helper_binop_args(node, left, not_op, MATCH_COMMUTATIVE, + return gen_helper_binop_args(node, left, not_op, + MATCH_COMMUTATIVE | MATCH_MODE_NEUTRAL, new_bd_sparc_XNor_reg, new_bd_sparc_XNor_imm); } @@ -592,8 +779,8 @@ static ir_node *gen_Eor(ir_node *node) new_bd_sparc_XNor_imm); } - return gen_helper_binop(node, MATCH_COMMUTATIVE, new_bd_sparc_Xor_reg, - new_bd_sparc_Xor_imm); + return gen_helper_binop(node, MATCH_COMMUTATIVE | MATCH_MODE_NEUTRAL, + new_bd_sparc_Xor_reg, new_bd_sparc_Xor_imm); } static ir_node *gen_Shl(ir_node *node) @@ -635,14 +822,6 @@ static ir_node *gen_Minus(ir_node *node) return new_bd_sparc_Sub_reg(dbgi, block, zero, new_op); } -static ir_node *make_addr(dbg_info *dbgi, ir_entity *entity) -{ - ir_node *block = get_irg_start_block(current_ir_graph); - ir_node *node = new_bd_sparc_SymConst(dbgi, block, entity); - be_dep_on_frame(node); - return node; -} - /** * Create an entity for a given (floating point) tarval */ @@ -682,11 +861,12 @@ static ir_node *gen_Const(ir_node *node) if (mode_is_float(mode)) { tarval *tv = get_Const_tarval(node); ir_entity *entity = create_float_const_entity(tv); - ir_node *addr = make_addr(dbgi, entity); + ir_node *hi = new_bd_sparc_SetHi(dbgi, block, entity, 0); ir_node *mem = new_NoMem(); ir_node *new_op - = create_ldf(dbgi, block, addr, mem, mode, NULL, 0, 0, false); + = create_ldf(dbgi, block, hi, mem, mode, entity, 0, false); ir_node *proj = new_Proj(new_op, mode, pn_sparc_Ldf_res); + be_dep_on_frame(hi); set_irn_pinned(new_op, op_pin_state_floats); return proj; @@ -697,12 +877,12 @@ static ir_node *gen_Const(ir_node *node) if (value == 0) { return get_g0(); } else if (-4096 <= value && value <= 4095) { - return new_bd_sparc_Or_imm(dbgi, block, get_g0(), value); + return new_bd_sparc_Or_imm(dbgi, block, get_g0(), NULL, value); } else { - ir_node *hi = new_bd_sparc_SetHi(dbgi, block, value); + 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, value & 0x3ff); + return new_bd_sparc_Or_imm(dbgi, block, hi, NULL, value & 0x3ff); } else { return hi; } @@ -723,9 +903,71 @@ static ir_mode *get_cmp_mode(ir_node *b_value) return get_irn_mode(op); } -/** - * Transform Cond nodes - */ +static ir_node *make_address(dbg_info *dbgi, ir_node *block, ir_entity *entity, + int32_t offset) +{ + 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; +} + +static ir_node *gen_SwitchJmp(ir_node *node) +{ + dbg_info *dbgi = get_irn_dbg_info(node); + ir_node *block = be_transform_node(get_nodes_block(node)); + ir_node *selector = get_Cond_selector(node); + ir_node *new_selector = be_transform_node(selector); + long switch_min = LONG_MAX; + long switch_max = LONG_MIN; + long default_pn = get_Cond_default_proj(node); + ir_entity *entity; + ir_node *table_address; + ir_node *index; + ir_node *load; + ir_node *address; + unsigned length; + const ir_edge_t *edge; + + /* switch with smaller mode not implemented yet */ + assert(get_mode_size_bits(get_irn_mode(selector)) == 32); + + foreach_out_edge(node, edge) { + ir_node *proj = get_edge_src_irn(edge); + long pn = get_Proj_proj(proj); + if (pn == default_pn) + continue; + + switch_min = pnswitch_max ? pn : switch_max; + } + length = (unsigned long) (switch_max - switch_min); + if (length > 16000) { + panic("Size of switch %+F bigger than 16000", node); + } + + entity = new_entity(NULL, id_unique("TBL%u"), get_unknown_type()); + set_entity_visibility(entity, ir_visibility_private); + add_entity_linkage(entity, IR_LINKAGE_CONSTANT); + + /* TODO: this code does not construct code to check for access + * out-of bounds of the jumptable yet. I think we should put this stuff + * into the switch_lowering phase to get some additional optimisations + * done. */ + + /* construct base address */ + table_address = make_address(dbgi, block, entity, + -switch_min * get_mode_size_bytes(mode_gp)); + /* scale index */ + index = new_bd_sparc_Sll_imm(dbgi, block, new_selector, NULL, 2); + /* load from jumptable */ + load = new_bd_sparc_Ld_reg(dbgi, block, table_address, index, new_NoMem(), + mode_gp); + address = new_r_Proj(load, mode_gp, pn_sparc_Ld_res); + + return new_bd_sparc_SwitchJmp(dbgi, block, address, default_pn, entity); +} + static ir_node *gen_Cond(ir_node *node) { ir_node *selector = get_Cond_selector(node); @@ -739,7 +981,7 @@ static ir_node *gen_Cond(ir_node *node) // switch/case jumps if (mode != mode_b) { - panic("SwitchJump not implemented yet"); + return gen_SwitchJmp(node); } // regular if/else jumps @@ -766,17 +1008,17 @@ static ir_node *gen_Cond(ir_node *node) */ static ir_node *gen_Cmp(ir_node *node) { - ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *op1 = get_Cmp_left(node); ir_node *op2 = get_Cmp_right(node); ir_mode *cmp_mode = get_irn_mode(op1); - dbg_info *dbgi = get_irn_dbg_info(node); - ir_node *new_op1 = be_transform_node(op1); - ir_node *new_op2 = be_transform_node(op2); assert(get_irn_mode(op2) == cmp_mode); if (mode_is_float(cmp_mode)) { - unsigned bits = get_mode_size_bits(cmp_mode); + ir_node *block = be_transform_node(get_nodes_block(node)); + dbg_info *dbgi = get_irn_dbg_info(node); + ir_node *new_op1 = be_transform_node(op1); + ir_node *new_op2 = be_transform_node(op2); + unsigned bits = get_mode_size_bits(cmp_mode); if (bits == 32) { return new_bd_sparc_fcmp_s(dbgi, block, new_op1, new_op2, cmp_mode); } else if (bits == 64) { @@ -788,9 +1030,8 @@ static ir_node *gen_Cmp(ir_node *node) } /* integer compare */ - new_op1 = gen_extension(dbgi, block, new_op1, cmp_mode); - new_op2 = gen_extension(dbgi, block, new_op2, cmp_mode); - return new_bd_sparc_Cmp_reg(dbgi, block, new_op1, new_op2); + return gen_helper_binop_args(node, op1, op2, MATCH_NONE, + new_bd_sparc_Cmp_reg, new_bd_sparc_Cmp_imm); } /** @@ -798,10 +1039,11 @@ static ir_node *gen_Cmp(ir_node *node) */ static ir_node *gen_SymConst(ir_node *node) { - ir_entity *entity = get_SymConst_entity(node); - dbg_info *dbgi = get_irn_dbg_info(node); - - return make_addr(dbgi, entity); + ir_entity *entity = get_SymConst_entity(node); + dbg_info *dbgi = get_irn_dbg_info(node); + ir_node *block = get_nodes_block(node); + ir_node *new_block = be_transform_node(block); + return make_address(dbgi, new_block, entity, 0); } static ir_node *create_fftof(dbg_info *dbgi, ir_node *block, ir_node *op, @@ -1138,16 +1380,16 @@ static ir_node *bitcast_int_to_float(dbg_info *dbgi, ir_node *block, ir_graph *irg = current_ir_graph; ir_node *sp = get_irg_frame(irg); ir_node *nomem = new_NoMem(); - ir_node *st = new_bd_sparc_St(dbgi, block, sp, value0, nomem, mode_gp, - NULL, 0, 0, true); + ir_node *st = new_bd_sparc_St_imm(dbgi, block, value0, sp, nomem, + mode_gp, NULL, 0, true); ir_mode *mode; ir_node *ldf; ir_node *mem; set_irn_pinned(st, op_pin_state_floats); if (value1 != NULL) { - ir_node *st1 = new_bd_sparc_St(dbgi, block, sp, value1, nomem, mode_gp, - NULL, 0, 4, true); + ir_node *st1 = new_bd_sparc_St_imm(dbgi, block, value1, sp, nomem, + mode_gp, NULL, 4, true); ir_node *in[2] = { st, st1 }; ir_node *sync = new_r_Sync(block, 2, in); set_irn_pinned(st1, op_pin_state_floats); @@ -1158,7 +1400,7 @@ static ir_node *bitcast_int_to_float(dbg_info *dbgi, ir_node *block, mode = mode_fp; } - ldf = create_ldf(dbgi, block, sp, mem, mode, NULL, 0, 0, true); + ldf = create_ldf(dbgi, block, sp, mem, mode, NULL, 0, true); set_irn_pinned(ldf, op_pin_state_floats); return new_Proj(ldf, mode, pn_sparc_Ldf_res); @@ -1171,19 +1413,19 @@ static void bitcast_float_to_int(dbg_info *dbgi, ir_node *block, ir_graph *irg = current_ir_graph; ir_node *stack = get_irg_frame(irg); ir_node *nomem = new_NoMem(); - ir_node *stf = create_stf(dbgi, block, stack, node, nomem, float_mode, - NULL, 0, 0, true); + ir_node *stf = create_stf(dbgi, block, node, stack, nomem, float_mode, + NULL, 0, true); int bits = get_mode_size_bits(float_mode); ir_node *ld; set_irn_pinned(stf, op_pin_state_floats); - ld = new_bd_sparc_Ld(dbgi, block, stack, stf, mode_gp, NULL, 0, 0, true); + ld = new_bd_sparc_Ld_imm(dbgi, block, stack, stf, mode_gp, NULL, 0, true); set_irn_pinned(ld, op_pin_state_floats); result[0] = new_Proj(ld, mode_gp, pn_sparc_Ld_res); if (bits == 64) { - ir_node *ld2 = new_bd_sparc_Ld(dbgi, block, stack, stf, mode_gp, - NULL, 0, 4, true); + ir_node *ld2 = new_bd_sparc_Ld_imm(dbgi, block, stack, stf, mode_gp, + NULL, 4, true); set_irn_pinned(ld, op_pin_state_floats); result[1] = new_Proj(ld2, mode_gp, pn_sparc_Ld_res); @@ -1291,11 +1533,11 @@ static ir_node *gen_Call(ir_node *node) /* create a parameter frame if necessary */ if (mode_is_float(mode)) { - str = create_stf(dbgi, new_block, incsp, new_value, new_mem, - mode, NULL, 0, param->offset, true); + str = create_stf(dbgi, new_block, new_value, incsp, new_mem, + mode, NULL, param->offset, true); } else { - str = new_bd_sparc_St(dbgi, new_block, incsp, new_value, new_mem, - mode, NULL, 0, param->offset, true); + str = new_bd_sparc_St_imm(dbgi, new_block, new_value, incsp, + new_mem, mode, NULL, param->offset, true); } set_irn_pinned(str, op_pin_state_floats); sync_ins[sync_arity++] = str; @@ -1377,7 +1619,7 @@ static ir_node *gen_Sel(ir_node *node) assert(get_entity_owner(entity) != get_method_value_param_type(get_entity_type(get_irg_entity(get_irn_irg(node))))); - return new_bd_sparc_FrameAddr(dbgi, new_block, new_ptr, entity); + return new_bd_sparc_FrameAddr(dbgi, new_block, new_ptr, entity, 0); } static const arch_register_req_t float1_req = { @@ -1617,9 +1859,9 @@ static ir_node *gen_Proj_Proj_Start(ir_node *node) } else if (param->entity != NULL) { ir_node *fp = be_prolog_get_reg_value(abihelper, fp_reg); ir_node *mem = be_prolog_get_memory(abihelper); - ir_node *ld = new_bd_sparc_Ld(NULL, new_block, fp, mem, - mode_gp, param->entity, - 0, 0, true); + ir_node *ld = new_bd_sparc_Ld_imm(NULL, new_block, fp, mem, + mode_gp, param->entity, + 0, true); value1 = new_Proj(ld, mode_gp, pn_sparc_Ld_res); } @@ -1637,11 +1879,11 @@ static ir_node *gen_Proj_Proj_Start(ir_node *node) if (mode_is_float(mode)) { load = create_ldf(NULL, new_block, fp, mem, mode, - param->entity, 0, 0, true); + param->entity, 0, true); value = new_r_Proj(load, mode_fp, pn_sparc_Ldf_res); } else { - load = new_bd_sparc_Ld(NULL, new_block, fp, mem, mode, - param->entity, 0, 0, true); + load = new_bd_sparc_Ld_imm(NULL, new_block, fp, mem, mode, + param->entity, 0, true); value = new_r_Proj(load, mode_gp, pn_sparc_Ld_res); } set_irn_pinned(load, op_pin_state_floats);