X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_transform.c;h=a61c536c51704ef0f9908ba91d75abf59068e285;hb=6ab332253afe6aaf5cb5db61adf575c3bfb30042;hp=9f5b820f6277221c4aa77b02bbe95c64a47eb207;hpb=4001b2d9dc732ba616cf5584cc149f056b59c8b5;p=libfirm diff --git a/ir/be/ia32/ia32_transform.c b/ir/be/ia32/ia32_transform.c index 9f5b820f6..a61c536c5 100644 --- a/ir/be/ia32/ia32_transform.c +++ b/ir/be/ia32/ia32_transform.c @@ -45,20 +45,15 @@ #include "irprintf.h" #include "debug.h" #include "irdom.h" -#include "type.h" -#include "entity.h" -#include "archop.h" /* we need this for Min and Max nodes */ +#include "archop.h" #include "error.h" -#include "cgana.h" -#include "irouts.h" -#include "trouts.h" -#include "irhooks.h" #include "../benode_t.h" #include "../besched.h" #include "../beabi.h" #include "../beutil.h" #include "../beirg_t.h" +#include "../betranshlp.h" #include "bearch_ia32_t.h" #include "ia32_nodes_attr.h" @@ -91,15 +86,8 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) -typedef struct ia32_transform_env_t { - ir_graph *irg; /**< The irg, the node should be created in */ - ia32_code_gen_t *cg; /**< The code generator */ - int visited; /**< visited count that indicates whether a - node is already transformed */ - pdeq *worklist; /**< worklist of nodes that still need to be - transformed */ - ir_node **old_anchors;/**< the list of anchors nodes in the old irg*/ -} ia32_transform_env_t; +/** holdd the current code generator during transformation */ +static ia32_code_gen_t *env_cg; extern ir_op *get_op_Mulh(void); @@ -107,12 +95,14 @@ typedef ir_node *construct_binop_func(dbg_info *db, ir_graph *irg, ir_node *block, ir_node *base, ir_node *index, ir_node *op1, ir_node *op2, ir_node *mem); +typedef ir_node *construct_binop_float_func(dbg_info *db, ir_graph *irg, + ir_node *block, ir_node *base, ir_node *index, ir_node *op1, + ir_node *op2, ir_node *mem, ir_node *fpcw); + typedef ir_node *construct_unop_func(dbg_info *db, ir_graph *irg, ir_node *block, ir_node *base, ir_node *index, ir_node *op, ir_node *mem); -typedef ir_node *(transform_func)(ia32_transform_env_t *env, ir_node *node); - /**************************************************************************************************** * _ _ __ _ _ * | | | | / _| | | (_) @@ -123,30 +113,18 @@ typedef ir_node *(transform_func)(ia32_transform_env_t *env, ir_node *node); * ****************************************************************************************************/ -static ir_node *duplicate_node(ia32_transform_env_t *env, ir_node *node); -static ir_node *transform_node(ia32_transform_env_t *env, ir_node *node); -static void duplicate_deps(ia32_transform_env_t *env, ir_node *old_node, - ir_node *new_node); +static ir_node *try_create_Immediate(ir_node *node, + char immediate_constraint_type); -static INLINE int mode_needs_gp_reg(ir_mode *mode) -{ +/** + * Return true if a mode can be stored in the GP register set + */ +static INLINE int mode_needs_gp_reg(ir_mode *mode) { if(mode == mode_fpcw) return 0; - return mode_is_int(mode) || mode_is_character(mode) || mode_is_reference(mode); } -static INLINE void set_new_node(ir_node *old_node, ir_node *new_node) -{ - set_irn_link(old_node, new_node); -} - -static INLINE ir_node *get_new_node(ir_node *old_node) -{ - assert(irn_visited(old_node)); - return (ir_node*) get_irn_link(old_node); -} - /** * Returns 1 if irn is a Const representing 0, 0 otherwise */ @@ -220,6 +198,7 @@ static ir_type *get_prim_type(pmap *types, ir_mode *mode) char buf[64]; snprintf(buf, sizeof(buf), "prim_type_%s", get_mode_name(mode)); res = new_type_primitive(new_id_from_str(buf), mode); + set_type_alignment_bytes(res, 16); pmap_insert(types, mode, res); } else @@ -265,24 +244,38 @@ static ir_entity *get_entity_for_tv(ia32_code_gen_t *cg, ir_node *cnst) return res; } +static int is_Const_0(ir_node *node) { + if(!is_Const(node)) + return 0; + + return classify_Const(node) == CNST_NULL; +} + +static int is_Const_1(ir_node *node) { + if(!is_Const(node)) + return 0; + + return classify_Const(node) == CNST_ONE; +} + /** * Transforms a Const. */ -static ir_node *gen_Const(ia32_transform_env_t *env, ir_node *node) { - ir_graph *irg = env->irg; - ir_node *block = transform_node(env, get_nodes_block(node)); +static ir_node *gen_Const(ir_node *node) { + ir_graph *irg = current_ir_graph; + ir_node *block = be_transform_node(get_nodes_block(node)); dbg_info *dbgi = get_irn_dbg_info(node); ir_mode *mode = get_irn_mode(node); if (mode_is_float(mode)) { ir_node *res = NULL; - ir_node *noreg = ia32_new_NoReg_gp(env->cg); + ir_node *noreg = ia32_new_NoReg_gp(env_cg); ir_node *nomem = new_NoMem(); ir_node *load; ir_entity *floatent; - FP_USED(env->cg); - if (! USE_SSE2(env->cg)) { + FP_USED(env_cg); + if (! USE_SSE2(env_cg)) { cnst_classify_t clss = classify_Const(node); if (clss == CNST_NULL) { @@ -292,10 +285,9 @@ static ir_node *gen_Const(ia32_transform_env_t *env, ir_node *node) { load = new_rd_ia32_vfld1(dbgi, irg, block); res = load; } else { - floatent = get_entity_for_tv(env->cg, node); + floatent = get_entity_for_tv(env_cg, node); - load = new_rd_ia32_vfld(dbgi, irg, block, noreg, noreg, nomem); - set_ia32_am_support(load, ia32_am_Source); + load = new_rd_ia32_vfld(dbgi, irg, block, noreg, noreg, nomem, mode); set_ia32_op_type(load, ia32_AddrModeS); set_ia32_am_flavour(load, ia32_am_N); set_ia32_am_sc(load, floatent); @@ -303,10 +295,9 @@ static ir_node *gen_Const(ia32_transform_env_t *env, ir_node *node) { } set_ia32_ls_mode(load, mode); } else { - floatent = get_entity_for_tv(env->cg, node); + floatent = get_entity_for_tv(env_cg, node); load = new_rd_ia32_xLoad(dbgi, irg, block, noreg, noreg, nomem); - set_ia32_am_support(load, ia32_am_Source); set_ia32_op_type(load, ia32_AddrModeS); set_ia32_am_flavour(load, ia32_am_N); set_ia32_am_sc(load, floatent); @@ -315,16 +306,18 @@ static ir_node *gen_Const(ia32_transform_env_t *env, ir_node *node) { res = new_r_Proj(irg, block, load, mode_xmm, pn_ia32_xLoad_res); } - SET_IA32_ORIG_NODE(load, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(load, ia32_get_old_node_name(env_cg, node)); /* Const Nodes before the initial IncSP are a bad idea, because - * they could be spilled and we have no SP ready at that point yet + * they could be spilled and we have no SP ready at that point yet. + * So add a dependency to the initial frame pointer calculation to + * avoid that situation. */ if (get_irg_start_block(irg) == block) { add_irn_dep(load, get_irg_frame(irg)); } - SET_IA32_ORIG_NODE(load, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(load, ia32_get_old_node_name(env_cg, node)); return res; } else { ir_node *cnst = new_rd_ia32_Const(dbgi, irg, block); @@ -335,7 +328,7 @@ static ir_node *gen_Const(ia32_transform_env_t *env, ir_node *node) { } set_ia32_Const_attr(cnst, node); - SET_IA32_ORIG_NODE(cnst, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(cnst, ia32_get_old_node_name(env_cg, node)); return cnst; } @@ -346,20 +339,21 @@ static ir_node *gen_Const(ia32_transform_env_t *env, ir_node *node) { /** * Transforms a SymConst. */ -static ir_node *gen_SymConst(ia32_transform_env_t *env, ir_node *node) { - ir_graph *irg = env->irg; - ir_node *block = transform_node(env, get_nodes_block(node)); +static ir_node *gen_SymConst(ir_node *node) { + ir_graph *irg = current_ir_graph; + ir_node *block = be_transform_node(get_nodes_block(node)); dbg_info *dbgi = get_irn_dbg_info(node); ir_mode *mode = get_irn_mode(node); ir_node *cnst; if (mode_is_float(mode)) { - FP_USED(env->cg); - if (USE_SSE2(env->cg)) + FP_USED(env_cg); + if (USE_SSE2(env_cg)) cnst = new_rd_ia32_xConst(dbgi, irg, block); else cnst = new_rd_ia32_vfConst(dbgi, irg, block); - set_ia32_ls_mode(cnst, mode); + //set_ia32_ls_mode(cnst, mode); + set_ia32_ls_mode(cnst, mode_E); } else { cnst = new_rd_ia32_Const(dbgi, irg, block); } @@ -372,52 +366,11 @@ static ir_node *gen_SymConst(ia32_transform_env_t *env, ir_node *node) { } set_ia32_Const_attr(cnst, node); - SET_IA32_ORIG_NODE(cnst, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(cnst, ia32_get_old_node_name(env_cg, node)); return cnst; } -/** - * SSE convert of an integer node into a floating point node. - */ -static ir_node *gen_sse_conv_int2float(ia32_code_gen_t *cg, dbg_info *dbgi, - ir_graph *irg, ir_node *block, - ir_node *in, ir_node *old_node, ir_mode *tgt_mode) -{ - ir_node *noreg = ia32_new_NoReg_gp(cg); - ir_node *nomem = new_rd_NoMem(irg); - ir_node *old_pred = get_Cmp_left(old_node); - ir_mode *in_mode = get_irn_mode(old_pred); - int in_bits = get_mode_size_bits(in_mode); - ir_node *conv = new_rd_ia32_Conv_I2FP(dbgi, irg, block, noreg, noreg, in, nomem); - - set_ia32_ls_mode(conv, tgt_mode); - if (in_bits == 32) { - set_ia32_am_support(conv, ia32_am_Source); - } - SET_IA32_ORIG_NODE(conv, ia32_get_old_node_name(cg, old_node)); - - return conv; -} - -/** - * SSE convert of an float node into a double node. - */ -static ir_node *gen_sse_conv_f2d(ia32_code_gen_t *cg, dbg_info *dbgi, - ir_graph *irg, ir_node *block, - ir_node *in, ir_node *old_node) -{ - ir_node *noreg = ia32_new_NoReg_gp(cg); - ir_node *nomem = new_rd_NoMem(irg); - ir_node *conv = new_rd_ia32_Conv_FP2FP(dbgi, irg, block, noreg, noreg, in, nomem); - - set_ia32_am_support(conv, ia32_am_Source); - set_ia32_ls_mode(conv, mode_xmm); - SET_IA32_ORIG_NODE(conv, ia32_get_old_node_name(cg, old_node)); - - return conv; -} - /* Generates an entity for a known FP const (used for FP Neg + Abs) */ ir_entity *ia32_gen_fp_known_const(ia32_known_const_t kct) { static const struct { @@ -499,11 +452,11 @@ static ir_node *get_expr_op(ir_node *op1, ir_node *op2) { return !is_ia32_Cnst(op1) ? op1 : (!is_ia32_Cnst(op2) ? op2 : NULL); } -static void fold_immediate(ia32_transform_env_t *env, ir_node *node, int in1, int in2) { +static void fold_immediate(ir_node *node, int in1, int in2) { ir_node *left; ir_node *right; - if (! (env->cg->opt & IA32_OPT_IMMOPS)) + if (!(env_cg->opt & IA32_OPT_IMMOPS)) return; left = get_irn_n(node, in1); @@ -514,52 +467,72 @@ static void fold_immediate(ia32_transform_env_t *env, ir_node *node, int in1, in return; /* exchange left/right */ set_irn_n(node, in1, right); - set_irn_n(node, in2, ia32_get_admissible_noreg(env->cg, node, in2)); + set_irn_n(node, in2, ia32_get_admissible_noreg(env_cg, node, in2)); copy_ia32_Immop_attr(node, left); } else if(is_ia32_Cnst(right)) { - set_irn_n(node, in2, ia32_get_admissible_noreg(env->cg, node, in2)); + set_irn_n(node, in2, ia32_get_admissible_noreg(env_cg, node, in2)); copy_ia32_Immop_attr(node, right); } else { return; } - set_ia32_am_support(node, get_ia32_am_support(node) & ~ia32_am_Source); + clear_ia32_commutative(node); + set_ia32_am_support(node, get_ia32_am_support(node) & ~ia32_am_Source, + get_ia32_am_arity(node)); } /** * Construct a standard binary operation, set AM and immediate if required. * - * @param env The transformation environment * @param op1 The first operand * @param op2 The second operand * @param func The node constructor function * @return The constructed ia32 node. */ -static ir_node *gen_binop(ia32_transform_env_t *env, ir_node *node, - ir_node *op1, ir_node *op2, - construct_binop_func *func) +static ir_node *gen_binop(ir_node *node, ir_node *op1, ir_node *op2, + construct_binop_func *func, int commutative) { - ir_node *block = transform_node(env, get_nodes_block(node)); - ir_node *new_op1 = transform_node(env, op1); - ir_node *new_op2 = transform_node(env, op2); + ir_node *block = be_transform_node(get_nodes_block(node)); + ir_node *new_op1 = NULL; + ir_node *new_op2 = NULL; ir_node *new_node = NULL; - ir_graph *irg = env->irg; + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); - ir_node *noreg_gp = ia32_new_NoReg_gp(env->cg); + ir_node *noreg_gp = ia32_new_NoReg_gp(env_cg); ir_node *nomem = new_NoMem(); + if(commutative) { + new_op2 = try_create_Immediate(op1, 0); + if(new_op2 != NULL) { + new_op1 = be_transform_node(op2); + commutative = 0; + } + } + + if(new_op2 == NULL) { + new_op2 = try_create_Immediate(op2, 0); + if(new_op2 != NULL) { + new_op1 = be_transform_node(op1); + commutative = 0; + } + } + + if(new_op2 == NULL) { + new_op1 = be_transform_node(op1); + new_op2 = be_transform_node(op2); + } + new_node = func(dbgi, irg, block, noreg_gp, noreg_gp, new_op1, new_op2, nomem); if (func == new_rd_ia32_IMul) { - set_ia32_am_support(new_node, ia32_am_Source); + set_ia32_am_support(new_node, ia32_am_Source, ia32_am_binary); } else { - set_ia32_am_support(new_node, ia32_am_Full); + set_ia32_am_support(new_node, ia32_am_Full, ia32_am_binary); } - SET_IA32_ORIG_NODE(new_node, ia32_get_old_node_name(env->cg, node)); - if (is_op_commutative(get_irn_op(node))) { + SET_IA32_ORIG_NODE(new_node, ia32_get_old_node_name(env_cg, node)); + if (commutative) { set_ia32_commutative(new_node); } - fold_immediate(env, new_node, 2, 3); return new_node; } @@ -567,61 +540,95 @@ static ir_node *gen_binop(ia32_transform_env_t *env, ir_node *node, /** * Construct a standard binary operation, set AM and immediate if required. * - * @param env The transformation environment * @param op1 The first operand * @param op2 The second operand * @param func The node constructor function * @return The constructed ia32 node. */ -static ir_node *gen_binop_float(ia32_transform_env_t *env, ir_node *node, - ir_node *op1, ir_node *op2, - construct_binop_func *func) +static ir_node *gen_binop_sse_float(ir_node *node, ir_node *op1, ir_node *op2, + construct_binop_func *func) { - ir_node *block = transform_node(env, get_nodes_block(node)); - ir_node *new_op1 = transform_node(env, op1); - ir_node *new_op2 = transform_node(env, op2); + ir_node *block = be_transform_node(get_nodes_block(node)); + ir_node *new_op1 = be_transform_node(op1); + ir_node *new_op2 = be_transform_node(op2); ir_node *new_node = NULL; dbg_info *dbgi = get_irn_dbg_info(node); - ir_graph *irg = env->irg; + ir_graph *irg = current_ir_graph; ir_mode *mode = get_irn_mode(node); - ir_node *noreg_gp = ia32_new_NoReg_gp(env->cg); + ir_node *noreg_gp = ia32_new_NoReg_gp(env_cg); ir_node *nomem = new_NoMem(); - new_node = func(dbgi, irg, block, noreg_gp, noreg_gp, new_op1, new_op2, nomem); - set_ia32_am_support(new_node, ia32_am_Source); + new_node = func(dbgi, irg, block, noreg_gp, noreg_gp, new_op1, new_op2, + nomem); + set_ia32_am_support(new_node, ia32_am_Source, ia32_am_binary); if (is_op_commutative(get_irn_op(node))) { set_ia32_commutative(new_node); } - if (USE_SSE2(env->cg)) { + if (USE_SSE2(env_cg)) { set_ia32_ls_mode(new_node, mode); } - SET_IA32_ORIG_NODE(new_node, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(new_node, ia32_get_old_node_name(env_cg, node)); return new_node; } +/** + * Construct a standard binary operation, set AM and immediate if required. + * + * @param op1 The first operand + * @param op2 The second operand + * @param func The node constructor function + * @return The constructed ia32 node. + */ +static ir_node *gen_binop_x87_float(ir_node *node, ir_node *op1, ir_node *op2, + construct_binop_float_func *func) +{ + ir_node *block = be_transform_node(get_nodes_block(node)); + ir_node *new_op1 = be_transform_node(op1); + ir_node *new_op2 = be_transform_node(op2); + ir_node *new_node = NULL; + dbg_info *dbgi = get_irn_dbg_info(node); + ir_graph *irg = current_ir_graph; + ir_mode *mode = get_irn_mode(node); + ir_node *noreg_gp = ia32_new_NoReg_gp(env_cg); + ir_node *nomem = new_NoMem(); + ir_node *fpcw = be_abi_get_ignore_irn(env_cg->birg->abi, + &ia32_fp_cw_regs[REG_FPCW]); + + new_node = func(dbgi, irg, block, noreg_gp, noreg_gp, new_op1, new_op2, + nomem, fpcw); + set_ia32_am_support(new_node, ia32_am_Source, ia32_am_binary); + if (is_op_commutative(get_irn_op(node))) { + set_ia32_commutative(new_node); + } + if (USE_SSE2(env_cg)) { + set_ia32_ls_mode(new_node, mode); + } + + SET_IA32_ORIG_NODE(new_node, ia32_get_old_node_name(env_cg, node)); + + return new_node; +} /** * Construct a shift/rotate binary operation, sets AM and immediate if required. * - * @param env The transformation environment * @param op1 The first operand * @param op2 The second operand * @param func The node constructor function * @return The constructed ia32 node. */ -static ir_node *gen_shift_binop(ia32_transform_env_t *env, ir_node *node, - ir_node *op1, ir_node *op2, +static ir_node *gen_shift_binop(ir_node *node, ir_node *op1, ir_node *op2, construct_binop_func *func) { - ir_node *block = transform_node(env, get_nodes_block(node)); - ir_node *new_op1 = transform_node(env, op1); - ir_node *new_op2 = transform_node(env, op2); + ir_node *block = be_transform_node(get_nodes_block(node)); + ir_node *new_op1 = be_transform_node(op1); + ir_node *new_op2 = be_transform_node(op2); ir_node *new_op = NULL; dbg_info *dbgi = get_irn_dbg_info(node); - ir_graph *irg = env->irg; - ir_node *noreg = ia32_new_NoReg_gp(env->cg); + ir_graph *irg = current_ir_graph; + ir_node *noreg = ia32_new_NoReg_gp(env_cg); ir_node *nomem = new_NoMem(); ir_node *expr_op; ir_node *imm_op; @@ -632,7 +639,7 @@ static ir_node *gen_shift_binop(ia32_transform_env_t *env, ir_node *node, /* Check if immediate optimization is on and */ /* if it's an operation with immediate. */ - imm_op = (env->cg->opt & IA32_OPT_IMMOPS) ? get_immediate_op(NULL, new_op2) : NULL; + imm_op = (env_cg->opt & IA32_OPT_IMMOPS) ? get_immediate_op(NULL, new_op2) : NULL; expr_op = get_expr_op(new_op1, new_op2); assert((expr_op || imm_op) && "invalid operands"); @@ -669,9 +676,9 @@ static ir_node *gen_shift_binop(ia32_transform_env_t *env, ir_node *node, } /* set AM support */ - set_ia32_am_support(new_op, ia32_am_Dest); + set_ia32_am_support(new_op, ia32_am_Dest, ia32_am_binary); - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node)); set_ia32_emit_cl(new_op); @@ -682,65 +689,61 @@ static ir_node *gen_shift_binop(ia32_transform_env_t *env, ir_node *node, /** * Construct a standard unary operation, set AM and immediate if required. * - * @param env The transformation environment * @param op The operand * @param func The node constructor function * @return The constructed ia32 node. */ -static ir_node *gen_unop(ia32_transform_env_t *env, ir_node *node, ir_node *op, - construct_unop_func *func) +static ir_node *gen_unop(ir_node *node, ir_node *op, construct_unop_func *func) { - ir_node *block = transform_node(env, get_nodes_block(node)); - ir_node *new_op = transform_node(env, op); + ir_node *block = be_transform_node(get_nodes_block(node)); + ir_node *new_op = be_transform_node(op); ir_node *new_node = NULL; - ir_graph *irg = env->irg; + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); - ir_node *noreg = ia32_new_NoReg_gp(env->cg); + ir_node *noreg = ia32_new_NoReg_gp(env_cg); ir_node *nomem = new_NoMem(); new_node = func(dbgi, irg, block, noreg, noreg, new_op, nomem); DB((dbg, LEVEL_1, "INT unop ...")); - set_ia32_am_support(new_node, ia32_am_Dest); + set_ia32_am_support(new_node, ia32_am_Dest, ia32_am_unary); - SET_IA32_ORIG_NODE(new_node, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(new_node, ia32_get_old_node_name(env_cg, node)); return new_node; } - /** * Creates an ia32 Add. * - * @param env The transformation environment * @return the created ia32 Add node */ -static ir_node *gen_Add(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); +static ir_node *gen_Add(ir_node *node) { + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *op1 = get_Add_left(node); - ir_node *new_op1 = transform_node(env, op1); + ir_node *new_op1 = be_transform_node(op1); ir_node *op2 = get_Add_right(node); - ir_node *new_op2 = transform_node(env, op2); + ir_node *new_op2 = be_transform_node(op2); ir_node *new_op = NULL; - ir_graph *irg = env->irg; + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); ir_mode *mode = get_irn_mode(node); - ir_node *noreg = ia32_new_NoReg_gp(env->cg); + ir_node *noreg = ia32_new_NoReg_gp(env_cg); ir_node *nomem = new_NoMem(); ir_node *expr_op, *imm_op; /* Check if immediate optimization is on and */ /* if it's an operation with immediate. */ - imm_op = (env->cg->opt & IA32_OPT_IMMOPS) ? get_immediate_op(new_op1, new_op2) : NULL; + imm_op = (env_cg->opt & IA32_OPT_IMMOPS) ? get_immediate_op(new_op1, new_op2) : NULL; expr_op = get_expr_op(new_op1, new_op2); assert((expr_op || imm_op) && "invalid operands"); if (mode_is_float(mode)) { - FP_USED(env->cg); - if (USE_SSE2(env->cg)) - return gen_binop_float(env, node, op1, op2, new_rd_ia32_xAdd); + FP_USED(env_cg); + if (USE_SSE2(env_cg)) + return gen_binop_sse_float(node, op1, op2, new_rd_ia32_xAdd); else - return gen_binop_float(env, node, op1, op2, new_rd_ia32_vfadd); + return gen_binop_x87_float(node, op1, op2, new_rd_ia32_vfadd); } /* integer ADD */ @@ -760,8 +763,7 @@ static ir_node *gen_Add(ia32_transform_env_t *env, ir_node *node) { /* this is the 2nd case */ new_op = new_rd_ia32_Lea(dbgi, irg, block, new_op1, noreg); set_ia32_am_sc(new_op, get_ia32_Immop_symconst(new_op2)); - set_ia32_am_flavour(new_op, ia32_am_OB); - set_ia32_am_support(new_op, ia32_am_Source); + set_ia32_am_flavour(new_op, ia32_am_B); set_ia32_op_type(new_op, ia32_AddrModeS); DBG_OPT_LEA3(new_op1, new_op2, node, new_op); @@ -770,24 +772,24 @@ static ir_node *gen_Add(ia32_transform_env_t *env, ir_node *node) { long offs = get_tarval_long(tv); new_op = new_rd_ia32_Lea(dbgi, irg, block, noreg, noreg); + add_irn_dep(new_op, get_irg_frame(irg)); DBG_OPT_LEA3(new_op1, new_op2, node, new_op); set_ia32_am_sc(new_op, get_ia32_Immop_symconst(new_op1)); add_ia32_am_offs_int(new_op, offs); - set_ia32_am_flavour(new_op, ia32_am_O); - set_ia32_am_support(new_op, ia32_am_Source); + set_ia32_am_flavour(new_op, ia32_am_OB); set_ia32_op_type(new_op, ia32_AddrModeS); } else if (tp2 == ia32_ImmSymConst) { tarval *tv = get_ia32_Immop_tarval(new_op1); long offs = get_tarval_long(tv); new_op = new_rd_ia32_Lea(dbgi, irg, block, noreg, noreg); + add_irn_dep(new_op, get_irg_frame(irg)); DBG_OPT_LEA3(new_op1, new_op2, node, new_op); add_ia32_am_offs_int(new_op, offs); set_ia32_am_sc(new_op, get_ia32_Immop_symconst(new_op2)); - set_ia32_am_flavour(new_op, ia32_am_O); - set_ia32_am_support(new_op, ia32_am_Source); + set_ia32_am_flavour(new_op, ia32_am_OB); set_ia32_op_type(new_op, ia32_AddrModeS); } else { tarval *tv1 = get_ia32_Immop_tarval(new_op1); @@ -801,10 +803,10 @@ static ir_node *gen_Add(ia32_transform_env_t *env, ir_node *node) { DBG_OPT_LEA3(new_op1, new_op2, node, new_op); } - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node)); return new_op; } else if (imm_op) { - if ((env->cg->opt & IA32_OPT_INCDEC) && get_ia32_immop_type(imm_op) == ia32_ImmConst) { + if ((env_cg->opt & IA32_OPT_INCDEC) && get_ia32_immop_type(imm_op) == ia32_ImmConst) { tarval_classification_t class_tv, class_negtv; tarval *tv = get_ia32_Immop_tarval(imm_op); @@ -815,12 +817,12 @@ static ir_node *gen_Add(ia32_transform_env_t *env, ir_node *node) { if (class_tv == TV_CLASSIFY_ONE) { /* + 1 == INC */ DB((dbg, LEVEL_2, "Add(1) to Inc ... ")); new_op = new_rd_ia32_Inc(dbgi, irg, block, noreg, noreg, expr_op, nomem); - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node)); return new_op; } else if (class_tv == TV_CLASSIFY_ALL_ONE || class_negtv == TV_CLASSIFY_ONE) { /* + (-1) == DEC */ DB((dbg, LEVEL_2, "Add(-1) to Dec ... ")); new_op = new_rd_ia32_Dec(dbgi, irg, block, noreg, noreg, expr_op, nomem); - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node)); return new_op; } } @@ -830,32 +832,32 @@ static ir_node *gen_Add(ia32_transform_env_t *env, ir_node *node) { new_op = new_rd_ia32_Add(dbgi, irg, block, noreg, noreg, new_op1, new_op2, nomem); /* set AM support */ - set_ia32_am_support(new_op, ia32_am_Full); + set_ia32_am_support(new_op, ia32_am_Full, ia32_am_binary); set_ia32_commutative(new_op); - fold_immediate(env, new_op, 2, 3); + fold_immediate(new_op, 2, 3); - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node)); return new_op; } #if 0 -static ir_node *create_ia32_Mul(ia32_transform_env_t *env, ir_node *node) { - ir_graph *irg = env->irg; +static ir_node *create_ia32_Mul(ir_node *node) { + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); - ir_node *block = transform_node(env, get_nodes_block(node)); + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *op1 = get_Mul_left(node); ir_node *op2 = get_Mul_right(node); - ir_node *new_op1 = transform_node(env, op1); - ir_node *new_op2 = transform_node(env, op2); - ir_node *noreg = ia32_new_NoReg_gp(env->cg); + ir_node *new_op1 = be_transform_node(op1); + ir_node *new_op2 = be_transform_node(op2); + ir_node *noreg = ia32_new_NoReg_gp(env_cg); ir_node *proj_EAX, *proj_EDX, *res; ir_node *in[1]; res = new_rd_ia32_Mul(dbgi, irg, block, noreg, noreg, new_op1, new_op2, new_NoMem()); set_ia32_commutative(res); - set_ia32_am_support(res, ia32_am_Source); + set_ia32_am_support(res, ia32_am_Source | ia32_am_binary); /* imediates are not supported, so no fold_immediate */ proj_EAX = new_rd_Proj(dbgi, irg, block, res, mode_Iu, pn_EAX); @@ -873,20 +875,19 @@ static ir_node *create_ia32_Mul(ia32_transform_env_t *env, ir_node *node) { /** * Creates an ia32 Mul. * - * @param env The transformation environment * @return the created ia32 Mul node */ -static ir_node *gen_Mul(ia32_transform_env_t *env, ir_node *node) { +static ir_node *gen_Mul(ir_node *node) { ir_node *op1 = get_Mul_left(node); ir_node *op2 = get_Mul_right(node); ir_mode *mode = get_irn_mode(node); if (mode_is_float(mode)) { - FP_USED(env->cg); - if (USE_SSE2(env->cg)) - return gen_binop_float(env, node, op1, op2, new_rd_ia32_xMul); + FP_USED(env_cg); + if (USE_SSE2(env_cg)) + return gen_binop_sse_float(node, op1, op2, new_rd_ia32_xMul); else - return gen_binop_float(env, node, op1, op2, new_rd_ia32_vfmul); + return gen_binop_x87_float(node, op1, op2, new_rd_ia32_vfmul); } /* @@ -894,7 +895,7 @@ static ir_node *gen_Mul(ia32_transform_env_t *env, ir_node *node) { signed or unsigned multiplication so we use IMul as it has fewer constraints */ - return gen_binop(env, node, op1, op2, new_rd_ia32_IMul); + return gen_binop(node, op1, op2, new_rd_ia32_IMul, 1); } /** @@ -902,18 +903,17 @@ static ir_node *gen_Mul(ia32_transform_env_t *env, ir_node *node) { * Note: Mul produces a 64Bit result and Mulh returns the upper 32 bit of * this result while Mul returns the lower 32 bit. * - * @param env The transformation environment * @return the created ia32 Mulh node */ -static ir_node *gen_Mulh(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); +static ir_node *gen_Mulh(ir_node *node) { + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *op1 = get_irn_n(node, 0); - ir_node *new_op1 = transform_node(env, op1); + ir_node *new_op1 = be_transform_node(op1); ir_node *op2 = get_irn_n(node, 1); - ir_node *new_op2 = transform_node(env, op2); - ir_graph *irg = env->irg; + ir_node *new_op2 = be_transform_node(op2); + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); - ir_node *noreg = ia32_new_NoReg_gp(env->cg); + ir_node *noreg = ia32_new_NoReg_gp(env_cg); ir_mode *mode = get_irn_mode(node); ir_node *proj_EAX, *proj_EDX, *res; ir_node *in[1]; @@ -926,9 +926,7 @@ static ir_node *gen_Mulh(ia32_transform_env_t *env, ir_node *node) { } set_ia32_commutative(res); - set_ia32_am_support(res, ia32_am_Source); - - set_ia32_am_support(res, ia32_am_Source); + set_ia32_am_support(res, ia32_am_Source, ia32_am_binary); proj_EAX = new_rd_Proj(dbgi, irg, block, res, mode_Iu, pn_EAX); proj_EDX = new_rd_Proj(dbgi, irg, block, res, mode_Iu, pn_EDX); @@ -945,15 +943,14 @@ static ir_node *gen_Mulh(ia32_transform_env_t *env, ir_node *node) { /** * Creates an ia32 And. * - * @param env The transformation environment * @return The created ia32 And node */ -static ir_node *gen_And(ia32_transform_env_t *env, ir_node *node) { +static ir_node *gen_And(ir_node *node) { ir_node *op1 = get_And_left(node); ir_node *op2 = get_And_right(node); assert (! mode_is_float(get_irn_mode(node))); - return gen_binop(env, node, op1, op2, new_rd_ia32_And); + return gen_binop(node, op1, op2, new_rd_ia32_And, 1); } @@ -961,15 +958,14 @@ static ir_node *gen_And(ia32_transform_env_t *env, ir_node *node) { /** * Creates an ia32 Or. * - * @param env The transformation environment * @return The created ia32 Or node */ -static ir_node *gen_Or(ia32_transform_env_t *env, ir_node *node) { +static ir_node *gen_Or(ir_node *node) { ir_node *op1 = get_Or_left(node); ir_node *op2 = get_Or_right(node); assert (! mode_is_float(get_irn_mode(node))); - return gen_binop(env, node, op1, op2, new_rd_ia32_Or); + return gen_binop(node, op1, op2, new_rd_ia32_Or, 1); } @@ -977,15 +973,14 @@ static ir_node *gen_Or(ia32_transform_env_t *env, ir_node *node) { /** * Creates an ia32 Eor. * - * @param env The transformation environment * @return The created ia32 Eor node */ -static ir_node *gen_Eor(ia32_transform_env_t *env, ir_node *node) { +static ir_node *gen_Eor(ir_node *node) { ir_node *op1 = get_Eor_left(node); ir_node *op2 = get_Eor_right(node); assert(! mode_is_float(get_irn_mode(node))); - return gen_binop(env, node, op1, op2, new_rd_ia32_Xor); + return gen_binop(node, op1, op2, new_rd_ia32_Xor, 1); } @@ -993,16 +988,15 @@ static ir_node *gen_Eor(ia32_transform_env_t *env, ir_node *node) { /** * Creates an ia32 Max. * - * @param env The transformation environment * @return the created ia32 Max node */ -static ir_node *gen_Max(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); +static ir_node *gen_Max(ir_node *node) { + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *op1 = get_irn_n(node, 0); - ir_node *new_op1 = transform_node(env, op1); + ir_node *new_op1 = be_transform_node(op1); ir_node *op2 = get_irn_n(node, 1); - ir_node *new_op2 = transform_node(env, op2); - ir_graph *irg = env->irg; + ir_node *new_op2 = be_transform_node(op2); + ir_graph *irg = current_ir_graph; ir_mode *mode = get_irn_mode(node); dbg_info *dbgi = get_irn_dbg_info(node); ir_mode *op_mode = get_irn_mode(op1); @@ -1011,9 +1005,9 @@ static ir_node *gen_Max(ia32_transform_env_t *env, ir_node *node) { assert(get_mode_size_bits(mode) == 32); if (mode_is_float(mode)) { - FP_USED(env->cg); - if (USE_SSE2(env->cg)) { - new_op = gen_binop_float(env, node, new_op1, new_op2, new_rd_ia32_xMax); + FP_USED(env_cg); + if (USE_SSE2(env_cg)) { + new_op = gen_binop_sse_float(node, new_op1, new_op2, new_rd_ia32_xMax); } else { panic("Can't create Max node"); } @@ -1022,11 +1016,10 @@ static ir_node *gen_Max(ia32_transform_env_t *env, ir_node *node) { if (! mode_is_signed(op_mode)) { pnc |= ia32_pn_Cmp_Unsigned; } - new_op = new_rd_ia32_CmpCMov(dbgi, irg, block, new_op1, new_op2, new_op1, new_op2); - set_ia32_pncode(new_op, pnc); - set_ia32_am_support(new_op, ia32_am_None); + new_op = new_rd_ia32_CmpCMov(dbgi, irg, block, new_op1, new_op2, + new_op1, new_op2, pnc); } - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node)); return new_op; } @@ -1034,16 +1027,15 @@ static ir_node *gen_Max(ia32_transform_env_t *env, ir_node *node) { /** * Creates an ia32 Min. * - * @param env The transformation environment * @return the created ia32 Min node */ -static ir_node *gen_Min(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); +static ir_node *gen_Min(ir_node *node) { + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *op1 = get_irn_n(node, 0); - ir_node *new_op1 = transform_node(env, op1); + ir_node *new_op1 = be_transform_node(op1); ir_node *op2 = get_irn_n(node, 1); - ir_node *new_op2 = transform_node(env, op2); - ir_graph *irg = env->irg; + ir_node *new_op2 = be_transform_node(op2); + ir_graph *irg = current_ir_graph; ir_mode *mode = get_irn_mode(node); dbg_info *dbgi = get_irn_dbg_info(node); ir_mode *op_mode = get_irn_mode(op1); @@ -1052,9 +1044,9 @@ static ir_node *gen_Min(ia32_transform_env_t *env, ir_node *node) { assert(get_mode_size_bits(mode) == 32); if (mode_is_float(mode)) { - FP_USED(env->cg); - if (USE_SSE2(env->cg)) { - new_op = gen_binop_float(env, node, op1, op2, new_rd_ia32_xMin); + FP_USED(env_cg); + if (USE_SSE2(env_cg)) { + new_op = gen_binop_sse_float(node, op1, op2, new_rd_ia32_xMin); } else { panic("can't create Min node"); } @@ -1063,11 +1055,10 @@ static ir_node *gen_Min(ia32_transform_env_t *env, ir_node *node) { if (! mode_is_signed(op_mode)) { pnc |= ia32_pn_Cmp_Unsigned; } - new_op = new_rd_ia32_CmpCMov(dbgi, irg, block, new_op1, new_op2, new_op1, new_op2); - set_ia32_pncode(new_op, pnc); - set_ia32_am_support(new_op, ia32_am_None); + new_op = new_rd_ia32_CmpCMov(dbgi, irg, block, new_op1, new_op2, + new_op1, new_op2, pnc); } - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node)); return new_op; } @@ -1076,36 +1067,35 @@ static ir_node *gen_Min(ia32_transform_env_t *env, ir_node *node) { /** * Creates an ia32 Sub. * - * @param env The transformation environment * @return The created ia32 Sub node */ -static ir_node *gen_Sub(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); +static ir_node *gen_Sub(ir_node *node) { + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *op1 = get_Sub_left(node); - ir_node *new_op1 = transform_node(env, op1); + ir_node *new_op1 = be_transform_node(op1); ir_node *op2 = get_Sub_right(node); - ir_node *new_op2 = transform_node(env, op2); + ir_node *new_op2 = be_transform_node(op2); ir_node *new_op = NULL; - ir_graph *irg = env->irg; + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); ir_mode *mode = get_irn_mode(node); - ir_node *noreg = ia32_new_NoReg_gp(env->cg); + ir_node *noreg = ia32_new_NoReg_gp(env_cg); ir_node *nomem = new_NoMem(); ir_node *expr_op, *imm_op; /* Check if immediate optimization is on and */ /* if it's an operation with immediate. */ - imm_op = (env->cg->opt & IA32_OPT_IMMOPS) ? get_immediate_op(NULL, new_op2) : NULL; + imm_op = (env_cg->opt & IA32_OPT_IMMOPS) ? get_immediate_op(NULL, new_op2) : NULL; expr_op = get_expr_op(new_op1, new_op2); assert((expr_op || imm_op) && "invalid operands"); if (mode_is_float(mode)) { - FP_USED(env->cg); - if (USE_SSE2(env->cg)) - return gen_binop_float(env, node, op1, op2, new_rd_ia32_xSub); + FP_USED(env_cg); + if (USE_SSE2(env_cg)) + return gen_binop_sse_float(node, op1, op2, new_rd_ia32_xSub); else - return gen_binop_float(env, node, op1, op2, new_rd_ia32_vfsub); + return gen_binop_x87_float(node, op1, op2, new_rd_ia32_vfsub); } /* integer SUB */ @@ -1125,7 +1115,7 @@ static ir_node *gen_Sub(ia32_transform_env_t *env, ir_node *node) { new_op = new_rd_ia32_Lea(dbgi, irg, block, new_op1, noreg); set_ia32_am_sc(new_op, get_ia32_Immop_symconst(op2)); set_ia32_am_sc_sign(new_op); - set_ia32_am_flavour(new_op, ia32_am_OB); + set_ia32_am_flavour(new_op, ia32_am_B); DBG_OPT_LEA3(op1, op2, node, new_op); } else if (tp1 == ia32_ImmSymConst) { @@ -1133,25 +1123,25 @@ static ir_node *gen_Sub(ia32_transform_env_t *env, ir_node *node) { long offs = get_tarval_long(tv); new_op = new_rd_ia32_Lea(dbgi, irg, block, noreg, noreg); + add_irn_dep(new_op, get_irg_frame(irg)); DBG_OPT_LEA3(op1, op2, node, new_op); set_ia32_am_sc(new_op, get_ia32_Immop_symconst(new_op1)); add_ia32_am_offs_int(new_op, -offs); - set_ia32_am_flavour(new_op, ia32_am_O); - set_ia32_am_support(new_op, ia32_am_Source); + set_ia32_am_flavour(new_op, ia32_am_OB); set_ia32_op_type(new_op, ia32_AddrModeS); } else if (tp2 == ia32_ImmSymConst) { tarval *tv = get_ia32_Immop_tarval(new_op1); long offs = get_tarval_long(tv); new_op = new_rd_ia32_Lea(dbgi, irg, block, noreg, noreg); + add_irn_dep(new_op, get_irg_frame(irg)); DBG_OPT_LEA3(op1, op2, node, new_op); add_ia32_am_offs_int(new_op, offs); set_ia32_am_sc(new_op, get_ia32_Immop_symconst(new_op2)); set_ia32_am_sc_sign(new_op); - set_ia32_am_flavour(new_op, ia32_am_O); - set_ia32_am_support(new_op, ia32_am_Source); + set_ia32_am_flavour(new_op, ia32_am_OB); set_ia32_op_type(new_op, ia32_AddrModeS); } else { tarval *tv1 = get_ia32_Immop_tarval(new_op1); @@ -1165,10 +1155,10 @@ static ir_node *gen_Sub(ia32_transform_env_t *env, ir_node *node) { DBG_OPT_LEA3(new_op1, new_op2, node, new_op); } - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node)); return new_op; } else if (imm_op) { - if ((env->cg->opt & IA32_OPT_INCDEC) && get_ia32_immop_type(imm_op) == ia32_ImmConst) { + if ((env_cg->opt & IA32_OPT_INCDEC) && get_ia32_immop_type(imm_op) == ia32_ImmConst) { tarval_classification_t class_tv, class_negtv; tarval *tv = get_ia32_Immop_tarval(imm_op); @@ -1179,12 +1169,12 @@ static ir_node *gen_Sub(ia32_transform_env_t *env, ir_node *node) { if (class_tv == TV_CLASSIFY_ONE) { DB((dbg, LEVEL_2, "Sub(1) to Dec ... ")); new_op = new_rd_ia32_Dec(dbgi, irg, block, noreg, noreg, expr_op, nomem); - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node)); return new_op; } else if (class_tv == TV_CLASSIFY_ALL_ONE || class_negtv == TV_CLASSIFY_ONE) { DB((dbg, LEVEL_2, "Sub(-1) to Inc ... ")); new_op = new_rd_ia32_Inc(dbgi, irg, block, noreg, noreg, expr_op, nomem); - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node)); return new_op; } } @@ -1194,11 +1184,11 @@ static ir_node *gen_Sub(ia32_transform_env_t *env, ir_node *node) { new_op = new_rd_ia32_Sub(dbgi, irg, block, noreg, noreg, new_op1, new_op2, nomem); /* set AM support */ - set_ia32_am_support(new_op, ia32_am_Full); + set_ia32_am_support(new_op, ia32_am_Full, ia32_am_binary); - fold_immediate(env, new_op, 2, 3); + fold_immediate(new_op, 2, 3); - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node)); return new_op; } @@ -1209,55 +1199,56 @@ static ir_node *gen_Sub(ia32_transform_env_t *env, ir_node *node) { * Generates an ia32 DivMod with additional infrastructure for the * register allocator if needed. * - * @param env The transformation environment * @param dividend -no comment- :) * @param divisor -no comment- :) * @param dm_flav flavour_Div/Mod/DivMod * @return The created ia32 DivMod node */ -static ir_node *generate_DivMod(ia32_transform_env_t *env, ir_node *node, - ir_node *dividend, ir_node *divisor, - ia32_op_flavour_t dm_flav) +static ir_node *generate_DivMod(ir_node *node, ir_node *dividend, + ir_node *divisor, ia32_op_flavour_t dm_flav) { - ir_node *block = transform_node(env, get_nodes_block(node)); - ir_node *new_dividend = transform_node(env, dividend); - ir_node *new_divisor = transform_node(env, divisor); - ir_graph *irg = env->irg; + ir_node *block = be_transform_node(get_nodes_block(node)); + ir_node *new_dividend = be_transform_node(dividend); + ir_node *new_divisor = be_transform_node(divisor); + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); ir_mode *mode = get_irn_mode(node); - ir_node *noreg = ia32_new_NoReg_gp(env->cg); + ir_node *noreg = ia32_new_NoReg_gp(env_cg); ir_node *res, *proj_div, *proj_mod; ir_node *edx_node, *cltd; ir_node *in_keep[2]; ir_node *mem, *new_mem; ir_node *projs[pn_DivMod_max]; - int i; + int i, has_exc; ia32_collect_Projs(node, projs, pn_DivMod_max); - proj_div = NULL; - proj_mod = NULL; + proj_div = proj_mod = NULL; + has_exc = 0; switch (dm_flav) { case flavour_Div: mem = get_Div_mem(node); mode = get_Div_resmode(node); proj_div = be_get_Proj_for_pn(node, pn_Div_res); + has_exc = be_get_Proj_for_pn(node, pn_Div_X_except) != NULL; break; case flavour_Mod: mem = get_Mod_mem(node); mode = get_Mod_resmode(node); proj_mod = be_get_Proj_for_pn(node, pn_Mod_res); + has_exc = be_get_Proj_for_pn(node, pn_Mod_X_except) != NULL; break; case flavour_DivMod: mem = get_DivMod_mem(node); mode = get_DivMod_resmode(node); proj_div = be_get_Proj_for_pn(node, pn_DivMod_res_div); proj_mod = be_get_Proj_for_pn(node, pn_DivMod_res_mod); + has_exc = be_get_Proj_for_pn(node, pn_DivMod_X_except) != NULL; break; default: panic("invalid divmod flavour!"); } - new_mem = transform_node(env, mem); + new_mem = be_transform_node(mem); if (mode_is_signed(mode)) { /* in signed mode, we need to sign extend the dividend */ @@ -1266,7 +1257,7 @@ static ir_node *generate_DivMod(ia32_transform_env_t *env, ir_node *node, edx_node = new_rd_Proj(dbgi, irg, block, cltd, mode_Iu, pn_ia32_Cltd_EDX); } else { edx_node = new_rd_ia32_Const(dbgi, irg, block); - add_irn_dep(edx_node, be_abi_get_start_barrier(env->cg->birg->abi)); + add_irn_dep(edx_node, be_abi_get_start_barrier(env_cg->birg->abi)); set_ia32_Immop_tarval(edx_node, get_tarval_null(mode_Iu)); } @@ -1276,14 +1267,15 @@ static ir_node *generate_DivMod(ia32_transform_env_t *env, ir_node *node, res = new_rd_ia32_Div(dbgi, irg, block, noreg, noreg, new_dividend, edx_node, new_divisor, new_mem, dm_flav); } + set_ia32_exc_label(res, has_exc); + set_irn_pinned(res, get_irn_pinned(node)); + /* Matze: code can't handle this at the moment... */ #if 0 /* set AM support */ - set_ia32_am_support(res, ia32_am_Source); + set_ia32_am_support(res, ia32_am_Source | ia32_am_binary); #endif - set_ia32_n_res(res, 2); - /* check, which Proj-Keep, we need to add */ i = 0; if (proj_div == NULL) { @@ -1299,7 +1291,7 @@ static ir_node *generate_DivMod(ia32_transform_env_t *env, ir_node *node, if(i > 0) be_new_Keep(&ia32_reg_classes[CLASS_ia32_gp], irg, block, i, in_keep); - SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node)); return res; } @@ -1308,28 +1300,26 @@ static ir_node *generate_DivMod(ia32_transform_env_t *env, ir_node *node, /** * Wrapper for generate_DivMod. Sets flavour_Mod. * - * @param env The transformation environment */ -static ir_node *gen_Mod(ia32_transform_env_t *env, ir_node *node) { - return generate_DivMod(env, node, get_Mod_left(node), +static ir_node *gen_Mod(ir_node *node) { + return generate_DivMod(node, get_Mod_left(node), get_Mod_right(node), flavour_Mod); } /** * Wrapper for generate_DivMod. Sets flavour_Div. * - * @param env The transformation environment */ -static ir_node *gen_Div(ia32_transform_env_t *env, ir_node *node) { - return generate_DivMod(env, node, get_Div_left(node), +static ir_node *gen_Div(ir_node *node) { + return generate_DivMod(node, get_Div_left(node), get_Div_right(node), flavour_Div); } /** * Wrapper for generate_DivMod. Sets flavour_DivMod. */ -static ir_node *gen_DivMod(ia32_transform_env_t *env, ir_node *node) { - return generate_DivMod(env, node, get_DivMod_left(node), +static ir_node *gen_DivMod(ir_node *node) { + return generate_DivMod(node, get_DivMod_left(node), get_DivMod_right(node), flavour_DivMod); } @@ -1338,40 +1328,42 @@ static ir_node *gen_DivMod(ia32_transform_env_t *env, ir_node *node) { /** * Creates an ia32 floating Div. * - * @param env The transformation environment * @return The created ia32 xDiv node */ -static ir_node *gen_Quot(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); +static ir_node *gen_Quot(ir_node *node) { + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *op1 = get_Quot_left(node); - ir_node *new_op1 = transform_node(env, op1); + ir_node *new_op1 = be_transform_node(op1); ir_node *op2 = get_Quot_right(node); - ir_node *new_op2 = transform_node(env, op2); - ir_graph *irg = env->irg; + ir_node *new_op2 = be_transform_node(op2); + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); - ir_node *noreg = ia32_new_NoReg_gp(env->cg); - ir_node *nomem = new_rd_NoMem(env->irg); + ir_node *noreg = ia32_new_NoReg_gp(env_cg); + ir_node *nomem = new_rd_NoMem(current_ir_graph); ir_node *new_op; - FP_USED(env->cg); - if (USE_SSE2(env->cg)) { + FP_USED(env_cg); + if (USE_SSE2(env_cg)) { ir_mode *mode = get_irn_mode(op1); if (is_ia32_xConst(new_op2)) { new_op = new_rd_ia32_xDiv(dbgi, irg, block, noreg, noreg, new_op1, noreg, nomem); - set_ia32_am_support(new_op, ia32_am_None); + set_ia32_am_support(new_op, ia32_am_None, ia32_am_arity_none); copy_ia32_Immop_attr(new_op, new_op2); } else { new_op = new_rd_ia32_xDiv(dbgi, irg, block, noreg, noreg, new_op1, new_op2, nomem); // Matze: disabled for now, spillslot coalescer fails - //set_ia32_am_support(new_op, ia32_am_Source); + //set_ia32_am_support(new_op, ia32_am_Source | ia32_am_binary); } set_ia32_ls_mode(new_op, mode); } else { - new_op = new_rd_ia32_vfdiv(dbgi, irg, block, noreg, noreg, new_op1, new_op2, nomem); + ir_node *fpcw = be_abi_get_ignore_irn(env_cg->birg->abi, + &ia32_fp_cw_regs[REG_FPCW]); + new_op = new_rd_ia32_vfdiv(dbgi, irg, block, noreg, noreg, new_op1, + new_op2, nomem, fpcw); // Matze: disabled for now (spillslot coalescer fails) - //set_ia32_am_support(new_op, ia32_am_Source); + //set_ia32_am_support(new_op, ia32_am_Source | ia32_am_binary); } - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node)); return new_op; } @@ -1379,11 +1371,10 @@ static ir_node *gen_Quot(ia32_transform_env_t *env, ir_node *node) { /** * Creates an ia32 Shl. * - * @param env The transformation environment * @return The created ia32 Shl node */ -static ir_node *gen_Shl(ia32_transform_env_t *env, ir_node *node) { - return gen_shift_binop(env, node, get_Shl_left(node), get_Shl_right(node), +static ir_node *gen_Shl(ir_node *node) { + return gen_shift_binop(node, get_Shl_left(node), get_Shl_right(node), new_rd_ia32_Shl); } @@ -1392,11 +1383,10 @@ static ir_node *gen_Shl(ia32_transform_env_t *env, ir_node *node) { /** * Creates an ia32 Shr. * - * @param env The transformation environment * @return The created ia32 Shr node */ -static ir_node *gen_Shr(ia32_transform_env_t *env, ir_node *node) { - return gen_shift_binop(env, node, get_Shr_left(node), +static ir_node *gen_Shr(ir_node *node) { + return gen_shift_binop(node, get_Shr_left(node), get_Shr_right(node), new_rd_ia32_Shr); } @@ -1405,11 +1395,10 @@ static ir_node *gen_Shr(ia32_transform_env_t *env, ir_node *node) { /** * Creates an ia32 Sar. * - * @param env The transformation environment * @return The created ia32 Shrs node */ -static ir_node *gen_Shrs(ia32_transform_env_t *env, ir_node *node) { - return gen_shift_binop(env, node, get_Shrs_left(node), +static ir_node *gen_Shrs(ir_node *node) { + return gen_shift_binop(node, get_Shrs_left(node), get_Shrs_right(node), new_rd_ia32_Sar); } @@ -1418,14 +1407,13 @@ static ir_node *gen_Shrs(ia32_transform_env_t *env, ir_node *node) { /** * Creates an ia32 RotL. * - * @param env The transformation environment * @param op1 The first operator * @param op2 The second operator * @return The created ia32 RotL node */ -static ir_node *gen_RotL(ia32_transform_env_t *env, ir_node *node, +static ir_node *gen_RotL(ir_node *node, ir_node *op1, ir_node *op2) { - return gen_shift_binop(env, node, op1, op2, new_rd_ia32_Rol); + return gen_shift_binop(node, op1, op2, new_rd_ia32_Rol); } @@ -1435,14 +1423,13 @@ static ir_node *gen_RotL(ia32_transform_env_t *env, ir_node *node, * NOTE: There is no RotR with immediate because this would always be a RotL * "imm-mode_size_bits" which can be pre-calculated. * - * @param env The transformation environment * @param op1 The first operator * @param op2 The second operator * @return The created ia32 RotR node */ -static ir_node *gen_RotR(ia32_transform_env_t *env, ir_node *node, ir_node *op1, +static ir_node *gen_RotR(ir_node *node, ir_node *op1, ir_node *op2) { - return gen_shift_binop(env, node, op1, op2, new_rd_ia32_Ror); + return gen_shift_binop(node, op1, op2, new_rd_ia32_Ror); } @@ -1450,10 +1437,9 @@ static ir_node *gen_RotR(ia32_transform_env_t *env, ir_node *node, ir_node *op1, /** * Creates an ia32 RotR or RotL (depending on the found pattern). * - * @param env The transformation environment * @return The created ia32 RotL or RotR node */ -static ir_node *gen_Rot(ia32_transform_env_t *env, ir_node *node) { +static ir_node *gen_Rot(ir_node *node) { ir_node *rotate = NULL; ir_node *op1 = get_Rot_left(node); ir_node *op2 = get_Rot_right(node); @@ -1476,13 +1462,13 @@ static ir_node *gen_Rot(ia32_transform_env_t *env, ir_node *node) { get_tarval_long(tv) == bits) { DB((dbg, LEVEL_1, "RotL into RotR ... ")); - rotate = gen_RotR(env, node, op1, get_Minus_op(left)); + rotate = gen_RotR(node, op1, get_Minus_op(left)); } } } if (rotate == NULL) { - rotate = gen_RotL(env, node, op1, op2); + rotate = gen_RotL(node, op1, op2); } return rotate; @@ -1493,13 +1479,12 @@ static ir_node *gen_Rot(ia32_transform_env_t *env, ir_node *node) { /** * Transforms a Minus node. * - * @param env The transformation environment * @param op The Minus operand * @return The created ia32 Minus node */ -ir_node *gen_Minus_ex(ia32_transform_env_t *env, ir_node *node, ir_node *op) { - ir_node *block = transform_node(env, get_nodes_block(node)); - ir_graph *irg = env->irg; +ir_node *gen_Minus_ex(ir_node *node, ir_node *op) { + ir_node *block = be_transform_node(get_nodes_block(node)); + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); ir_mode *mode = get_irn_mode(node); ir_entity *ent; @@ -1507,11 +1492,11 @@ ir_node *gen_Minus_ex(ia32_transform_env_t *env, ir_node *node, ir_node *op) { int size; if (mode_is_float(mode)) { - ir_node *new_op = transform_node(env, op); - FP_USED(env->cg); - if (USE_SSE2(env->cg)) { - ir_node *noreg_gp = ia32_new_NoReg_gp(env->cg); - ir_node *noreg_fp = ia32_new_NoReg_fp(env->cg); + ir_node *new_op = be_transform_node(op); + FP_USED(env_cg); + if (USE_SSE2(env_cg)) { + ir_node *noreg_gp = ia32_new_NoReg_gp(env_cg); + ir_node *noreg_fp = ia32_new_NoReg_fp(env_cg); ir_node *nomem = new_rd_NoMem(irg); res = new_rd_ia32_xXor(dbgi, irg, block, noreg_gp, noreg_gp, new_op, noreg_fp, nomem); @@ -1526,10 +1511,10 @@ ir_node *gen_Minus_ex(ia32_transform_env_t *env, ir_node *node, ir_node *op) { res = new_rd_ia32_vfchs(dbgi, irg, block, new_op); } } else { - res = gen_unop(env, node, op, new_rd_ia32_Neg); + res = gen_unop(node, op, new_rd_ia32_Neg); } - SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node)); return res; } @@ -1537,25 +1522,23 @@ ir_node *gen_Minus_ex(ia32_transform_env_t *env, ir_node *node, ir_node *op) { /** * Transforms a Minus node. * - * @param env The transformation environment * @return The created ia32 Minus node */ -static ir_node *gen_Minus(ia32_transform_env_t *env, ir_node *node) { - return gen_Minus_ex(env, node, get_Minus_op(node)); +static ir_node *gen_Minus(ir_node *node) { + return gen_Minus_ex(node, get_Minus_op(node)); } /** * Transforms a Not node. * - * @param env The transformation environment * @return The created ia32 Not node */ -static ir_node *gen_Not(ia32_transform_env_t *env, ir_node *node) { +static ir_node *gen_Not(ir_node *node) { ir_node *op = get_Not_op(node); assert (! mode_is_float(get_irn_mode(node))); - return gen_unop(env, node, op, new_rd_ia32_Not); + return gen_unop(node, op, new_rd_ia32_Not); } @@ -1563,26 +1546,25 @@ static ir_node *gen_Not(ia32_transform_env_t *env, ir_node *node) { /** * Transforms an Abs node. * - * @param env The transformation environment * @return The created ia32 Abs node */ -static ir_node *gen_Abs(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); +static ir_node *gen_Abs(ir_node *node) { + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *op = get_Abs_op(node); - ir_node *new_op = transform_node(env, op); - ir_graph *irg = env->irg; + ir_node *new_op = be_transform_node(op); + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); ir_mode *mode = get_irn_mode(node); - ir_node *noreg_gp = ia32_new_NoReg_gp(env->cg); - ir_node *noreg_fp = ia32_new_NoReg_fp(env->cg); + ir_node *noreg_gp = ia32_new_NoReg_gp(env_cg); + ir_node *noreg_fp = ia32_new_NoReg_fp(env_cg); ir_node *nomem = new_NoMem(); ir_node *res, *p_eax, *p_edx; int size; ir_entity *ent; if (mode_is_float(mode)) { - FP_USED(env->cg); - if (USE_SSE2(env->cg)) { + FP_USED(env_cg); + if (USE_SSE2(env_cg)) { res = new_rd_ia32_xAnd(dbgi,irg, block, noreg_gp, noreg_gp, new_op, noreg_fp, nomem); size = get_mode_size_bits(mode); @@ -1590,28 +1572,28 @@ static ir_node *gen_Abs(ia32_transform_env_t *env, ir_node *node) { set_ia32_am_sc(res, ent); - SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node)); set_ia32_op_type(res, ia32_AddrModeS); set_ia32_ls_mode(res, mode); } else { res = new_rd_ia32_vfabs(dbgi, irg, block, new_op); - SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node)); } } else { res = new_rd_ia32_Cltd(dbgi, irg, block, new_op); - SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node)); p_eax = new_rd_Proj(dbgi, irg, block, res, mode_Iu, pn_EAX); p_edx = new_rd_Proj(dbgi, irg, block, res, mode_Iu, pn_EDX); res = new_rd_ia32_Xor(dbgi, irg, block, noreg_gp, noreg_gp, p_eax, p_edx, nomem); - SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node)); res = new_rd_ia32_Sub(dbgi, irg, block, noreg_gp, noreg_gp, res, p_edx, nomem); - SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node)); } return res; @@ -1622,19 +1604,19 @@ static ir_node *gen_Abs(ia32_transform_env_t *env, ir_node *node) { /** * Transforms a Load. * - * @param env The transformation environment * @return the created ia32 Load node */ -static ir_node *gen_Load(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); +static ir_node *gen_Load(ir_node *node) { + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *ptr = get_Load_ptr(node); - ir_node *new_ptr = transform_node(env, ptr); + ir_node *new_ptr = be_transform_node(ptr); ir_node *mem = get_Load_mem(node); - ir_node *new_mem = transform_node(env, mem); - ir_graph *irg = env->irg; + ir_node *new_mem = be_transform_node(mem); + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); - ir_node *noreg = ia32_new_NoReg_gp(env->cg); + ir_node *noreg = ia32_new_NoReg_gp(env_cg); ir_mode *mode = get_Load_mode(node); + ir_mode *res_mode; ir_node *lptr = new_ptr; int is_imm = 0; ir_node *new_op; @@ -1643,16 +1625,6 @@ static ir_node *gen_Load(ia32_transform_env_t *env, ir_node *node) { ia32_collect_Projs(node, projs, pn_Load_max); - /* - check for special case: the loaded value might not be used (optimized, volatile, ...) - we add a Proj + Keep for volatile loads and ignore all other cases - */ - if (! be_get_Proj_for_pn(node, pn_Load_res) && get_Load_volatility(node) == volatility_is_volatile) { - /* add a result proj and a Keep to produce a pseudo use */ - ir_node *proj = new_r_Proj(irg, block, node, mode_Iu, pn_ia32_Load_res); - be_new_Keep(arch_get_irn_reg_class(env->cg->arch_env, proj, -1), irg, block, 1, &proj); - } - /* address might be a constant (symconst or absolute address) */ if (is_ia32_Const(new_ptr)) { lptr = noreg; @@ -1660,14 +1632,27 @@ static ir_node *gen_Load(ia32_transform_env_t *env, ir_node *node) { } if (mode_is_float(mode)) { - FP_USED(env->cg); - if (USE_SSE2(env->cg)) { - new_op = new_rd_ia32_xLoad(dbgi, irg, block, lptr, noreg, new_mem); + FP_USED(env_cg); + if (USE_SSE2(env_cg)) { + new_op = new_rd_ia32_xLoad(dbgi, irg, block, lptr, noreg, new_mem); + res_mode = mode_xmm; } else { - new_op = new_rd_ia32_vfld(dbgi, irg, block, lptr, noreg, new_mem); + new_op = new_rd_ia32_vfld(dbgi, irg, block, lptr, noreg, new_mem, mode); + res_mode = mode_vfp; } } else { - new_op = new_rd_ia32_Load(dbgi, irg, block, lptr, noreg, new_mem); + new_op = new_rd_ia32_Load(dbgi, irg, block, lptr, noreg, new_mem); + res_mode = mode_Iu; + } + + /* + check for special case: the loaded value might not be used + */ + if (be_get_Proj_for_pn(node, pn_Load_res) == NULL) { + /* add a result proj and a Keep to produce a pseudo use */ + ir_node *proj = new_r_Proj(irg, block, new_op, mode_Iu, + pn_ia32_Load_res); + be_new_Keep(arch_get_irn_reg_class(env_cg->arch_env, proj, -1), irg, block, 1, &proj); } /* base is a constant address */ @@ -1684,7 +1669,7 @@ static ir_node *gen_Load(ia32_transform_env_t *env, ir_node *node) { } } - set_ia32_am_support(new_op, ia32_am_Source); + set_irn_pinned(new_op, get_irn_pinned(node)); set_ia32_op_type(new_op, ia32_AddrModeS); set_ia32_am_flavour(new_op, am_flav); set_ia32_ls_mode(new_op, mode); @@ -1696,7 +1681,8 @@ static ir_node *gen_Load(ia32_transform_env_t *env, ir_node *node) { add_irn_dep(new_op, get_irg_frame(irg)); } - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); + set_ia32_exc_label(new_op, be_get_Proj_for_pn(node, pn_Load_X_except) != NULL); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node)); return new_op; } @@ -1706,20 +1692,19 @@ static ir_node *gen_Load(ia32_transform_env_t *env, ir_node *node) { /** * Transforms a Store. * - * @param env The transformation environment * @return the created ia32 Store node */ -static ir_node *gen_Store(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); +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 = transform_node(env, ptr); + ir_node *new_ptr = be_transform_node(ptr); ir_node *val = get_Store_value(node); - ir_node *new_val = transform_node(env, val); + ir_node *new_val = be_transform_node(val); ir_node *mem = get_Store_mem(node); - ir_node *new_mem = transform_node(env, mem); - ir_graph *irg = env->irg; + ir_node *new_mem = be_transform_node(mem); + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); - ir_node *noreg = ia32_new_NoReg_gp(env->cg); + ir_node *noreg = ia32_new_NoReg_gp(env_cg); ir_node *sptr = new_ptr; ir_mode *mode = get_irn_mode(val); ir_node *sval = new_val; @@ -1739,11 +1724,11 @@ static ir_node *gen_Store(ia32_transform_env_t *env, ir_node *node) { } if (mode_is_float(mode)) { - FP_USED(env->cg); - if (USE_SSE2(env->cg)) { + FP_USED(env_cg); + if (USE_SSE2(env_cg)) { new_op = new_rd_ia32_xStore(dbgi, irg, block, sptr, noreg, sval, new_mem); } else { - new_op = new_rd_ia32_vfst(dbgi, irg, block, sptr, noreg, sval, new_mem); + new_op = new_rd_ia32_vfst(dbgi, irg, block, sptr, noreg, sval, new_mem, mode); } } else if (get_mode_size_bits(mode) == 8) { new_op = new_rd_ia32_Store8Bit(dbgi, irg, block, sptr, noreg, sval, new_mem); @@ -1771,12 +1756,13 @@ static ir_node *gen_Store(ia32_transform_env_t *env, ir_node *node) { } } - set_ia32_am_support(new_op, ia32_am_Dest); + set_irn_pinned(new_op, get_irn_pinned(node)); set_ia32_op_type(new_op, ia32_AddrModeD); set_ia32_am_flavour(new_op, am_flav); set_ia32_ls_mode(new_op, mode); - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); + set_ia32_exc_label(new_op, be_get_Proj_for_pn(node, pn_Store_X_except) != NULL); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node)); return new_op; } @@ -1786,25 +1772,24 @@ static ir_node *gen_Store(ia32_transform_env_t *env, ir_node *node) { /** * Transforms a Cond -> Proj[b] -> Cmp into a CondJmp, CondJmp_i or TestJmp * - * @param env The transformation environment * @return The transformed node. */ -static ir_node *gen_Cond(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); - ir_graph *irg = env->irg; +static ir_node *gen_Cond(ir_node *node) { + ir_node *block = be_transform_node(get_nodes_block(node)); + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); ir_node *sel = get_Cond_selector(node); ir_mode *sel_mode = get_irn_mode(sel); ir_node *res = NULL; - ir_node *noreg = ia32_new_NoReg_gp(env->cg); + ir_node *noreg = ia32_new_NoReg_gp(env_cg); ir_node *cnst, *expr; if (is_Proj(sel) && sel_mode == mode_b) { ir_node *pred = get_Proj_pred(sel); ir_node *cmp_a = get_Cmp_left(pred); - ir_node *new_cmp_a = transform_node(env, cmp_a); + ir_node *new_cmp_a = be_transform_node(cmp_a); ir_node *cmp_b = get_Cmp_right(pred); - ir_node *new_cmp_b = transform_node(env, cmp_b); + ir_node *new_cmp_b = be_transform_node(cmp_b); ir_mode *cmp_mode = get_irn_mode(cmp_a); ir_node *nomem = new_NoMem(); @@ -1814,7 +1799,7 @@ static ir_node *gen_Cond(ia32_transform_env_t *env, ir_node *node) { } /* check if we can use a CondJmp with immediate */ - cnst = (env->cg->opt & IA32_OPT_IMMOPS) ? get_immediate_op(new_cmp_a, new_cmp_b) : NULL; + cnst = (env_cg->opt & IA32_OPT_IMMOPS) ? get_immediate_op(new_cmp_a, new_cmp_b) : NULL; expr = get_expr_op(new_cmp_a, new_cmp_b); if (cnst != NULL && expr != NULL) { @@ -1846,14 +1831,14 @@ static ir_node *gen_Cond(ia32_transform_env_t *env, ir_node *node) { copy_ia32_Immop_attr(res, expr); } - SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node)); return res; } } if (mode_is_float(cmp_mode)) { - FP_USED(env->cg); - if (USE_SSE2(env->cg)) { + FP_USED(env_cg); + if (USE_SSE2(env_cg)) { res = new_rd_ia32_xCondJmp(dbgi, irg, block, noreg, noreg, expr, noreg, nomem); set_ia32_ls_mode(res, cmp_mode); } else { @@ -1870,8 +1855,8 @@ static ir_node *gen_Cond(ia32_transform_env_t *env, ir_node *node) { ir_mode *cmp_mode = get_irn_mode(cmp_a); if (mode_is_float(cmp_mode)) { - FP_USED(env->cg); - if (USE_SSE2(env->cg)) { + FP_USED(env_cg); + if (USE_SSE2(env_cg)) { res = new_rd_ia32_xCondJmp(dbgi, irg, block, noreg, noreg, cmp_a, cmp_b, nomem); set_ia32_ls_mode(res, cmp_mode); } else { @@ -1893,11 +1878,11 @@ static ir_node *gen_Cond(ia32_transform_env_t *env, ir_node *node) { // is not able to detect the mode of the spilled value // moreover, the lea optimize phase freely exchanges left/right // without updating the pnc - //set_ia32_am_support(res, ia32_am_Source); + //set_ia32_am_support(res, ia32_am_Source | ia32_am_binary); } else { /* determine the smallest switch case value */ - ir_node *new_sel = transform_node(env, sel); + ir_node *new_sel = be_transform_node(sel); int switch_min = INT_MAX; const ir_edge_t *edge; @@ -1909,10 +1894,9 @@ static ir_node *gen_Cond(ia32_transform_env_t *env, ir_node *node) { if (switch_min) { /* if smallest switch case is not 0 we need an additional sub */ res = new_rd_ia32_Lea(dbgi, irg, block, new_sel, noreg); - SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node)); add_ia32_am_offs_int(res, -switch_min); set_ia32_am_flavour(res, ia32_am_OB); - set_ia32_am_support(res, ia32_am_Source); set_ia32_op_type(res, ia32_AddrModeS); } @@ -1920,7 +1904,7 @@ static ir_node *gen_Cond(ia32_transform_env_t *env, ir_node *node) { set_ia32_pncode(res, get_Cond_defaultProj(node)); } - SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node)); return res; } @@ -1929,19 +1913,18 @@ static ir_node *gen_Cond(ia32_transform_env_t *env, ir_node *node) { /** * Transforms a CopyB node. * - * @param env The transformation environment * @return The transformed node. */ -static ir_node *gen_CopyB(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); +static ir_node *gen_CopyB(ir_node *node) { + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *src = get_CopyB_src(node); - ir_node *new_src = transform_node(env, src); + ir_node *new_src = be_transform_node(src); ir_node *dst = get_CopyB_dst(node); - ir_node *new_dst = transform_node(env, dst); + ir_node *new_dst = be_transform_node(dst); ir_node *mem = get_CopyB_mem(node); - ir_node *new_mem = transform_node(env, mem); + ir_node *new_mem = be_transform_node(mem); ir_node *res = NULL; - ir_graph *irg = env->irg; + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); int size = get_type_size_bytes(get_CopyB_type(node)); ir_mode *dst_mode = get_irn_mode(dst); @@ -1956,7 +1939,7 @@ static ir_node *gen_CopyB(ia32_transform_env_t *env, ir_node *node) { size >>= 2; res = new_rd_ia32_Const(dbgi, irg, block); - add_irn_dep(res, be_abi_get_start_barrier(env->cg->birg->abi)); + add_irn_dep(res, be_abi_get_start_barrier(env_cg->birg->abi)); set_ia32_Immop_tarval(res, new_tarval_from_long(size, mode_Is)); res = new_rd_ia32_CopyB(dbgi, irg, block, new_dst, new_src, res, new_mem); @@ -1978,24 +1961,36 @@ static ir_node *gen_CopyB(ia32_transform_env_t *env, ir_node *node) { be_new_Keep(&ia32_reg_classes[CLASS_ia32_gp], irg, block, 2, in); } - SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node)); return res; } +static +ir_node *gen_be_Copy(ir_node *node) +{ + ir_node *result = be_duplicate_node(node); + ir_mode *mode = get_irn_mode(result); + + if (mode_needs_gp_reg(mode)) { + set_irn_mode(result, mode_Iu); + } + + return result; +} + #if 0 /** * Transforms a Mux node into CMov. * - * @param env The transformation environment * @return The transformed node. */ -static ir_node *gen_Mux(ia32_transform_env_t *env, ir_node *node) { - ir_node *new_op = new_rd_ia32_CMov(env->dbgi, env->irg, env->block, \ - get_Mux_sel(node), get_Mux_false(node), get_Mux_true(node), env->mode); +static ir_node *gen_Mux(ir_node *node) { + ir_node *new_op = new_rd_ia32_CMov(env.dbgi, current_ir_graph, env.block, \ + get_Mux_sel(node), get_Mux_false(node), get_Mux_true(node), env.mode); - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node)); return new_op; } @@ -2008,160 +2003,81 @@ typedef ir_node *cmov_func_t(dbg_info *db, ir_graph *irg, ir_node *block, /** * Transforms a Psi node into CMov. * - * @param env The transformation environment * @return The transformed node. */ -static ir_node *gen_Psi(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); +static ir_node *gen_Psi(ir_node *node) { + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *psi_true = get_Psi_val(node, 0); - ir_node *new_psi_true = transform_node(env, psi_true); ir_node *psi_default = get_Psi_default(node); - ir_node *new_psi_default = transform_node(env, psi_default); - ia32_code_gen_t *cg = env->cg; - ir_graph *irg = env->irg; + ia32_code_gen_t *cg = env_cg; + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); - ir_mode *mode = get_irn_mode(node); - ir_node *cmp_proj = get_Mux_sel(node); - ir_node *noreg = ia32_new_NoReg_gp(cg); - ir_node *nomem = new_rd_NoMem(irg); - ir_node *cmp, *cmp_a, *cmp_b, *and1, *and2, *new_op = NULL; + ir_node *cond = get_Psi_cond(node, 0); + ir_node *noreg = ia32_new_NoReg_gp(env_cg); + ir_node *nomem = new_NoMem(); + ir_node *new_op; + ir_node *cmp, *cmp_a, *cmp_b; ir_node *new_cmp_a, *new_cmp_b; ir_mode *cmp_mode; - int pnc; - - assert(get_irn_mode(cmp_proj) == mode_b && "Condition for Psi must have mode_b"); - - cmp = get_Proj_pred(cmp_proj); - cmp_a = get_Cmp_left(cmp); - cmp_b = get_Cmp_right(cmp); - cmp_mode = get_irn_mode(cmp_a); - new_cmp_a = transform_node(env, cmp_a); - new_cmp_b = transform_node(env, cmp_b); - - pnc = get_Proj_proj(cmp_proj); - if (mode_is_float(cmp_mode) || !mode_is_signed(cmp_mode)) { - pnc |= ia32_pn_Cmp_Unsigned; - } - - if (mode_is_float(mode)) { - /* floating point psi */ - FP_USED(cg); - - /* 1st case: compare operands are float too */ - if (USE_SSE2(cg)) { - /* psi(cmp(a, b), t, f) can be done as: */ - /* tmp = cmp a, b */ - /* tmp2 = t and tmp */ - /* tmp3 = f and not tmp */ - /* res = tmp2 or tmp3 */ - - /* in case the compare operands are int, we move them into xmm register */ - if (! mode_is_float(get_irn_mode(cmp_a))) { - new_cmp_a = gen_sse_conv_int2float(cg, dbgi, irg, block, new_cmp_a, node, mode_xmm); - new_cmp_b = gen_sse_conv_int2float(cg, dbgi, irg, block, new_cmp_b, node, mode_xmm); - - pnc |= 8; /* transform integer compare to fp compare */ - } - - new_op = new_rd_ia32_xCmp(dbgi, irg, block, noreg, noreg, new_cmp_a, new_cmp_b, nomem); - set_ia32_pncode(new_op, pnc); - set_ia32_am_support(new_op, ia32_am_Source); - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(cg, node)); - - and1 = new_rd_ia32_xAnd(dbgi, irg, block, noreg, noreg, new_psi_true, new_op, nomem); - set_ia32_am_support(and1, ia32_am_None); - set_ia32_commutative(and1); - SET_IA32_ORIG_NODE(and1, ia32_get_old_node_name(cg, node)); - - and2 = new_rd_ia32_xAndNot(dbgi, irg, block, noreg, noreg, new_op, new_psi_default, nomem); - set_ia32_am_support(and2, ia32_am_None); - set_ia32_commutative(and2); - SET_IA32_ORIG_NODE(and2, ia32_get_old_node_name(cg, node)); - - new_op = new_rd_ia32_xOr(dbgi, irg, block, noreg, noreg, and1, and2, nomem); - set_ia32_am_support(new_op, ia32_am_None); - set_ia32_commutative(new_op); - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(cg, node)); - } - else { - /* x87 FPU */ - new_op = new_rd_ia32_vfCMov(dbgi, irg, block, new_cmp_a, new_cmp_b, new_psi_true, new_psi_default); - set_ia32_pncode(new_op, pnc); - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); - } - } - else { - /* integer psi */ - construct_binop_func *set_func = NULL; - cmov_func_t *cmov_func = NULL; - - if (mode_is_float(get_irn_mode(cmp_a))) { - /* 1st case: compare operands are floats */ - FP_USED(cg); - - if (USE_SSE2(cg)) { - /* SSE FPU */ - set_func = new_rd_ia32_xCmpSet; - cmov_func = new_rd_ia32_xCmpCMov; - } - else { - /* x87 FPU */ - set_func = new_rd_ia32_vfCmpSet; - cmov_func = new_rd_ia32_vfCmpCMov; + int pnc; + + assert(get_Psi_n_conds(node) == 1); + assert(get_irn_mode(cond) == mode_b); + + if(is_And(cond) || is_Or(cond)) { + ir_node *new_cond = be_transform_node(cond); + tarval *tv_zero = new_tarval_from_long(0, mode_Iu); + ir_node *zero = new_rd_ia32_Immediate(NULL, irg, block, NULL, 0, + tv_zero); + arch_set_irn_register(env_cg->arch_env, zero, + &ia32_gp_regs[REG_GP_NOREG]); + + /* we have to compare the result against zero */ + new_cmp_a = new_cond; + new_cmp_b = zero; + cmp_mode = mode_Iu; + pnc = pn_Cmp_Lg; + } else { + cmp = get_Proj_pred(cond); + cmp_a = get_Cmp_left(cmp); + cmp_b = get_Cmp_right(cmp); + cmp_mode = get_irn_mode(cmp_a); + pnc = get_Proj_proj(cond); + + new_cmp_b = try_create_Immediate(cmp_b, 0); + if(new_cmp_b == NULL) { + new_cmp_b = try_create_Immediate(cmp_a, 0); + if(new_cmp_b != NULL) { + pnc = get_inversed_pnc(pnc); + new_cmp_a = be_transform_node(cmp_b); } - - pnc &= ~0x8; /* fp compare -> int compare */ + } else { + new_cmp_a = be_transform_node(cmp_a); } - else { - /* 2nd case: compare operand are integer too */ - set_func = new_rd_ia32_CmpSet; - cmov_func = new_rd_ia32_CmpCMov; + if(new_cmp_b == NULL) { + new_cmp_a = be_transform_node(cmp_a); + new_cmp_b = be_transform_node(cmp_b); } - /* check for special case first: And/Or -- Cmp with 0 -- Psi */ - if (is_ia32_Const_0(new_cmp_b) && is_Proj(new_cmp_a) && (is_ia32_And(get_Proj_pred(new_cmp_a)) || is_ia32_Or(get_Proj_pred(new_cmp_a)))) { - if (is_ia32_Const_1(psi_true) && is_ia32_Const_0(psi_default)) { - /* first case for SETcc: default is 0, set to 1 iff condition is true */ - new_op = new_rd_ia32_PsiCondSet(dbgi, irg, block, new_cmp_a); - set_ia32_pncode(new_op, pnc); - } - else if (is_ia32_Const_0(psi_true) && is_ia32_Const_1(psi_default)) { - /* second case for SETcc: default is 1, set to 0 iff condition is true: */ - /* we invert condition and set default to 0 */ - new_op = new_rd_ia32_PsiCondSet(dbgi, irg, block, new_cmp_a); - set_ia32_pncode(new_op, get_inversed_pnc(pnc)); - } - else { - /* otherwise: use CMOVcc */ - new_op = new_rd_ia32_PsiCondCMov(dbgi, irg, block, new_cmp_a, new_psi_true, new_psi_default); - set_ia32_pncode(new_op, pnc); - } - - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(cg, node)); - } - else { - if (is_ia32_Const_1(psi_true) && is_ia32_Const_0(psi_default)) { - /* first case for SETcc: default is 0, set to 1 iff condition is true */ - new_op = gen_binop(env, node, cmp_a, cmp_b, set_func); - set_ia32_pncode(new_op, pnc); - set_ia32_am_support(new_op, ia32_am_Source); - } - else if (is_ia32_Const_0(psi_true) && is_ia32_Const_1(psi_default)) { - /* second case for SETcc: default is 1, set to 0 iff condition is true: */ - /* we invert condition and set default to 0 */ - new_op = gen_binop(env, node, cmp_a, cmp_b, set_func); - set_ia32_pncode(new_op, get_inversed_pnc(pnc)); - set_ia32_am_support(new_op, ia32_am_Source); - } - else { - /* otherwise: use CMOVcc */ - new_op = cmov_func(dbgi, irg, block, new_cmp_a, new_cmp_b, new_psi_true, new_psi_default); - set_ia32_pncode(new_op, pnc); - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(cg, node)); - } + if (!mode_is_signed(cmp_mode)) { + pnc |= ia32_pn_Cmp_Unsigned; } } + if(is_Const_1(psi_true) && is_Const_0(psi_default)) { + new_op = new_rd_ia32_CmpSet(dbgi, irg, block, noreg, noreg, + new_cmp_a, new_cmp_b, nomem, pnc); + } else if(is_Const_0(psi_true) && is_Const_1(psi_default)) { + pnc = get_negated_pnc(pnc, cmp_mode); + new_op = new_rd_ia32_CmpSet(dbgi, irg, block, noreg, noreg, + new_cmp_a, new_cmp_b, nomem, pnc); + } else { + ir_node *new_psi_true = be_transform_node(psi_true); + ir_node *new_psi_default = be_transform_node(psi_default); + new_op = new_rd_ia32_CmpCMov(dbgi, irg, block, new_cmp_a, new_cmp_b, + new_psi_true, new_psi_default, pnc); + } + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(cg, node)); return new_op; } @@ -2197,12 +2113,12 @@ static ir_node *gen_Psi(ia32_transform_env_t *env, ir_node *node) { /** * Create a conversion from x87 state register to general purpose. */ -static ir_node *gen_x87_fp_to_gp(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); +static ir_node *gen_x87_fp_to_gp(ir_node *node) { + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *op = get_Conv_op(node); - ir_node *new_op = transform_node(env, op); - ia32_code_gen_t *cg = env->cg; - ir_graph *irg = env->irg; + ir_node *new_op = be_transform_node(op); + ia32_code_gen_t *cg = env_cg; + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); ir_node *noreg = ia32_new_NoReg_gp(cg); ir_node *trunc_mode = ia32_new_Fpu_truncate(cg); @@ -2212,8 +2128,8 @@ static ir_node *gen_x87_fp_to_gp(ia32_transform_env_t *env, ir_node *node) { fist = new_rd_ia32_vfist(dbgi, irg, block, get_irg_frame(irg), noreg, new_op, trunc_mode, new_NoMem()); + set_irn_pinned(fist, op_pin_state_floats); set_ia32_use_frame(fist); - set_ia32_am_support(fist, ia32_am_Dest); set_ia32_op_type(fist, ia32_AddrModeD); set_ia32_am_flavour(fist, ia32_am_B); set_ia32_ls_mode(fist, mode_Iu); @@ -2222,8 +2138,8 @@ static ir_node *gen_x87_fp_to_gp(ia32_transform_env_t *env, ir_node *node) { /* do a Load */ load = new_rd_ia32_Load(dbgi, irg, block, get_irg_frame(irg), noreg, fist); + set_irn_pinned(load, op_pin_state_floats); set_ia32_use_frame(load); - set_ia32_am_support(load, ia32_am_Source); set_ia32_op_type(load, ia32_AddrModeS); set_ia32_am_flavour(load, ia32_am_B); set_ia32_ls_mode(load, mode_Iu); @@ -2235,13 +2151,13 @@ static ir_node *gen_x87_fp_to_gp(ia32_transform_env_t *env, ir_node *node) { /** * Create a conversion from general purpose to x87 register */ -static ir_node *gen_x87_gp_to_fp(ia32_transform_env_t *env, ir_node *node, ir_mode *src_mode) { - ir_node *block = transform_node(env, get_nodes_block(node)); +static ir_node *gen_x87_gp_to_fp(ir_node *node, ir_mode *src_mode) { + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *op = get_Conv_op(node); - ir_node *new_op = transform_node(env, op); - ir_graph *irg = env->irg; + ir_node *new_op = be_transform_node(op); + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); - ir_node *noreg = ia32_new_NoReg_gp(env->cg); + ir_node *noreg = ia32_new_NoReg_gp(env_cg); ir_node *nomem = new_NoMem(); ir_node *fild, *store; int src_bits; @@ -2250,21 +2166,20 @@ static ir_node *gen_x87_gp_to_fp(ia32_transform_env_t *env, ir_node *node, ir_mo src_bits = get_mode_size_bits(src_mode); if (src_bits == 8) { new_op = new_rd_ia32_Conv_I2I8Bit(dbgi, irg, block, noreg, noreg, new_op, nomem); - set_ia32_am_support(new_op, ia32_am_Source); + set_ia32_am_support(new_op, ia32_am_Source, ia32_am_unary); set_ia32_ls_mode(new_op, src_mode); - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node)); } else if (src_bits < 32) { new_op = new_rd_ia32_Conv_I2I(dbgi, irg, block, noreg, noreg, new_op, nomem); - set_ia32_am_support(new_op, ia32_am_Source); + set_ia32_am_support(new_op, ia32_am_Source, ia32_am_unary); set_ia32_ls_mode(new_op, src_mode); - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node)); } /* do a store */ store = new_rd_ia32_Store(dbgi, irg, block, get_irg_frame(irg), noreg, new_op, nomem); set_ia32_use_frame(store); - set_ia32_am_support(store, ia32_am_Dest); set_ia32_op_type(store, ia32_AddrModeD); set_ia32_am_flavour(store, ia32_am_OB); set_ia32_ls_mode(store, mode_Iu); @@ -2273,7 +2188,6 @@ static ir_node *gen_x87_gp_to_fp(ia32_transform_env_t *env, ir_node *node, ir_mo fild = new_rd_ia32_vfild(dbgi, irg, block, get_irg_frame(irg), noreg, store); set_ia32_use_frame(fild); - set_ia32_am_support(fild, ia32_am_Source); set_ia32_op_type(fild, ia32_AddrModeS); set_ia32_am_flavour(fild, ia32_am_OB); set_ia32_ls_mode(fild, mode_Iu); @@ -2281,29 +2195,64 @@ static ir_node *gen_x87_gp_to_fp(ia32_transform_env_t *env, ir_node *node, ir_mo return new_r_Proj(irg, block, fild, mode_vfp, pn_ia32_vfild_res); } +static ir_node *create_Strict_conv(ir_mode *src_mode, ir_mode *tgt_mode, + ir_node *node) +{ + ir_node *block = get_nodes_block(node); + ir_graph *irg = current_ir_graph; + dbg_info *dbgi = get_irn_dbg_info(node); + ir_node *noreg = ia32_new_NoReg_gp(env_cg); + ir_node *nomem = new_NoMem(); + int src_bits = get_mode_size_bits(src_mode); + int tgt_bits = get_mode_size_bits(tgt_mode); + ir_node *frame = get_irg_frame(irg); + ir_mode *smaller_mode; + ir_node *store, *load; + ir_node *res; + + if(src_bits <= tgt_bits) + smaller_mode = src_mode; + else + smaller_mode = tgt_mode; + + store = new_rd_ia32_vfst(dbgi, irg, block, frame, noreg, node, nomem, + smaller_mode); + set_ia32_use_frame(store); + set_ia32_op_type(store, ia32_AddrModeD); + set_ia32_am_flavour(store, ia32_am_OB); + + load = new_rd_ia32_vfld(dbgi, irg, block, frame, noreg, store, + smaller_mode); + set_ia32_use_frame(load); + set_ia32_op_type(load, ia32_AddrModeS); + set_ia32_am_flavour(load, ia32_am_OB); + + res = new_r_Proj(irg, block, load, mode_E, pn_ia32_vfld_res); + return res; +} + /** * Transforms a Conv node. * - * @param env The transformation environment * @return The created ia32 Conv node */ -static ir_node *gen_Conv(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); +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 = transform_node(env, op); - ir_graph *irg = env->irg; + ir_node *new_op = be_transform_node(op); + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); ir_mode *src_mode = get_irn_mode(op); ir_mode *tgt_mode = get_irn_mode(node); int src_bits = get_mode_size_bits(src_mode); int tgt_bits = get_mode_size_bits(tgt_mode); - ir_node *noreg = ia32_new_NoReg_gp(env->cg); + ir_node *noreg = ia32_new_NoReg_gp(env_cg); ir_node *nomem = new_rd_NoMem(irg); ir_node *res; if (src_mode == tgt_mode) { if (get_Conv_strict(node)) { - if (USE_SSE2(env->cg)) { + if (USE_SSE2(env_cg)) { /* when we are in SSE mode, we can kill all strict no-op conversion */ return new_op; } @@ -2318,41 +2267,51 @@ static ir_node *gen_Conv(ia32_transform_env_t *env, ir_node *node) { if (mode_is_float(src_mode)) { /* we convert from float ... */ if (mode_is_float(tgt_mode)) { + if(src_mode == mode_E && tgt_mode == mode_D + && !get_Conv_strict(node)) { + DB((dbg, LEVEL_1, "killed Conv(mode, mode) ...")); + return new_op; + } + /* ... to float */ - if (USE_SSE2(env->cg)) { + if (USE_SSE2(env_cg)) { DB((dbg, LEVEL_1, "create Conv(float, float) ...")); res = new_rd_ia32_Conv_FP2FP(dbgi, irg, block, noreg, noreg, new_op, nomem); set_ia32_ls_mode(res, tgt_mode); } else { // Matze: TODO what about strict convs? - DEBUG_ONLY(ir_fprintf(stderr, "Debug warning: strict conv %+F ignored yet\n", node)); + if(get_Conv_strict(node)) { + res = create_Strict_conv(src_mode, tgt_mode, new_op); + SET_IA32_ORIG_NODE(get_Proj_pred(res), ia32_get_old_node_name(env_cg, node)); + return res; + } DB((dbg, LEVEL_1, "killed Conv(float, float) ...")); return new_op; } } else { /* ... to int */ DB((dbg, LEVEL_1, "create Conv(float, int) ...")); - if (USE_SSE2(env->cg)) { + if (USE_SSE2(env_cg)) { res = new_rd_ia32_Conv_FP2I(dbgi, irg, block, noreg, noreg, new_op, nomem); set_ia32_ls_mode(res, src_mode); } else { - return gen_x87_fp_to_gp(env, node); + return gen_x87_fp_to_gp(node); } } } else { /* we convert from int ... */ if (mode_is_float(tgt_mode)) { - FP_USED(env->cg); + FP_USED(env_cg); /* ... to float */ DB((dbg, LEVEL_1, "create Conv(int, float) ...")); - if (USE_SSE2(env->cg)) { + if (USE_SSE2(env_cg)) { res = new_rd_ia32_Conv_I2FP(dbgi, irg, block, noreg, noreg, new_op, nomem); set_ia32_ls_mode(res, tgt_mode); if(src_bits == 32) { - set_ia32_am_support(res, ia32_am_Source); + set_ia32_am_support(res, ia32_am_Source, ia32_am_unary); } } else { - return gen_x87_gp_to_fp(env, node, src_mode); + return gen_x87_gp_to_fp(node, src_mode); } } else { /* to int */ @@ -2372,24 +2331,6 @@ static ir_node *gen_Conv(ia32_transform_env_t *env, ir_node *node) { smaller_bits = tgt_bits; } - /* - The following is not correct, we can't change the mode, - maybe others are using the load too - better move this to a separate phase! - */ -#if 0 - /* ... to int */ - if(is_Proj(new_op)) { - /* load operations do already sign/zero extend, so we have - * nothing left to do */ - ir_node *pred = get_Proj_pred(new_op); - if(is_ia32_Load(pred)) { - set_ia32_ls_mode(pred, smaller_mode); - return new_op; - } - } -#endif /* if 0 */ - DB((dbg, LEVEL_1, "create Conv(int, int) ...", src_mode, tgt_mode)); if (smaller_bits == 8) { res = new_rd_ia32_Conv_I2I8Bit(dbgi, irg, block, noreg, noreg, new_op, nomem); @@ -2398,16 +2339,514 @@ static ir_node *gen_Conv(ia32_transform_env_t *env, ir_node *node) { res = new_rd_ia32_Conv_I2I(dbgi, irg, block, noreg, noreg, new_op, nomem); set_ia32_ls_mode(res, smaller_mode); } - set_ia32_am_support(res, ia32_am_Source); + set_ia32_am_support(res, ia32_am_Source, ia32_am_unary); } } - SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node)); return res; } +static +int check_immediate_constraint(tarval *tv, char immediate_constraint_type) +{ + long val; + + assert(tarval_is_long(tv)); + val = get_tarval_long(tv); + + switch (immediate_constraint_type) { + case 0: + return 1; + case 'I': + return val >= 0 && val <= 32; + case 'J': + return val >= 0 && val <= 63; + case 'K': + return val >= -128 && val <= 127; + case 'L': + return val == 0xff || val == 0xffff; + case 'M': + return val >= 0 && val <= 3; + case 'N': + return val >= 0 && val <= 255; + case 'O': + return val >= 0 && val <= 127; + default: + break; + } + panic("Invalid immediate constraint found"); + return 0; +} + +static +ir_node *try_create_Immediate(ir_node *node, char immediate_constraint_type) +{ + int minus = 0; + tarval *offset = NULL; + int offset_sign = 0; + ir_entity *symconst_ent = NULL; + int symconst_sign = 0; + ir_mode *mode; + ir_node *cnst = NULL; + ir_node *symconst = NULL; + ir_node *res; + ir_graph *irg; + dbg_info *dbgi; + ir_node *block; + + mode = get_irn_mode(node); + if(!mode_is_int(mode) && !mode_is_character(mode) && + !mode_is_reference(mode)) { + return NULL; + } + + if(is_Minus(node)) { + minus = 1; + node = get_Minus_op(node); + } + + if(is_Const(node)) { + cnst = node; + symconst = NULL; + offset_sign = minus; + } else if(is_SymConst(node)) { + cnst = NULL; + symconst = node; + symconst_sign = minus; + } else if(is_Add(node)) { + ir_node *left = get_Add_left(node); + ir_node *right = get_Add_right(node); + if(is_Const(left) && is_SymConst(right)) { + cnst = left; + symconst = right; + symconst_sign = minus; + offset_sign = minus; + } else if(is_SymConst(left) && is_Const(right)) { + cnst = right; + symconst = left; + symconst_sign = minus; + offset_sign = minus; + } + } else if(is_Sub(node)) { + ir_node *left = get_Sub_left(node); + ir_node *right = get_Sub_right(node); + if(is_Const(left) && is_SymConst(right)) { + cnst = left; + symconst = right; + symconst_sign = !minus; + offset_sign = minus; + } else if(is_SymConst(left) && is_Const(right)) { + cnst = right; + symconst = left; + symconst_sign = minus; + offset_sign = !minus; + } + } else { + return NULL; + } + + if(cnst != NULL) { + offset = get_Const_tarval(cnst); + if(!tarval_is_long(offset)) { + ir_fprintf(stderr, "Optimisation Warning: tarval from %+F is not a " + "long?\n", cnst); + return NULL; + } + + if(!check_immediate_constraint(offset, immediate_constraint_type)) + return NULL; + } + if(symconst != NULL) { + if(immediate_constraint_type != 0) { + /* we need full 32bits for symconsts */ + return NULL; + } + + if(get_SymConst_kind(symconst) != symconst_addr_ent) + return NULL; + symconst_ent = get_SymConst_entity(symconst); + } + if(cnst == NULL && symconst == NULL) + return NULL; + + if(offset_sign && offset != NULL) { + offset = tarval_neg(offset); + } + + irg = current_ir_graph; + dbgi = get_irn_dbg_info(node); + block = get_irg_start_block(irg); + res = new_rd_ia32_Immediate(dbgi, irg, block, symconst_ent, symconst_sign, + offset); + arch_set_irn_register(env_cg->arch_env, res, &ia32_gp_regs[REG_GP_NOREG]); + + /* make sure we don't schedule stuff before the barrier */ + add_irn_dep(res, get_irg_frame(irg)); + + return res; +} + +typedef struct constraint_t constraint_t; +struct constraint_t { + int is_in; + int n_outs; + const arch_register_req_t **out_reqs; + const arch_register_req_t *req; + unsigned immediate_possible; + char immediate_type; +}; + +void parse_asm_constraint(int pos, constraint_t *constraint, const char *c) +{ + int immediate_possible = 0; + char immediate_type = 0; + unsigned limited = 0; + const arch_register_class_t *cls = NULL; + ir_graph *irg; + struct obstack *obst; + arch_register_req_t *req; + unsigned *limited_ptr; + int p; + int same_as = -1; + + /* TODO: replace all the asserts with nice error messages */ + + printf("Constraint: %s\n", c); + + while(*c != 0) { + switch(*c) { + case ' ': + case '\t': + case '\n': + break; + + case 'a': + assert(cls == NULL || + (cls == &ia32_reg_classes[CLASS_ia32_gp] && limited != 0)); + cls = &ia32_reg_classes[CLASS_ia32_gp]; + limited |= 1 << REG_EAX; + break; + case 'b': + assert(cls == NULL || + (cls == &ia32_reg_classes[CLASS_ia32_gp] && limited != 0)); + cls = &ia32_reg_classes[CLASS_ia32_gp]; + limited |= 1 << REG_EBX; + break; + case 'c': + assert(cls == NULL || + (cls == &ia32_reg_classes[CLASS_ia32_gp] && limited != 0)); + cls = &ia32_reg_classes[CLASS_ia32_gp]; + limited |= 1 << REG_ECX; + break; + case 'd': + assert(cls == NULL || + (cls == &ia32_reg_classes[CLASS_ia32_gp] && limited != 0)); + cls = &ia32_reg_classes[CLASS_ia32_gp]; + limited |= 1 << REG_EDX; + break; + case 'D': + assert(cls == NULL || + (cls == &ia32_reg_classes[CLASS_ia32_gp] && limited != 0)); + cls = &ia32_reg_classes[CLASS_ia32_gp]; + limited |= 1 << REG_EDI; + break; + case 'S': + assert(cls == NULL || + (cls == &ia32_reg_classes[CLASS_ia32_gp] && limited != 0)); + cls = &ia32_reg_classes[CLASS_ia32_gp]; + limited |= 1 << REG_ESI; + break; + case 'Q': + case 'q': /* q means lower part of the regs only, this makes no + * difference to Q for us (we only assigne whole registers) */ + assert(cls == NULL || + (cls == &ia32_reg_classes[CLASS_ia32_gp] && limited != 0)); + cls = &ia32_reg_classes[CLASS_ia32_gp]; + limited |= 1 << REG_EAX | 1 << REG_EBX | 1 << REG_ECX | + 1 << REG_EDX; + break; + case 'A': + assert(cls == NULL || + (cls == &ia32_reg_classes[CLASS_ia32_gp] && limited != 0)); + cls = &ia32_reg_classes[CLASS_ia32_gp]; + limited |= 1 << REG_EAX | 1 << REG_EDX; + break; + case 'l': + assert(cls == NULL || + (cls == &ia32_reg_classes[CLASS_ia32_gp] && limited != 0)); + cls = &ia32_reg_classes[CLASS_ia32_gp]; + limited |= 1 << REG_EAX | 1 << REG_EBX | 1 << REG_ECX | + 1 << REG_EDX | 1 << REG_ESI | 1 << REG_EDI | + 1 << REG_EBP; + break; + + case 'R': + case 'r': + case 'p': + assert(cls == NULL); + cls = &ia32_reg_classes[CLASS_ia32_gp]; + break; + + case 'f': + case 't': + case 'u': + /* TODO: mark values so the x87 simulator knows about t and u */ + assert(cls == NULL); + cls = &ia32_reg_classes[CLASS_ia32_vfp]; + break; + + case 'Y': + case 'x': + assert(cls == NULL); + /* TODO: check that sse2 is supported */ + cls = &ia32_reg_classes[CLASS_ia32_xmm]; + break; + + case 'I': + case 'J': + case 'K': + case 'L': + case 'M': + case 'N': + case 'O': + assert(!immediate_possible); + immediate_possible = 1; + immediate_type = *c; + break; + case 'n': + case 'i': + assert(!immediate_possible); + immediate_possible = 1; + break; + + case 'g': + assert(!immediate_possible && cls == NULL); + immediate_possible = 1; + cls = &ia32_reg_classes[CLASS_ia32_gp]; + break; + + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + assert(constraint->is_in && "can only specify same constraint " + "on input"); + + sscanf(c, "%d%n", &same_as, &p); + if(same_as >= 0) { + c += p; + continue; + } + break; + + case 'E': /* no float consts yet */ + case 'F': /* no float consts yet */ + case 's': /* makes no sense on x86 */ + case 'X': /* we can't support that in firm */ + case 'm': + case 'o': + case 'V': + case '<': /* no autodecrement on x86 */ + case '>': /* no autoincrement on x86 */ + case 'C': /* sse constant not supported yet */ + case 'G': /* 80387 constant not supported yet */ + case 'y': /* we don't support mmx registers yet */ + case 'Z': /* not available in 32 bit mode */ + case 'e': /* not available in 32 bit mode */ + assert(0 && "asm constraint not supported"); + break; + default: + assert(0 && "unknown asm constraint found"); + break; + } + ++c; + } + + if(same_as >= 0) { + const arch_register_req_t *other_constr; + + assert(cls == NULL && "same as and register constraint not supported"); + assert(!immediate_possible && "same as and immediate constraint not " + "supported"); + assert(same_as < constraint->n_outs && "wrong constraint number in " + "same_as constraint"); + + other_constr = constraint->out_reqs[same_as]; + + req = obstack_alloc(obst, sizeof(req[0])); + req->cls = other_constr->cls; + req->type = arch_register_req_type_should_be_same; + req->limited = NULL; + req->other_same = pos; + req->other_different = -1; + + /* switch constraints. This is because in firm we have same_as + * constraints on the output constraints while in the gcc asm syntax + * they are specified on the input constraints */ + constraint->req = other_constr; + constraint->out_reqs[same_as] = req; + constraint->immediate_possible = 0; + return; + } + + if(immediate_possible && cls == NULL) { + cls = &ia32_reg_classes[CLASS_ia32_gp]; + } + assert(!immediate_possible || cls == &ia32_reg_classes[CLASS_ia32_gp]); + assert(cls != NULL); + + if(immediate_possible) { + assert(constraint->is_in + && "imeediates make no sense for output constraints"); + } + /* todo: check types (no float input on 'r' constrainted in and such... */ + + irg = current_ir_graph; + obst = get_irg_obstack(irg); + + if(limited != 0) { + req = obstack_alloc(obst, sizeof(req[0]) + sizeof(unsigned)); + limited_ptr = (unsigned*) (req+1); + } else { + req = obstack_alloc(obst, sizeof(req[0])); + } + memset(req, 0, sizeof(req[0])); + + if(limited != 0) { + req->type = arch_register_req_type_limited; + *limited_ptr = limited; + req->limited = limited_ptr; + } else { + req->type = arch_register_req_type_normal; + } + req->cls = cls; + + constraint->req = req; + constraint->immediate_possible = immediate_possible; + constraint->immediate_type = immediate_type; +} + +static +void parse_clobber(ir_node *node, int pos, constraint_t *constraint, + const char *c) +{ + (void) node; + (void) pos; + (void) constraint; + (void) c; + panic("Clobbers not supported yet"); +} + +ir_node *gen_ASM(ir_node *node) +{ + int i, arity; + ir_graph *irg = current_ir_graph; + ir_node *block = be_transform_node(get_nodes_block(node)); + dbg_info *dbgi = get_irn_dbg_info(node); + ir_node **in; + ir_node *res; + int out_arity; + int n_outs; + int n_clobbers; + void *generic_attr; + ia32_asm_attr_t *attr; + const arch_register_req_t **out_reqs; + const arch_register_req_t **in_reqs; + struct obstack *obst; + constraint_t parsed_constraint; + + /* assembler could contain float statements */ + FP_USED(env_cg); + + /* transform inputs */ + arity = get_irn_arity(node); + in = alloca(arity * sizeof(in[0])); + memset(in, 0, arity * sizeof(in[0])); + + n_outs = get_ASM_n_output_constraints(node); + n_clobbers = get_ASM_n_clobbers(node); + out_arity = n_outs + n_clobbers; + + /* construct register constraints */ + obst = get_irg_obstack(irg); + out_reqs = obstack_alloc(obst, out_arity * sizeof(out_reqs[0])); + parsed_constraint.out_reqs = out_reqs; + parsed_constraint.n_outs = n_outs; + parsed_constraint.is_in = 0; + for(i = 0; i < out_arity; ++i) { + const char *c; + + if(i < n_outs) { + const ir_asm_constraint *constraint; + constraint = & get_ASM_output_constraints(node) [i]; + c = get_id_str(constraint->constraint); + parse_asm_constraint(i, &parsed_constraint, c); + } else { + ident *glob_id = get_ASM_clobbers(node) [i - n_outs]; + c = get_id_str(glob_id); + parse_clobber(node, i, &parsed_constraint, c); + } + out_reqs[i] = parsed_constraint.req; + } + + in_reqs = obstack_alloc(obst, arity * sizeof(in_reqs[0])); + parsed_constraint.is_in = 1; + for(i = 0; i < arity; ++i) { + const ir_asm_constraint *constraint; + ident *constr_id; + const char *c; + + constraint = & get_ASM_input_constraints(node) [i]; + constr_id = constraint->constraint; + c = get_id_str(constr_id); + parse_asm_constraint(i, &parsed_constraint, c); + in_reqs[i] = parsed_constraint.req; + + if(parsed_constraint.immediate_possible) { + ir_node *pred = get_irn_n(node, i); + char imm_type = parsed_constraint.immediate_type; + ir_node *immediate = try_create_Immediate(pred, imm_type); + + if(immediate != NULL) { + in[i] = immediate; + } + } + } + + /* transform inputs */ + for(i = 0; i < arity; ++i) { + ir_node *pred; + ir_node *transformed; + + if(in[i] != NULL) + continue; + + pred = get_irn_n(node, i); + transformed = be_transform_node(pred); + in[i] = transformed; + } + + res = new_rd_ia32_Asm(dbgi, irg, block, arity, in, out_arity); + + generic_attr = get_irn_generic_attr(res); + attr = CAST_IA32_ATTR(ia32_asm_attr_t, generic_attr); + attr->asm_text = get_ASM_text(node); + set_ia32_out_req_all(res, out_reqs); + set_ia32_in_req_all(res, in_reqs); + + SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node)); + + return res; +} /******************************************** * _ _ @@ -2419,28 +2858,28 @@ static ir_node *gen_Conv(ia32_transform_env_t *env, ir_node *node) { * ********************************************/ -static ir_node *gen_be_StackParam(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); +static ir_node *gen_be_StackParam(ir_node *node) { + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *ptr = get_irn_n(node, be_pos_StackParam_ptr); - ir_node *new_ptr = transform_node(env, ptr); + ir_node *new_ptr = be_transform_node(ptr); ir_node *new_op = NULL; - ir_graph *irg = env->irg; + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); - ir_node *nomem = new_rd_NoMem(env->irg); - ir_entity *ent = arch_get_frame_entity(env->cg->arch_env, node); + ir_node *nomem = new_rd_NoMem(current_ir_graph); + ir_entity *ent = arch_get_frame_entity(env_cg->arch_env, node); ir_mode *load_mode = get_irn_mode(node); - ir_node *noreg = ia32_new_NoReg_gp(env->cg); + ir_node *noreg = ia32_new_NoReg_gp(env_cg); ir_mode *proj_mode; long pn_res; if (mode_is_float(load_mode)) { - FP_USED(env->cg); - if (USE_SSE2(env->cg)) { + FP_USED(env_cg); + if (USE_SSE2(env_cg)) { new_op = new_rd_ia32_xLoad(dbgi, irg, block, new_ptr, noreg, nomem); pn_res = pn_ia32_xLoad_res; proj_mode = mode_xmm; } else { - new_op = new_rd_ia32_vfld(dbgi, irg, block, new_ptr, noreg, nomem); + new_op = new_rd_ia32_vfld(dbgi, irg, block, new_ptr, noreg, nomem, load_mode); pn_res = pn_ia32_vfld_res; proj_mode = mode_vfp; } @@ -2450,16 +2889,16 @@ static ir_node *gen_be_StackParam(ia32_transform_env_t *env, ir_node *node) { pn_res = pn_ia32_Load_res; } + set_irn_pinned(new_op, op_pin_state_floats); set_ia32_frame_ent(new_op, ent); set_ia32_use_frame(new_op); - set_ia32_am_support(new_op, ia32_am_Source); set_ia32_op_type(new_op, ia32_AddrModeS); set_ia32_am_flavour(new_op, ia32_am_B); set_ia32_ls_mode(new_op, load_mode); set_ia32_flags(new_op, get_ia32_flags(new_op) | arch_irn_flags_rematerializable); - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node)); return new_rd_Proj(dbgi, irg, block, new_op, proj_mode, pn_res); } @@ -2467,22 +2906,21 @@ static ir_node *gen_be_StackParam(ia32_transform_env_t *env, ir_node *node) { /** * Transforms a FrameAddr into an ia32 Add. */ -static ir_node *gen_be_FrameAddr(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); - ir_node *op = get_irn_n(node, be_pos_FrameAddr_ptr); - ir_node *new_op = transform_node(env, op); - ir_graph *irg = env->irg; +static ir_node *gen_be_FrameAddr(ir_node *node) { + ir_node *block = be_transform_node(get_nodes_block(node)); + ir_node *op = be_get_FrameAddr_frame(node); + ir_node *new_op = be_transform_node(op); + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); - ir_node *noreg = ia32_new_NoReg_gp(env->cg); + ir_node *noreg = ia32_new_NoReg_gp(env_cg); ir_node *res; res = new_rd_ia32_Lea(dbgi, irg, block, new_op, noreg); - set_ia32_frame_ent(res, arch_get_frame_entity(env->cg->arch_env, node)); - set_ia32_am_support(res, ia32_am_Full); + set_ia32_frame_ent(res, arch_get_frame_entity(env_cg->arch_env, node)); set_ia32_use_frame(res); set_ia32_am_flavour(res, ia32_am_OB); - SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node)); return res; } @@ -2490,44 +2928,44 @@ static ir_node *gen_be_FrameAddr(ia32_transform_env_t *env, ir_node *node) { /** * Transforms a FrameLoad into an ia32 Load. */ -static ir_node *gen_be_FrameLoad(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); +static ir_node *gen_be_FrameLoad(ir_node *node) { + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *mem = get_irn_n(node, be_pos_FrameLoad_mem); - ir_node *new_mem = transform_node(env, mem); + ir_node *new_mem = be_transform_node(mem); ir_node *ptr = get_irn_n(node, be_pos_FrameLoad_ptr); - ir_node *new_ptr = transform_node(env, ptr); + ir_node *new_ptr = be_transform_node(ptr); ir_node *new_op = NULL; - ir_graph *irg = env->irg; + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); - ir_node *noreg = ia32_new_NoReg_gp(env->cg); - ir_entity *ent = arch_get_frame_entity(env->cg->arch_env, node); + ir_node *noreg = ia32_new_NoReg_gp(env_cg); + ir_entity *ent = arch_get_frame_entity(env_cg->arch_env, node); ir_mode *mode = get_type_mode(get_entity_type(ent)); ir_node *projs[pn_Load_max]; ia32_collect_Projs(node, projs, pn_Load_max); if (mode_is_float(mode)) { - FP_USED(env->cg); - if (USE_SSE2(env->cg)) { + FP_USED(env_cg); + if (USE_SSE2(env_cg)) { new_op = new_rd_ia32_xLoad(dbgi, irg, block, new_ptr, noreg, new_mem); } else { - new_op = new_rd_ia32_vfld(dbgi, irg, block, new_ptr, noreg, new_mem); + new_op = new_rd_ia32_vfld(dbgi, irg, block, new_ptr, noreg, new_mem, mode); } } else { new_op = new_rd_ia32_Load(dbgi, irg, block, new_ptr, noreg, new_mem); } + set_irn_pinned(new_op, op_pin_state_floats); set_ia32_frame_ent(new_op, ent); set_ia32_use_frame(new_op); - set_ia32_am_support(new_op, ia32_am_Source); set_ia32_op_type(new_op, ia32_AddrModeS); set_ia32_am_flavour(new_op, ia32_am_B); set_ia32_ls_mode(new_op, mode); - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node)); return new_op; } @@ -2536,27 +2974,27 @@ static ir_node *gen_be_FrameLoad(ia32_transform_env_t *env, ir_node *node) { /** * Transforms a FrameStore into an ia32 Store. */ -static ir_node *gen_be_FrameStore(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); +static ir_node *gen_be_FrameStore(ir_node *node) { + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *mem = get_irn_n(node, be_pos_FrameStore_mem); - ir_node *new_mem = transform_node(env, mem); + ir_node *new_mem = be_transform_node(mem); ir_node *ptr = get_irn_n(node, be_pos_FrameStore_ptr); - ir_node *new_ptr = transform_node(env, ptr); + ir_node *new_ptr = be_transform_node(ptr); ir_node *val = get_irn_n(node, be_pos_FrameStore_val); - ir_node *new_val = transform_node(env, val); + ir_node *new_val = be_transform_node(val); ir_node *new_op = NULL; - ir_graph *irg = env->irg; + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); - ir_node *noreg = ia32_new_NoReg_gp(env->cg); - ir_entity *ent = arch_get_frame_entity(env->cg->arch_env, node); + ir_node *noreg = ia32_new_NoReg_gp(env_cg); + ir_entity *ent = arch_get_frame_entity(env_cg->arch_env, node); ir_mode *mode = get_irn_mode(val); if (mode_is_float(mode)) { - FP_USED(env->cg); - if (USE_SSE2(env->cg)) { + FP_USED(env_cg); + if (USE_SSE2(env_cg)) { new_op = new_rd_ia32_xStore(dbgi, irg, block, new_ptr, noreg, new_val, new_mem); } else { - new_op = new_rd_ia32_vfst(dbgi, irg, block, new_ptr, noreg, new_val, new_mem); + new_op = new_rd_ia32_vfst(dbgi, irg, block, new_ptr, noreg, new_val, new_mem, mode); } } else if (get_mode_size_bits(mode) == 8) { new_op = new_rd_ia32_Store8Bit(dbgi, irg, block, new_ptr, noreg, new_val, new_mem); @@ -2567,12 +3005,11 @@ static ir_node *gen_be_FrameStore(ia32_transform_env_t *env, ir_node *node) { set_ia32_frame_ent(new_op, ent); set_ia32_use_frame(new_op); - set_ia32_am_support(new_op, ia32_am_Dest); set_ia32_op_type(new_op, ia32_AddrModeD); set_ia32_am_flavour(new_op, ia32_am_B); set_ia32_ls_mode(new_op, mode); - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node)); return new_op; } @@ -2580,8 +3017,8 @@ static ir_node *gen_be_FrameStore(ia32_transform_env_t *env, ir_node *node) { /** * In case SSE is used we need to copy the result from XMM0 to FPU TOS before return. */ -static ir_node *gen_be_Return(ia32_transform_env_t *env, ir_node *node) { - ir_graph *irg = env->irg; +static ir_node *gen_be_Return(ir_node *node) { + ir_graph *irg = current_ir_graph; ir_node *ret_val = get_irn_n(node, be_pos_Return_val); ir_node *ret_mem = get_irn_n(node, be_pos_Return_mem); ir_entity *ent = get_irg_entity(irg); @@ -2597,19 +3034,19 @@ static ir_node *gen_be_Return(ia32_transform_env_t *env, ir_node *node) { int pn_ret_val, pn_ret_mem, arity, i; assert(ret_val != NULL); - if (be_Return_get_n_rets(node) < 1 || ! USE_SSE2(env->cg)) { - return duplicate_node(env, node); + if (be_Return_get_n_rets(node) < 1 || ! USE_SSE2(env_cg)) { + return be_duplicate_node(node); } res_type = get_method_res_type(tp, 0); if (! is_Primitive_type(res_type)) { - return duplicate_node(env, node); + return be_duplicate_node(node); } mode = get_type_mode(res_type); if (! mode_is_float(mode)) { - return duplicate_node(env, node); + return be_duplicate_node(node); } assert(get_method_n_ress(tp) == 1); @@ -2622,18 +3059,18 @@ static ir_node *gen_be_Return(ia32_transform_env_t *env, ir_node *node) { /* get result input of the Barrier */ ret_val = get_irn_n(barrier, pn_ret_val); - new_ret_val = transform_node(env, ret_val); + new_ret_val = be_transform_node(ret_val); /* get memory input of the Barrier */ ret_mem = get_irn_n(barrier, pn_ret_mem); - new_ret_mem = transform_node(env, ret_mem); + new_ret_mem = be_transform_node(ret_mem); frame = get_irg_frame(irg); dbgi = get_irn_dbg_info(barrier); - block = transform_node(env, get_nodes_block(barrier)); + block = be_transform_node(get_nodes_block(barrier)); - noreg = ia32_new_NoReg_gp(env->cg); + noreg = ia32_new_NoReg_gp(env_cg); /* store xmm0 onto stack */ sse_store = new_rd_ia32_xStoreSimple(dbgi, irg, block, frame, noreg, new_ret_val, new_ret_mem); @@ -2641,7 +3078,6 @@ static ir_node *gen_be_Return(ia32_transform_env_t *env, ir_node *node) { set_ia32_op_type(sse_store, ia32_AddrModeD); set_ia32_use_frame(sse_store); set_ia32_am_flavour(sse_store, ia32_am_B); - set_ia32_am_support(sse_store, ia32_am_Dest); /* load into st0 */ fld = new_rd_ia32_SetST0(dbgi, irg, block, frame, noreg, sse_store); @@ -2649,11 +3085,10 @@ static ir_node *gen_be_Return(ia32_transform_env_t *env, ir_node *node) { set_ia32_op_type(fld, ia32_AddrModeS); set_ia32_use_frame(fld); set_ia32_am_flavour(fld, ia32_am_B); - set_ia32_am_support(fld, ia32_am_Source); mproj = new_r_Proj(irg, block, fld, mode_M, pn_ia32_SetST0_M); fld = new_r_Proj(irg, block, fld, mode_vfp, pn_ia32_SetST0_res); - arch_set_irn_register(env->cg->arch_env, fld, &ia32_vfp_regs[REG_VF0]); + arch_set_irn_register(env_cg->arch_env, fld, &ia32_vfp_regs[REG_VF0]); /* create a new barrier */ arity = get_irn_arity(barrier); @@ -2667,7 +3102,7 @@ static ir_node *gen_be_Return(ia32_transform_env_t *env, ir_node *node) { new_in = mproj; } else { ir_node *in = get_irn_n(barrier, i); - new_in = transform_node(env, in); + new_in = be_transform_node(in); } in[i] = new_in; } @@ -2676,35 +3111,35 @@ static ir_node *gen_be_Return(ia32_transform_env_t *env, ir_node *node) { get_irn_op(barrier), get_irn_mode(barrier), arity, in); copy_node_attr(barrier, new_barrier); - duplicate_deps(env, barrier, new_barrier); - set_new_node(barrier, new_barrier); + be_duplicate_deps(barrier, new_barrier); + be_set_transformed_node(barrier, new_barrier); mark_irn_visited(barrier); /* transform normally */ - return duplicate_node(env, node); + return be_duplicate_node(node); } /** * Transform a be_AddSP into an ia32_AddSP. Eat up const sizes. */ -static ir_node *gen_be_AddSP(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); +static ir_node *gen_be_AddSP(ir_node *node) { + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *sz = get_irn_n(node, be_pos_AddSP_size); - ir_node *new_sz = transform_node(env, sz); + ir_node *new_sz = be_transform_node(sz); ir_node *sp = get_irn_n(node, be_pos_AddSP_old_sp); - ir_node *new_sp = transform_node(env, sp); - ir_graph *irg = env->irg; + ir_node *new_sp = be_transform_node(sp); + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); - ir_node *noreg = ia32_new_NoReg_gp(env->cg); + ir_node *noreg = ia32_new_NoReg_gp(env_cg); ir_node *nomem = new_NoMem(); ir_node *new_op; /* ia32 stack grows in reverse direction, make a SubSP */ new_op = new_rd_ia32_SubSP(dbgi, irg, block, noreg, noreg, new_sp, new_sz, nomem); - set_ia32_am_support(new_op, ia32_am_Source); - fold_immediate(env, new_op, 2, 3); + set_ia32_am_support(new_op, ia32_am_Source, ia32_am_binary); + fold_immediate(new_op, 2, 3); - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node)); return new_op; } @@ -2712,24 +3147,24 @@ static ir_node *gen_be_AddSP(ia32_transform_env_t *env, ir_node *node) { /** * Transform a be_SubSP into an ia32_SubSP. Eat up const sizes. */ -static ir_node *gen_be_SubSP(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); +static ir_node *gen_be_SubSP(ir_node *node) { + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *sz = get_irn_n(node, be_pos_SubSP_size); - ir_node *new_sz = transform_node(env, sz); + ir_node *new_sz = be_transform_node(sz); ir_node *sp = get_irn_n(node, be_pos_SubSP_old_sp); - ir_node *new_sp = transform_node(env, sp); - ir_graph *irg = env->irg; + ir_node *new_sp = be_transform_node(sp); + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); - ir_node *noreg = ia32_new_NoReg_gp(env->cg); + ir_node *noreg = ia32_new_NoReg_gp(env_cg); ir_node *nomem = new_NoMem(); ir_node *new_op; /* ia32 stack grows in reverse direction, make an AddSP */ new_op = new_rd_ia32_AddSP(dbgi, irg, block, noreg, noreg, new_sp, new_sz, nomem); - set_ia32_am_support(new_op, ia32_am_Source); - fold_immediate(env, new_op, 2, 3); + set_ia32_am_support(new_op, ia32_am_Source, ia32_am_binary); + fold_immediate(new_op, 2, 3); - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node)); return new_op; } @@ -2739,16 +3174,16 @@ static ir_node *gen_be_SubSP(ia32_transform_env_t *env, ir_node *node) { * as this is not done during register allocation because Unknown * is an "ignore" node. */ -static ir_node *gen_Unknown(ia32_transform_env_t *env, ir_node *node) { +static ir_node *gen_Unknown(ir_node *node) { ir_mode *mode = get_irn_mode(node); if (mode_is_float(mode)) { - if (USE_SSE2(env->cg)) - return ia32_new_Unknown_xmm(env->cg); + if (USE_SSE2(env_cg)) + return ia32_new_Unknown_xmm(env_cg); else - return ia32_new_Unknown_vfp(env->cg); + return ia32_new_Unknown_vfp(env_cg); } else if (mode_needs_gp_reg(mode)) { - return ia32_new_Unknown_gp(env->cg); + return ia32_new_Unknown_gp(env_cg); } else { assert(0 && "unsupported Unknown-Mode"); } @@ -2759,13 +3194,12 @@ static ir_node *gen_Unknown(ia32_transform_env_t *env, ir_node *node) { /** * Change some phi modes */ -static ir_node *gen_Phi(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); - ir_graph *irg = env->irg; +static ir_node *gen_Phi(ir_node *node) { + ir_node *block = be_transform_node(get_nodes_block(node)); + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); ir_mode *mode = get_irn_mode(node); ir_node *phi; - int i, arity; if(mode_needs_gp_reg(mode)) { /* we shouldn't have any 64bit stuff around anymore */ @@ -2773,8 +3207,7 @@ static ir_node *gen_Phi(ia32_transform_env_t *env, ir_node *node) { /* all integer operations are on 32bit registers now */ mode = mode_Iu; } else if(mode_is_float(mode)) { - assert(mode == mode_D || mode == mode_F); - if (USE_SSE2(env->cg)) { + if (USE_SSE2(env_cg)) { mode = mode_xmm; } else { mode = mode_vfp; @@ -2785,16 +3218,10 @@ static ir_node *gen_Phi(ia32_transform_env_t *env, ir_node *node) { * and fix this later */ phi = new_ir_node(dbgi, irg, block, op_Phi, mode, get_irn_arity(node), get_irn_in(node) + 1); copy_node_attr(node, phi); - duplicate_deps(env, node, phi); + be_duplicate_deps(node, phi); - set_new_node(node, phi); - - /* put the preds in the worklist */ - arity = get_irn_arity(node); - for (i = 0; i < arity; ++i) { - ir_node *pred = get_irn_n(node, i); - pdeq_putr(env->worklist, pred); - } + be_set_transformed_node(node, phi); + be_enqueue_preds(node); return phi; } @@ -2820,16 +3247,16 @@ typedef ir_node *construct_store_func(dbg_info *db, ir_graph *irg, ir_node *bloc /** * Transforms a lowered Load into a "real" one. */ -static ir_node *gen_lowered_Load(ia32_transform_env_t *env, ir_node *node, construct_load_func func, char fp_unit) { - ir_node *block = transform_node(env, get_nodes_block(node)); +static ir_node *gen_lowered_Load(ir_node *node, construct_load_func func, char fp_unit) { + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *ptr = get_irn_n(node, 0); - ir_node *new_ptr = transform_node(env, ptr); + ir_node *new_ptr = be_transform_node(ptr); ir_node *mem = get_irn_n(node, 1); - ir_node *new_mem = transform_node(env, mem); - ir_graph *irg = env->irg; + ir_node *new_mem = be_transform_node(mem); + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); ir_mode *mode = get_ia32_ls_mode(node); - ir_node *noreg = ia32_new_NoReg_gp(env->cg); + ir_node *noreg = ia32_new_NoReg_gp(env_cg); ir_node *new_op; /* @@ -2837,14 +3264,13 @@ static ir_node *gen_lowered_Load(ia32_transform_env_t *env, ir_node *node, const lowering we have x87 nodes, so we need to enforce simulation. */ if (mode_is_float(mode)) { - FP_USED(env->cg); + FP_USED(env_cg); if (fp_unit == fp_x87) - FORCE_x87(env->cg); + FORCE_x87(env_cg); } new_op = func(dbgi, irg, block, new_ptr, noreg, new_mem); - set_ia32_am_support(new_op, ia32_am_Source); set_ia32_op_type(new_op, ia32_AddrModeS); set_ia32_am_flavour(new_op, ia32_am_OB); set_ia32_am_offs_int(new_op, 0); @@ -2858,7 +3284,7 @@ static ir_node *gen_lowered_Load(ia32_transform_env_t *env, ir_node *node, const set_ia32_use_frame(new_op); } - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node)); return new_op; } @@ -2866,17 +3292,17 @@ static ir_node *gen_lowered_Load(ia32_transform_env_t *env, ir_node *node, const /** * Transforms a lowered Store into a "real" one. */ -static ir_node *gen_lowered_Store(ia32_transform_env_t *env, ir_node *node, construct_store_func func, char fp_unit) { - ir_node *block = transform_node(env, get_nodes_block(node)); +static ir_node *gen_lowered_Store(ir_node *node, construct_store_func func, char fp_unit) { + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *ptr = get_irn_n(node, 0); - ir_node *new_ptr = transform_node(env, ptr); + ir_node *new_ptr = be_transform_node(ptr); ir_node *val = get_irn_n(node, 1); - ir_node *new_val = transform_node(env, val); + ir_node *new_val = be_transform_node(val); ir_node *mem = get_irn_n(node, 2); - ir_node *new_mem = transform_node(env, mem); - ir_graph *irg = env->irg; + ir_node *new_mem = be_transform_node(mem); + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); - ir_node *noreg = ia32_new_NoReg_gp(env->cg); + ir_node *noreg = ia32_new_NoReg_gp(env_cg); ir_mode *mode = get_ia32_ls_mode(node); ir_node *new_op; long am_offs; @@ -2887,9 +3313,9 @@ static ir_node *gen_lowered_Store(ia32_transform_env_t *env, ir_node *node, cons lowering we have x87 nodes, so we need to enforce simulation. */ if (mode_is_float(mode)) { - FP_USED(env->cg); + FP_USED(env_cg); if (fp_unit == fp_x87) - FORCE_x87(env->cg); + FORCE_x87(env_cg); } new_op = func(dbgi, irg, block, new_ptr, noreg, new_val, new_mem); @@ -2899,14 +3325,13 @@ static ir_node *gen_lowered_Store(ia32_transform_env_t *env, ir_node *node, cons add_ia32_am_offs_int(new_op, am_offs); } - set_ia32_am_support(new_op, ia32_am_Dest); set_ia32_op_type(new_op, ia32_AddrModeD); set_ia32_am_flavour(new_op, am_flav); set_ia32_ls_mode(new_op, mode); set_ia32_frame_ent(new_op, get_ia32_frame_ent(node)); set_ia32_use_frame(new_op); - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node)); return new_op; } @@ -2918,43 +3343,43 @@ static ir_node *gen_lowered_Store(ia32_transform_env_t *env, ir_node *node, cons * @param env The transformation environment * @return the created ia32 XXX node */ -#define GEN_LOWERED_OP(op) \ - static ir_node *gen_ia32_l_##op(ia32_transform_env_t *env, ir_node *node) {\ - ir_mode *mode = get_irn_mode(node); \ - if (mode_is_float(mode)) \ - FP_USED(env->cg); \ - return gen_binop(env, node, get_binop_left(node), \ - get_binop_right(node), new_rd_ia32_##op); \ +#define GEN_LOWERED_OP(op) \ + static ir_node *gen_ia32_l_##op(ir_node *node) { \ + ir_mode *mode = get_irn_mode(node); \ + if (mode_is_float(mode)) \ + FP_USED(env_cg); \ + return gen_binop(node, get_binop_left(node), \ + get_binop_right(node), new_rd_ia32_##op,0); \ } #define GEN_LOWERED_x87_OP(op) \ - static ir_node *gen_ia32_l_##op(ia32_transform_env_t *env, ir_node *node) {\ + static ir_node *gen_ia32_l_##op(ir_node *node) { \ ir_node *new_op; \ - FORCE_x87(env->cg); \ - new_op = gen_binop_float(env, node, get_binop_left(node), \ - get_binop_right(node), new_rd_ia32_##op); \ + FORCE_x87(env_cg); \ + new_op = gen_binop_x87_float(node, get_binop_left(node), \ + get_binop_right(node), new_rd_ia32_##op); \ return new_op; \ } #define GEN_LOWERED_UNOP(op) \ - static ir_node *gen_ia32_l_##op(ia32_transform_env_t *env, ir_node *node) {\ - return gen_unop(env, node, get_unop_op(node), new_rd_ia32_##op); \ + static ir_node *gen_ia32_l_##op(ir_node *node) {\ + return gen_unop(node, get_unop_op(node), new_rd_ia32_##op); \ } #define GEN_LOWERED_SHIFT_OP(op) \ - static ir_node *gen_ia32_l_##op(ia32_transform_env_t *env, ir_node *node) {\ - return gen_shift_binop(env, node, get_binop_left(node), \ + static ir_node *gen_ia32_l_##op(ir_node *node) {\ + return gen_shift_binop(node, get_binop_left(node), \ get_binop_right(node), new_rd_ia32_##op); \ } #define GEN_LOWERED_LOAD(op, fp_unit) \ - static ir_node *gen_ia32_l_##op(ia32_transform_env_t *env, ir_node *node) {\ - return gen_lowered_Load(env, node, new_rd_ia32_##op, fp_unit); \ + static ir_node *gen_ia32_l_##op(ir_node *node) {\ + return gen_lowered_Load(node, new_rd_ia32_##op, fp_unit); \ } #define GEN_LOWERED_STORE(op, fp_unit) \ - static ir_node *gen_ia32_l_##op(ia32_transform_env_t *env, ir_node *node) {\ - return gen_lowered_Store(env, node, new_rd_ia32_##op, fp_unit); \ + static ir_node *gen_ia32_l_##op(ir_node *node) {\ + return gen_lowered_Store(node, new_rd_ia32_##op, fp_unit); \ } GEN_LOWERED_OP(Adc) @@ -2976,25 +3401,28 @@ GEN_LOWERED_LOAD(Load, fp_none) */ GEN_LOWERED_STORE(Store, fp_none) -static ir_node *gen_ia32_l_vfdiv(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); +static ir_node *gen_ia32_l_vfdiv(ir_node *node) { + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *left = get_binop_left(node); - ir_node *new_left = transform_node(env, left); + ir_node *new_left = be_transform_node(left); ir_node *right = get_binop_right(node); - ir_node *new_right = transform_node(env, right); - ir_node *noreg = ia32_new_NoReg_gp(env->cg); - ir_graph *irg = env->irg; + ir_node *new_right = be_transform_node(right); + ir_node *noreg = ia32_new_NoReg_gp(env_cg); + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); + ir_node *fpcw = be_abi_get_ignore_irn(env_cg->birg->abi, + &ia32_fp_cw_regs[REG_FPCW]); ir_node *vfdiv; - vfdiv = new_rd_ia32_vfdiv(dbgi, irg, block, noreg, noreg, new_left, new_right, new_NoMem()); + vfdiv = new_rd_ia32_vfdiv(dbgi, irg, block, noreg, noreg, new_left, + new_right, new_NoMem(), fpcw); clear_ia32_commutative(vfdiv); - set_ia32_am_support(vfdiv, ia32_am_Source); - fold_immediate(env, vfdiv, 2, 3); + set_ia32_am_support(vfdiv, ia32_am_Source, ia32_am_binary); + fold_immediate(vfdiv, 2, 3); - SET_IA32_ORIG_NODE(vfdiv, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(vfdiv, ia32_get_old_node_name(env_cg, node)); - FORCE_x87(env->cg); + FORCE_x87(env_cg); return vfdiv; } @@ -3005,14 +3433,14 @@ static ir_node *gen_ia32_l_vfdiv(ia32_transform_env_t *env, ir_node *node) { * @param env The transformation environment * @return the created ia32 Mul node */ -static ir_node *gen_ia32_l_Mul(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); +static ir_node *gen_ia32_l_Mul(ir_node *node) { + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *left = get_binop_left(node); - ir_node *new_left = transform_node(env, left); + ir_node *new_left = be_transform_node(left); ir_node *right = get_binop_right(node); - ir_node *new_right = transform_node(env, right); - ir_node *noreg = ia32_new_NoReg_gp(env->cg); - ir_graph *irg = env->irg; + ir_node *new_right = be_transform_node(right); + ir_node *noreg = ia32_new_NoReg_gp(env_cg); + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); ir_node *in[2]; @@ -3020,15 +3448,15 @@ static ir_node *gen_ia32_l_Mul(ia32_transform_env_t *env, ir_node *node) { /* and then skip the result Proj, because all needed Projs are already there. */ ir_node *muls = new_rd_ia32_Mul(dbgi, irg, block, noreg, noreg, new_left, new_right, new_NoMem()); clear_ia32_commutative(muls); - set_ia32_am_support(muls, ia32_am_Source); - fold_immediate(env, muls, 2, 3); + set_ia32_am_support(muls, ia32_am_Source, ia32_am_binary); + fold_immediate(muls, 2, 3); /* check if EAX and EDX proj exist, add missing one */ in[0] = new_rd_Proj(dbgi, irg, block, muls, mode_Iu, pn_EAX); in[1] = new_rd_Proj(dbgi, irg, block, muls, mode_Iu, pn_EDX); be_new_Keep(&ia32_reg_classes[CLASS_ia32_gp], irg, block, 2, in); - SET_IA32_ORIG_NODE(muls, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(muls, ia32_get_old_node_name(env_cg, node)); return muls; } @@ -3044,18 +3472,17 @@ GEN_LOWERED_SHIFT_OP(Sar) * op3 - shift count * Only op3 can be an immediate. */ -static ir_node *gen_lowered_64bit_shifts(ia32_transform_env_t *env, ir_node *node, - ir_node *op1, ir_node *op2, - ir_node *count) +static ir_node *gen_lowered_64bit_shifts(ir_node *node, ir_node *op1, + ir_node *op2, ir_node *count) { - ir_node *block = transform_node(env, get_nodes_block(node)); - ir_node *new_op1 = transform_node(env, op1); - ir_node *new_op2 = transform_node(env, op2); - ir_node *new_count = transform_node(env, count); + ir_node *block = be_transform_node(get_nodes_block(node)); + ir_node *new_op1 = be_transform_node(op1); + ir_node *new_op2 = be_transform_node(op2); + ir_node *new_count = be_transform_node(count); ir_node *new_op = NULL; - ir_graph *irg = env->irg; + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); - ir_node *noreg = ia32_new_NoReg_gp(env->cg); + ir_node *noreg = ia32_new_NoReg_gp(env_cg); ir_node *nomem = new_NoMem(); ir_node *imm_op; tarval *tv; @@ -3064,7 +3491,7 @@ static ir_node *gen_lowered_64bit_shifts(ia32_transform_env_t *env, ir_node *nod /* Check if immediate optimization is on and */ /* if it's an operation with immediate. */ - imm_op = (env->cg->opt & IA32_OPT_IMMOPS) ? get_immediate_op(NULL, new_count) : NULL; + imm_op = (env_cg->opt & IA32_OPT_IMMOPS) ? get_immediate_op(NULL, new_count) : NULL; /* Limit imm_op within range imm8 */ if (imm_op) { @@ -3104,36 +3531,35 @@ static ir_node *gen_lowered_64bit_shifts(ia32_transform_env_t *env, ir_node *nod } /* set AM support */ - // Matze: node has unsupported format (6inputs) - //set_ia32_am_support(new_op, ia32_am_Dest); + set_ia32_am_support(new_op, ia32_am_Dest, ia32_am_binary); - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node)); set_ia32_emit_cl(new_op); return new_op; } -static ir_node *gen_ia32_l_ShlD(ia32_transform_env_t *env, ir_node *node) { - return gen_lowered_64bit_shifts(env, node, get_irn_n(node, 0), +static ir_node *gen_ia32_l_ShlD(ir_node *node) { + return gen_lowered_64bit_shifts(node, get_irn_n(node, 0), get_irn_n(node, 1), get_irn_n(node, 2)); } -static ir_node *gen_ia32_l_ShrD(ia32_transform_env_t *env, ir_node *node) { - return gen_lowered_64bit_shifts(env, node, get_irn_n(node, 0), +static ir_node *gen_ia32_l_ShrD(ir_node *node) { + return gen_lowered_64bit_shifts(node, get_irn_n(node, 0), get_irn_n(node, 1), get_irn_n(node, 2)); } /** * In case SSE Unit is used, the node is transformed into a vfst + xLoad. */ -static ir_node *gen_ia32_l_X87toSSE(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); +static ir_node *gen_ia32_l_X87toSSE(ir_node *node) { + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *val = get_irn_n(node, 1); - ir_node *new_val = transform_node(env, val); - ia32_code_gen_t *cg = env->cg; + ir_node *new_val = be_transform_node(val); + ia32_code_gen_t *cg = env_cg; ir_node *res = NULL; - ir_graph *irg = env->irg; + ir_graph *irg = current_ir_graph; dbg_info *dbgi; ir_node *noreg, *new_ptr, *new_mem; ir_node *ptr, *mem; @@ -3143,18 +3569,17 @@ static ir_node *gen_ia32_l_X87toSSE(ia32_transform_env_t *env, ir_node *node) { } mem = get_irn_n(node, 2); - new_mem = transform_node(env, mem); + new_mem = be_transform_node(mem); ptr = get_irn_n(node, 0); - new_ptr = transform_node(env, ptr); + new_ptr = be_transform_node(ptr); noreg = ia32_new_NoReg_gp(cg); dbgi = get_irn_dbg_info(node); /* Store x87 -> MEM */ - res = new_rd_ia32_vfst(dbgi, irg, block, new_ptr, noreg, new_val, new_mem); + res = new_rd_ia32_vfst(dbgi, irg, block, new_ptr, noreg, new_val, new_mem, get_ia32_ls_mode(node)); set_ia32_frame_ent(res, get_ia32_frame_ent(node)); set_ia32_use_frame(res); set_ia32_ls_mode(res, get_ia32_ls_mode(node)); - set_ia32_am_support(res, ia32_am_Dest); set_ia32_am_flavour(res, ia32_B); set_ia32_op_type(res, ia32_AddrModeD); @@ -3163,7 +3588,6 @@ static ir_node *gen_ia32_l_X87toSSE(ia32_transform_env_t *env, ir_node *node) { set_ia32_frame_ent(res, get_ia32_frame_ent(node)); set_ia32_use_frame(res); set_ia32_ls_mode(res, get_ia32_ls_mode(node)); - set_ia32_am_support(res, ia32_am_Source); set_ia32_am_flavour(res, ia32_B); set_ia32_op_type(res, ia32_AddrModeS); res = new_rd_Proj(dbgi, irg, block, res, mode_xmm, pn_ia32_xLoad_res); @@ -3174,12 +3598,12 @@ static ir_node *gen_ia32_l_X87toSSE(ia32_transform_env_t *env, ir_node *node) { /** * In case SSE Unit is used, the node is transformed into a xStore + vfld. */ -static ir_node *gen_ia32_l_SSEtoX87(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); +static ir_node *gen_ia32_l_SSEtoX87(ir_node *node) { + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *val = get_irn_n(node, 1); - ir_node *new_val = transform_node(env, val); - ia32_code_gen_t *cg = env->cg; - ir_graph *irg = env->irg; + ir_node *new_val = be_transform_node(val); + ia32_code_gen_t *cg = env_cg; + ir_graph *irg = current_ir_graph; ir_node *res = NULL; ir_entity *fent = get_ia32_frame_ent(node); ir_mode *lsmode = get_ia32_ls_mode(node); @@ -3194,9 +3618,9 @@ static ir_node *gen_ia32_l_SSEtoX87(ia32_transform_env_t *env, ir_node *node) { } ptr = get_irn_n(node, 0); - new_ptr = transform_node(env, ptr); + new_ptr = be_transform_node(ptr); mem = get_irn_n(node, 2); - new_mem = transform_node(env, mem); + new_mem = be_transform_node(mem); noreg = ia32_new_NoReg_gp(cg); dbgi = get_irn_dbg_info(node); @@ -3213,19 +3637,16 @@ static ir_node *gen_ia32_l_SSEtoX87(ia32_transform_env_t *env, ir_node *node) { set_ia32_frame_ent(res, fent); set_ia32_use_frame(res); set_ia32_ls_mode(res, lsmode); - set_ia32_am_support(res, ia32_am_Dest); set_ia32_am_flavour(res, ia32_B); set_ia32_op_type(res, ia32_AddrModeD); mem = res; } /* Load MEM -> x87 */ - res = new_rd_ia32_vfld(dbgi, irg, block, new_ptr, noreg, new_mem); + res = new_rd_ia32_vfld(dbgi, irg, block, new_ptr, noreg, new_mem, lsmode); set_ia32_frame_ent(res, fent); set_ia32_use_frame(res); - set_ia32_ls_mode(res, lsmode); add_ia32_am_offs_int(res, offs); - set_ia32_am_support(res, ia32_am_Source); set_ia32_am_flavour(res, ia32_B); set_ia32_op_type(res, ia32_AddrModeS); res = new_rd_Proj(dbgi, irg, block, res, mode_vfp, pn_ia32_vfld_res); @@ -3246,85 +3667,25 @@ static ir_node *gen_ia32_l_SSEtoX87(ia32_transform_env_t *env, ir_node *node) { /** * the BAD transformer. */ -static ir_node *bad_transform(ia32_transform_env_t *env, ir_node *node) { +static ir_node *bad_transform(ir_node *node) { panic("No transform function for %+F available.\n", node); return NULL; } -static ir_node *gen_End(ia32_transform_env_t *env, ir_node *node) { - /* end has to be duplicated manually because we need a dynamic in array */ - ir_graph *irg = env->irg; - dbg_info *dbgi = get_irn_dbg_info(node); - ir_node *block = transform_node(env, get_nodes_block(node)); - int i, arity; - ir_node *new_end; - - new_end = new_ir_node(dbgi, irg, block, op_End, mode_X, -1, NULL); - copy_node_attr(node, new_end); - duplicate_deps(env, node, new_end); - - set_irg_end(irg, new_end); - set_new_node(new_end, new_end); - - /* transform preds */ - arity = get_irn_arity(node); - for (i = 0; i < arity; ++i) { - ir_node *in = get_irn_n(node, i); - ir_node *new_in = transform_node(env, in); - - add_End_keepalive(new_end, new_in); - } - - return new_end; -} - -static ir_node *gen_Block(ia32_transform_env_t *env, ir_node *node) { - ir_graph *irg = env->irg; - dbg_info *dbgi = get_irn_dbg_info(node); - ir_node *start_block = env->old_anchors[anchor_start_block]; - ir_node *block; - int i, arity; - - /* - * We replace the ProjX from the start node with a jump, - * so the startblock has no preds anymore now - */ - if (node == start_block) { - return new_rd_Block(dbgi, irg, 0, NULL); - } - - /* we use the old blocks for now, because jumps allow cycles in the graph - * we have to fix this later */ - block = new_ir_node(dbgi, irg, NULL, get_irn_op(node), get_irn_mode(node), - get_irn_arity(node), get_irn_in(node) + 1); - copy_node_attr(node, block); - -#ifdef DEBUG_libfirm - block->node_nr = node->node_nr; -#endif - set_new_node(node, block); - - /* put the preds in the worklist */ - arity = get_irn_arity(node); - for (i = 0; i < arity; ++i) { - ir_node *in = get_irn_n(node, i); - pdeq_putr(env->worklist, in); - } - - return block; -} - -static ir_node *gen_Proj_be_AddSP(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); +/** + * Transform the Projs of an AddSP. + */ +static ir_node *gen_Proj_be_AddSP(ir_node *node) { + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *pred = get_Proj_pred(node); - ir_node *new_pred = transform_node(env, pred); - ir_graph *irg = env->irg; + ir_node *new_pred = be_transform_node(pred); + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); long proj = get_Proj_proj(node); if (proj == pn_be_AddSP_res) { ir_node *res = new_rd_Proj(dbgi, irg, block, new_pred, mode_Iu, pn_ia32_AddSP_stack); - arch_set_irn_register(env->cg->arch_env, res, &ia32_gp_regs[REG_ESP]); + arch_set_irn_register(env_cg->arch_env, res, &ia32_gp_regs[REG_ESP]); return res; } else if (proj == pn_be_AddSP_M) { return new_rd_Proj(dbgi, irg, block, new_pred, mode_M, pn_ia32_AddSP_M); @@ -3334,17 +3695,20 @@ static ir_node *gen_Proj_be_AddSP(ia32_transform_env_t *env, ir_node *node) { return new_rd_Unknown(irg, get_irn_mode(node)); } -static ir_node *gen_Proj_be_SubSP(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); +/** + * Transform the Projs of a SubSP. + */ +static ir_node *gen_Proj_be_SubSP(ir_node *node) { + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *pred = get_Proj_pred(node); - ir_node *new_pred = transform_node(env, pred); - ir_graph *irg = env->irg; + ir_node *new_pred = be_transform_node(pred); + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); long proj = get_Proj_proj(node); if (proj == pn_be_SubSP_res) { - ir_node *res = new_rd_Proj(dbgi, irg, block, new_pred, mode_Iu, pn_ia32_AddSP_stack); - arch_set_irn_register(env->cg->arch_env, res, &ia32_gp_regs[REG_ESP]); + ir_node *res = new_rd_Proj(dbgi, irg, block, new_pred, mode_Iu, pn_ia32_SubSP_stack); + arch_set_irn_register(env_cg->arch_env, res, &ia32_gp_regs[REG_ESP]); return res; } else if (proj == pn_be_SubSP_M) { return new_rd_Proj(dbgi, irg, block, new_pred, mode_M, pn_ia32_SubSP_M); @@ -3354,11 +3718,14 @@ static ir_node *gen_Proj_be_SubSP(ia32_transform_env_t *env, ir_node *node) { return new_rd_Unknown(irg, get_irn_mode(node)); } -static ir_node *gen_Proj_Load(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); +/** + * Transform and renumber the Projs from a Load. + */ +static ir_node *gen_Proj_Load(ir_node *node) { + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *pred = get_Proj_pred(node); - ir_node *new_pred = transform_node(env, pred); - ir_graph *irg = env->irg; + ir_node *new_pred = be_transform_node(pred); + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); long proj = get_Proj_proj(node); @@ -3387,11 +3754,14 @@ static ir_node *gen_Proj_Load(ia32_transform_env_t *env, ir_node *node) { return new_rd_Unknown(irg, get_irn_mode(node)); } -static ir_node *gen_Proj_DivMod(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); +/** + * Transform and renumber the Projs from a DivMod like instruction. + */ +static ir_node *gen_Proj_DivMod(ir_node *node) { + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *pred = get_Proj_pred(node); - ir_node *new_pred = transform_node(env, pred); - ir_graph *irg = env->irg; + ir_node *new_pred = be_transform_node(pred); + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); ir_mode *mode = get_irn_mode(node); long proj = get_Proj_proj(node); @@ -3439,11 +3809,14 @@ static ir_node *gen_Proj_DivMod(ia32_transform_env_t *env, ir_node *node) { return new_rd_Unknown(irg, mode); } -static ir_node *gen_Proj_CopyB(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); +/** + * Transform and renumber the Projs from a CopyB. + */ +static ir_node *gen_Proj_CopyB(ir_node *node) { + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *pred = get_Proj_pred(node); - ir_node *new_pred = transform_node(env, pred); - ir_graph *irg = env->irg; + ir_node *new_pred = be_transform_node(pred); + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); ir_mode *mode = get_irn_mode(node); long proj = get_Proj_proj(node); @@ -3464,11 +3837,14 @@ static ir_node *gen_Proj_CopyB(ia32_transform_env_t *env, ir_node *node) { return new_rd_Unknown(irg, mode); } -static ir_node *gen_Proj_l_vfdiv(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); +/** + * Transform and renumber the Projs from a vfdiv. + */ +static ir_node *gen_Proj_l_vfdiv(ir_node *node) { + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *pred = get_Proj_pred(node); - ir_node *new_pred = transform_node(env, pred); - ir_graph *irg = env->irg; + ir_node *new_pred = be_transform_node(pred); + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); ir_mode *mode = get_irn_mode(node); long proj = get_Proj_proj(node); @@ -3485,11 +3861,14 @@ static ir_node *gen_Proj_l_vfdiv(ia32_transform_env_t *env, ir_node *node) { return new_rd_Unknown(irg, mode); } -static ir_node *gen_Proj_Quot(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); +/** + * Transform and renumber the Projs from a Quot. + */ +static ir_node *gen_Proj_Quot(ir_node *node) { + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *pred = get_Proj_pred(node); - ir_node *new_pred = transform_node(env, pred); - ir_graph *irg = env->irg; + ir_node *new_pred = be_transform_node(pred); + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); ir_mode *mode = get_irn_mode(node); long proj = get_Proj_proj(node); @@ -3517,20 +3896,26 @@ static ir_node *gen_Proj_Quot(ia32_transform_env_t *env, ir_node *node) { return new_rd_Unknown(irg, mode); } -static ir_node *gen_Proj_tls(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); - ir_graph *irg = env->irg; +/** + * Transform the Thread Local Storage Proj. + */ +static ir_node *gen_Proj_tls(ir_node *node) { + ir_node *block = be_transform_node(get_nodes_block(node)); + ir_graph *irg = current_ir_graph; dbg_info *dbgi = NULL; ir_node *res = new_rd_ia32_LdTls(dbgi, irg, block, mode_Iu); return res; } -static ir_node *gen_Proj_be_Call(ia32_transform_env_t *env, ir_node *node) { - ir_node *block = transform_node(env, get_nodes_block(node)); +/** + * Transform the Projs from a be_Call. + */ +static ir_node *gen_Proj_be_Call(ir_node *node) { + ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *call = get_Proj_pred(node); - ir_node *new_call = transform_node(env, call); - ir_graph *irg = env->irg; + ir_node *new_call = be_transform_node(call); + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); long proj = get_Proj_proj(node); ir_mode *mode = get_irn_mode(node); @@ -3550,7 +3935,7 @@ static ir_node *gen_Proj_be_Call(ia32_transform_env_t *env, ir_node *node) { ir_node *call_res_pred = NULL; if (call_res != NULL) { - call_res_new = transform_node(env, call_res); + call_res_new = be_transform_node(call_res); call_res_pred = get_Proj_pred(call_res_new); } @@ -3561,10 +3946,10 @@ static ir_node *gen_Proj_be_Call(ia32_transform_env_t *env, ir_node *node) { return new_rd_Proj(dbgi, irg, block, call_res_pred, mode_M, pn_ia32_xLoad_M); } } - if (proj == pn_be_Call_first_res && mode_is_float(mode) && USE_SSE2(env->cg)) { + if (proj == pn_be_Call_first_res && mode_is_float(mode) && USE_SSE2(env_cg)) { ir_node *fstp; ir_node *frame = get_irg_frame(irg); - ir_node *noreg = ia32_new_NoReg_gp(env->cg); + ir_node *noreg = ia32_new_NoReg_gp(env_cg); ir_node *p; ir_node *call_mem = be_get_Proj_for_pn(call, pn_be_Call_M_regular); ir_node *keepin[1]; @@ -3580,7 +3965,6 @@ static ir_node *gen_Proj_be_Call(ia32_transform_env_t *env, ir_node *node) { set_ia32_op_type(fstp, ia32_AddrModeD); set_ia32_use_frame(fstp); set_ia32_am_flavour(fstp, ia32_am_B); - set_ia32_am_support(fstp, ia32_am_Dest); /* load into SSE register */ sse_load = new_rd_ia32_xLoad(dbgi, irg, block, frame, noreg, fstp); @@ -3588,7 +3972,6 @@ static ir_node *gen_Proj_be_Call(ia32_transform_env_t *env, ir_node *node) { set_ia32_op_type(sse_load, ia32_AddrModeS); set_ia32_use_frame(sse_load); set_ia32_am_flavour(sse_load, ia32_am_B); - set_ia32_am_support(sse_load, ia32_am_Source); sse_load = new_rd_Proj(dbgi, irg, block, sse_load, mode_xmm, pn_ia32_xLoad_res); @@ -3603,7 +3986,7 @@ static ir_node *gen_Proj_be_Call(ia32_transform_env_t *env, ir_node *node) { assert(be_is_Keep(p) && "Keep expected."); /* keep the result */ - cls = arch_get_irn_reg_class(env->cg->arch_env, sse_load, -1); + cls = arch_get_irn_reg_class(env_cg->arch_env, sse_load, -1); keepin[0] = sse_load; be_new_Keep(cls, irg, block, 1, keepin); @@ -3612,59 +3995,131 @@ static ir_node *gen_Proj_be_Call(ia32_transform_env_t *env, ir_node *node) { /* transform call modes */ if (mode_is_data(mode)) { - cls = arch_get_irn_reg_class(env->cg->arch_env, node, -1); + cls = arch_get_irn_reg_class(env_cg->arch_env, node, -1); mode = cls->mode; } return new_rd_Proj(dbgi, irg, block, new_call, mode, proj); } -static ir_node *gen_Proj(ia32_transform_env_t *env, ir_node *node) { - ir_graph *irg = env->irg; +/** + * Transform the Projs from a Cmp. + */ +static ir_node *gen_Proj_Cmp(ir_node *node) +{ + /* normally Cmps are processed when looking at Cond nodes, but this case + * can happen in complicated Psi conditions */ + + ir_graph *irg = current_ir_graph; + dbg_info *dbgi = get_irn_dbg_info(node); + ir_node *block = be_transform_node(get_nodes_block(node)); + ir_node *cmp = get_Proj_pred(node); + long pnc = get_Proj_proj(node); + ir_node *cmp_left = get_Cmp_left(cmp); + ir_node *cmp_right = get_Cmp_right(cmp); + ir_node *new_cmp_left; + ir_node *new_cmp_right; + ir_node *noreg = ia32_new_NoReg_gp(env_cg); + ir_node *nomem = new_rd_NoMem(irg); + ir_mode *cmp_mode = get_irn_mode(cmp_left); + ir_node *new_op; + + assert(!mode_is_float(cmp_mode)); + + /* (a != b) -> (a ^ b) */ + if(pnc == pn_Cmp_Lg) { + if(is_Const_0(cmp_left)) { + new_op = be_transform_node(cmp_right); + } else if(is_Const_0(cmp_right)) { + new_op = be_transform_node(cmp_left); + } else { + new_op = gen_binop(cmp, cmp_left, cmp_right, new_rd_ia32_Xor, 1); + } + + return new_op; + } + /* TODO: + * (a == b) -> !(a ^ b) + * (a < 0) -> (a & 0x80000000) oder a >> 31 + * (a >= 0) -> (a >> 31) ^ 1 + */ + + if(!mode_is_signed(cmp_mode)) { + pnc |= ia32_pn_Cmp_Unsigned; + } + + new_cmp_right = try_create_Immediate(cmp_right, 0); + if(new_cmp_right == NULL) { + new_cmp_right = try_create_Immediate(cmp_left, 0); + if(new_cmp_right != NULL) { + pnc = get_inversed_pnc(pnc); + new_cmp_left = be_transform_node(cmp_right); + } + } else { + new_cmp_left = be_transform_node(cmp_left); + } + if(new_cmp_right == NULL) { + new_cmp_left = be_transform_node(cmp_left); + new_cmp_right = be_transform_node(cmp_right); + } + + new_op = new_rd_ia32_CmpSet(dbgi, irg, block, noreg, noreg, new_cmp_left, + new_cmp_right, nomem, pnc); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, cmp)); + + return new_op; +} + +/** + * Transform and potentially renumber Proj nodes. + */ +static ir_node *gen_Proj(ir_node *node) { + ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); ir_node *pred = get_Proj_pred(node); long proj = get_Proj_proj(node); if (is_Store(pred) || be_is_FrameStore(pred)) { if (proj == pn_Store_M) { - return transform_node(env, pred); + return be_transform_node(pred); } else { assert(0); return new_r_Bad(irg); } } else if (is_Load(pred) || be_is_FrameLoad(pred)) { - return gen_Proj_Load(env, node); + return gen_Proj_Load(node); } else if (is_Div(pred) || is_Mod(pred) || is_DivMod(pred)) { - return gen_Proj_DivMod(env, node); + return gen_Proj_DivMod(node); } else if (is_CopyB(pred)) { - return gen_Proj_CopyB(env, node); + return gen_Proj_CopyB(node); } else if (is_Quot(pred)) { - return gen_Proj_Quot(env, node); + return gen_Proj_Quot(node); } else if (is_ia32_l_vfdiv(pred)) { - return gen_Proj_l_vfdiv(env, node); + return gen_Proj_l_vfdiv(node); } else if (be_is_SubSP(pred)) { - return gen_Proj_be_SubSP(env, node); + return gen_Proj_be_SubSP(node); } else if (be_is_AddSP(pred)) { - return gen_Proj_be_AddSP(env, node); + return gen_Proj_be_AddSP(node); } else if (be_is_Call(pred)) { - return gen_Proj_be_Call(env, node); + return gen_Proj_be_Call(node); + } else if (is_Cmp(pred)) { + return gen_Proj_Cmp(node); } else if (get_irn_op(pred) == op_Start) { if (proj == pn_Start_X_initial_exec) { ir_node *block = get_nodes_block(pred); ir_node *jump; /* we exchange the ProjX with a jump */ - block = transform_node(env, block); + block = be_transform_node(block); jump = new_rd_Jmp(dbgi, irg, block); - ir_fprintf(stderr, "created jump: %+F\n", jump); return jump; } - if (node == env->old_anchors[anchor_tls]) { - return gen_Proj_tls(env, node); + if (node == be_get_old_anchor(anchor_tls)) { + return gen_Proj_tls(node); } } else { - ir_node *new_pred = transform_node(env, pred); - ir_node *block = transform_node(env, get_nodes_block(node)); + ir_node *new_pred = be_transform_node(pred); + ir_node *block = be_transform_node(get_nodes_block(node)); ir_mode *mode = get_irn_mode(node); if (mode_needs_gp_reg(mode)) { ir_node *new_proj = new_r_Proj(irg, block, new_pred, mode_Iu, @@ -3676,7 +4131,7 @@ static ir_node *gen_Proj(ia32_transform_env_t *env, ir_node *node) { } } - return duplicate_node(env, node); + return be_duplicate_node(node); } /** @@ -3688,7 +4143,7 @@ static void register_transformers(void) { /* first clear the generic function pointer for all ops */ clear_irp_opcodes_generic_func(); -#define GEN(a) { transform_func *func = gen_##a; op_##a->ops.generic = (op_func) func; } +#define GEN(a) { be_transform_func *func = gen_##a; op_##a->ops.generic = (op_func) func; } #define BAD(a) op_##a->ops.generic = (op_func)bad_transform GEN(Add); @@ -3718,6 +4173,7 @@ static void register_transformers(void) { GEN(Store); GEN(Cond); + GEN(ASM); GEN(CopyB); //GEN(Mux); BAD(Mux); @@ -3725,9 +4181,6 @@ static void register_transformers(void) { GEN(Proj); GEN(Phi); - GEN(Block); - GEN(End); - /* transform ops from intrinsic lowering */ GEN(ia32_l_Add); GEN(ia32_l_Adc); @@ -3780,6 +4233,7 @@ static void register_transformers(void) { GEN(be_StackParam); GEN(be_AddSP); GEN(be_SubSP); + GEN(be_Copy); /* set the register for all Unknown nodes */ GEN(Unknown); @@ -3798,418 +4252,25 @@ static void register_transformers(void) { #undef BAD } -static void duplicate_deps(ia32_transform_env_t *env, ir_node *old_node, - ir_node *new_node) -{ - int i; - int deps = get_irn_deps(old_node); - - for (i = 0; i < deps; ++i) { - ir_node *dep = get_irn_dep(old_node, i); - ir_node *new_dep = transform_node(env, dep); - - add_irn_dep(new_node, new_dep); - } -} - -static ir_node *duplicate_node(ia32_transform_env_t *env, ir_node *node) -{ - ir_node *block = transform_node(env, get_nodes_block(node)); - ir_graph *irg = env->irg; - dbg_info *dbgi = get_irn_dbg_info(node); - ir_mode *mode = get_irn_mode(node); - ir_op *op = get_irn_op(node); - ir_node *new_node; - int i, arity; - - arity = get_irn_arity(node); - if (op->opar == oparity_dynamic) { - new_node = new_ir_node(dbgi, irg, block, op, mode, -1, NULL); - for (i = 0; i < arity; ++i) { - ir_node *in = get_irn_n(node, i); - in = transform_node(env, in); - add_irn_n(new_node, in); - } - } else { - ir_node **ins = alloca(arity * sizeof(ins[0])); - for (i = 0; i < arity; ++i) { - ir_node *in = get_irn_n(node, i); - ins[i] = transform_node(env, in); - } - - new_node = new_ir_node(dbgi, irg, block, op, mode, arity, ins); - } - - copy_node_attr(node, new_node); - duplicate_deps(env, node, new_node); - -#ifdef DEBUG_libfirm - new_node->node_nr = node->node_nr; -#endif - - return new_node; -} - -/** - * Calls transformation function for given node and marks it visited. - */ -static ir_node *transform_node(ia32_transform_env_t *env, ir_node *node) { - ir_node *new_node; - ir_op *op = get_irn_op(node); - - if (irn_visited(node)) { - assert(get_new_node(node) != NULL); - return get_new_node(node); - } - - mark_irn_visited(node); - DEBUG_ONLY(set_new_node(node, NULL)); - - if (op->ops.generic) { - transform_func *transform = (transform_func *)op->ops.generic; - - new_node = (*transform)(env, node); - assert(new_node != NULL); - } else { - new_node = duplicate_node(env, node); - } - DB((dbg, LEVEL_4, "%+F -> %+F\n", node, new_node)); - - set_new_node(node, new_node); - mark_irn_visited(new_node); - hook_dead_node_elim_subst(current_ir_graph, node, new_node); - return new_node; -} - -/** - * Rewire nodes which are potential loops (like Phis) to avoid endless loops. - */ -static void fix_loops(ia32_transform_env_t *env, ir_node *node) { - int i, arity; - - if (irn_visited(node)) - return; - - mark_irn_visited(node); - - assert(node_is_in_irgs_storage(env->irg, node)); - - if (! is_Block(node)) { - ir_node *block = get_nodes_block(node); - ir_node *new_block = (ir_node *)get_irn_link(block); - - if (new_block != NULL) { - set_nodes_block(node, new_block); - block = new_block; - } - - fix_loops(env, block); - } - - arity = get_irn_arity(node); - for (i = 0; i < arity; ++i) { - ir_node *in = get_irn_n(node, i); - ir_node *nw = (ir_node *)get_irn_link(in); - - if (nw != NULL && nw != in) { - set_irn_n(node, i, nw); - in = nw; - } - - fix_loops(env, in); - } - - arity = get_irn_deps(node); - for (i = 0; i < arity; ++i) { - ir_node *in = get_irn_dep(node, i); - ir_node *nw = (ir_node *)get_irn_link(in); - - if (nw != NULL && nw != in) { - set_irn_dep(node, i, nw); - in = nw; - } - - fix_loops(env, in); - } -} - -static void pre_transform_node(ir_node **place, ia32_transform_env_t *env) -{ - if (*place == NULL) - return; - - *place = transform_node(env, *place); -} - /** - * Transforms all nodes. Deletes the old obstack and creates a new one. + * Pre-transform all unknown and noreg nodes. */ -static void transform_nodes(ia32_code_gen_t *cg) { - int i; - ir_graph *irg = cg->irg; - ir_node *old_end; - ia32_transform_env_t env; - - hook_dead_node_elim(irg, 1); - - inc_irg_visited(irg); - - env.irg = irg; - env.cg = cg; - env.visited = get_irg_visited(irg); - env.worklist = new_pdeq(); - env.old_anchors = alloca(anchor_max * sizeof(env.old_anchors[0])); - - old_end = get_irg_end(irg); - - /* put all anchor nodes in the worklist */ - for (i = 0; i < anchor_max; ++i) { - ir_node *anchor = irg->anchors[i]; - - if (anchor == NULL) - continue; - pdeq_putr(env.worklist, anchor); - - /* remember anchor */ - env.old_anchors[i] = anchor; - /* and set it to NULL to make sure we don't accidently use it */ - irg->anchors[i] = NULL; - } - - /* pre transform some anchors (so they are available in the other transform - * functions) */ - set_irg_bad(irg, transform_node(&env, env.old_anchors[anchor_bad])); - set_irg_no_mem(irg, transform_node(&env, env.old_anchors[anchor_no_mem])); - set_irg_start_block(irg, transform_node(&env, env.old_anchors[anchor_start_block])); - set_irg_start(irg, transform_node(&env, env.old_anchors[anchor_start])); - set_irg_frame(irg, transform_node(&env, env.old_anchors[anchor_frame])); - - pre_transform_node(&cg->unknown_gp, &env); - pre_transform_node(&cg->unknown_vfp, &env); - pre_transform_node(&cg->unknown_xmm, &env); - pre_transform_node(&cg->noreg_gp, &env); - pre_transform_node(&cg->noreg_vfp, &env); - pre_transform_node(&cg->noreg_xmm, &env); - - /* process worklist (this should transform all nodes in the graph) */ - while (! pdeq_empty(env.worklist)) { - ir_node *node = pdeq_getl(env.worklist); - transform_node(&env, node); - } - - /* fix loops and set new anchors*/ - inc_irg_visited(irg); - for (i = 0; i < anchor_max; ++i) { - ir_node *anchor = env.old_anchors[i]; - - if (anchor == NULL) - continue; - - anchor = get_irn_link(anchor); - fix_loops(&env, anchor); - assert(irg->anchors[i] == NULL || irg->anchors[i] == anchor); - irg->anchors[i] = anchor; - } - - del_pdeq(env.worklist); - free_End(old_end); - hook_dead_node_elim(irg, 0); +static void ia32_pretransform_node(void *arch_cg) { + ia32_code_gen_t *cg = arch_cg; + + cg->unknown_gp = be_pre_transform_node(cg->unknown_gp); + cg->unknown_vfp = be_pre_transform_node(cg->unknown_vfp); + cg->unknown_xmm = be_pre_transform_node(cg->unknown_xmm); + cg->noreg_gp = be_pre_transform_node(cg->noreg_gp); + cg->noreg_vfp = be_pre_transform_node(cg->noreg_vfp); + cg->noreg_xmm = be_pre_transform_node(cg->noreg_xmm); } -void ia32_transform_graph(ia32_code_gen_t *cg) -{ - ir_graph *irg = cg->irg; - be_irg_t *birg = cg->birg; - ir_graph *old_current_ir_graph = current_ir_graph; - int old_interprocedural_view = get_interprocedural_view(); - struct obstack *old_obst = NULL; - struct obstack *new_obst = NULL; - - current_ir_graph = irg; - set_interprocedural_view(0); +/* do the transformation */ +void ia32_transform_graph(ia32_code_gen_t *cg) { register_transformers(); - - /* most analysis info is wrong after transformation */ - free_callee_info(irg); - free_irg_outs(irg); - irg->outs_state = outs_none; - free_trouts(); - free_loop_information(irg); - set_irg_doms_inconsistent(irg); - be_invalidate_liveness(birg); - be_invalidate_dom_front(birg); - - /* create a new obstack */ - old_obst = irg->obst; - new_obst = xmalloc(sizeof(*new_obst)); - obstack_init(new_obst); - irg->obst = new_obst; - irg->last_node_idx = 0; - - /* create new value table for CSE */ - del_identities(irg->value_table); - irg->value_table = new_identities(); - - /* do the main transformation */ - transform_nodes(cg); - - /* we don't want the globals anchor anymore */ - set_irg_globals(irg, new_r_Bad(irg)); - - /* free the old obstack */ - obstack_free(old_obst, 0); - xfree(old_obst); - - /* restore state */ - current_ir_graph = old_current_ir_graph; - set_interprocedural_view(old_interprocedural_view); - - /* recalculate edges */ - edges_deactivate(irg); - edges_activate(irg); -} - -/** - * Transforms a psi condition. - */ -static void transform_psi_cond(ir_node *cond, ir_mode *mode, ia32_code_gen_t *cg) { - int i; - - /* if the mode is target mode, we have already seen this part of the tree */ - if (get_irn_mode(cond) == mode) - return; - - assert(get_irn_mode(cond) == mode_b && "logical operator for condition must be mode_b"); - - set_irn_mode(cond, mode); - - for (i = get_irn_arity(cond) - 1; i >= 0; i--) { - ir_node *in = get_irn_n(cond, i); - - /* if in is a compare: transform into Set/xCmp */ - if (is_Proj(in)) { - ir_node *new_op = NULL; - ir_node *cmp = get_Proj_pred(in); - ir_node *cmp_a = get_Cmp_left(cmp); - ir_node *cmp_b = get_Cmp_right(cmp); - dbg_info *dbgi = get_irn_dbg_info(cmp); - ir_graph *irg = get_irn_irg(cmp); - ir_node *block = get_nodes_block(cmp); - ir_node *noreg = ia32_new_NoReg_gp(cg); - ir_node *nomem = new_rd_NoMem(irg); - int pnc = get_Proj_proj(in); - - /* this is a compare */ - if (mode_is_float(mode)) { - /* Psi is float, we need a floating point compare */ - - if (USE_SSE2(cg)) { - ir_mode *m = get_irn_mode(cmp_a); - /* SSE FPU */ - if (! mode_is_float(m)) { - cmp_a = gen_sse_conv_int2float(cg, dbgi, irg, block, cmp_a, cmp_a, mode); - cmp_b = gen_sse_conv_int2float(cg, dbgi, irg, block, cmp_b, cmp_b, mode); - } else if (m == mode_F) { - /* we convert cmp values always to double, to get correct bitmask with cmpsd */ - cmp_a = gen_sse_conv_f2d(cg, dbgi, irg, block, cmp_a, cmp_a); - cmp_b = gen_sse_conv_f2d(cg, dbgi, irg, block, cmp_b, cmp_b); - } - - new_op = new_rd_ia32_xCmp(dbgi, irg, block, noreg, noreg, cmp_a, cmp_b, nomem); - set_ia32_pncode(new_op, pnc); - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(cg, cmp)); - } else { - /* x87 FPU */ - assert(0); - } - } else { - /* integer Psi */ - construct_binop_func *set_func = NULL; - - if (mode_is_float(get_irn_mode(cmp_a))) { - /* 1st case: compare operands are floats */ - FP_USED(cg); - - if (USE_SSE2(cg)) { - /* SSE FPU */ - set_func = new_rd_ia32_xCmpSet; - } else { - /* x87 FPU */ - set_func = new_rd_ia32_vfCmpSet; - } - - pnc &= 7; /* fp compare -> int compare */ - } else { - /* 2nd case: compare operand are integer too */ - set_func = new_rd_ia32_CmpSet; - } - - new_op = set_func(dbgi, irg, block, noreg, noreg, cmp_a, cmp_b, nomem); - if (! mode_is_signed(mode)) - pnc |= ia32_pn_Cmp_Unsigned; - - set_ia32_pncode(new_op, pnc); - set_ia32_am_support(new_op, ia32_am_Source); - } - - /* the the new compare as in */ - set_irn_n(cond, i, new_op); - } else { - /* another complex condition */ - transform_psi_cond(in, mode, cg); - } - } -} - -/** - * The Psi selector can be a tree of compares combined with "And"s and "Or"s. - * We create a Set node, respectively a xCmp in case the Psi is a float, for - * each compare, which causes the compare result to be stored in a register. The - * "And"s and "Or"s are transformed later, we just have to set their mode right. - */ -void ia32_transform_psi_cond_tree(ir_node *node, void *env) { - ia32_code_gen_t *cg = env; - ir_node *psi_sel, *new_cmp, *block; - ir_graph *irg; - ir_mode *mode; - - /* check for Psi */ - if (get_irn_opcode(node) != iro_Psi) - return; - - psi_sel = get_Psi_cond(node, 0); - - /* if psi_cond is a cmp: do nothing, this case is covered by gen_Psi */ - if (is_Proj(psi_sel)) { - assert(is_Cmp(get_Proj_pred(psi_sel))); - return; - } - - //mode = get_irn_mode(node); - // TODO probably wrong... - mode = mode_Iu; - - transform_psi_cond(psi_sel, mode, cg); - - irg = get_irn_irg(node); - block = get_nodes_block(node); - - /* we need to compare the evaluated condition tree with 0 */ - mode = get_irn_mode(node); - if (mode_is_float(mode)) { - /* BEWARE: new_r_Const_long works for floating point as well */ - ir_node *zero = new_r_Const_long(irg, block, mode, 0); - - psi_sel = gen_sse_conv_int2float(cg, NULL, irg, block, psi_sel, NULL, mode); - new_cmp = new_r_Cmp(irg, block, psi_sel, zero); - new_cmp = new_r_Proj(irg, block, new_cmp, mode_b, pn_Cmp_Ne); - } else { - ir_node *zero = new_r_Const_long(irg, block, mode_Iu, 0); - new_cmp = new_r_Cmp(irg, block, psi_sel, zero); - new_cmp = new_r_Proj(irg, block, new_cmp, mode_b, pn_Cmp_Gt | pn_Cmp_Lt); - } - - set_Psi_cond(node, 0, new_cmp); + env_cg = cg; + be_transform_graph(cg->birg, ia32_pretransform_node, cg); } void ia32_init_transform(void)