X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_intrinsics.c;h=2a522d7fc2ffc7fc7a0620c0f23c985b4d08802f;hb=b151d11c50d89b9dffadfb63f7ccfd81ea8db44f;hp=6778f966fbf129f1ca70fd7d3b0ba3580635de3a;hpb=bf9be89cbbf5d6ca1b80fd5736b80f47c1a14e90;p=libfirm diff --git a/ir/be/ia32/ia32_intrinsics.c b/ir/be/ia32/ia32_intrinsics.c index 6778f966f..2a522d7fc 100644 --- a/ir/be/ia32/ia32_intrinsics.c +++ b/ir/be/ia32/ia32_intrinsics.c @@ -39,6 +39,7 @@ #include "ia32_new_nodes.h" #include "bearch_ia32_t.h" #include "gen_ia32_regalloc_if.h" +#include "begnuas.h" /** The array of all intrinsics that must be mapped. */ static i_record *intrinsics; @@ -111,7 +112,7 @@ static void resolve_call(ir_node *call, ir_node *l_res, ir_node *h_res, ir_graph foreach_out_edge_safe(call, edge, next) { ir_node *proj = get_edge_src_irn(edge); - pn_Call pn = get_Proj_proj(proj); + pn_Call pn = (pn_Call)get_Proj_proj(proj); switch (pn) { case pn_Call_X_regular: @@ -201,10 +202,10 @@ static int map_Add(ir_node *call, void *ctx) /* h_res = a_h + b_h + carry */ add_low = new_bd_ia32_l_Add(dbg, block, a_l, b_l, mode_T); - flags = new_r_Proj(block, add_low, mode_flags, pn_ia32_flags); + flags = new_r_Proj(add_low, mode_flags, pn_ia32_flags); add_high = new_bd_ia32_l_Adc(dbg, block, a_h, b_h, flags, h_mode); - l_res = new_r_Proj(block, add_low, l_mode, pn_ia32_res); + l_res = new_r_Proj(add_low, l_mode, pn_ia32_res); h_res = add_high; resolve_call(call, l_res, h_res, current_ir_graph, block); @@ -235,10 +236,10 @@ static int map_Sub(ir_node *call, void *ctx) /* h_res = a_h - b_h - carry */ sub_low = new_bd_ia32_l_Sub(dbg, block, a_l, b_l, mode_T); - flags = new_r_Proj(block, sub_low, mode_flags, pn_ia32_flags); + flags = new_r_Proj(sub_low, mode_flags, pn_ia32_flags); sub_high = new_bd_ia32_l_Sbb(dbg, block, a_h, b_h, flags, h_mode); - l_res = new_r_Proj( block, sub_low, l_mode, pn_ia32_res); + l_res = new_r_Proj(sub_low, l_mode, pn_ia32_res); h_res = sub_high; resolve_call(call, l_res, h_res, current_ir_graph, block); @@ -266,9 +267,10 @@ static int map_Shl(ir_node *call, void *ctx) if (is_Const(cnt)) { /* the shift count is a const, create better code */ - tarval *tv = get_Const_tarval(cnt); + ir_tarval *tv = get_Const_tarval(cnt); - if (tarval_cmp(tv, new_tarval_from_long(32, l_mode)) & (pn_Cmp_Gt|pn_Cmp_Eq)) { + if (tarval_cmp(tv, new_tarval_from_long(32, l_mode)) + & (ir_relation_greater_equal)) { /* simplest case: shift only the lower bits. Note that there is no need to reduce the constant here, this is done by the hardware. */ ir_node *conv = new_rd_Conv(dbg, block, a_l, h_mode); @@ -299,12 +301,11 @@ static int map_Shl(ir_node *call, void *ctx) c_mode = get_irn_mode(cnt); irn = new_r_Const_long(irg, c_mode, 32); irn = new_rd_And(dbg, upper, cnt, irn, c_mode); - irn = new_rd_Cmp(dbg, upper, irn, new_r_Const(irg, get_mode_null(c_mode))); - irn = new_r_Proj(upper, irn, mode_b, pn_Cmp_Eq); + irn = new_rd_Cmp(dbg, upper, irn, new_r_Const(irg, get_mode_null(c_mode)), ir_relation_equal); cond = new_rd_Cond(dbg, upper, irn); - in[0] = new_r_Proj(upper, cond, mode_X, pn_Cond_true); - in[1] = new_r_Proj(upper, cond, mode_X, pn_Cond_false); + in[0] = new_r_Proj(cond, mode_X, pn_Cond_true); + in[1] = new_r_Proj(cond, mode_X, pn_Cond_false); /* the block for cnt >= 32 */ n_block = new_rd_Block(dbg, irg, 1, &in[1]); @@ -327,8 +328,10 @@ static int map_Shl(ir_node *call, void *ctx) /* move it down */ set_nodes_block(call, block); - for (irn = get_irn_link(call); irn != NULL; irn = get_irn_link(irn)) + for (irn = (ir_node*)get_irn_link(call); irn != NULL; + irn = (ir_node*)get_irn_link(irn)) { set_nodes_block(irn, block); + } resolve_call(call, l_res, h_res, irg, block); return 1; @@ -355,9 +358,9 @@ static int map_Shr(ir_node *call, void *ctx) if (is_Const(cnt)) { /* the shift count is a const, create better code */ - tarval *tv = get_Const_tarval(cnt); + ir_tarval *tv = get_Const_tarval(cnt); - if (tarval_cmp(tv, new_tarval_from_long(32, l_mode)) & (pn_Cmp_Gt|pn_Cmp_Eq)) { + if (tarval_cmp(tv, new_tarval_from_long(32, l_mode)) & (ir_relation_greater_equal)) { /* simplest case: shift only the higher bits. Note that there is no need to reduce the constant here, this is done by the hardware. */ ir_node *conv = new_rd_Conv(dbg, block, a_h, l_mode); @@ -386,12 +389,11 @@ static int map_Shr(ir_node *call, void *ctx) c_mode = get_irn_mode(cnt); irn = new_r_Const_long(irg, c_mode, 32); irn = new_rd_And(dbg, upper, cnt, irn, c_mode); - irn = new_rd_Cmp(dbg, upper, irn, new_r_Const(irg, get_mode_null(c_mode))); - irn = new_r_Proj(upper, irn, mode_b, pn_Cmp_Eq); + irn = new_rd_Cmp(dbg, upper, irn, new_r_Const(irg, get_mode_null(c_mode)), ir_relation_equal); cond = new_rd_Cond(dbg, upper, irn); - in[0] = new_r_Proj(upper, cond, mode_X, pn_Cond_true); - in[1] = new_r_Proj(upper, cond, mode_X, pn_Cond_false); + in[0] = new_r_Proj(cond, mode_X, pn_Cond_true); + in[1] = new_r_Proj(cond, mode_X, pn_Cond_false); /* the block for cnt >= 32 */ n_block = new_rd_Block(dbg, irg, 1, &in[1]); @@ -414,8 +416,10 @@ static int map_Shr(ir_node *call, void *ctx) /* move it down */ set_nodes_block(call, block); - for (irn = get_irn_link(call); irn != NULL; irn = get_irn_link(irn)) + for (irn = (ir_node*)get_irn_link(call); irn != NULL; + irn = (ir_node*)get_irn_link(irn)) { set_nodes_block(irn, block); + } resolve_call(call, l_res, h_res, irg, block); return 1; @@ -442,9 +446,9 @@ static int map_Shrs(ir_node *call, void *ctx) if (is_Const(cnt)) { /* the shift count is a const, create better code */ - tarval *tv = get_Const_tarval(cnt); + ir_tarval *tv = get_Const_tarval(cnt); - if (tarval_cmp(tv, new_tarval_from_long(32, l_mode)) & (pn_Cmp_Gt|pn_Cmp_Eq)) { + if (tarval_cmp(tv, new_tarval_from_long(32, l_mode)) & (ir_relation_greater_equal)) { /* simplest case: shift only the higher bits. Note that there is no need to reduce the constant here, this is done by the hardware. */ ir_node *conv = new_rd_Conv(dbg, block, a_h, l_mode); @@ -475,12 +479,11 @@ static int map_Shrs(ir_node *call, void *ctx) c_mode = get_irn_mode(cnt); irn = new_r_Const_long(irg, c_mode, 32); irn = new_rd_And(dbg, upper, cnt, irn, c_mode); - irn = new_rd_Cmp(dbg, upper, irn, new_r_Const(irg, get_mode_null(c_mode))); - irn = new_r_Proj(upper, irn, mode_b, pn_Cmp_Eq); + irn = new_rd_Cmp(dbg, upper, irn, new_r_Const(irg, get_mode_null(c_mode)), ir_relation_equal); cond = new_rd_Cond(dbg, upper, irn); - in[0] = new_r_Proj(upper, cond, mode_X, pn_Cond_true); - in[1] = new_r_Proj(upper, cond, mode_X, pn_Cond_false); + in[0] = new_r_Proj(cond, mode_X, pn_Cond_true); + in[1] = new_r_Proj(cond, mode_X, pn_Cond_false); /* the block for cnt >= 32 */ n_block = new_rd_Block(dbg, irg, 1, &in[1]); @@ -503,8 +506,10 @@ static int map_Shrs(ir_node *call, void *ctx) /* move it down */ set_nodes_block(call, block); - for (irn = get_irn_link(call); irn != NULL; irn = get_irn_link(irn)) + for (irn = (ir_node*)get_irn_link(call); irn != NULL; + irn = (ir_node*)get_irn_link(irn)) { set_nodes_block(irn, block); + } resolve_call(call, l_res, h_res, irg, block); return 1; @@ -516,9 +521,9 @@ static int map_Shrs(ir_node *call, void *ctx) static int is_sign_extend(ir_node *low, ir_node *high) { if (is_Shrs(high)) { - ir_node *high_l; - ir_node *high_r; - tarval *shift_count; + ir_node *high_l; + ir_node *high_r; + ir_tarval *shift_count; high_r = get_Shrs_right(high); if (!is_Const(high_r)) return 0; @@ -532,8 +537,8 @@ static int is_sign_extend(ir_node *low, ir_node *high) if (is_Conv(low) && get_Conv_op(low) == high_l) return 1; if (is_Conv(high_l) && get_Conv_op(high_l) == low) return 1; } else if (is_Const(low) && is_Const(high)) { - tarval *tl = get_Const_tarval(low); - tarval *th = get_Const_tarval(high); + ir_tarval *tl = get_Const_tarval(low); + ir_tarval *th = get_Const_tarval(high); if (tarval_is_long(th) && tarval_is_long(tl)) { long l = get_tarval_long(tl); @@ -577,13 +582,13 @@ static int map_Mul(ir_node *call, void *ctx) /* handle the often used case of 32x32=64 mul */ if (is_sign_extend(a_l, a_h) && is_sign_extend(b_l, b_h)) { mul = new_bd_ia32_l_IMul(dbg, block, a_l, b_l); - h_res = new_rd_Proj(dbg, block, mul, h_mode, pn_ia32_l_IMul_res_high); - l_res = new_rd_Proj(dbg, block, mul, l_mode, pn_ia32_l_IMul_res_low); + h_res = new_rd_Proj(dbg, mul, h_mode, pn_ia32_l_IMul_res_high); + l_res = new_rd_Proj(dbg, mul, l_mode, pn_ia32_l_IMul_res_low); } else { /* note that zero extension is handled hare efficiently */ mul = new_bd_ia32_l_Mul(dbg, block, a_l, b_l); - pEDX = new_rd_Proj(dbg, block, mul, h_mode, pn_ia32_l_Mul_res_high); - l_res = new_rd_Proj(dbg, block, mul, l_mode, pn_ia32_l_Mul_res_low); + pEDX = new_rd_Proj(dbg, mul, h_mode, pn_ia32_l_Mul_res_high); + l_res = new_rd_Proj(dbg, mul, l_mode, pn_ia32_l_Mul_res_low); b_l = new_rd_Conv(dbg, block, b_l, h_mode); mul = new_rd_Mul( dbg, block, a_h, b_l, h_mode); @@ -614,14 +619,15 @@ static int map_Minus(ir_node *call, void *ctx) (void) ctx; res = new_bd_ia32_Minus64Bit(dbg, block, a_l, a_h); - l_res = new_r_Proj(block, res, l_mode, pn_ia32_Minus64Bit_low_res); - h_res = new_r_Proj(block, res, h_mode, pn_ia32_Minus64Bit_high_res); + l_res = new_r_Proj(res, l_mode, pn_ia32_Minus64Bit_low_res); + h_res = new_r_Proj(res, h_mode, pn_ia32_Minus64Bit_high_res); resolve_call(call, l_res, h_res, current_ir_graph, block); return 1; } +#if 0 /** * Map a Abs (a_l, a_h) */ @@ -657,29 +663,51 @@ static int map_Abs(ir_node *call, void *ctx) */ /* TODO: give a hint to the backend somehow to not create a cltd here... */ - sign = new_rd_Shrs(dbg, block, a_h, new_Const_long(l_mode, 31), h_mode); + sign = new_rd_Shrs(dbg, block, a_h, new_r_Const_long(irg, l_mode, 31), h_mode); sign_l = new_rd_Conv(dbg, block, sign, l_mode); sub_l = new_rd_Eor(dbg, block, a_l, sign_l, l_mode); sub_h = new_rd_Eor(dbg, block, a_h, sign, h_mode); l_sub = new_bd_ia32_l_Sub(dbg, block, sub_l, sign_l, mode_T); - l_res = new_r_Proj(block, l_sub, l_mode, pn_ia32_res); - flags = new_r_Proj(block, l_sub, mode_flags, pn_ia32_flags); + l_res = new_r_Proj(l_sub, l_mode, pn_ia32_res); + flags = new_r_Proj(l_sub, mode_flags, pn_ia32_flags); h_res = new_bd_ia32_l_Sbb(dbg, block, sub_h, sign, flags, h_mode); resolve_call(call, l_res, h_res, current_ir_graph, block); return 1; } +#endif #define ID(x) new_id_from_chars(x, sizeof(x)-1) +static ir_entity *create_compiler_lib_entity(const char *name, ir_type *type) +{ + ir_type *glob = get_glob_type(); + ident *id = new_id_from_str(name); + ir_entity *entity; + + /* Hack: we need to know the type of runtime library we use. Strictly + speaking it's not the same as the object-file-format. But in practice + the following should be enough */ + if (be_gas_object_file_format == OBJECT_FILE_FORMAT_MACH_O + || be_gas_object_file_format == OBJECT_FILE_FORMAT_COFF) { + id = id_mangle3("___", id, ""); + } else { + id = id_mangle3("__", id, ""); + } + entity = new_entity(glob, id, type); + set_entity_visibility(entity, ir_visibility_local); + set_entity_ld_ident(entity, id); + return entity; +} + /** * Maps a Div. Change into a library call. */ static int map_Div(ir_node *call, void *ctx) { - ia32_intrinsic_env_t *env = ctx; + ia32_intrinsic_env_t *env = (ia32_intrinsic_env_t*)ctx; ir_type *method = get_Call_type(call); ir_mode *h_mode = get_type_mode(get_method_res_type(method, 1)); ir_node *ptr; @@ -691,19 +719,14 @@ static int map_Div(ir_node *call, void *ctx) /* 64bit signed Division */ ent = env->divdi3; if (ent == NULL) { - /* create library entity */ - ent = env->divdi3 = new_entity(get_glob_type(), ID("__divdi3"), method); - set_entity_visibility(ent, ir_visibility_external); - set_entity_ld_ident(ent, ID("__divdi3")); + ent = env->divdi3 = create_compiler_lib_entity("divdi3", method); } } else { /* 64bit unsigned Division */ ent = env->udivdi3; if (ent == NULL) { /* create library entity */ - ent = env->udivdi3 = new_entity(get_glob_type(), ID("__udivdi3"), method); - set_entity_visibility(ent, ir_visibility_external); - set_entity_ld_ident(ent, ID("__udivdi3")); + ent = env->udivdi3 = create_compiler_lib_entity("udivdi3", method); } } @@ -720,7 +743,7 @@ static int map_Div(ir_node *call, void *ctx) */ static int map_Mod(ir_node *call, void *ctx) { - ia32_intrinsic_env_t *env = ctx; + ia32_intrinsic_env_t *env = (ia32_intrinsic_env_t*)ctx; ir_type *method = get_Call_type(call); ir_mode *h_mode = get_type_mode(get_method_res_type(method, 1)); ir_node *ptr; @@ -733,18 +756,14 @@ static int map_Mod(ir_node *call, void *ctx) ent = env->moddi3; if (ent == NULL) { /* create library entity */ - ent = env->moddi3 = new_entity(get_glob_type(), ID("__moddi3"), method); - set_entity_visibility(ent, ir_visibility_external); - set_entity_ld_ident(ent, ID("__moddi3")); + ent = env->moddi3 = create_compiler_lib_entity("moddi3", method); } } else { /* 64bit signed Modulo */ ent = env->umoddi3; if (ent == NULL) { /* create library entity */ - ent = env->umoddi3 = new_entity(get_glob_type(), ID("__umoddi3"), method); - set_entity_visibility(ent, ir_visibility_external); - set_entity_ld_ident(ent, ID("__umoddi3")); + ent = env->umoddi3 = create_compiler_lib_entity("umoddi3", method); } } @@ -784,36 +803,35 @@ static int map_Conv(ir_node *call, void *ctx) /* convert from float to signed 64bit */ float_to_ll = new_bd_ia32_l_FloattoLL(dbg, block, a_f); - l_res = new_r_Proj(block, float_to_ll, l_res_mode, - pn_ia32_l_FloattoLL_res_low); - h_res = new_r_Proj(block, float_to_ll, h_res_mode, + l_res = new_r_Proj(float_to_ll, l_res_mode, + pn_ia32_l_FloattoLL_res_low); + h_res = new_r_Proj(float_to_ll, h_res_mode, pn_ia32_l_FloattoLL_res_high); } else { /* convert from float to signed 64bit */ - ir_mode *flt_mode = get_irn_mode(a_f); - tarval *flt_tv = new_tarval_from_str("9223372036854775808", 19, flt_mode); - ir_node *flt_corr = new_Const(flt_tv); - ir_node *lower_blk = block; - ir_node *upper_blk; - ir_node *cmp, *proj, *cond, *blk, *int_phi, *flt_phi; - ir_node *in[2]; + ir_mode *flt_mode = get_irn_mode(a_f); + ir_tarval *flt_tv = new_tarval_from_str("9223372036854775808", 19, flt_mode); + ir_node *flt_corr = new_r_Const(irg, flt_tv); + ir_node *lower_blk = block; + ir_node *upper_blk; + ir_node *cmp, *proj, *cond, *blk, *int_phi, *flt_phi; + ir_node *in[2]; part_block(call); upper_blk = get_nodes_block(call); - cmp = new_rd_Cmp(dbg, upper_blk, a_f, flt_corr); - proj = new_r_Proj(upper_blk, cmp, mode_b, pn_Cmp_Lt); - cond = new_rd_Cond(dbg, upper_blk, proj); - in[0] = new_r_Proj(upper_blk, cond, mode_X, pn_Cond_true); - in[1] = new_r_Proj(upper_blk, cond, mode_X, pn_Cond_false); + cmp = new_rd_Cmp(dbg, upper_blk, a_f, flt_corr, ir_relation_less); + cond = new_rd_Cond(dbg, upper_blk, cmp); + in[0] = new_r_Proj(cond, mode_X, pn_Cond_true); + in[1] = new_r_Proj(cond, mode_X, pn_Cond_false); blk = new_r_Block(irg, 1, &in[1]); in[1] = new_r_Jmp(blk); set_irn_in(lower_blk, 2, in); /* create to Phis */ - in[0] = new_Const(get_mode_null(h_res_mode)); - in[1] = new_Const_long(h_res_mode, 0x80000000); + in[0] = new_r_Const(irg, get_mode_null(h_res_mode)); + in[1] = new_r_Const_long(irg, h_res_mode, 0x80000000); int_phi = new_r_Phi(lower_blk, 2, in, h_res_mode); @@ -829,9 +847,9 @@ static int map_Conv(ir_node *call, void *ctx) float_to_ll = new_bd_ia32_l_FloattoLL(dbg, lower_blk, flt_phi); - l_res = new_r_Proj(lower_blk, float_to_ll, l_res_mode, + l_res = new_r_Proj(float_to_ll, l_res_mode, pn_ia32_l_FloattoLL_res_low); - h_res = new_r_Proj(lower_blk, float_to_ll, h_res_mode, + h_res = new_r_Proj(float_to_ll, h_res_mode, pn_ia32_l_FloattoLL_res_high); h_res = new_rd_Add(dbg, lower_blk, h_res, int_phi, h_res_mode); @@ -839,8 +857,10 @@ static int map_Conv(ir_node *call, void *ctx) /* move the call and its Proj's to the lower block */ set_nodes_block(call, lower_blk); - for (proj = get_irn_link(call); proj != NULL; proj = get_irn_link(proj)) + for (proj = (ir_node*)get_irn_link(call); proj != NULL; + proj = (ir_node*)get_irn_link(proj)) { set_nodes_block(proj, lower_blk); + } block = lower_blk; } /* lower the call */ @@ -908,10 +928,6 @@ ir_entity *ia32_create_intrinsic_fkt(ir_type *method, const ir_op *op, ent = &i_ents[iro_Minus]; mapper = map_Minus; break; - case iro_Abs: - ent = &i_ents[iro_Abs]; - mapper = map_Abs; - break; case iro_Div: ent = &i_ents[iro_Div]; mapper = map_Div;