X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_transform.c;h=0f0d3e5f50a0d2fd3a7ef0ecaf48647ed3158aca;hb=d9ba33a4b9e7b4ee41bae2d4697c217cb4ad9b53;hp=984862dddb6df1ed4eb7ccd5da79de2cb7b3f603;hpb=719c4b4724a3f7deaeac0e4b484bdb504e5293b7;p=libfirm diff --git a/ir/be/ia32/ia32_transform.c b/ir/be/ia32/ia32_transform.c index 984862ddd..0f0d3e5f5 100644 --- a/ir/be/ia32/ia32_transform.c +++ b/ir/be/ia32/ia32_transform.c @@ -3,9 +3,8 @@ * @author Christian Wuerdig * $Id$ */ - #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include @@ -21,6 +20,7 @@ #include "irgmod.h" #include "irvrfy.h" #include "ircons.h" +#include "irgwalk.h" #include "dbginfo.h" #include "irprintf.h" #include "debug.h" @@ -29,10 +29,15 @@ #include "entity.h" #include "archop.h" /* we need this for Min and Max nodes */ #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 "bearch_ia32_t.h" #include "ia32_nodes_attr.h" @@ -60,17 +65,28 @@ #define ENT_SFP_ABS "IA32_SFP_ABS" #define ENT_DFP_ABS "IA32_DFP_ABS" +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*/ + DEBUG_ONLY(firm_dbg_module_t *mod;) /**< The firm debugger */ +} ia32_transform_env_t; + extern ir_op *get_op_Mulh(void); -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, ir_mode *mode); +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_unop_func(dbg_info *db, ir_graph *irg, ir_node *block, ir_node *base, ir_node *index, \ - ir_node *op, ir_node *mem, ir_mode *mode); +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 enum { - ia32_SSIGN, ia32_DSIGN, ia32_SABS, ia32_DABS, ia32_known_const_max -} ia32_known_const_t; +typedef ir_node *(transform_func)(ia32_transform_env_t *env, ir_node *node); /**************************************************************************************************** * _ _ __ _ _ @@ -82,96 +98,279 @@ typedef enum { * ****************************************************************************************************/ +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 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 */ static INLINE int is_ia32_Const_0(ir_node *irn) { - return (is_ia32_irn(irn) && get_ia32_op_type(irn) == ia32_Const) ? - classify_tarval(get_ia32_Immop_tarval(irn)) == TV_CLASSIFY_NULL : 0; + return is_ia32_irn(irn) && is_ia32_Const(irn) && get_ia32_immop_type(irn) == ia32_ImmConst + && tarval_is_null(get_ia32_Immop_tarval(irn)); } /** * Returns 1 if irn is a Const representing 1, 0 otherwise */ static INLINE int is_ia32_Const_1(ir_node *irn) { - return (is_ia32_irn(irn) && get_ia32_op_type(irn) == ia32_Const) ? - classify_tarval(get_ia32_Immop_tarval(irn)) == TV_CLASSIFY_ONE : 0; + return is_ia32_irn(irn) && is_ia32_Const(irn) && get_ia32_immop_type(irn) == ia32_ImmConst + && tarval_is_one(get_ia32_Immop_tarval(irn)); } /** - * Returns the Proj representing the UNKNOWN register for given mode. + * Collects all Projs of a node into the node array. Index is the projnum. + * BEWARE: The caller has to assure the appropriate array size! */ -static ir_node *be_get_unknown_for_mode(ia32_code_gen_t *cg, ir_mode *mode) { - be_abi_irg_t *babi = cg->birg->abi; - const arch_register_t *unknwn_reg = NULL; +static void ia32_collect_Projs(ir_node *irn, ir_node **projs, int size) { + const ir_edge_t *edge; + assert(get_irn_mode(irn) == mode_T && "need mode_T"); - if (mode_is_float(mode)) { - unknwn_reg = USE_SSE2(cg) ? &ia32_xmm_regs[REG_XMM_UKNWN] : &ia32_vfp_regs[REG_VFP_UKNWN]; - } - else { - unknwn_reg = &ia32_gp_regs[REG_GP_UKNWN]; + memset(projs, 0, size * sizeof(projs[0])); + + foreach_out_edge(irn, edge) { + ir_node *proj = get_edge_src_irn(edge); + int proj_proj = get_Proj_proj(proj); + assert(proj_proj < size); + projs[proj_proj] = proj; } +} - return be_abi_get_callee_save_irn(babi, unknwn_reg); +/** + * Renumbers the proj having pn_old in the array tp pn_new + * and removes the proj from the array. + */ +static INLINE void ia32_renumber_Proj(ir_node **projs, long pn_old, long pn_new) { + fprintf(stderr, "Warning: renumber_Proj used!\n"); + if (projs[pn_old]) { + set_Proj_proj(projs[pn_old], pn_new); + projs[pn_old] = NULL; + } } /** - * Gets the Proj with number pn from irn. + * creates a unique ident by adding a number to a tag + * + * @param tag the tag string, must contain a %d if a number + * should be added */ -static ir_node *get_proj_for_pn(const ir_node *irn, long pn) { - const ir_edge_t *edge; - ir_node *proj; - assert(get_irn_mode(irn) == mode_T && "need mode_T"); +static ident *unique_id(const char *tag) +{ + static unsigned id = 0; + char str[256]; - foreach_out_edge(irn, edge) { - proj = get_edge_src_irn(edge); + snprintf(str, sizeof(str), tag, ++id); + return new_id_from_str(str); +} + +/** + * Get a primitive type for a mode. + */ +static ir_type *get_prim_type(pmap *types, ir_mode *mode) +{ + pmap_entry *e = pmap_find(types, mode); + ir_type *res; - if (get_Proj_proj(proj) == pn) - return proj; + if (! e) { + char buf[64]; + snprintf(buf, sizeof(buf), "prim_type_%s", get_mode_name(mode)); + res = new_type_primitive(new_id_from_str(buf), mode); + pmap_insert(types, mode, res); } + else + res = e->value; + return res; +} - return NULL; +/** + * Get an entity that is initialized with a tarval + */ +static ir_entity *get_entity_for_tv(ia32_code_gen_t *cg, ir_node *cnst) +{ + tarval *tv = get_Const_tarval(cnst); + pmap_entry *e = pmap_find(cg->isa->tv_ent, tv); + ir_entity *res; + ir_graph *rem; + + if (! e) { + ir_mode *mode = get_irn_mode(cnst); + ir_type *tp = get_Const_type(cnst); + if (tp == firm_unknown_type) + tp = get_prim_type(cg->isa->types, mode); + + res = new_entity(get_glob_type(), unique_id(".LC%u"), tp); + + set_entity_ld_ident(res, get_entity_ident(res)); + set_entity_visibility(res, visibility_local); + set_entity_variability(res, variability_constant); + set_entity_allocation(res, allocation_static); + + /* we create a new entity here: It's initialization must resist on the + const code irg */ + rem = current_ir_graph; + current_ir_graph = get_const_code_irg(); + set_atomic_ent_value(res, new_Const_type(tv, tp)); + current_ir_graph = rem; + + pmap_insert(cg->isa->tv_ent, tv, res); + } + else + res = e->value; + return res; } /** - * Collects all Projs of a node into the node array. Index is the projnum. - * BEWARE: The caller has to assure the appropriate array size! + * Transforms a Const. + * + * @param mod the debug module + * @param block the block the new node should belong to + * @param node the ir Const node + * @param mode mode of the Const + * @return the created ia32 Const node */ -static void ia32_collect_Projs(ir_node *irn, ir_node **projs, int size) { - const ir_edge_t *edge; - ir_node *proj; - assert(get_irn_mode(irn) == mode_T && "need mode_T"); +static ir_node *gen_Const(ia32_transform_env_t *env, ir_node *node) { + ir_graph *irg = env->irg; + dbg_info *dbg = get_irn_dbg_info(node); + ir_mode *mode = get_irn_mode(node); + ir_node *block = transform_node(env, get_nodes_block(node)); - memset(projs, 0, size * sizeof(projs[0])); + if (mode_is_float(mode)) { + ir_node *res = NULL; + ir_entity *floatent; + ir_node *noreg = ia32_new_NoReg_gp(env->cg); + ir_node *nomem = new_NoMem(); + ir_node *load; - foreach_out_edge(irn, edge) { - proj = get_edge_src_irn(edge); - projs[get_Proj_proj(proj)] = proj; + FP_USED(env->cg); + if (! USE_SSE2(env->cg)) { + cnst_classify_t clss = classify_Const(node); + + if (clss == CNST_NULL) { + load = new_rd_ia32_vfldz(dbg, irg, block); + res = load; + } else if (clss == CNST_ONE) { + load = new_rd_ia32_vfld1(dbg, irg, block); + res = load; + } else { + floatent = get_entity_for_tv(env->cg, node); + + load = new_rd_ia32_vfld(dbg, 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, ia32_get_ent_ident(floatent)); + res = new_r_Proj(irg, block, load, mode_E, pn_ia32_vfld_res); + } + } else { + floatent = get_entity_for_tv(env->cg, node); + + load = new_rd_ia32_xLoad(dbg, 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, ia32_get_ent_ident(floatent)); + res = new_r_Proj(irg, block, load, mode_E, pn_ia32_xLoad_res); + } + + set_ia32_ls_mode(load, mode); + 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 + */ + 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)); + return res; + } else { + ir_node *cnst = new_rd_ia32_Const(dbg, irg, block); + + /* see above */ + if (get_irg_start_block(irg) == block) { + add_irn_dep(cnst, get_irg_frame(irg)); + } + + set_ia32_Const_attr(cnst, node); + SET_IA32_ORIG_NODE(cnst, ia32_get_old_node_name(env->cg, node)); + return cnst; } + + assert(0); + return new_r_Bad(irg); } /** - * Renumbers the proj having pn_old in the array tp pn_new - * and removes the proj from the array. + * Transforms a SymConst. + * + * @param mod the debug module + * @param block the block the new node should belong to + * @param node the ir SymConst node + * @param mode mode of the SymConst + * @return the created ia32 Const node */ -static INLINE void ia32_renumber_Proj(ir_node **projs, long pn_old, long pn_new) { - if (projs[pn_old]) { - set_Proj_proj(projs[pn_old], pn_new); - projs[pn_old] = NULL; +static ir_node *gen_SymConst(ia32_transform_env_t *env, ir_node *node) { + ir_graph *irg = env->irg; + dbg_info *dbg = get_irn_dbg_info(node); + ir_mode *mode = get_irn_mode(node); + ir_node *block = transform_node(env, get_nodes_block(node)); + ir_node *cnst; + + if (mode_is_float(mode)) { + FP_USED(env->cg); + if (USE_SSE2(env->cg)) + cnst = new_rd_ia32_xConst(dbg, irg, block); + else + cnst = new_rd_ia32_vfConst(dbg, irg, block); + set_ia32_ls_mode(cnst, mode); + } else { + cnst = new_rd_ia32_Const(dbg, irg, block); + } + + /* 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 + */ + if (get_irg_start_block(irg) == block) { + add_irn_dep(cnst, get_irg_frame(irg)); } + + set_ia32_Const_attr(cnst, 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 *dbg, ir_graph *irg, ir_node *block, +static ir_node *gen_sse_conv_int2float(ia32_code_gen_t *cg, dbg_info *dbg, + 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 *conv = new_rd_ia32_Conv_I2FP(dbg, irg, block, noreg, noreg, in, nomem, tgt_mode); - set_ia32_am_support(conv, ia32_am_Source); + 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(dbg, 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; @@ -180,21 +379,23 @@ static ir_node *gen_sse_conv_int2float(ia32_code_gen_t *cg, dbg_info *dbg, ir_gr /** * SSE convert of an float node into a double node. */ -static ir_node *gen_sse_conv_f2d(ia32_code_gen_t *cg, dbg_info *dbg, ir_graph *irg, ir_node *block, - ir_node *in, ir_node *old_node) +static ir_node *gen_sse_conv_f2d(ia32_code_gen_t *cg, dbg_info *dbg, + 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(dbg, irg, block, noreg, noreg, in, nomem, mode_D); + ir_node *conv = new_rd_ia32_Conv_FP2FP(dbg, irg, block, noreg, noreg, in, nomem); set_ia32_am_support(conv, ia32_am_Source); + set_ia32_ls_mode(conv, mode_E); 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) */ -static ident *gen_fp_known_const(ia32_known_const_t kct) { +ident *ia32_gen_fp_known_const(ia32_known_const_t kct) { static const struct { const char *tp_name; const char *ent_name; @@ -220,7 +421,8 @@ static ident *gen_fp_known_const(ia32_known_const_t kct) { tp_name = names[kct].tp_name; cnst_str = names[kct].cnst_str; - mode = kct == ia32_SSIGN || kct == ia32_SABS ? mode_Iu : mode_Lu; + //mode = kct == ia32_SSIGN || kct == ia32_SABS ? mode_Iu : mode_Lu; + mode = mode_LLu; tv = new_tarval_from_str(cnst_str, strlen(cnst_str), mode); tp = new_type_primitive(new_id_from_str(tp_name), mode); ent = new_entity(get_glob_type(), new_id_from_str(ent_name), tp); @@ -287,10 +489,10 @@ static void fold_immediate(ia32_transform_env_t *env, ir_node *node, int in1, in /* exchange left/right */ set_irn_n(node, in1, right); set_irn_n(node, in2, ia32_get_admissible_noreg(env->cg, node, in2)); - set_ia32_Immop_attr(node, left); + 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_ia32_Immop_attr(node, right); + copy_ia32_Immop_attr(node, right); } else { return; } @@ -307,39 +509,70 @@ static void fold_immediate(ia32_transform_env_t *env, ir_node *node, int in1, in * @param func The node constructor function * @return The constructed ia32 node. */ -static ir_node *gen_binop(ia32_transform_env_t *env, ir_node *op1, ir_node *op2, construct_binop_func *func) { - ir_node *new_op = NULL; - ir_mode *mode = env->mode; - dbg_info *dbg = env->dbg; +static ir_node *gen_binop(ia32_transform_env_t *env, ir_node *node, + ir_node *op1, ir_node *op2, + construct_binop_func *func) { + ir_node *new_node = NULL; ir_graph *irg = env->irg; - ir_node *block = env->block; + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *block = transform_node(env, get_nodes_block(node)); ir_node *noreg_gp = ia32_new_NoReg_gp(env->cg); ir_node *nomem = new_NoMem(); + ir_node *new_op1 = transform_node(env, op1); + ir_node *new_op2 = transform_node(env, op2); - if(mode_is_float(mode)) { - new_op = func(dbg, irg, block, noreg_gp, noreg_gp, op1, op2, nomem, mode); - set_ia32_am_support(new_op, ia32_am_Source); + new_node = func(dbg, 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); } else { - new_op = func(dbg, irg, block, noreg_gp, noreg_gp, op1, op2, nomem, mode); - if(func == new_rd_ia32_Mul) { - set_ia32_am_support(new_op, ia32_am_Source); - } else { - set_ia32_am_support(new_op, ia32_am_Full); - } + set_ia32_am_support(new_node, ia32_am_Full); } - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, env->irn)); - set_ia32_res_mode(new_op, mode); - if (is_op_commutative(get_irn_op(env->irn))) { - set_ia32_commutative(new_op); - } - if(func != new_rd_ia32_vfmul) { - fold_immediate(env, new_op, 2, 3); + SET_IA32_ORIG_NODE(new_node, ia32_get_old_node_name(env->cg, node)); + if (is_op_commutative(get_irn_op(node))) { + set_ia32_commutative(new_node); } + fold_immediate(env, new_node, 2, 3); - return new_op; + return new_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) +{ + ir_node *new_node = NULL; + dbg_info *dbg = get_irn_dbg_info(node); + ir_graph *irg = env->irg; + ir_mode *mode = get_irn_mode(node); + ir_node *block = transform_node(env, get_nodes_block(node)); + ir_node *noreg_gp = ia32_new_NoReg_gp(env->cg); + ir_node *nomem = new_NoMem(); + ir_node *new_op1 = transform_node(env, op1); + ir_node *new_op2 = transform_node(env, op2); + + new_node = func(dbg, irg, block, noreg_gp, noreg_gp, new_op1, new_op2, nomem); + set_ia32_am_support(new_node, ia32_am_Source); + 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; +} /** @@ -351,24 +584,29 @@ static ir_node *gen_binop(ia32_transform_env_t *env, ir_node *op1, ir_node *op2, * @param func The node constructor function * @return The constructed ia32 node. */ -static ir_node *gen_shift_binop(ia32_transform_env_t *env, ir_node *op1, ir_node *op2, construct_binop_func *func) { - ir_node *new_op = NULL; - ir_mode *mode = env->mode; - dbg_info *dbg = env->dbg; - ir_graph *irg = env->irg; - ir_node *block = env->block; - ir_node *noreg = ia32_new_NoReg_gp(env->cg); - ir_node *nomem = new_NoMem(); - ir_node *expr_op, *imm_op; - tarval *tv; +static ir_node *gen_shift_binop(ia32_transform_env_t *env, ir_node *node, + ir_node *op1, ir_node *op2, + construct_binop_func *func) { + ir_node *new_op = NULL; + ir_mode *mode = get_irn_mode(node); + dbg_info *dbg = get_irn_dbg_info(node); + ir_graph *irg = env->irg; + ir_node *block = transform_node(env, get_nodes_block(node)); + ir_node *noreg = ia32_new_NoReg_gp(env->cg); + ir_node *nomem = new_NoMem(); + ir_node *expr_op; + ir_node *imm_op; DEBUG_ONLY(firm_dbg_module_t *mod = env->mod;) + ir_node *new_op1 = transform_node(env, op1); + ir_node *new_op2 = transform_node(env, op2); + tarval *tv; assert(! mode_is_float(mode) && "Shift/Rotate with float not supported"); /* 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, op2) : NULL; - expr_op = get_expr_op(op1, op2); + 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"); @@ -395,21 +633,19 @@ static ir_node *gen_shift_binop(ia32_transform_env_t *env, ir_node *op1, ir_node /* This is shift/rot with const */ DB((mod, LEVEL_1, "Shift/Rot with immediate ...")); - new_op = func(dbg, irg, block, noreg, noreg, expr_op, noreg, nomem, mode); - set_ia32_Immop_attr(new_op, imm_op); - } - else { + new_op = func(dbg, irg, block, noreg, noreg, expr_op, noreg, nomem); + copy_ia32_Immop_attr(new_op, imm_op); + } else { /* This is a normal shift/rot */ DB((mod, LEVEL_1, "Shift/Rot binop ...")); - new_op = func(dbg, irg, block, noreg, noreg, op1, op2, nomem, mode); + new_op = func(dbg, irg, block, noreg, noreg, new_op1, new_op2, nomem); } /* set AM support */ set_ia32_am_support(new_op, ia32_am_Dest); - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, env->irn)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); - set_ia32_res_mode(new_op, mode); set_ia32_emit_cl(new_op); return new_op; @@ -424,184 +660,187 @@ static ir_node *gen_shift_binop(ia32_transform_env_t *env, ir_node *op1, ir_node * @param func The node constructor function * @return The constructed ia32 node. */ -static ir_node *gen_unop(ia32_transform_env_t *env, ir_node *op, construct_unop_func *func) { - ir_node *new_op = NULL; - ir_mode *mode = env->mode; - dbg_info *dbg = env->dbg; +static ir_node *gen_unop(ia32_transform_env_t *env, ir_node *node, ir_node *op, + construct_unop_func *func) { + ir_node *new_node = NULL; ir_graph *irg = env->irg; - ir_node *block = env->block; + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *block = transform_node(env, get_nodes_block(node)); ir_node *noreg = ia32_new_NoReg_gp(env->cg); ir_node *nomem = new_NoMem(); + ir_node *new_op = transform_node(env, op); DEBUG_ONLY(firm_dbg_module_t *mod = env->mod;) - new_op = func(dbg, irg, block, noreg, noreg, op, nomem, mode); - - if (mode_is_float(mode)) { - DB((mod, LEVEL_1, "FP unop ...")); - /* floating point operations don't support implicit store */ - set_ia32_am_support(new_op, ia32_am_None); - } - else { - DB((mod, LEVEL_1, "INT unop ...")); - set_ia32_am_support(new_op, ia32_am_Dest); - } - - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, env->irn)); + new_node = func(dbg, irg, block, noreg, noreg, new_op, nomem); + DB((mod, LEVEL_1, "INT unop ...")); + set_ia32_am_support(new_node, ia32_am_Dest); - set_ia32_res_mode(new_op, mode); + SET_IA32_ORIG_NODE(new_node, ia32_get_old_node_name(env->cg, node)); - return new_op; + return new_node; } - -/** - * Creates an ia32 Add with immediate. - * - * @param env The transformation environment - * @param expr_op The expression operator - * @param const_op The constant - * @return the created ia32 Add node - */ -static ir_node *gen_imm_Add(ia32_transform_env_t *env, ir_node *expr_op, ir_node *const_op) { - ir_node *new_op = NULL; - tarval *tv = get_ia32_Immop_tarval(const_op); - dbg_info *dbg = env->dbg; - ir_graph *irg = env->irg; - ir_node *block = env->block; - ir_node *noreg = ia32_new_NoReg_gp(env->cg); - ir_node *nomem = new_NoMem(); - ir_mode *mode = env->mode; - int normal_add = 1; - tarval_classification_t class_tv, class_negtv; - DEBUG_ONLY(firm_dbg_module_t *mod = env->mod;) - - /* try to optimize to inc/dec */ - if ((env->cg->opt & IA32_OPT_INCDEC) && tv && (get_ia32_op_type(const_op) == ia32_Const)) { - /* optimize tarvals */ - class_tv = classify_tarval(tv); - class_negtv = classify_tarval(tarval_neg(tv)); - - if (class_tv == TV_CLASSIFY_ONE) { /* + 1 == INC */ - DB((env->mod, LEVEL_2, "Add(1) to Inc ... ")); - new_op = new_rd_ia32_Inc(dbg, irg, block, noreg, noreg, expr_op, nomem, mode); - normal_add = 0; - } - else if (class_tv == TV_CLASSIFY_ALL_ONE || class_negtv == TV_CLASSIFY_ONE) { /* + (-1) == DEC */ - DB((mod, LEVEL_2, "Add(-1) to Dec ... ")); - new_op = new_rd_ia32_Dec(dbg, irg, block, noreg, noreg, expr_op, nomem, mode); - normal_add = 0; - } - } - - if (normal_add) { - new_op = new_rd_ia32_Add(dbg, irg, block, noreg, noreg, expr_op, noreg, nomem, mode); - set_ia32_Immop_attr(new_op, const_op); - set_ia32_commutative(new_op); - } - - return new_op; -} - /** * 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) { +static ir_node *gen_Add(ia32_transform_env_t *env, ir_node *node) { ir_node *new_op = NULL; - dbg_info *dbg = env->dbg; - ir_mode *mode = env->mode; ir_graph *irg = env->irg; - ir_node *block = env->block; + dbg_info *dbg = get_irn_dbg_info(node); + ir_mode *mode = get_irn_mode(node); + ir_node *block = transform_node(env, get_nodes_block(node)); ir_node *noreg = ia32_new_NoReg_gp(env->cg); ir_node *nomem = new_NoMem(); ir_node *expr_op, *imm_op; - ir_node *op1 = get_Add_left(env->irn); - ir_node *op2 = get_Add_right(env->irn); + ir_node *op1 = get_Add_left(node); + ir_node *op2 = get_Add_right(node); + ir_node *new_op1 = transform_node(env, op1); + ir_node *new_op2 = transform_node(env, op2); /* 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(op1, op2) : NULL; - expr_op = get_expr_op(op1, op2); + 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(env, op1, op2, new_rd_ia32_xAdd); + return gen_binop_float(env, node, op1, op2, new_rd_ia32_xAdd); else - return gen_binop(env, op1, op2, new_rd_ia32_vfadd); + return gen_binop_float(env, node, op1, op2, new_rd_ia32_vfadd); } - else { - /* integer ADD */ - if (!expr_op) { - /* No expr_op means, that we have two const - one symconst and */ - /* one tarval or another symconst - because this case is not */ - /* covered by constant folding */ - /* We need to check for: */ - /* 1) symconst + const -> becomes a LEA */ - /* 2) symconst + symconst -> becomes a const + LEA as the elf */ - /* linker doesn't support two symconsts */ - - if (get_ia32_op_type(op1) == ia32_SymConst && get_ia32_op_type(op2) == ia32_SymConst) { - /* this is the 2nd case */ - new_op = new_rd_ia32_Lea(dbg, irg, block, op1, noreg, mode); - set_ia32_am_sc(new_op, get_ia32_id_cnst(op2)); - set_ia32_am_flavour(new_op, ia32_am_OB); - - DBG_OPT_LEA3(op1, op2, env->irn, new_op); - } - else { - /* this is the 1st case */ - new_op = new_rd_ia32_Lea(dbg, irg, block, noreg, noreg, mode); - DBG_OPT_LEA3(op1, op2, env->irn, new_op); + /* integer ADD */ + if (!expr_op) { + ia32_immop_type_t tp1 = get_ia32_immop_type(new_op1); + ia32_immop_type_t tp2 = get_ia32_immop_type(new_op2); + + /* No expr_op means, that we have two const - one symconst and */ + /* one tarval or another symconst - because this case is not */ + /* covered by constant folding */ + /* We need to check for: */ + /* 1) symconst + const -> becomes a LEA */ + /* 2) symconst + symconst -> becomes a const + LEA as the elf */ + /* linker doesn't support two symconsts */ + + if (tp1 == ia32_ImmSymConst && tp2 == ia32_ImmSymConst) { + /* this is the 2nd case */ + new_op = new_rd_ia32_Lea(dbg, 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_op_type(new_op, ia32_AddrModeS); + + DBG_OPT_LEA3(new_op1, new_op2, node, new_op); + } else if (tp1 == ia32_ImmSymConst) { + tarval *tv = get_ia32_Immop_tarval(new_op2); + long offs = get_tarval_long(tv); - if (get_ia32_op_type(op1) == ia32_SymConst) { - set_ia32_am_sc(new_op, get_ia32_id_cnst(op1)); - add_ia32_am_offs(new_op, get_ia32_cnst(op2)); - } - else { - add_ia32_am_offs(new_op, get_ia32_cnst(op1)); - set_ia32_am_sc(new_op, get_ia32_id_cnst(op2)); - } - set_ia32_am_flavour(new_op, ia32_am_O); - } + new_op = new_rd_ia32_Lea(dbg, irg, block, noreg, noreg); + DBG_OPT_LEA3(new_op1, new_op2, node, new_op); - /* set AM support */ + 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_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); - /* Lea doesn't need a Proj */ - return new_op; - } - else if (imm_op) { - /* This is expr + const */ - new_op = gen_imm_Add(env, expr_op, imm_op); + new_op = new_rd_ia32_Lea(dbg, irg, block, noreg, noreg); + 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_op_type(new_op, ia32_AddrModeS); + } else { + tarval *tv1 = get_ia32_Immop_tarval(new_op1); + tarval *tv2 = get_ia32_Immop_tarval(new_op2); + tarval *restv = tarval_add(tv1, tv2); + + DEBUG_ONLY(ir_fprintf(stderr, "Warning: add with 2 consts not folded: %+F\n", node)); - /* set AM support */ - set_ia32_am_support(new_op, ia32_am_Dest); + new_op = new_rd_ia32_Const(dbg, irg, block); + set_ia32_Const_tarval(new_op, restv); + DBG_OPT_LEA3(new_op1, new_op2, node, new_op); } - else { - /* This is a normal add */ - new_op = new_rd_ia32_Add(dbg, irg, block, noreg, noreg, op1, op2, nomem, mode); - /* set AM support */ - set_ia32_am_support(new_op, ia32_am_Full); - set_ia32_commutative(new_op); + 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) { + tarval_classification_t class_tv, class_negtv; + tarval *tv = get_ia32_Immop_tarval(imm_op); + + /* optimize tarvals */ + class_tv = classify_tarval(tv); + class_negtv = classify_tarval(tarval_neg(tv)); + + if (class_tv == TV_CLASSIFY_ONE) { /* + 1 == INC */ + DB((env->mod, LEVEL_2, "Add(1) to Inc ... ")); + new_op = new_rd_ia32_Inc(dbg, irg, block, noreg, noreg, expr_op, nomem); + 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((env->mod, LEVEL_2, "Add(-1) to Dec ... ")); + new_op = new_rd_ia32_Dec(dbg, irg, block, noreg, noreg, expr_op, nomem); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); + return new_op; + } } } - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, env->irn)); + /* This is a normal add */ + new_op = new_rd_ia32_Add(dbg, irg, block, noreg, noreg, new_op1, new_op2, nomem); + + /* set AM support */ + set_ia32_am_support(new_op, ia32_am_Full); + set_ia32_commutative(new_op); + + fold_immediate(env, new_op, 2, 3); - set_ia32_res_mode(new_op, mode); + 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; + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *block = transform_node(env, 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 *proj_EAX, *proj_EDX, *res; + ir_node *in[1]; + + res = new_rd_ia32_Mul(dbg, irg, block, noreg, noreg, new_op1, new_op2, new_NoMem()); + set_ia32_commutative(res); + set_ia32_am_support(res, ia32_am_Source); + + /* imediates are not supported, so no fold_immediate */ + proj_EAX = new_rd_Proj(dbg, irg, block, res, mode_Iu, pn_EAX); + proj_EDX = new_rd_Proj(dbg, irg, block, res, mode_Iu, pn_EDX); + + /* keep EAX */ + in[0] = proj_EDX; + be_new_Keep(&ia32_reg_classes[CLASS_ia32_gp], irg, block, 1, in); + + return proj_EAX; +} +#endif /** @@ -610,27 +849,25 @@ static ir_node *gen_Add(ia32_transform_env_t *env) { * @param env The transformation environment * @return the created ia32 Mul node */ -static ir_node *gen_Mul(ia32_transform_env_t *env) { - ir_node *op1 = get_Mul_left(env->irn); - ir_node *op2 = get_Mul_right(env->irn); - ir_node *new_op; +static ir_node *gen_Mul(ia32_transform_env_t *env, 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(env->mode)) { + if (mode_is_float(mode)) { FP_USED(env->cg); if (USE_SSE2(env->cg)) - new_op = gen_binop(env, op1, op2, new_rd_ia32_xMul); + return gen_binop_float(env, node, op1, op2, new_rd_ia32_xMul); else - new_op = gen_binop(env, op1, op2, new_rd_ia32_vfmul); - } - else { - new_op = gen_binop(env, op1, op2, new_rd_ia32_Mul); + return gen_binop_float(env, node, op1, op2, new_rd_ia32_vfmul); } - return new_op; + // for the lower 32bit of the result it doesn't matter whether we use + // signed or unsigned multiplication so we use IMul as it has fewer + // constraints + return gen_binop(env, node, op1, op2, new_rd_ia32_IMul); } - - /** * Creates an ia32 Mulh. * Note: Mul produces a 64Bit result and Mulh returns the upper 32 bit of @@ -639,26 +876,37 @@ static ir_node *gen_Mul(ia32_transform_env_t *env) { * @param env The transformation environment * @return the created ia32 Mulh node */ -static ir_node *gen_Mulh(ia32_transform_env_t *env) { - ir_node *op1 = get_irn_n(env->irn, 0); - ir_node *op2 = get_irn_n(env->irn, 1); - ir_node *noreg = ia32_new_NoReg_gp(env->cg); - ir_node *proj_EAX, *proj_EDX, *mulh; +static ir_node *gen_Mulh(ia32_transform_env_t *env, ir_node *node) { + ir_graph *irg = env->irg; + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *block = transform_node(env, get_nodes_block(node)); + ir_node *op1 = get_irn_n(node, 0); + ir_node *op2 = get_irn_n(node, 1); + 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 *proj_EAX, *proj_EDX, *res; + ir_mode *mode = get_irn_mode(node); ir_node *in[1]; - assert(!mode_is_float(env->mode) && "Mulh with float not supported"); - mulh = new_rd_ia32_Mulh(env->dbg, env->irg, env->block, noreg, noreg, op1, op2, new_NoMem()); - set_ia32_commutative(mulh); - set_ia32_res_mode(mulh, env->mode); - set_ia32_am_support(mulh, ia32_am_Source); - /* imediates are not supported, so no fold_immediate */ + assert(!mode_is_float(mode) && "Mulh with float not supported"); + if(mode_is_signed(mode)) { + res = new_rd_ia32_IMul1OP(dbg, irg, block, noreg, noreg, new_op1, new_op2, new_NoMem()); + } else { + res = new_rd_ia32_Mul(dbg, irg, block, noreg, noreg, new_op1, new_op2, new_NoMem()); + } - proj_EAX = new_rd_Proj(env->dbg, env->irg, env->block, mulh, mode_Is, pn_EAX); - proj_EDX = new_rd_Proj(env->dbg, env->irg, env->block, mulh, mode_Is, pn_EDX); + set_ia32_commutative(res); + set_ia32_am_support(res, ia32_am_Source); + + set_ia32_am_support(res, ia32_am_Source); + + proj_EAX = new_rd_Proj(dbg, irg, block, res, mode_Iu, pn_EAX); + proj_EDX = new_rd_Proj(dbg, irg, block, res, mode_Iu, pn_EDX); /* keep EAX */ in[0] = proj_EAX; - be_new_Keep(&ia32_reg_classes[CLASS_ia32_gp], env->irg, env->block, 1, in); + be_new_Keep(&ia32_reg_classes[CLASS_ia32_gp], irg, block, 1, in); return proj_EDX; } @@ -671,12 +919,13 @@ static ir_node *gen_Mulh(ia32_transform_env_t *env) { * @param env The transformation environment * @return The created ia32 And node */ -static ir_node *gen_And(ia32_transform_env_t *env) { - ir_node *op1 = get_And_left(env->irn); - ir_node *op2 = get_And_right(env->irn); +static ir_node *gen_And(ia32_transform_env_t *env, ir_node *node) { + ir_node *op1 = get_And_left(node); + ir_node *op2 = get_And_right(node); + ir_mode *mode = get_irn_mode(node); - assert (! mode_is_float(env->mode)); - return gen_binop(env, op1, op2, new_rd_ia32_And); + assert (! mode_is_float(mode)); + return gen_binop(env, node, op1, op2, new_rd_ia32_And); } @@ -687,12 +936,13 @@ static ir_node *gen_And(ia32_transform_env_t *env) { * @param env The transformation environment * @return The created ia32 Or node */ -static ir_node *gen_Or(ia32_transform_env_t *env) { - ir_node *op1 = get_Or_left(env->irn); - ir_node *op2 = get_Or_right(env->irn); +static ir_node *gen_Or(ia32_transform_env_t *env, ir_node *node) { + ir_node *op1 = get_Or_left(node); + ir_node *op2 = get_Or_right(node); + ir_mode *mode = get_irn_mode(node); - assert (! mode_is_float(env->mode)); - return gen_binop(env, op1, op2, new_rd_ia32_Or); + assert (! mode_is_float(mode)); + return gen_binop(env, node, op1, op2, new_rd_ia32_Or); } @@ -703,12 +953,13 @@ static ir_node *gen_Or(ia32_transform_env_t *env) { * @param env The transformation environment * @return The created ia32 Eor node */ -static ir_node *gen_Eor(ia32_transform_env_t *env) { - ir_node *op1 = get_Eor_left(env->irn); - ir_node *op2 = get_Eor_right(env->irn); +static ir_node *gen_Eor(ia32_transform_env_t *env, ir_node *node) { + ir_node *op1 = get_Eor_left(node); + ir_node *op2 = get_Eor_right(node); + ir_mode *mode = get_irn_mode(node); - assert(! mode_is_float(env->mode)); - return gen_binop(env, op1, op2, new_rd_ia32_Eor); + assert(! mode_is_float(mode)); + return gen_binop(env, node, op1, op2, new_rd_ia32_Xor); } @@ -719,203 +970,211 @@ static ir_node *gen_Eor(ia32_transform_env_t *env) { * @param env The transformation environment * @return the created ia32 Max node */ -static ir_node *gen_Max(ia32_transform_env_t *env) { - ir_node *op1 = get_irn_n(env->irn, 0); - ir_node *op2 = get_irn_n(env->irn, 1); +static ir_node *gen_Max(ia32_transform_env_t *env, ir_node *node) { + ir_graph *irg = env->irg; ir_node *new_op; + ir_mode *mode = get_irn_mode(node); + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *block = transform_node(env, get_nodes_block(node)); + ir_node *op1 = get_irn_n(node, 0); + ir_node *op2 = get_irn_n(node, 1); + ir_node *new_op1 = transform_node(env, op1); + ir_node *new_op2 = transform_node(env, op2); + ir_mode *op_mode = get_irn_mode(op1); - if (mode_is_float(env->mode)) { + 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(env, op1, op2, new_rd_ia32_xMax); + new_op = gen_binop_float(env, node, new_op1, new_op2, new_rd_ia32_xMax); else { assert(0); } } else { - new_op = new_rd_ia32_Max(env->dbg, env->irg, env->block, op1, op2, env->mode); + long pnc = pn_Cmp_Gt; + if(!mode_is_signed(op_mode)) { + pnc |= ia32_pn_Cmp_Unsigned; + } + new_op = new_rd_ia32_CmpCMov(dbg, 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); - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, env->irn)); } + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); return new_op; } - - /** * 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 *op1 = get_irn_n(env->irn, 0); - ir_node *op2 = get_irn_n(env->irn, 1); +static ir_node *gen_Min(ia32_transform_env_t *env, ir_node *node) { + ir_graph *irg = env->irg; ir_node *new_op; + ir_mode *mode = get_irn_mode(node); + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *block = transform_node(env, get_nodes_block(node)); + ir_node *op1 = get_irn_n(node, 0); + ir_node *op2 = get_irn_n(node, 1); + ir_node *new_op1 = transform_node(env, op1); + ir_node *new_op2 = transform_node(env, op2); + ir_mode *op_mode = get_irn_mode(op1); - if (mode_is_float(env->mode)) { + 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(env, op1, op2, new_rd_ia32_xMin); + new_op = gen_binop_float(env, node, op1, op2, new_rd_ia32_xMin); else { assert(0); } } else { - new_op = new_rd_ia32_Min(env->dbg, env->irg, env->block, op1, op2, env->mode); + long pnc = pn_Cmp_Lt; + if(!mode_is_signed(op_mode)) { + pnc |= ia32_pn_Cmp_Unsigned; + } + new_op = new_rd_ia32_CmpCMov(dbg, 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); - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, env->irn)); } + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); return new_op; } - -/** - * Creates an ia32 Sub with immediate. - * - * @param env The transformation environment - * @param expr_op The first operator - * @param const_op The constant operator - * @return The created ia32 Sub node - */ -static ir_node *gen_imm_Sub(ia32_transform_env_t *env, ir_node *expr_op, ir_node *const_op) { - ir_node *new_op = NULL; - tarval *tv = get_ia32_Immop_tarval(const_op); - dbg_info *dbg = env->dbg; - ir_graph *irg = env->irg; - ir_node *block = env->block; - ir_node *noreg = ia32_new_NoReg_gp(env->cg); - ir_node *nomem = new_NoMem(); - ir_mode *mode = env->mode; - int normal_sub = 1; - tarval_classification_t class_tv, class_negtv; - DEBUG_ONLY(firm_dbg_module_t *mod = env->mod;) - - /* try to optimize to inc/dec */ - if ((env->cg->opt & IA32_OPT_INCDEC) && tv && (get_ia32_op_type(const_op) == ia32_Const)) { - /* optimize tarvals */ - class_tv = classify_tarval(tv); - class_negtv = classify_tarval(tarval_neg(tv)); - - if (class_tv == TV_CLASSIFY_ONE) { /* - 1 == DEC */ - DB((mod, LEVEL_2, "Sub(1) to Dec ... ")); - new_op = new_rd_ia32_Dec(dbg, irg, block, noreg, noreg, expr_op, nomem, mode); - normal_sub = 0; - } - else if (class_negtv == TV_CLASSIFY_ONE) { /* - (-1) == Sub */ - DB((mod, LEVEL_2, "Sub(-1) to Inc ... ")); - new_op = new_rd_ia32_Inc(dbg, irg, block, noreg, noreg, expr_op, nomem, mode); - normal_sub = 0; - } - } - - if (normal_sub) { - new_op = new_rd_ia32_Sub(dbg, irg, block, noreg, noreg, expr_op, noreg, nomem, mode); - set_ia32_Immop_attr(new_op, const_op); - } - - return new_op; -} - /** * 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) { +static ir_node *gen_Sub(ia32_transform_env_t *env, ir_node *node) { ir_node *new_op = NULL; - dbg_info *dbg = env->dbg; - ir_mode *mode = env->mode; ir_graph *irg = env->irg; - ir_node *block = env->block; + dbg_info *dbg = get_irn_dbg_info(node); + ir_mode *mode = get_irn_mode(node); + ir_node *block = transform_node(env, get_nodes_block(node)); ir_node *noreg = ia32_new_NoReg_gp(env->cg); ir_node *nomem = new_NoMem(); - ir_node *op1 = get_Sub_left(env->irn); - ir_node *op2 = get_Sub_right(env->irn); + ir_node *op1 = get_Sub_left(node); + ir_node *op2 = get_Sub_right(node); + ir_node *new_op1 = transform_node(env, op1); + ir_node *new_op2 = transform_node(env, op2); 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, op2) : NULL; - expr_op = get_expr_op(op1, op2); + 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(env, op1, op2, new_rd_ia32_xSub); + return gen_binop_float(env, node, op1, op2, new_rd_ia32_xSub); else - return gen_binop(env, op1, op2, new_rd_ia32_vfsub); + return gen_binop_float(env, node, op1, op2, new_rd_ia32_vfsub); } - else { - /* integer SUB */ - if (! expr_op) { - /* No expr_op means, that we have two const - one symconst and */ - /* one tarval or another symconst - because this case is not */ - /* covered by constant folding */ - /* We need to check for: */ - /* 1) symconst - const -> becomes a LEA */ - /* 2) symconst - symconst -> becomes a const - LEA as the elf */ - /* linker doesn't support two symconsts */ - - if (get_ia32_op_type(op1) == ia32_SymConst && get_ia32_op_type(op2) == ia32_SymConst) { - /* this is the 2nd case */ - new_op = new_rd_ia32_Lea(dbg, irg, block, op1, noreg, mode); - set_ia32_am_sc(new_op, get_ia32_id_cnst(op2)); - set_ia32_am_sc_sign(new_op); - set_ia32_am_flavour(new_op, ia32_am_OB); - - DBG_OPT_LEA3(op1, op2, env->irn, new_op); - } - else { - /* this is the 1st case */ - new_op = new_rd_ia32_Lea(dbg, irg, block, noreg, noreg, mode); - DBG_OPT_LEA3(op1, op2, env->irn, new_op); + /* integer SUB */ + if (! expr_op) { + ia32_immop_type_t tp1 = get_ia32_immop_type(new_op1); + ia32_immop_type_t tp2 = get_ia32_immop_type(new_op2); + + /* No expr_op means, that we have two const - one symconst and */ + /* one tarval or another symconst - because this case is not */ + /* covered by constant folding */ + /* We need to check for: */ + /* 1) symconst - const -> becomes a LEA */ + /* 2) symconst - symconst -> becomes a const - LEA as the elf */ + /* linker doesn't support two symconsts */ + if (tp1 == ia32_ImmSymConst && tp2 == ia32_ImmSymConst) { + /* this is the 2nd case */ + new_op = new_rd_ia32_Lea(dbg, 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); + + DBG_OPT_LEA3(op1, op2, node, new_op); + } else if (tp1 == ia32_ImmSymConst) { + tarval *tv = get_ia32_Immop_tarval(new_op2); + long offs = get_tarval_long(tv); + + new_op = new_rd_ia32_Lea(dbg, irg, block, noreg, noreg); + 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_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); - if (get_ia32_op_type(op1) == ia32_SymConst) { - set_ia32_am_sc(new_op, get_ia32_id_cnst(op1)); - sub_ia32_am_offs(new_op, get_ia32_cnst(op2)); - } - else { - add_ia32_am_offs(new_op, get_ia32_cnst(op1)); - set_ia32_am_sc(new_op, get_ia32_id_cnst(op2)); - set_ia32_am_sc_sign(new_op); - } - set_ia32_am_flavour(new_op, ia32_am_O); - } + new_op = new_rd_ia32_Lea(dbg, irg, block, noreg, noreg); + DBG_OPT_LEA3(op1, op2, node, new_op); - /* set AM support */ + 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_op_type(new_op, ia32_AddrModeS); + } else { + tarval *tv1 = get_ia32_Immop_tarval(new_op1); + tarval *tv2 = get_ia32_Immop_tarval(new_op2); + tarval *restv = tarval_sub(tv1, tv2); - /* Lea doesn't need a Proj */ - return new_op; - } - else if (imm_op) { - /* This is expr - const */ - new_op = gen_imm_Sub(env, expr_op, imm_op); + DEBUG_ONLY(ir_fprintf(stderr, "Warning: sub with 2 consts not folded: %+F\n", node)); - /* set AM support */ - set_ia32_am_support(new_op, ia32_am_Dest); + new_op = new_rd_ia32_Const(dbg, irg, block); + set_ia32_Const_tarval(new_op, restv); + DBG_OPT_LEA3(new_op1, new_op2, node, new_op); } - else { - /* This is a normal sub */ - new_op = new_rd_ia32_Sub(dbg, irg, block, noreg, noreg, op1, op2, nomem, mode); - /* set AM support */ - set_ia32_am_support(new_op, ia32_am_Full); + 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) { + tarval_classification_t class_tv, class_negtv; + tarval *tv = get_ia32_Immop_tarval(imm_op); + + /* optimize tarvals */ + class_tv = classify_tarval(tv); + class_negtv = classify_tarval(tarval_neg(tv)); + + if (class_tv == TV_CLASSIFY_ONE) { + DB((env->mod, LEVEL_2, "Sub(1) to Dec ... ")); + new_op = new_rd_ia32_Dec(dbg, irg, block, noreg, noreg, expr_op, nomem); + 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((env->mod, LEVEL_2, "Sub(-1) to Inc ... ")); + new_op = new_rd_ia32_Inc(dbg, irg, block, noreg, noreg, expr_op, nomem); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); + return new_op; + } } } - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, env->irn)); + /* This is a normal sub */ + new_op = new_rd_ia32_Sub(dbg, irg, block, noreg, noreg, new_op1, new_op2, nomem); - set_ia32_res_mode(new_op, mode); + /* set AM support */ + set_ia32_am_support(new_op, ia32_am_Full); + + fold_immediate(env, new_op, 2, 3); + + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); return new_op; } @@ -932,53 +1191,67 @@ static ir_node *gen_Sub(ia32_transform_env_t *env) { * @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 *dividend, ir_node *divisor, ia32_op_flavour_t dm_flav) { +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) { + ir_graph *irg = env->irg; + dbg_info *dbg = get_irn_dbg_info(node); + ir_mode *mode = get_irn_mode(node); + ir_node *block = transform_node(env, get_nodes_block(node)); ir_node *res, *proj_div, *proj_mod; ir_node *edx_node, *cltd; ir_node *in_keep[1]; - dbg_info *dbg = env->dbg; - ir_graph *irg = env->irg; - ir_node *block = env->block; - ir_mode *mode = env->mode; - ir_node *irn = env->irn; - ir_node *mem; + ir_node *mem, *new_mem; ir_node *projs[pn_DivMod_max]; + ir_node *noreg = ia32_new_NoReg_gp(env->cg); + ir_node *new_dividend = transform_node(env, dividend); + ir_node *new_divisor = transform_node(env, divisor); - ia32_collect_Projs(irn, projs, pn_DivMod_max); + ia32_collect_Projs(node, projs, pn_DivMod_max); switch (dm_flav) { case flavour_Div: - mem = get_Div_mem(irn); - mode = get_irn_mode(get_proj_for_pn(irn, pn_Div_res)); + mem = get_Div_mem(node); + mode = get_irn_mode(be_get_Proj_for_pn(node, pn_Div_res)); break; case flavour_Mod: - mem = get_Mod_mem(irn); - mode = get_irn_mode(get_proj_for_pn(irn, pn_Mod_res)); + mem = get_Mod_mem(node); + mode = get_irn_mode(be_get_Proj_for_pn(node, pn_Mod_res)); break; case flavour_DivMod: - mem = get_DivMod_mem(irn); - proj_div = get_proj_for_pn(irn, pn_DivMod_res_div); - proj_mod = get_proj_for_pn(irn, pn_DivMod_res_mod); + mem = get_DivMod_mem(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); mode = proj_div ? get_irn_mode(proj_div) : get_irn_mode(proj_mod); break; default: assert(0); } + new_mem = transform_node(env, mem); if (mode_is_signed(mode)) { /* in signed mode, we need to sign extend the dividend */ - cltd = new_rd_ia32_Cdq(dbg, irg, block, dividend); - dividend = new_rd_Proj(dbg, irg, block, cltd, mode_Is, pn_ia32_Cdq_EAX); - edx_node = new_rd_Proj(dbg, irg, block, cltd, mode_Is, pn_ia32_Cdq_EDX); - } - else { - edx_node = new_rd_ia32_Const(dbg, irg, block, mode_Iu); + cltd = new_rd_ia32_Cltd(dbg, irg, block, new_dividend); + new_dividend = new_rd_Proj(dbg, irg, block, cltd, mode_Iu, pn_ia32_Cltd_EAX); + edx_node = new_rd_Proj(dbg, irg, block, cltd, mode_Iu, pn_ia32_Cltd_EDX); + } else { + edx_node = new_rd_ia32_Const(dbg, irg, block); add_irn_dep(edx_node, be_abi_get_start_barrier(env->cg->birg->abi)); - set_ia32_Const_type(edx_node, ia32_Const); set_ia32_Immop_tarval(edx_node, get_tarval_null(mode_Iu)); } - res = new_rd_ia32_DivMod(dbg, irg, block, dividend, divisor, edx_node, mem, dm_flav); + if(mode_is_signed(mode)) { + res = new_rd_ia32_IDiv(dbg, irg, block, noreg, noreg, new_dividend, edx_node, new_divisor, new_mem, dm_flav); + } else { + res = new_rd_ia32_Div(dbg, irg, block, noreg, noreg, new_dividend, edx_node, new_divisor, new_mem, dm_flav); + } + + /* Matze: code can't handle this at the moment... */ +#if 0 + /* set AM support */ + set_ia32_am_support(res, ia32_am_Source); +#endif + set_ia32_n_res(res, 2); /* Only one proj is used -> We must add a second proj and */ @@ -986,47 +1259,36 @@ static ir_node *generate_DivMod(ia32_transform_env_t *env, ir_node *dividend, ir /* destroyed register. */ /* We also renumber the Firm projs into ia32 projs. */ - switch (get_irn_opcode(irn)) { + switch (get_irn_opcode(node)) { case iro_Div: - ia32_renumber_Proj(projs, pn_Div_M, pn_ia32_DivMod_M); - ia32_renumber_Proj(projs, pn_Div_res, pn_ia32_DivMod_div_res); /* add Proj-Keep for mod res */ - in_keep[0] = new_rd_Proj(dbg, irg, block, res, mode, pn_ia32_DivMod_mod_res); + in_keep[0] = new_rd_Proj(dbg, irg, block, res, mode_Iu, pn_ia32_Div_mod_res); be_new_Keep(&ia32_reg_classes[CLASS_ia32_gp], irg, block, 1, in_keep); break; case iro_Mod: - ia32_renumber_Proj(projs, pn_Mod_M, pn_ia32_DivMod_M); - ia32_renumber_Proj(projs, pn_Mod_res, pn_ia32_DivMod_mod_res); /* add Proj-Keep for div res */ - in_keep[0] = new_rd_Proj(dbg, irg, block, res, mode, pn_ia32_DivMod_div_res); + in_keep[0] = new_rd_Proj(dbg, irg, block, res, mode_Iu, pn_ia32_Div_div_res); be_new_Keep(&ia32_reg_classes[CLASS_ia32_gp], irg, block, 1, in_keep); break; case iro_DivMod: /* check, which Proj-Keep, we need to add */ - proj_div = get_proj_for_pn(irn, pn_DivMod_res_div); - proj_mod = get_proj_for_pn(irn, pn_DivMod_res_mod); - - /* BEWARE: renumber after getting original projs */ - ia32_renumber_Proj(projs, pn_DivMod_M, pn_ia32_DivMod_M); + proj_div = be_get_Proj_for_pn(node, pn_DivMod_res_div); + proj_mod = be_get_Proj_for_pn(node, pn_DivMod_res_mod); if (proj_div && proj_mod) { - /* we have both results used: simply renumber */ - ia32_renumber_Proj(projs, pn_DivMod_res_div, pn_ia32_DivMod_div_res); - ia32_renumber_Proj(projs, pn_DivMod_res_mod, pn_ia32_DivMod_mod_res); + /* nothing to be done */ } else if (! proj_div && ! proj_mod) { assert(0 && "Missing DivMod result proj"); } else if (! proj_div) { /* We have only mod result: add div res Proj-Keep */ - ia32_renumber_Proj(projs, pn_DivMod_res_mod, pn_ia32_DivMod_mod_res); - in_keep[0] = new_rd_Proj(dbg, irg, block, res, mode, pn_ia32_DivMod_div_res); + in_keep[0] = new_rd_Proj(dbg, irg, block, res, mode_Iu, pn_ia32_Div_div_res); be_new_Keep(&ia32_reg_classes[CLASS_ia32_gp], irg, block, 1, in_keep); } else { /* We have only div result: add mod res Proj-Keep */ - ia32_renumber_Proj(projs, pn_DivMod_res_div, pn_ia32_DivMod_div_res); - in_keep[0] = new_rd_Proj(dbg, irg, block, res, mode, pn_ia32_DivMod_mod_res); + in_keep[0] = new_rd_Proj(dbg, irg, block, res, mode_Iu, pn_ia32_Div_mod_res); be_new_Keep(&ia32_reg_classes[CLASS_ia32_gp], irg, block, 1, in_keep); } break; @@ -1035,8 +1297,7 @@ static ir_node *generate_DivMod(ia32_transform_env_t *env, ir_node *dividend, ir break; } - SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, env->irn)); - set_ia32_res_mode(res, mode); + SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, node)); return res; } @@ -1047,8 +1308,9 @@ static ir_node *generate_DivMod(ia32_transform_env_t *env, ir_node *dividend, ir * * @param env The transformation environment */ -static ir_node *gen_Mod(ia32_transform_env_t *env) { - return generate_DivMod(env, get_Mod_left(env->irn), get_Mod_right(env->irn), flavour_Mod); +static ir_node *gen_Mod(ia32_transform_env_t *env, ir_node *node) { + return generate_DivMod(env, node, get_Mod_left(node), + get_Mod_right(node), flavour_Mod); } /** @@ -1056,15 +1318,17 @@ static ir_node *gen_Mod(ia32_transform_env_t *env) { * * @param env The transformation environment */ -static ir_node *gen_Div(ia32_transform_env_t *env) { - return generate_DivMod(env, get_Div_left(env->irn), get_Div_right(env->irn), flavour_Div); +static ir_node *gen_Div(ia32_transform_env_t *env, ir_node *node) { + return generate_DivMod(env, 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) { - return generate_DivMod(env, get_DivMod_left(env->irn), get_DivMod_right(env->irn), flavour_DivMod); +static ir_node *gen_DivMod(ia32_transform_env_t *env, ir_node *node) { + return generate_DivMod(env, node, get_DivMod_left(node), + get_DivMod_right(node), flavour_DivMod); } @@ -1075,53 +1339,50 @@ static ir_node *gen_DivMod(ia32_transform_env_t *env) { * @param env The transformation environment * @return The created ia32 xDiv node */ -static ir_node *gen_Quot(ia32_transform_env_t *env) { +static ir_node *gen_Quot(ia32_transform_env_t *env, ir_node *node) { + ir_graph *irg = env->irg; + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *block = transform_node(env, get_nodes_block(node)); ir_node *noreg = ia32_new_NoReg_gp(env->cg); ir_node *new_op; ir_node *nomem = new_rd_NoMem(env->irg); - ir_node *op1 = get_Quot_left(env->irn); - ir_node *op2 = get_Quot_right(env->irn); - ir_mode *mode = get_irn_mode(get_proj_for_pn(env->irn, pn_Quot_res)); - ir_node *projs[pn_Quot_max]; - /* BEWARE: Projs will be renumbered, so retrieve res Proj here */ - - ia32_collect_Projs(env->irn, projs, pn_Quot_max); + ir_node *op1 = get_Quot_left(node); + ir_node *op2 = get_Quot_right(node); + ir_node *new_op1 = transform_node(env, op1); + ir_node *new_op2 = transform_node(env, op2); FP_USED(env->cg); if (USE_SSE2(env->cg)) { - if (is_ia32_xConst(op2)) { - new_op = new_rd_ia32_xDiv(env->dbg, env->irg, env->block, noreg, noreg, op1, noreg, nomem); + ir_mode *mode = get_irn_mode(op1); + if (is_ia32_xConst(new_op2)) { + new_op = new_rd_ia32_xDiv(dbg, irg, block, noreg, noreg, new_op1, noreg, nomem); set_ia32_am_support(new_op, ia32_am_None); - set_ia32_Immop_attr(new_op, op2); - } - else { - new_op = new_rd_ia32_xDiv(env->dbg, env->irg, env->block, noreg, noreg, op1, op2, nomem); - set_ia32_am_support(new_op, ia32_am_Source); + copy_ia32_Immop_attr(new_op, new_op2); + } else { + new_op = new_rd_ia32_xDiv(dbg, 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); } - ia32_renumber_Proj(projs, pn_Quot_M, pn_ia32_xDiv_M); - ia32_renumber_Proj(projs, pn_Quot_res, pn_ia32_xDiv_res); - } - else { - new_op = new_rd_ia32_vfdiv(env->dbg, env->irg, env->block, noreg, noreg, op1, op2, nomem); - set_ia32_am_support(new_op, ia32_am_Source); - ia32_renumber_Proj(projs, pn_Quot_M, pn_ia32_vfdiv_M); - ia32_renumber_Proj(projs, pn_Quot_res, pn_ia32_vfdiv_res); + set_ia32_ls_mode(new_op, mode); + } else { + new_op = new_rd_ia32_vfdiv(dbg, 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_res_mode(new_op, mode); - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, env->irn)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); return new_op; } - /** * 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) { - return gen_shift_binop(env, get_Shl_left(env->irn), get_Shl_right(env->irn), new_rd_ia32_Shl); +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), + new_rd_ia32_Shl); } @@ -1132,20 +1393,22 @@ static ir_node *gen_Shl(ia32_transform_env_t *env) { * @param env The transformation environment * @return The created ia32 Shr node */ -static ir_node *gen_Shr(ia32_transform_env_t *env) { - return gen_shift_binop(env, get_Shr_left(env->irn), get_Shr_right(env->irn), new_rd_ia32_Shr); +static ir_node *gen_Shr(ia32_transform_env_t *env, ir_node *node) { + return gen_shift_binop(env, node, get_Shr_left(node), + get_Shr_right(node), new_rd_ia32_Shr); } /** - * Creates an ia32 Shrs. + * 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) { - return gen_shift_binop(env, get_Shrs_left(env->irn), get_Shrs_right(env->irn), new_rd_ia32_Shrs); +static ir_node *gen_Shrs(ia32_transform_env_t *env, ir_node *node) { + return gen_shift_binop(env, node, get_Shrs_left(node), + get_Shrs_right(node), new_rd_ia32_Sar); } @@ -1158,8 +1421,9 @@ static ir_node *gen_Shrs(ia32_transform_env_t *env) { * @param op2 The second operator * @return The created ia32 RotL node */ -static ir_node *gen_RotL(ia32_transform_env_t *env, ir_node *op1, ir_node *op2) { - return gen_shift_binop(env, op1, op2, new_rd_ia32_RotL); +static ir_node *gen_RotL(ia32_transform_env_t *env, ir_node *node, + ir_node *op1, ir_node *op2) { + return gen_shift_binop(env, node, op1, op2, new_rd_ia32_Rol); } @@ -1174,8 +1438,9 @@ static ir_node *gen_RotL(ia32_transform_env_t *env, ir_node *op1, ir_node *op2) * @param op2 The second operator * @return The created ia32 RotR node */ -static ir_node *gen_RotR(ia32_transform_env_t *env, ir_node *op1, ir_node *op2) { - return gen_shift_binop(env, op1, op2, new_rd_ia32_RotR); +static ir_node *gen_RotR(ia32_transform_env_t *env, ir_node *node, ir_node *op1, + ir_node *op2) { + return gen_shift_binop(env, node, op1, op2, new_rd_ia32_Ror); } @@ -1186,40 +1451,36 @@ static ir_node *gen_RotR(ia32_transform_env_t *env, ir_node *op1, ir_node *op2) * @param env The transformation environment * @return The created ia32 RotL or RotR node */ -static ir_node *gen_Rot(ia32_transform_env_t *env) { +static ir_node *gen_Rot(ia32_transform_env_t *env, ir_node *node) { ir_node *rotate = NULL; - ir_node *op1 = get_Rot_left(env->irn); - ir_node *op2 = get_Rot_right(env->irn); + ir_node *op1 = get_Rot_left(node); + ir_node *op2 = get_Rot_right(node); /* Firm has only Rot (which is a RotL), so we are looking for a right (op2) operand "-e+mode_size_bits" (it's an already modified "mode_size_bits-e", that means we can create a RotR instead of an Add and a RotL */ - if (is_Proj(op2)) { - ir_node *pred = get_Proj_pred(op2); - - if (is_ia32_Add(pred)) { - ir_node *pred_pred = get_irn_n(pred, 2); - tarval *tv = get_ia32_Immop_tarval(pred); - long bits = get_mode_size_bits(env->mode); - - if (is_Proj(pred_pred)) { - pred_pred = get_Proj_pred(pred_pred); - } - - if (is_ia32_Minus(pred_pred) && - tarval_is_long(tv) && - get_tarval_long(tv) == bits) + if (get_irn_op(op2) == op_Add) { + ir_node *add = op2; + ir_node *left = get_Add_left(add); + ir_node *right = get_Add_right(add); + if (is_Const(right)) { + tarval *tv = get_Const_tarval(right); + ir_mode *mode = get_irn_mode(node); + long bits = get_mode_size_bits(mode); + + if (get_irn_op(left) == op_Minus && + tarval_is_long(tv) && + get_tarval_long(tv) == bits) { DB((env->mod, LEVEL_1, "RotL into RotR ... ")); - rotate = gen_RotR(env, op1, get_irn_n(pred_pred, 2)); + rotate = gen_RotR(env, node, op1, get_Minus_op(left)); } - } } - if (!rotate) { - rotate = gen_RotL(env, op1, op2); + if (rotate == NULL) { + rotate = gen_RotL(env, node, op1, op2); } return rotate; @@ -1234,42 +1495,41 @@ static ir_node *gen_Rot(ia32_transform_env_t *env) { * @param op The Minus operand * @return The created ia32 Minus node */ -ir_node *gen_Minus_ex(ia32_transform_env_t *env, ir_node *op) { +ir_node *gen_Minus_ex(ia32_transform_env_t *env, ir_node *node, ir_node *op) { ident *name; - ir_node *new_op; - ir_mode *mode = env->mode; + ir_node *res; + ir_graph *irg = env->irg; + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *block = transform_node(env, get_nodes_block(node)); + ir_mode *mode = get_irn_mode(node); 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 *nomem = new_rd_NoMem(env->irg); + ir_node *nomem = new_rd_NoMem(irg); - new_op = new_rd_ia32_xEor(env->dbg, env->irg, env->block, noreg_gp, noreg_gp, op, noreg_fp, nomem, mode); + res = new_rd_ia32_xXor(dbg, irg, block, noreg_gp, noreg_gp, new_op, noreg_fp, nomem); size = get_mode_size_bits(mode); - name = gen_fp_known_const(size == 32 ? ia32_SSIGN : ia32_DSIGN); - - set_ia32_am_sc(new_op, name); - - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, env->irn)); + name = ia32_gen_fp_known_const(size == 32 ? ia32_SSIGN : ia32_DSIGN); - set_ia32_res_mode(new_op, mode); - set_ia32_op_type(new_op, ia32_AddrModeS); - set_ia32_ls_mode(new_op, mode); - } - else { - new_op = new_rd_ia32_vfchs(env->dbg, env->irg, env->block, op, mode); - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, env->irn)); + set_ia32_am_sc(res, name); + set_ia32_op_type(res, ia32_AddrModeS); + set_ia32_ls_mode(res, mode); + } else { + res = new_rd_ia32_vfchs(dbg, irg, block, new_op); } - } - else { - new_op = gen_unop(env, op, new_rd_ia32_Minus); + } else { + res = gen_unop(env, node, op, new_rd_ia32_Neg); } - return new_op; + SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, node)); + + return res; } /** @@ -1278,8 +1538,8 @@ ir_node *gen_Minus_ex(ia32_transform_env_t *env, ir_node *op) { * @param env The transformation environment * @return The created ia32 Minus node */ -static ir_node *gen_Minus(ia32_transform_env_t *env) { - return gen_Minus_ex(env, get_Minus_op(env->irn)); +static ir_node *gen_Minus(ia32_transform_env_t *env, ir_node *node) { + return gen_Minus_ex(env, node, get_Minus_op(node)); } @@ -1289,9 +1549,12 @@ static ir_node *gen_Minus(ia32_transform_env_t *env) { * @param env The transformation environment * @return The created ia32 Not node */ -static ir_node *gen_Not(ia32_transform_env_t *env) { - assert (! mode_is_float(env->mode)); - return gen_unop(env, get_Not_op(env->irn), new_rd_ia32_Not); +static ir_node *gen_Not(ia32_transform_env_t *env, ir_node *node) { + ir_mode *mode = get_irn_mode(node); + ir_node *op = get_Not_op(node); + + assert (! mode_is_float(mode)); + return gen_unop(env, node, op, new_rd_ia32_Not); } @@ -1302,59 +1565,52 @@ static ir_node *gen_Not(ia32_transform_env_t *env) { * @param env The transformation environment * @return The created ia32 Abs node */ -static ir_node *gen_Abs(ia32_transform_env_t *env) { +static ir_node *gen_Abs(ia32_transform_env_t *env, ir_node *node) { ir_node *res, *p_eax, *p_edx; - dbg_info *dbg = env->dbg; - ir_mode *mode = env->mode; ir_graph *irg = env->irg; - ir_node *block = env->block; + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *block = transform_node(env, get_nodes_block(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 *nomem = new_NoMem(); - ir_node *op = get_Abs_op(env->irn); + ir_node *op = get_Abs_op(node); + ir_node *new_op = transform_node(env, op); int size; ident *name; if (mode_is_float(mode)) { FP_USED(env->cg); if (USE_SSE2(env->cg)) { - res = new_rd_ia32_xAnd(dbg,irg, block, noreg_gp, noreg_gp, op, noreg_fp, nomem, mode); + res = new_rd_ia32_xAnd(dbg,irg, block, noreg_gp, noreg_gp, new_op, noreg_fp, nomem); size = get_mode_size_bits(mode); - name = gen_fp_known_const(size == 32 ? ia32_SABS : ia32_DABS); + name = ia32_gen_fp_known_const(size == 32 ? ia32_SABS : ia32_DABS); set_ia32_am_sc(res, name); - SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, env->irn)); + SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, node)); - set_ia32_res_mode(res, mode); set_ia32_op_type(res, ia32_AddrModeS); - set_ia32_ls_mode(res, env->mode); + set_ia32_ls_mode(res, mode); } else { - res = new_rd_ia32_vfabs(dbg, irg, block, op, mode); - SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, env->irn)); + res = new_rd_ia32_vfabs(dbg, irg, block, new_op); + SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, node)); } } else { - // Matze: does this work with other modes? I'm not sure... - // someone should check and remove this assert then - assert(get_mode_size_bits(mode) == 32); - - res = new_rd_ia32_Cdq(dbg, irg, block, op); - SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, env->irn)); - set_ia32_res_mode(res, mode); + res = new_rd_ia32_Cltd(dbg, irg, block, new_op); + SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, node)); - p_eax = new_rd_Proj(dbg, irg, block, res, mode, pn_EAX); - p_edx = new_rd_Proj(dbg, irg, block, res, mode, pn_EDX); + p_eax = new_rd_Proj(dbg, irg, block, res, mode_Iu, pn_EAX); + p_edx = new_rd_Proj(dbg, irg, block, res, mode_Iu, pn_EDX); - res = new_rd_ia32_Eor(dbg, irg, block, noreg_gp, noreg_gp, p_eax, p_edx, nomem, mode); - SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, env->irn)); - set_ia32_res_mode(res, mode); + res = new_rd_ia32_Xor(dbg, irg, block, noreg_gp, noreg_gp, p_eax, p_edx, nomem); + SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, node)); - res = new_rd_ia32_Sub(dbg, irg, block, noreg_gp, noreg_gp, res, p_edx, nomem, mode); - SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, env->irn)); - set_ia32_res_mode(res, mode); + res = new_rd_ia32_Sub(dbg, irg, block, noreg_gp, noreg_gp, res, p_edx, nomem); + SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, node)); } return res; @@ -1368,31 +1624,36 @@ static ir_node *gen_Abs(ia32_transform_env_t *env) { * @param env The transformation environment * @return the created ia32 Load node */ -static ir_node *gen_Load(ia32_transform_env_t *env) { - ir_node *node = env->irn; +static ir_node *gen_Load(ia32_transform_env_t *env, ir_node *node) { + ir_graph *irg = env->irg; + dbg_info *dbg = get_irn_dbg_info(node); ir_node *noreg = ia32_new_NoReg_gp(env->cg); - ir_node *ptr = get_Load_ptr(node); - ir_node *lptr = ptr; ir_mode *mode = get_Load_mode(node); + ir_node *block = transform_node(env, get_nodes_block(node)); + ir_node *ptr = get_Load_ptr(node); + ir_node *new_ptr = transform_node(env, ptr); + ir_node *lptr = new_ptr; + ir_node *mem = get_Load_mem(node); + ir_node *new_mem = transform_node(env, mem); int is_imm = 0; ir_node *new_op; ia32_am_flavour_t am_flav = ia32_am_B; ir_node *projs[pn_Load_max]; - ia32_collect_Projs(env->irn, projs, pn_Load_max); + 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 (! get_proj_for_pn(node, pn_Load_res) && get_Load_volatility(node) == volatility_is_volatile) { + 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(env->irg, env->block, node, mode, pn_ia32_Load_res); - be_new_Keep(arch_get_irn_reg_class(env->cg->arch_env, proj, -1), env->irg, env->block, 1, &proj); + 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(ptr)) { + if (is_ia32_Const(new_ptr)) { lptr = noreg; is_imm = 1; } @@ -1400,35 +1661,26 @@ static ir_node *gen_Load(ia32_transform_env_t *env) { if (mode_is_float(mode)) { FP_USED(env->cg); if (USE_SSE2(env->cg)) { - new_op = new_rd_ia32_xLoad(env->dbg, env->irg, env->block, lptr, noreg, get_Load_mem(node)); - ia32_renumber_Proj(projs, pn_Load_M, pn_ia32_xLoad_M); - ia32_renumber_Proj(projs, pn_Load_res, pn_ia32_xLoad_res); - } - else { - new_op = new_rd_ia32_vfld(env->dbg, env->irg, env->block, lptr, noreg, get_Load_mem(node)); - ia32_renumber_Proj(projs, pn_Load_M, pn_ia32_vfld_M); - ia32_renumber_Proj(projs, pn_Load_res, pn_ia32_vfld_res); + new_op = new_rd_ia32_xLoad(dbg, irg, block, lptr, noreg, new_mem); + } else { + new_op = new_rd_ia32_vfld(dbg, irg, block, lptr, noreg, new_mem); } - } - else { - new_op = new_rd_ia32_Load(env->dbg, env->irg, env->block, lptr, noreg, get_Load_mem(node)); - ia32_renumber_Proj(projs, pn_Load_M, pn_ia32_Load_M); - ia32_renumber_Proj(projs, pn_Load_res, pn_ia32_Load_res); + } else { + new_op = new_rd_ia32_Load(dbg, irg, block, lptr, noreg, new_mem); } - /* base is an constant address */ + /* base is a constant address */ if (is_imm) { - if (get_ia32_op_type(ptr) == ia32_SymConst) { - set_ia32_am_sc(new_op, get_ia32_id_cnst(ptr)); + if (get_ia32_immop_type(new_ptr) == ia32_ImmSymConst) { + set_ia32_am_sc(new_op, get_ia32_Immop_symconst(new_ptr)); am_flav = ia32_am_N; - } - else { - add_ia32_am_offs(new_op, get_ia32_cnst(ptr)); + } else { + tarval *tv = get_ia32_Immop_tarval(new_ptr); + long offs = get_tarval_long(tv); + + add_ia32_am_offs_int(new_op, offs); am_flav = ia32_am_O; } - /* add dependency to barrier, if we are in start block */ - if (get_irg_start_block(env->irg) == env->block) - add_irn_dep(new_op, be_abi_get_start_barrier(env->cg->birg->abi)); } set_ia32_am_support(new_op, ia32_am_Source); @@ -1436,7 +1688,14 @@ static ir_node *gen_Load(ia32_transform_env_t *env) { 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, env->irn)); + /* make sure we are scheduled behind the intial IncSP/Barrier + * to avoid spills being placed before it + */ + if(block == get_irg_start_block(irg)) { + add_irn_dep(new_op, get_irg_frame(irg)); + } + + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); return new_op; } @@ -1449,40 +1708,31 @@ static ir_node *gen_Load(ia32_transform_env_t *env) { * @param env The transformation environment * @return the created ia32 Store node */ -static ir_node *gen_Store(ia32_transform_env_t *env) { - ir_node *node = env->irn; +static ir_node *gen_Store(ia32_transform_env_t *env, ir_node *node) { ir_graph *irg = env->irg; + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *block = transform_node(env, get_nodes_block(node)); ir_node *noreg = ia32_new_NoReg_gp(env->cg); - ir_node *val = get_Store_value(node); ir_node *ptr = get_Store_ptr(node); - ir_node *sptr = ptr; + ir_node *new_ptr = transform_node(env, ptr); + ir_node *sptr = new_ptr; + ir_node *val = get_Store_value(node); + ir_node *new_val = transform_node(env, val); ir_node *mem = get_Store_mem(node); + ir_node *new_mem = transform_node(env, mem); ir_mode *mode = get_irn_mode(val); - ir_node *sval = val; + ir_node *sval = new_val; int is_imm = 0; ir_node *new_op; ia32_am_flavour_t am_flav = ia32_am_B; - ia32_immop_type_t immop = ia32_ImmNone; - - if (! mode_is_float(mode)) { - /* in case of storing a const (but not a symconst) -> make it an attribute */ - if (is_ia32_Cnst(val)) { - switch (get_ia32_op_type(val)) { - case ia32_Const: - immop = ia32_ImmConst; - break; - case ia32_SymConst: - immop = ia32_ImmSymConst; - break; - default: - assert(0 && "unsupported Const type"); - } - sval = noreg; - } + + if (is_ia32_Const(new_val)) { + assert(!mode_is_float(mode)); + sval = noreg; } /* address might be a constant (symconst or absolute address) */ - if (is_ia32_Const(ptr)) { + if (is_ia32_Const(new_ptr)) { sptr = noreg; is_imm = 1; } @@ -1490,32 +1740,32 @@ static ir_node *gen_Store(ia32_transform_env_t *env) { if (mode_is_float(mode)) { FP_USED(env->cg); if (USE_SSE2(env->cg)) { - new_op = new_rd_ia32_xStore(env->dbg, irg, env->block, sptr, noreg, sval, mem); - } - else { - new_op = new_rd_ia32_vfst(env->dbg, irg, env->block, sptr, noreg, sval, mem); + new_op = new_rd_ia32_xStore(dbg, irg, block, sptr, noreg, sval, new_mem); + } else { + new_op = new_rd_ia32_vfst(dbg, irg, block, sptr, noreg, sval, new_mem); } - } - else if (get_mode_size_bits(mode) == 8) { - new_op = new_rd_ia32_Store8Bit(env->dbg, irg, env->block, sptr, noreg, sval, mem); - } - else { - new_op = new_rd_ia32_Store(env->dbg, irg, env->block, sptr, noreg, sval, mem); + } else if (get_mode_size_bits(mode) == 8) { + new_op = new_rd_ia32_Store8Bit(dbg, irg, block, sptr, noreg, sval, new_mem); + } else { + new_op = new_rd_ia32_Store(dbg, irg, block, sptr, noreg, sval, new_mem); } - /* stored const is an attribute (saves a register) */ - if (! mode_is_float(mode) && is_ia32_Cnst(val)) { - set_ia32_Immop_attr(new_op, val); + /* stored const is an immediate value */ + if (is_ia32_Const(new_val)) { + assert(!mode_is_float(mode)); + copy_ia32_Immop_attr(new_op, new_val); } /* base is an constant address */ if (is_imm) { - if (get_ia32_op_type(ptr) == ia32_SymConst) { - set_ia32_am_sc(new_op, get_ia32_id_cnst(ptr)); + if (get_ia32_immop_type(new_ptr) == ia32_ImmSymConst) { + set_ia32_am_sc(new_op, get_ia32_Immop_symconst(new_ptr)); am_flav = ia32_am_N; - } - else { - add_ia32_am_offs(new_op, get_ia32_cnst(ptr)); + } else { + tarval *tv = get_ia32_Immop_tarval(new_ptr); + long offs = get_tarval_long(tv); + + add_ia32_am_offs_int(new_op, offs); am_flav = ia32_am_O; } } @@ -1524,9 +1774,8 @@ static ir_node *gen_Store(ia32_transform_env_t *env) { 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_immop_type(new_op, immop); - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, env->irn)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); return new_op; } @@ -1539,91 +1788,94 @@ static ir_node *gen_Store(ia32_transform_env_t *env) { * @param env The transformation environment * @return The transformed node. */ -static ir_node *gen_Cond(ia32_transform_env_t *env) { - dbg_info *dbg = env->dbg; +static ir_node *gen_Cond(ia32_transform_env_t *env, ir_node *node) { ir_graph *irg = env->irg; - ir_node *block = env->block; - ir_node *node = env->irn; + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *block = transform_node(env, get_nodes_block(node)); ir_node *sel = get_Cond_selector(node); ir_mode *sel_mode = get_irn_mode(sel); ir_node *res = NULL; - ir_node *pred = NULL; ir_node *noreg = ia32_new_NoReg_gp(env->cg); - ir_node *cmp_a, *cmp_b, *cnst, *expr; + ir_node *cnst, *expr; if (is_Proj(sel) && sel_mode == mode_b) { - ir_node *nomem = new_NoMem(); - pn_Cmp pnc = get_Proj_proj(sel); - - pred = get_Proj_pred(sel); - - /* get both compare operators */ - cmp_a = get_Cmp_left(pred); - cmp_b = get_Cmp_right(pred); + ir_node *nomem = new_NoMem(); + 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 *cmp_b = get_Cmp_right(pred); + ir_node *new_cmp_b = transform_node(env, cmp_b); + ir_mode *cmp_mode = get_irn_mode(cmp_a); + + int pnc = get_Proj_proj(sel); + if(mode_is_float(cmp_mode) || !mode_is_signed(cmp_mode)) { + pnc |= ia32_pn_Cmp_Unsigned; + } /* check if we can use a CondJmp with immediate */ - cnst = (env->cg->opt & IA32_OPT_IMMOPS) ? get_immediate_op(cmp_a, cmp_b) : NULL; - expr = get_expr_op(cmp_a, cmp_b); + 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 && expr) { + if (cnst != NULL && expr != NULL) { /* immop has to be the right operand, we might need to flip pnc */ - if(cnst != cmp_b) { + if(cnst != new_cmp_b) { pnc = get_inversed_pnc(pnc); } if ((pnc == pn_Cmp_Eq || pnc == pn_Cmp_Lg) && mode_is_int(get_irn_mode(expr))) { - if (get_ia32_op_type(cnst) == ia32_Const && + if (get_ia32_immop_type(cnst) == ia32_ImmConst && classify_tarval(get_ia32_Immop_tarval(cnst)) == TV_CLASSIFY_NULL) { /* a Cmp A =/!= 0 */ ir_node *op1 = expr; ir_node *op2 = expr; - ir_node *and = skip_Proj(expr); - const char *cnst = NULL; + int is_and = 0; /* check, if expr is an only once used And operation */ - if (get_irn_n_edges(expr) == 1 && is_ia32_And(and)) { - op1 = get_irn_n(and, 2); - op2 = get_irn_n(and, 3); + if (is_ia32_And(expr) && get_irn_n_edges(expr)) { + op1 = get_irn_n(expr, 2); + op2 = get_irn_n(expr, 3); - cnst = (is_ia32_ImmConst(and) || is_ia32_ImmSymConst(and)) ? get_ia32_cnst(and) : NULL; + is_and = (is_ia32_ImmConst(expr) || is_ia32_ImmSymConst(expr)); } res = new_rd_ia32_TestJmp(dbg, irg, block, op1, op2); set_ia32_pncode(res, pnc); - set_ia32_res_mode(res, get_irn_mode(op1)); - if (cnst) { - copy_ia32_Immop_attr(res, and); + if (is_and) { + copy_ia32_Immop_attr(res, expr); } - SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, env->irn)); + SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, node)); return res; } } - if (mode_is_float(get_irn_mode(expr))) { + if (mode_is_float(cmp_mode)) { FP_USED(env->cg); - if (USE_SSE2(env->cg)) + if (USE_SSE2(env->cg)) { res = new_rd_ia32_xCondJmp(dbg, irg, block, noreg, noreg, expr, noreg, nomem); - else { + set_ia32_ls_mode(res, cmp_mode); + } else { assert(0); } } else { res = new_rd_ia32_CondJmp(dbg, irg, block, noreg, noreg, expr, noreg, nomem); } - set_ia32_Immop_attr(res, cnst); - set_ia32_res_mode(res, get_irn_mode(expr)); + copy_ia32_Immop_attr(res, cnst); } else { - if (mode_is_float(get_irn_mode(cmp_a))) { + ir_mode *cmp_mode = get_irn_mode(cmp_a); + + if (mode_is_float(cmp_mode)) { FP_USED(env->cg); - if (USE_SSE2(env->cg)) + if (USE_SSE2(env->cg)) { res = new_rd_ia32_xCondJmp(dbg, irg, block, noreg, noreg, cmp_a, cmp_b, nomem); - else { + set_ia32_ls_mode(res, cmp_mode); + } else { ir_node *proj_eax; res = new_rd_ia32_vfCondJmp(dbg, irg, block, noreg, noreg, cmp_a, cmp_b, nomem); - proj_eax = new_r_Proj(irg, block, res, mode_Is, pn_ia32_vfCondJmp_temp_reg_eax); + proj_eax = new_r_Proj(irg, block, res, mode_Iu, pn_ia32_vfCondJmp_temp_reg_eax); be_new_Keep(&ia32_reg_classes[CLASS_ia32_gp], irg, block, 1, &proj_eax); } } @@ -1631,17 +1883,20 @@ static ir_node *gen_Cond(ia32_transform_env_t *env) { res = new_rd_ia32_CondJmp(dbg, irg, block, noreg, noreg, cmp_a, cmp_b, nomem); set_ia32_commutative(res); } - set_ia32_res_mode(res, get_irn_mode(cmp_a)); } set_ia32_pncode(res, pnc); + // Matze: disabled for now, because the default collect_spills_walker + // 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); } else { /* determine the smallest switch case value */ int switch_min = INT_MAX; const ir_edge_t *edge; - char buf[64]; + ir_node *new_sel = transform_node(env, sel); foreach_out_edge(node, edge) { int pn = get_Proj_proj(get_edge_src_irn(edge)); @@ -1650,21 +1905,19 @@ static ir_node *gen_Cond(ia32_transform_env_t *env) { if (switch_min) { /* if smallest switch case is not 0 we need an additional sub */ - snprintf(buf, sizeof(buf), "%d", switch_min); - res = new_rd_ia32_Lea(dbg, irg, block, sel, noreg, mode_Is); - SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, env->irn)); - sub_ia32_am_offs(res, buf); + res = new_rd_ia32_Lea(dbg, irg, block, new_sel, noreg); + 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); } - res = new_rd_ia32_SwitchJmp(dbg, irg, block, switch_min ? res : sel, mode_T); + res = new_rd_ia32_SwitchJmp(dbg, irg, block, switch_min ? res : new_sel, mode_T); set_ia32_pncode(res, get_Cond_defaultProj(node)); - set_ia32_res_mode(res, get_irn_mode(sel)); } - SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, env->irn)); + SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, node)); return res; } @@ -1676,23 +1929,22 @@ static ir_node *gen_Cond(ia32_transform_env_t *env) { * @param env The transformation environment * @return The transformed node. */ -static ir_node *gen_CopyB(ia32_transform_env_t *env) { +static ir_node *gen_CopyB(ia32_transform_env_t *env, ir_node *node) { ir_node *res = NULL; - dbg_info *dbg = env->dbg; ir_graph *irg = env->irg; - ir_node *block = env->block; - ir_node *node = env->irn; + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *block = transform_node(env, get_nodes_block(node)); ir_node *src = get_CopyB_src(node); + ir_node *new_src = transform_node(env, src); ir_node *dst = get_CopyB_dst(node); + ir_node *new_dst = transform_node(env, dst); ir_node *mem = get_CopyB_mem(node); + ir_node *new_mem = transform_node(env, mem); int size = get_type_size_bytes(get_CopyB_type(node)); ir_mode *dst_mode = get_irn_mode(dst); ir_mode *src_mode = get_irn_mode(src); int rem; ir_node *in[3]; - ir_node *projs[pn_CopyB_max]; - - ia32_collect_Projs(env->irn, projs, pn_CopyB_max); /* If we have to copy more than 32 bytes, we use REP MOVSx and */ /* then we need the size explicitly in ECX. */ @@ -1700,63 +1952,55 @@ static ir_node *gen_CopyB(ia32_transform_env_t *env) { rem = size & 0x3; /* size % 4 */ size >>= 2; - res = new_rd_ia32_Const(dbg, irg, block, mode_Is); + res = new_rd_ia32_Const(dbg, irg, block); add_irn_dep(res, be_abi_get_start_barrier(env->cg->birg->abi)); - set_ia32_op_type(res, ia32_Const); set_ia32_Immop_tarval(res, new_tarval_from_long(size, mode_Is)); - res = new_rd_ia32_CopyB(dbg, irg, block, dst, src, res, mem); + res = new_rd_ia32_CopyB(dbg, irg, block, new_dst, new_src, res, new_mem); set_ia32_Immop_tarval(res, new_tarval_from_long(rem, mode_Is)); /* ok: now attach Proj's because rep movsd will destroy esi, edi and ecx */ in[0] = new_r_Proj(irg, block, res, dst_mode, pn_ia32_CopyB_DST); in[1] = new_r_Proj(irg, block, res, src_mode, pn_ia32_CopyB_SRC); - in[2] = new_r_Proj(irg, block, res, mode_Is, pn_ia32_CopyB_CNT); + in[2] = new_r_Proj(irg, block, res, mode_Iu, pn_ia32_CopyB_CNT); be_new_Keep(&ia32_reg_classes[CLASS_ia32_gp], irg, block, 3, in); - - ia32_renumber_Proj(projs, pn_CopyB_M_regular, pn_ia32_CopyB_M); } else { - res = new_rd_ia32_CopyB_i(dbg, irg, block, dst, src, mem); + res = new_rd_ia32_CopyB_i(dbg, irg, block, new_dst, new_src, new_mem); set_ia32_Immop_tarval(res, new_tarval_from_long(size, mode_Is)); - set_ia32_immop_type(res, ia32_ImmConst); /* ok: now attach Proj's because movsd will destroy esi and edi */ in[0] = new_r_Proj(irg, block, res, dst_mode, pn_ia32_CopyB_i_DST); in[1] = new_r_Proj(irg, block, res, src_mode, pn_ia32_CopyB_i_SRC); be_new_Keep(&ia32_reg_classes[CLASS_ia32_gp], irg, block, 2, in); - - ia32_renumber_Proj(projs, pn_CopyB_M_regular, pn_ia32_CopyB_i_M); } - SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, env->irn)); + SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, node)); return res; } - +#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) { -#if 0 - ir_node *node = env->irn; +static ir_node *gen_Mux(ia32_transform_env_t *env, ir_node *node) { ir_node *new_op = new_rd_ia32_CMov(env->dbg, env->irg, 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, env->irn)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); return new_op; -#endif - return NULL; } +#endif -typedef ir_node *cmov_func_t(dbg_info *db, ir_graph *irg, ir_node *block, ir_node *cmp_a, ir_node *cmp_b, \ - ir_node *psi_true, ir_node *psi_default, ir_mode *mode); +typedef ir_node *cmov_func_t(dbg_info *db, ir_graph *irg, ir_node *block, + ir_node *cmp_a, ir_node *cmp_b, ir_node *psi_true, + ir_node *psi_default); /** * Transforms a Psi node into CMov. @@ -1764,19 +2008,22 @@ typedef ir_node *cmov_func_t(dbg_info *db, ir_graph *irg, ir_node *block, ir_nod * @param env The transformation environment * @return The transformed node. */ -static ir_node *gen_Psi(ia32_transform_env_t *env) { +static ir_node *gen_Psi(ia32_transform_env_t *env, ir_node *node) { ia32_code_gen_t *cg = env->cg; - dbg_info *dbg = env->dbg; ir_graph *irg = env->irg; - ir_mode *mode = env->mode; - ir_node *block = env->block; - ir_node *node = env->irn; + dbg_info *dbg = get_irn_dbg_info(node); + ir_mode *mode = get_irn_mode(node); + ir_node *block = transform_node(env, get_nodes_block(node)); ir_node *cmp_proj = get_Mux_sel(node); ir_node *psi_true = get_Psi_val(node, 0); ir_node *psi_default = get_Psi_default(node); + ir_node *new_psi_true = transform_node(env, psi_true); + ir_node *new_psi_default = transform_node(env, psi_default); 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 *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"); @@ -1784,7 +2031,14 @@ static ir_node *gen_Psi(ia32_transform_env_t *env) { 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 */ @@ -1800,39 +2054,35 @@ static ir_node *gen_Psi(ia32_transform_env_t *env) { /* in case the compare operands are int, we move them into xmm register */ if (! mode_is_float(get_irn_mode(cmp_a))) { - cmp_a = gen_sse_conv_int2float(cg, dbg, irg, block, cmp_a, node, mode_D); - cmp_b = gen_sse_conv_int2float(cg, dbg, irg, block, cmp_b, node, mode_D); + new_cmp_a = gen_sse_conv_int2float(cg, dbg, irg, block, new_cmp_a, node, mode_E); + new_cmp_b = gen_sse_conv_int2float(cg, dbg, irg, block, new_cmp_b, node, mode_E); pnc |= 8; /* transform integer compare to fp compare */ } - new_op = new_rd_ia32_xCmp(dbg, irg, block, noreg, noreg, cmp_a, cmp_b, nomem, mode); + new_op = new_rd_ia32_xCmp(dbg, 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_res_mode(new_op, mode); SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(cg, node)); - and1 = new_rd_ia32_xAnd(dbg, irg, block, noreg, noreg, psi_true, new_op, nomem, mode); + and1 = new_rd_ia32_xAnd(dbg, irg, block, noreg, noreg, new_psi_true, new_op, nomem); set_ia32_am_support(and1, ia32_am_None); - set_ia32_res_mode(and1, mode); set_ia32_commutative(and1); SET_IA32_ORIG_NODE(and1, ia32_get_old_node_name(cg, node)); - and2 = new_rd_ia32_xAndNot(dbg, irg, block, noreg, noreg, new_op, psi_default, nomem, mode); + and2 = new_rd_ia32_xAndNot(dbg, irg, block, noreg, noreg, new_op, new_psi_default, nomem); set_ia32_am_support(and2, ia32_am_None); - set_ia32_res_mode(and2, mode); set_ia32_commutative(and2); SET_IA32_ORIG_NODE(and2, ia32_get_old_node_name(cg, node)); - new_op = new_rd_ia32_xOr(dbg, irg, block, noreg, noreg, and1, and2, nomem, mode); + new_op = new_rd_ia32_xOr(dbg, irg, block, noreg, noreg, and1, and2, nomem); set_ia32_am_support(new_op, ia32_am_None); - set_ia32_res_mode(new_op, mode); 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(dbg, irg, block, cmp_a, cmp_b, psi_true, psi_default, mode); + new_op = new_rd_ia32_vfCMov(dbg, 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)); } @@ -1857,7 +2107,7 @@ static ir_node *gen_Psi(ia32_transform_env_t *env) { cmov_func = new_rd_ia32_vfCmpCMov; } - pnc &= 7; /* fp compare -> int compare */ + pnc &= ~0x8; /* fp compare -> int compare */ } else { /* 2nd case: compare operand are integer too */ @@ -1865,47 +2115,44 @@ static ir_node *gen_Psi(ia32_transform_env_t *env) { cmov_func = new_rd_ia32_CmpCMov; } - /* create the nodes */ - /* check for special case first: And/Or -- Cmp with 0 -- Psi */ - if (is_ia32_Const_0(cmp_b) && is_Proj(cmp_a) && (is_ia32_And(get_Proj_pred(cmp_a)) || is_ia32_Or(get_Proj_pred(cmp_a)))) { + 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(dbg, irg, block, cmp_a, mode); + new_op = new_rd_ia32_PsiCondSet(dbg, 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(dbg, irg, block, cmp_a, mode); + new_op = new_rd_ia32_PsiCondSet(dbg, irg, block, new_cmp_a); set_ia32_pncode(new_op, get_inversed_pnc(pnc)); } else { /* otherwise: use CMOVcc */ - new_op = new_rd_ia32_PsiCondCMov(dbg, irg, block, cmp_a, psi_true, psi_default, mode); + new_op = new_rd_ia32_PsiCondCMov(dbg, 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 { - env->irn = cmp; 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, cmp_a, cmp_b, set_func); + 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, cmp_a, cmp_b, set_func); + 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(dbg, irg, block, cmp_a, cmp_b, psi_true, psi_default, mode); + new_op = cmov_func(dbg, 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)); } @@ -1922,8 +2169,7 @@ static ir_node *gen_Psi(ia32_transform_env_t *env) { * INT -> INT * ============ * 1) n bit -> m bit n > m (downscale) - * a) target is signed: movsx - * b) target is unsigned: and with lower bits sets + * always ignored * 2) n bit -> m bit n == m (sign change) * always ignored * 3) n bit -> m bit n < m (upscale) @@ -1937,7 +2183,6 @@ static ir_node *gen_Psi(ia32_transform_env_t *env) { * FLOAT -> INT * ============== * SSE(1/2) convert from float or double to 32bit int (cvtss/sd2si) - * if target mode < 32bit: additional INT -> INT conversion (see above) * * FLOAT -> FLOAT * ================ @@ -1949,84 +2194,86 @@ static ir_node *gen_Psi(ia32_transform_env_t *env) { /** * Create a conversion from x87 state register to general purpose. */ -static ir_node *gen_x87_fp_to_gp(ia32_transform_env_t *env, ir_mode *tgt_mode) { +static ir_node *gen_x87_fp_to_gp(ia32_transform_env_t *env, ir_node *node) { ia32_code_gen_t *cg = env->cg; ir_graph *irg = env->irg; - ir_node *irn = env->irn; - ir_node *block = env->block; + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *block = transform_node(env, get_nodes_block(node)); ir_node *noreg = ia32_new_NoReg_gp(env->cg); - ir_node *op = get_Conv_op(env->irn); - ir_node *fist, *mem, *load; + ir_node *op = get_Conv_op(node); + ir_node *new_op = transform_node(env, op); + ir_node *fist, *load; /* do a fist */ - fist = new_rd_ia32_vfist(env->dbg, irg, block, get_irg_frame(irg), noreg, op, get_irg_no_mem(irg)); + fist = new_rd_ia32_vfist(dbg, irg, block, get_irg_frame(irg), noreg, new_op, new_NoMem()); 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_B); - set_ia32_ls_mode(fist, mode_F); - SET_IA32_ORIG_NODE(fist, ia32_get_old_node_name(cg, irn)); - - mem = fist; + set_ia32_am_flavour(fist, ia32_am_B); + set_ia32_ls_mode(fist, mode_Iu); + SET_IA32_ORIG_NODE(fist, ia32_get_old_node_name(cg, node)); /* do a Load */ - load = new_rd_ia32_Load(env->dbg, irg, block, get_irg_frame(irg), noreg, mem); + load = new_rd_ia32_Load(dbg, irg, block, get_irg_frame(irg), noreg, fist); 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_B); - set_ia32_ls_mode(load, tgt_mode); - SET_IA32_ORIG_NODE(load, ia32_get_old_node_name(cg, irn)); + set_ia32_am_flavour(load, ia32_am_B); + set_ia32_ls_mode(load, mode_Iu); + SET_IA32_ORIG_NODE(load, ia32_get_old_node_name(cg, node)); - return new_r_Proj(irg, block, load, tgt_mode, pn_ia32_Load_res); + return new_r_Proj(irg, block, load, mode_Iu, pn_ia32_Load_res); } /** * Create a conversion from general purpose to x87 register */ -static ir_node *gen_x87_gp_to_fp(ia32_transform_env_t *env, ir_mode *src_mode) { +static ir_node *gen_x87_gp_to_fp(ia32_transform_env_t *env, ir_node *node, ir_mode *src_mode) { ia32_code_gen_t *cg = env->cg; - ir_node *irn = env->irn; - ir_graph *irg = env->irg; - ir_node *block = env->block; - ir_node *noreg = ia32_new_NoReg_gp(env->cg); - ir_node *nomem = get_irg_no_mem(irg); - ir_node *op = get_Conv_op(env->irn); + ir_graph *irg = env->irg; + dbg_info *dbg = get_irn_dbg_info(node); + ir_mode *mode = get_irn_mode(node); + ir_node *block = transform_node(env, get_nodes_block(node)); + ir_node *noreg = ia32_new_NoReg_gp(env->cg); + ir_node *nomem = new_NoMem(); + ir_node *op = get_Conv_op(node); + ir_node *new_op = transform_node(env, op); ir_node *fild, *store; int src_bits; - /* first convert to 32 bit */ + /* first convert to 32 bit if necessary */ src_bits = get_mode_size_bits(src_mode); if (src_bits == 8) { - op = new_rd_ia32_Conv_I2I8Bit(env->dbg, irg, block, noreg, noreg, op, nomem, mode_Is); - set_ia32_am_support(op, ia32_am_Source); - SET_IA32_ORIG_NODE(op, ia32_get_old_node_name(cg, irn)); - } - else if (src_bits < 32) { - op = new_rd_ia32_Conv_I2I(env->dbg, irg, block, noreg, noreg, op, nomem, mode_Is); - set_ia32_am_support(op, ia32_am_Source); - SET_IA32_ORIG_NODE(op, ia32_get_old_node_name(cg, irn)); + new_op = new_rd_ia32_Conv_I2I8Bit(dbg, irg, block, noreg, noreg, new_op, nomem); + set_ia32_am_support(new_op, ia32_am_Source); + set_ia32_ls_mode(new_op, src_mode); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(cg, node)); + } else if (src_bits < 32) { + new_op = new_rd_ia32_Conv_I2I(dbg, irg, block, noreg, noreg, new_op, nomem); + set_ia32_am_support(new_op, ia32_am_Source); + set_ia32_ls_mode(new_op, src_mode); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(cg, node)); } /* do a store */ - store = new_rd_ia32_Store(env->dbg, irg, block, get_irg_frame(irg), noreg, op, nomem); + store = new_rd_ia32_Store(dbg, 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_Is); + set_ia32_ls_mode(store, mode_Iu); /* do a fild */ - fild = new_rd_ia32_vfild(env->dbg, irg, block, get_irg_frame(irg), noreg, store); + fild = new_rd_ia32_vfild(dbg, 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_Is); + set_ia32_ls_mode(fild, mode); return new_r_Proj(irg, block, fild, mode_F, pn_ia32_vfild_res); } @@ -2037,113 +2284,115 @@ static ir_node *gen_x87_gp_to_fp(ia32_transform_env_t *env, ir_mode *src_mode) { * @param env The transformation environment * @return The created ia32 Conv node */ -static ir_node *gen_Conv(ia32_transform_env_t *env) { - dbg_info *dbg = env->dbg; +static ir_node *gen_Conv(ia32_transform_env_t *env, ir_node *node) { ir_graph *irg = env->irg; - ir_node *op = get_Conv_op(env->irn); + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *op = get_Conv_op(node); ir_mode *src_mode = get_irn_mode(op); - ir_mode *tgt_mode = env->mode; + 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); - int kill = 0; - ir_node *block = env->block; - ir_node *new_op = NULL; + ir_node *block = transform_node(env, get_nodes_block(node)); + ir_node *res; ir_node *noreg = ia32_new_NoReg_gp(env->cg); ir_node *nomem = new_rd_NoMem(irg); + ir_node *new_op = transform_node(env, op); DEBUG_ONLY(firm_dbg_module_t *mod = env->mod;) if (src_mode == tgt_mode) { - /* this can happen when changing mode_P to mode_Is */ + /* this should be optimized already, but who knows... */ + DEBUG_ONLY(ir_fprintf(stderr, "Debug warning: conv %+F is pointless\n", node)); DB((mod, LEVEL_1, "killed Conv(mode, mode) ...")); - exchange(env->irn, op); + return new_op; } - else if (mode_is_float(src_mode)) { + + if (mode_is_float(src_mode)) { /* we convert from float ... */ if (mode_is_float(tgt_mode)) { /* ... to float */ if (USE_SSE2(env->cg)) { DB((mod, LEVEL_1, "create Conv(float, float) ...")); - new_op = new_rd_ia32_Conv_FP2FP(dbg, irg, block, noreg, noreg, op, nomem, tgt_mode); - } - else { + res = new_rd_ia32_Conv_FP2FP(dbg, irg, block, noreg, noreg, new_op, nomem); + set_ia32_ls_mode(res, tgt_mode); + } else { + // Matze: TODO what about strict convs? DB((mod, LEVEL_1, "killed Conv(float, float) ...")); - /* - remark: we create a intermediate conv here, so modes will be spread correctly - these convs will be killed later - */ - new_op = new_rd_ia32_Conv_FP2FP(dbg, irg, block, noreg, noreg, op, nomem, tgt_mode); - kill = 1; + return new_op; } - } - else { + } else { /* ... to int */ DB((mod, LEVEL_1, "create Conv(float, int) ...")); if (USE_SSE2(env->cg)) { - new_op = new_rd_ia32_Conv_FP2I(dbg, irg, block, noreg, noreg, op, nomem, mode_Is); - } - else - return gen_x87_fp_to_gp(env, mode_Is); - - /* if target mode is not int: add an additional downscale convert */ - if (tgt_mode != mode_Is) { - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, env->irn)); - - if (tgt_bits == 8 || src_bits == 8) { - new_op = new_rd_ia32_Conv_I2I8Bit(dbg, irg, block, noreg, noreg, new_op, nomem, tgt_mode); - } - else { - new_op = new_rd_ia32_Conv_I2I(dbg, irg, block, noreg, noreg, new_op, nomem, tgt_mode); - } - src_mode = mode_Is; + res = new_rd_ia32_Conv_FP2I(dbg, irg, block, noreg, noreg, new_op, nomem); + set_ia32_ls_mode(res, src_mode); + } else { + return gen_x87_fp_to_gp(env, node); } } - } - else { + } else { /* we convert from int ... */ if (mode_is_float(tgt_mode)) { FP_USED(env->cg); /* ... to float */ DB((mod, LEVEL_1, "create Conv(int, float) ...")); if (USE_SSE2(env->cg)) { - new_op = new_rd_ia32_Conv_I2FP(dbg, irg, block, noreg, noreg, op, nomem, tgt_mode); + res = new_rd_ia32_Conv_I2FP(dbg, 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); + } + } else { + return gen_x87_gp_to_fp(env, node, src_mode); } - else - return gen_x87_gp_to_fp(env, src_mode); } else { - /* ... to int */ - if (get_mode_size_bits(src_mode) == tgt_bits) { - DB((mod, LEVEL_1, "omitting equal size Conv(%+F, %+F) ...", src_mode, tgt_mode)); - /* - remark: we create a intermediate conv here, so modes will be spread correctly - these convs will be killed later - */ - new_op = new_rd_ia32_Conv_I2I(dbg, irg, block, noreg, noreg, op, nomem, tgt_mode); - kill = 1; + ir_mode *smaller_mode; + int smaller_bits; + + if (src_bits == tgt_bits) { + DB((mod, LEVEL_1, "omitting unnecessary Conv(%+F, %+F) ...", src_mode, tgt_mode)); + return new_op; } - else { - DB((mod, LEVEL_1, "create Conv(int, int) ...", src_mode, tgt_mode)); - if (tgt_bits == 8 || src_bits == 8) { - new_op = new_rd_ia32_Conv_I2I8Bit(dbg, irg, block, noreg, noreg, op, nomem, tgt_mode); - } - else { - new_op = new_rd_ia32_Conv_I2I(dbg, irg, block, noreg, noreg, op, nomem, tgt_mode); + + if(src_bits < tgt_bits) { + smaller_mode = src_mode; + smaller_bits = src_bits; + } else { + smaller_mode = tgt_mode; + 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 + + DB((mod, LEVEL_1, "create Conv(int, int) ...", src_mode, tgt_mode)); + if (smaller_bits == 8) { + res = new_rd_ia32_Conv_I2I8Bit(dbg, irg, block, noreg, noreg, new_op, nomem); + set_ia32_ls_mode(res, smaller_mode); + } else { + res = new_rd_ia32_Conv_I2I(dbg, irg, block, noreg, noreg, new_op, nomem); + set_ia32_ls_mode(res, smaller_mode); + } + set_ia32_am_support(res, ia32_am_Source); } } - if (new_op) { - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, env->irn)); - - if(tgt_bits >= src_bits) - set_ia32_am_support(new_op, ia32_am_Source); - - if (kill) - nodeset_insert(env->cg->kill_conv, new_op); - } + SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, node)); - return new_op; + return res; } @@ -2158,29 +2407,34 @@ static ir_node *gen_Conv(ia32_transform_env_t *env) { * ********************************************/ -static ir_node *gen_be_StackParam(ia32_transform_env_t *env) { +static ir_node *gen_be_StackParam(ia32_transform_env_t *env, ir_node *node) { ir_node *new_op = NULL; - ir_node *node = env->irn; + ir_graph *irg = env->irg; + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *block = transform_node(env, get_nodes_block(node)); ir_node *noreg = ia32_new_NoReg_gp(env->cg); - ir_node *mem = new_rd_NoMem(env->irg); + ir_node *nomem = new_rd_NoMem(env->irg); ir_node *ptr = get_irn_n(node, 0); + ir_node *new_ptr = transform_node(env, ptr); ir_entity *ent = arch_get_frame_entity(env->cg->arch_env, node); - ir_mode *mode = env->mode; + ir_mode *load_mode = get_irn_mode(node); + ir_mode *proj_mode; long pn_res; - if (mode_is_float(mode)) { + if (mode_is_float(load_mode)) { FP_USED(env->cg); if (USE_SSE2(env->cg)) { - new_op = new_rd_ia32_xLoad(env->dbg, env->irg, env->block, ptr, noreg, mem); + new_op = new_rd_ia32_xLoad(dbg, irg, block, new_ptr, noreg, nomem); pn_res = pn_ia32_xLoad_res; - } - else { - new_op = new_rd_ia32_vfld(env->dbg, env->irg, env->block, ptr, noreg, mem); + } else { + new_op = new_rd_ia32_vfld(dbg, irg, block, new_ptr, noreg, nomem); pn_res = pn_ia32_vfld_res; } - } - else { - new_op = new_rd_ia32_Load(env->dbg, env->irg, env->block, ptr, noreg, mem); + + proj_mode = mode_E; + } else { + new_op = new_rd_ia32_Load(dbg, irg, block, new_ptr, noreg, nomem); + proj_mode = mode_Iu; pn_res = pn_ia32_Load_res; } @@ -2189,70 +2443,68 @@ static ir_node *gen_be_StackParam(ia32_transform_env_t *env) { set_ia32_am_support(new_op, ia32_am_Source); set_ia32_op_type(new_op, ia32_AddrModeS); - set_ia32_am_flavour(new_op, ia32_B); - set_ia32_ls_mode(new_op, mode); + 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, env->irn)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); - return new_rd_Proj(env->dbg, env->irg, env->block, new_op, mode, pn_res); + return new_rd_Proj(dbg, irg, block, new_op, proj_mode, pn_res); } /** * Transforms a FrameAddr into an ia32 Add. */ -static ir_node *gen_be_FrameAddr(ia32_transform_env_t *env) { - ir_node *new_op = NULL; - ir_node *node = env->irn; +static ir_node *gen_be_FrameAddr(ia32_transform_env_t *env, ir_node *node) { + ir_graph *irg = env->irg; + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *block = transform_node(env, get_nodes_block(node)); ir_node *op = get_irn_n(node, 0); + ir_node *new_op = transform_node(env, op); + ir_node *res; ir_node *noreg = ia32_new_NoReg_gp(env->cg); - ir_node *nomem = new_rd_NoMem(env->irg); - ir_mode *mode = env->mode; - new_op = new_rd_ia32_Add(env->dbg, env->irg, env->block, noreg, noreg, op, noreg, nomem, mode); - set_ia32_frame_ent(new_op, arch_get_frame_entity(env->cg->arch_env, node)); - set_ia32_am_support(new_op, ia32_am_Full); - set_ia32_use_frame(new_op); - set_ia32_immop_type(new_op, ia32_ImmConst); - set_ia32_commutative(new_op); + res = new_rd_ia32_Lea(dbg, 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_use_frame(res); + set_ia32_am_flavour(res, ia32_am_OB); - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, env->irn)); + SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env->cg, node)); - return new_op; + return res; } /** * Transforms a FrameLoad into an ia32 Load. */ -static ir_node *gen_be_FrameLoad(ia32_transform_env_t *env) { - ir_node *new_op = NULL; - ir_node *node = env->irn; - ir_node *noreg = ia32_new_NoReg_gp(env->cg); - ir_node *mem = get_irn_n(node, 0); - ir_node *ptr = get_irn_n(node, 1); - ir_entity *ent = arch_get_frame_entity(env->cg->arch_env, node); - ir_mode *mode = get_type_mode(get_entity_type(ent)); +static ir_node *gen_be_FrameLoad(ia32_transform_env_t *env, ir_node *node) { + ir_node *new_op = NULL; + ir_graph *irg = env->irg; + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *block = transform_node(env, get_nodes_block(node)); + ir_node *noreg = ia32_new_NoReg_gp(env->cg); + ir_node *mem = get_irn_n(node, 0); + ir_node *ptr = get_irn_n(node, 1); + ir_node *new_mem = transform_node(env, mem); + ir_node *new_ptr = transform_node(env, ptr); + 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(env->irn, 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)) { - new_op = new_rd_ia32_xLoad(env->dbg, env->irg, env->block, ptr, noreg, mem); - ia32_renumber_Proj(projs, pn_Load_M, pn_ia32_xLoad_M); - ia32_renumber_Proj(projs, pn_Load_res, pn_ia32_xLoad_res); + new_op = new_rd_ia32_xLoad(dbg, irg, block, new_ptr, noreg, new_mem); } else { - new_op = new_rd_ia32_vfld(env->dbg, env->irg, env->block, ptr, noreg, mem); - ia32_renumber_Proj(projs, pn_Load_M, pn_ia32_vfld_M); - ia32_renumber_Proj(projs, pn_Load_res, pn_ia32_vfld_res); + new_op = new_rd_ia32_vfld(dbg, irg, block, new_ptr, noreg, new_mem); } } else { - new_op = new_rd_ia32_Load(env->dbg, env->irg, env->block, ptr, noreg, mem); - ia32_renumber_Proj(projs, pn_Load_M, pn_ia32_Load_M); - ia32_renumber_Proj(projs, pn_Load_res, pn_ia32_Load_res); + new_op = new_rd_ia32_Load(dbg, irg, block, new_ptr, noreg, new_mem); } set_ia32_frame_ent(new_op, ent); @@ -2260,10 +2512,10 @@ static ir_node *gen_be_FrameLoad(ia32_transform_env_t *env) { set_ia32_am_support(new_op, ia32_am_Source); set_ia32_op_type(new_op, ia32_AddrModeS); - set_ia32_am_flavour(new_op, ia32_B); + 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, env->irn)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); return new_op; } @@ -2272,34 +2524,35 @@ static ir_node *gen_be_FrameLoad(ia32_transform_env_t *env) { /** * Transforms a FrameStore into an ia32 Store. */ -static ir_node *gen_be_FrameStore(ia32_transform_env_t *env) { - ir_node *new_op = NULL; - ir_node *node = env->irn; - ir_graph *irg = env->irg; - ir_node *noreg = ia32_new_NoReg_gp(env->cg); - ir_node *mem = get_irn_n(node, 0); - ir_node *ptr = get_irn_n(node, 1); - ir_node *val = get_irn_n(node, 2); - ir_entity *ent = arch_get_frame_entity(env->cg->arch_env, node); - ir_mode *mode = get_irn_mode(val); - ir_node *projs[pn_Store_max]; - - ia32_collect_Projs(env->irn, projs, pn_Store_max); +static ir_node *gen_be_FrameStore(ia32_transform_env_t *env, ir_node *node) { + ir_node *new_op = NULL; + ir_graph *irg = env->irg; + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *block = transform_node(env, get_nodes_block(node)); + ir_node *noreg = ia32_new_NoReg_gp(env->cg); + ir_node *mem = get_irn_n(node, 0); + ir_node *ptr = get_irn_n(node, 1); + ir_node *val = get_irn_n(node, 2); + ir_node *new_mem = transform_node(env, mem); + ir_node *new_ptr = transform_node(env, ptr); + ir_node *new_val = transform_node(env, val); + 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)) { - new_op = new_rd_ia32_xStore(env->dbg, irg, env->block, ptr, noreg, val, mem); + new_op = new_rd_ia32_xStore(dbg, irg, block, new_ptr, noreg, new_val, new_mem); } else { - new_op = new_rd_ia32_vfst(env->dbg, irg, env->block, ptr, noreg, val, mem); + new_op = new_rd_ia32_vfst(dbg, irg, block, new_ptr, noreg, new_val, new_mem); } } else if (get_mode_size_bits(mode) == 8) { - new_op = new_rd_ia32_Store8Bit(env->dbg, irg, env->block, ptr, noreg, val, mem); + new_op = new_rd_ia32_Store8Bit(dbg, irg, block, new_ptr, noreg, new_val, new_mem); } else { - new_op = new_rd_ia32_Store(env->dbg, irg, env->block, ptr, noreg, val, mem); + new_op = new_rd_ia32_Store(dbg, irg, block, new_ptr, noreg, new_val, new_mem); } set_ia32_frame_ent(new_op, ent); @@ -2307,218 +2560,138 @@ static ir_node *gen_be_FrameStore(ia32_transform_env_t *env) { set_ia32_am_support(new_op, ia32_am_Dest); set_ia32_op_type(new_op, ia32_AddrModeD); - set_ia32_am_flavour(new_op, ia32_B); + 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, env->irn)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); return new_op; } -/** - * In case SSE is used we need to copy the result from FPU TOS. - */ -static ir_node *gen_be_Call(ia32_transform_env_t *env) { - ir_node *call_res = get_proj_for_pn(env->irn, pn_be_Call_first_res); - ir_node *call_mem = get_proj_for_pn(env->irn, pn_be_Call_M_regular); - ir_mode *mode; - ir_node *nomem = new_NoMem(); - ir_node *noreg = ia32_new_NoReg_gp(env->cg); - - if (! call_res || ! USE_SSE2(env->cg)) - return NULL; - - mode = get_irn_mode(call_res); - - /* in case there is no memory output: create one to serialize the copy FPU -> SSE */ - if (! call_mem) - call_mem = new_r_Proj(env->irg, env->block, env->irn, mode_M, pn_be_Call_M_regular); - - if (mode_is_float(mode)) { - /* store st(0) onto stack */ - ir_node *frame = get_irg_frame(env->irg); - ir_node *fstp = new_rd_ia32_GetST0(env->dbg, env->irg, env->block, frame, noreg, nomem); - ir_entity *ent = frame_alloc_area(get_irg_frame_type(env->irg), get_mode_size_bytes(mode), 16, 0); - ir_node *sse_load, *p, *bad, *keep; - ir_node *mproj; - ir_node **in_keep; - int keep_arity, i; - - set_ia32_ls_mode(fstp, mode); - set_ia32_op_type(fstp, ia32_AddrModeD); - set_ia32_use_frame(fstp); - set_ia32_frame_ent(fstp, ent); - set_ia32_am_flavour(fstp, ia32_B); - set_ia32_am_support(fstp, ia32_am_Dest); - - /* load into SSE register */ - sse_load = new_rd_ia32_xLoad(env->dbg, env->irg, env->block, frame, ia32_new_NoReg_gp(env->cg), fstp); - set_ia32_ls_mode(sse_load, mode); - set_ia32_op_type(sse_load, ia32_AddrModeS); - set_ia32_use_frame(sse_load); - set_ia32_frame_ent(sse_load, ent); - set_ia32_am_flavour(sse_load, ia32_B); - set_ia32_am_support(sse_load, ia32_am_Source); - mproj = new_r_Proj(env->irg, env->block, sse_load, mode_M, pn_ia32_xLoad_M); - sse_load = new_r_Proj(env->irg, env->block, sse_load, mode, pn_ia32_xLoad_res); - - /* reroute all users of the result proj to the sse load */ - edges_reroute(call_res, sse_load, env->irg); - edges_reroute_kind(call_res, sse_load, EDGE_KIND_DEP, env->irg); - - /* reroute all users of the old call memory to the sse load memory */ - edges_reroute(call_mem, mproj, env->irg); - edges_reroute_kind(call_mem, mproj, EDGE_KIND_DEP, env->irg); - - /* now, we can set the old call mem as input of GetST0 */ - set_irn_n(fstp, 1, call_mem); - - /* now: create new Keep whith all former ins and one additional in - the result Proj */ - - /* get a Proj representing a caller save register */ - p = get_proj_for_pn(env->irn, pn_be_Call_first_res + 1); - assert(is_Proj(p) && "Proj expected."); - - /* user of the the proj is the Keep */ - p = get_edge_src_irn(get_irn_out_edge_first(p)); - assert(be_is_Keep(p) && "Keep expected."); - - /* copy in array of the old keep and set the result proj as additional in */ - keep_arity = get_irn_arity(p) + 1; - NEW_ARR_A(ir_node *, in_keep, keep_arity); - in_keep[keep_arity - 1] = call_res; - for (i = 0; i < keep_arity - 1; ++i) - in_keep[i] = get_irn_n(p, i); - - /* create new keep and set the in class requirements properly */ - keep = be_new_Keep(NULL, env->irg, env->block, keep_arity, in_keep); - for(i = 0; i < keep_arity; ++i) { - const arch_register_class_t *cls = arch_get_irn_reg_class(env->cg->arch_env, in_keep[i], -1); - be_node_set_reg_class(keep, i, cls); - } - - /* kill the old keep */ - bad = get_irg_bad(env->irg); - for (i = 0; i < keep_arity - 1; i++) - set_irn_n(p, i, bad); - remove_End_keepalive(get_irg_end(env->irg), p); - } - - return NULL; -} - /** * 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 *ret_val = get_irn_n(env->irn, be_pos_Return_val); - ir_node *ret_mem = get_irn_n(env->irn, be_pos_Return_mem); - ir_entity *ent = get_irg_entity(get_irn_irg(ret_val)); +static ir_node *gen_be_Return(ia32_transform_env_t *env, ir_node *node) { + ir_graph *irg = env->irg; + dbg_info *dbg; + ir_node *block; + 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); ir_type *tp = get_entity_type(ent); + ir_type *res_type; + ir_mode *mode; + ir_node *frame, *sse_store, *fld, *mproj, *barrier; + ir_node *new_barrier, *new_ret_val, *new_ret_mem; + ir_node **in; + 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); + } + + res_type = get_method_res_type(tp, 0); - if (be_Return_get_n_rets(env->irn) < 1 || ! ret_val || ! USE_SSE2(env->cg)) - return NULL; + if (!is_Primitive_type(res_type)) { + return duplicate_node(env, node); + } - if (get_method_n_ress(tp) == 1) { - ir_type *res_type = get_method_res_type(tp, 0); - ir_mode *mode; + mode = get_type_mode(res_type); + if (!mode_is_float(mode)) { + return duplicate_node(env, node); + } - if (is_Primitive_type(res_type)) { - mode = get_type_mode(res_type); - if (mode_is_float(mode)) { - ir_node *frame; - ir_entity *ent; - ir_node *sse_store, *fld, *mproj, *barrier; - int pn_ret_val = get_Proj_proj(ret_val); - int pn_ret_mem = get_Proj_proj(ret_mem); - - /* get the Barrier */ - barrier = get_Proj_pred(ret_val); - - /* get result input of the Barrier */ - ret_val = get_irn_n(barrier, pn_ret_val); - - /* get memory input of the Barrier */ - ret_mem = get_irn_n(barrier, pn_ret_mem); - - frame = get_irg_frame(env->irg); - ent = frame_alloc_area(get_irg_frame_type(env->irg), get_mode_size_bytes(mode), 16, 0); - - /* store xmm0 onto stack */ - sse_store = new_rd_ia32_xStoreSimple(env->dbg, env->irg, env->block, frame, ret_val, ret_mem); - set_ia32_ls_mode(sse_store, mode); - set_ia32_op_type(sse_store, ia32_AddrModeD); - set_ia32_use_frame(sse_store); - set_ia32_frame_ent(sse_store, ent); - set_ia32_am_flavour(sse_store, ia32_B); - set_ia32_am_support(sse_store, ia32_am_Dest); - - /* load into st0 */ - fld = new_rd_ia32_SetST0(env->dbg, env->irg, env->block, frame, sse_store); - set_ia32_ls_mode(fld, mode); - set_ia32_op_type(fld, ia32_AddrModeS); - set_ia32_use_frame(fld); - set_ia32_frame_ent(fld, ent); - set_ia32_am_flavour(fld, ia32_B); - set_ia32_am_support(fld, ia32_am_Source); - mproj = new_r_Proj(env->irg, env->block, fld, mode_M, pn_ia32_SetST0_M); - fld = new_r_Proj(env->irg, env->block, fld, mode, pn_ia32_SetST0_res); - arch_set_irn_register(env->cg->arch_env, fld, &ia32_vfp_regs[REG_VF0]); - - /* set new return value */ - set_irn_n(barrier, pn_ret_val, fld); - set_irn_n(barrier, pn_ret_mem, mproj); - } + assert(get_method_n_ress(tp) == 1); + + pn_ret_val = get_Proj_proj(ret_val); + pn_ret_mem = get_Proj_proj(ret_mem); + + /* get the Barrier */ + barrier = get_Proj_pred(ret_val); + + /* get result input of the Barrier */ + ret_val = get_irn_n(barrier, pn_ret_val); + new_ret_val = transform_node(env, 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); + + frame = get_irg_frame(irg); + + dbg = get_irn_dbg_info(barrier); + block = transform_node(env, get_nodes_block(barrier)); + + /* store xmm0 onto stack */ + sse_store = new_rd_ia32_xStoreSimple(dbg, irg, block, frame, new_ret_val, new_ret_mem); + set_ia32_ls_mode(sse_store, mode); + 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(dbg, irg, block, frame, sse_store); + set_ia32_ls_mode(fld, mode); + 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_E, pn_ia32_SetST0_res); + arch_set_irn_register(env->cg->arch_env, fld, &ia32_vfp_regs[REG_VF0]); + + /* create a new barrier */ + arity = get_irn_arity(barrier); + in = alloca(arity * sizeof(in[0])); + for(i = 0; i < arity; ++i) { + ir_node *new_in; + if(i == pn_ret_val) { + new_in = fld; + } else if(i == pn_ret_mem) { + new_in = mproj; + } else { + ir_node *in = get_irn_n(barrier, i); + new_in = transform_node(env, in); } + in[i] = new_in; } - return NULL; + new_barrier = new_ir_node(dbg, irg, block, + 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); + mark_irn_visited(barrier); + + /* transform normally */ + return duplicate_node(env, node); } /** * Transform a be_AddSP into an ia32_AddSP. Eat up const sizes. */ -static ir_node *gen_be_AddSP(ia32_transform_env_t *env) { +static ir_node *gen_be_AddSP(ia32_transform_env_t *env, ir_node *node) { ir_node *new_op; - const ir_edge_t *edge; - ir_node *sz = get_irn_n(env->irn, be_pos_AddSP_size); - ir_node *sp = get_irn_n(env->irn, be_pos_AddSP_old_sp); - - new_op = new_rd_ia32_AddSP(env->dbg, env->irg, env->block, sp, sz); - - if (is_ia32_Const(sz)) { - set_ia32_Immop_attr(new_op, sz); - set_irn_n(new_op, 1, ia32_new_NoReg_gp(env->cg)); - } - else if (is_ia32_Load(sz) && get_ia32_am_flavour(sz) == ia32_O) { - set_ia32_immop_type(new_op, ia32_ImmSymConst); - set_ia32_op_type(new_op, ia32_AddrModeS); - set_ia32_am_sc(new_op, get_ia32_am_sc(sz)); - add_ia32_am_offs(new_op, get_ia32_am_offs(sz)); - set_irn_n(new_op, 1, ia32_new_NoReg_gp(env->cg)); - } - - /* fix proj nums */ - foreach_out_edge(env->irn, edge) { - ir_node *proj = get_edge_src_irn(edge); - - assert(is_Proj(proj)); + ir_graph *irg = env->irg; + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *block = transform_node(env, 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 *sp = get_irn_n(node, be_pos_AddSP_old_sp); + ir_node *new_sp = transform_node(env, sp); + ir_node *noreg = ia32_new_NoReg_gp(env->cg); + ir_node *nomem = new_NoMem(); - if (get_Proj_proj(proj) == pn_be_AddSP_res) { - /* the node is not yet exchanged: we need to set the register manually */ - ia32_attr_t *attr = get_ia32_attr(new_op); - attr->slots[pn_ia32_AddSP_stack] = &ia32_gp_regs[REG_ESP]; - set_Proj_proj(proj, pn_ia32_AddSP_stack); - } - else if (get_Proj_proj(proj) == pn_be_AddSP_M) { - set_Proj_proj(proj, pn_ia32_AddSP_M); - } - else { - assert(0); - } - } + /* ia32 stack grows in reverse direction, make a SubSP */ + new_op = new_rd_ia32_SubSP(dbg, 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_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, env->irn)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); return new_op; } @@ -2526,47 +2699,24 @@ static ir_node *gen_be_AddSP(ia32_transform_env_t *env) { /** * Transform a be_SubSP into an ia32_SubSP. Eat up const sizes. */ -static ir_node *gen_be_SubSP(ia32_transform_env_t *env) { +static ir_node *gen_be_SubSP(ia32_transform_env_t *env, ir_node *node) { ir_node *new_op; - const ir_edge_t *edge; - ir_node *sz = get_irn_n(env->irn, be_pos_SubSP_size); - ir_node *sp = get_irn_n(env->irn, be_pos_SubSP_old_sp); - - new_op = new_rd_ia32_SubSP(env->dbg, env->irg, env->block, sp, sz); - - if (is_ia32_Const(sz)) { - set_ia32_Immop_attr(new_op, sz); - set_irn_n(new_op, 1, ia32_new_NoReg_gp(env->cg)); - } - else if (is_ia32_Load(sz) && get_ia32_am_flavour(sz) == ia32_O) { - set_ia32_immop_type(new_op, ia32_ImmSymConst); - set_ia32_op_type(new_op, ia32_AddrModeS); - set_ia32_am_sc(new_op, get_ia32_am_sc(sz)); - add_ia32_am_offs(new_op, get_ia32_am_offs(sz)); - set_irn_n(new_op, 1, ia32_new_NoReg_gp(env->cg)); - } - - /* fix proj nums */ - foreach_out_edge(env->irn, edge) { - ir_node *proj = get_edge_src_irn(edge); - - assert(is_Proj(proj)); + ir_graph *irg = env->irg; + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *block = transform_node(env, 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 *sp = get_irn_n(node, be_pos_SubSP_old_sp); + ir_node *new_sp = transform_node(env, sp); + ir_node *noreg = ia32_new_NoReg_gp(env->cg); + ir_node *nomem = new_NoMem(); - if (get_Proj_proj(proj) == pn_be_SubSP_res) { - /* the node is not yet exchanged: we need to set the register manually */ - ia32_attr_t *attr = get_ia32_attr(new_op); - attr->slots[pn_ia32_SubSP_stack] = &ia32_gp_regs[REG_ESP]; - set_Proj_proj(proj, pn_ia32_SubSP_stack); - } - else if (get_Proj_proj(proj) == pn_be_SubSP_M) { - set_Proj_proj(proj, pn_ia32_SubSP_M); - } - else { - assert(0); - } - } + /* ia32 stack grows in reverse direction, make an AddSP */ + new_op = new_rd_ia32_AddSP(dbg, 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_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, env->irn)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); return new_op; } @@ -2576,47 +2726,62 @@ static ir_node *gen_be_SubSP(ia32_transform_env_t *env) { * 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_mode *mode = env->mode; - ir_node *irn = env->irn; +static ir_node *gen_Unknown(ia32_transform_env_t *env, ir_node *node) { + ir_mode *mode = get_irn_mode(node); if (mode_is_float(mode)) { if (USE_SSE2(env->cg)) - arch_set_irn_register(env->cg->arch_env, irn, &ia32_xmm_regs[REG_XMM_UKNWN]); + return ia32_new_Unknown_xmm(env->cg); else - arch_set_irn_register(env->cg->arch_env, irn, &ia32_vfp_regs[REG_VFP_UKNWN]); - } - else if (mode_is_int(mode) || mode_is_reference(mode) || mode_is_character(mode)) { - arch_set_irn_register(env->cg->arch_env, irn, &ia32_gp_regs[REG_GP_UKNWN]); - } - else { + return ia32_new_Unknown_vfp(env->cg); + } else if (mode_is_int(mode) || mode_is_reference(mode)) { + return ia32_new_Unknown_gp(env->cg); + } else { assert(0 && "unsupported Unknown-Mode"); } return NULL; } -static ir_node *gen_Proj(ia32_transform_env_t *env) { - ir_node *pred = get_Proj_pred(env->irn); - int proj = get_Proj_proj(env->irn); +/** + * Change some phi modes + */ +static ir_node *gen_Phi(ia32_transform_env_t *env, ir_node *node) { + ir_graph *irg = env->irg; + dbg_info *dbg = get_irn_dbg_info(node); + ir_mode *mode = get_irn_mode(node); + ir_node *block = transform_node(env, get_nodes_block(node)); + ir_node *phi; + int i, arity; + + if(mode_is_int(mode) || mode_is_reference(mode)) { + // we shouldn't have any 64bit stuff around anymore + assert(get_mode_size_bits(mode) <= 32); + // all integer operations are on 32bit registers now + mode = mode_Iu; + } else if(mode_is_float(mode)) { + assert(mode == mode_D || mode == mode_F); + // all float operations are on mode_E registers + mode = mode_E; + } - if(is_Store(pred)) { - if(proj == pn_Store_M) { - env->irn = pred; - return gen_Store(env); - } else { - return new_Bad(); - } - } else if(be_is_FrameStore(pred)) { - if(proj == pn_Store_M) { - env->irn = pred; - return gen_be_FrameStore(env); - } else { - return new_Bad(); - } + /* phi nodes allow loops, so we use the old arguments for now + * and fix this later */ + phi = new_ir_node(dbg, irg, block, op_Phi, mode, get_irn_arity(node), + get_irn_in(node) + 1); + copy_node_attr(node, phi); + duplicate_deps(env, 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); } - return NULL; + return phi; } /********************************************************************** @@ -2640,10 +2805,17 @@ 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, construct_load_func func, char fp_unit) { - ir_node *node = env->irn; +static ir_node *gen_lowered_Load(ia32_transform_env_t *env, ir_node *node, construct_load_func func, char fp_unit) { + ir_graph *irg = env->irg; + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *block = transform_node(env, get_nodes_block(node)); ir_mode *mode = get_ia32_ls_mode(node); ir_node *new_op; + ir_node *noreg = ia32_new_NoReg_gp(env->cg); + ir_node *ptr = get_irn_n(node, 0); + ir_node *mem = get_irn_n(node, 1); + ir_node *new_ptr = transform_node(env, ptr); + ir_node *new_mem = transform_node(env, mem); /* Could be that we have SSE2 unit, but due to 64Bit Div/Conv @@ -2655,16 +2827,16 @@ static ir_node *gen_lowered_Load(ia32_transform_env_t *env, construct_load_func FORCE_x87(env->cg); } - new_op = func(env->dbg, env->irg, env->block, get_irn_n(node, 0), get_irn_n(node, 1), get_irn_n(node, 2)); + new_op = func(dbg, 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, get_ia32_am_flavour(node)); - set_ia32_am_offs_int(new_op, get_ia32_am_offs_int(node)); + set_ia32_am_flavour(new_op, ia32_am_OB); + set_ia32_am_offs_int(new_op, 0); + set_ia32_am_scale(new_op, 1); set_ia32_am_sc(new_op, get_ia32_am_sc(node)); if(is_ia32_am_sc_sign(node)) set_ia32_am_sc_sign(new_op); - set_ia32_am_scale(new_op, get_ia32_am_scale(node)); set_ia32_ls_mode(new_op, get_ia32_ls_mode(node)); if(is_ia32_use_frame(node)) { set_ia32_frame_ent(new_op, get_ia32_frame_ent(node)); @@ -2679,13 +2851,21 @@ static ir_node *gen_lowered_Load(ia32_transform_env_t *env, construct_load_func /** * Transforms a lowered Store into a "real" one. */ -static ir_node *gen_lowered_Store(ia32_transform_env_t *env, construct_store_func func, char fp_unit) { - ir_node *node = env->irn; +static ir_node *gen_lowered_Store(ia32_transform_env_t *env, ir_node *node, construct_store_func func, char fp_unit) { + ir_graph *irg = env->irg; + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *block = transform_node(env, get_nodes_block(node)); ir_node *noreg = ia32_new_NoReg_gp(env->cg); ir_mode *mode = get_ia32_ls_mode(node); ir_node *new_op; - char *am_offs; + long am_offs; ia32_am_flavour_t am_flav = ia32_B; + ir_node *ptr = get_irn_n(node, 0); + ir_node *val = get_irn_n(node, 1); + ir_node *mem = get_irn_n(node, 2); + ir_node *new_ptr = transform_node(env, ptr); + ir_node *new_val = transform_node(env, val); + ir_node *new_mem = transform_node(env, mem); /* Could be that we have SSE2 unit, but due to 64Bit Div/Conv @@ -2697,11 +2877,11 @@ static ir_node *gen_lowered_Store(ia32_transform_env_t *env, construct_store_fun FORCE_x87(env->cg); } - new_op = func(env->dbg, env->irg, env->block, get_irn_n(node, 0), noreg, get_irn_n(node, 1), get_irn_n(node, 2)); + new_op = func(dbg, irg, block, new_ptr, noreg, new_val, new_mem); - if ((am_offs = get_ia32_am_offs(node)) != NULL) { + if ((am_offs = get_ia32_am_offs_int(node)) != 0) { am_flav |= ia32_O; - add_ia32_am_offs(new_op, am_offs); + add_ia32_am_offs_int(new_op, am_offs); } set_ia32_am_support(new_op, ia32_am_Dest); @@ -2723,76 +2903,79 @@ static ir_node *gen_lowered_Store(ia32_transform_env_t *env, construct_store_fun * @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) { \ - if (mode_is_float(env->mode)) \ - FP_USED(env->cg); \ - return gen_binop(env, get_binop_left(env->irn), get_binop_right(env->irn), new_rd_ia32_##op); \ +#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_x87_OP(op) \ - static ir_node *gen_ia32_l_##op(ia32_transform_env_t *env) { \ - ir_node *new_op; \ - FORCE_x87(env->cg); \ - new_op = gen_binop(env, get_binop_left(env->irn), get_binop_right(env->irn), new_rd_ia32_##op); \ - return new_op; \ +#define GEN_LOWERED_x87_OP(op) \ + static ir_node *gen_ia32_l_##op(ia32_transform_env_t *env, 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); \ + return new_op; \ } -#define GEN_LOWERED_UNOP(op) \ - static ir_node *gen_ia32_l_##op(ia32_transform_env_t *env) { \ - return gen_unop(env, get_unop_op(env->irn), new_rd_ia32_##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); \ } -#define GEN_LOWERED_SHIFT_OP(op) \ - static ir_node *gen_ia32_l_##op(ia32_transform_env_t *env) { \ - return gen_shift_binop(env, get_binop_left(env->irn), get_binop_right(env->irn), 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), \ + 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) { \ - return gen_lowered_Load(env, new_rd_ia32_##op, fp_unit); \ +#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); \ } -#define GEN_LOWERED_STORE(op, fp_unit) \ - static ir_node *gen_ia32_l_##op(ia32_transform_env_t *env) { \ - return gen_lowered_Store(env, 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); \ + } -GEN_LOWERED_OP(AddC) +GEN_LOWERED_OP(Adc) GEN_LOWERED_OP(Add) -GEN_LOWERED_OP(SubC) +GEN_LOWERED_OP(Sbb) GEN_LOWERED_OP(Sub) -GEN_LOWERED_OP(Mul) -GEN_LOWERED_OP(Eor) +GEN_LOWERED_OP(IMul) +GEN_LOWERED_OP(Xor) GEN_LOWERED_x87_OP(vfprem) GEN_LOWERED_x87_OP(vfmul) GEN_LOWERED_x87_OP(vfsub) -GEN_LOWERED_UNOP(Minus) +GEN_LOWERED_UNOP(Neg) GEN_LOWERED_LOAD(vfild, fp_x87) GEN_LOWERED_LOAD(Load, fp_none) GEN_LOWERED_STORE(vfist, fp_x87) GEN_LOWERED_STORE(Store, fp_none) -static ir_node *gen_ia32_l_vfdiv(ia32_transform_env_t *env) { +static ir_node *gen_ia32_l_vfdiv(ia32_transform_env_t *env, ir_node *node) { ir_node *noreg = ia32_new_NoReg_gp(env->cg); - ir_node *node = env->irn; + ir_graph *irg = env->irg; + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *block = transform_node(env, get_nodes_block(node)); ir_node *left = get_binop_left(node); ir_node *right = get_binop_right(node); - ir_mode *mode = env->mode; + ir_node *new_left = transform_node(env, left); + ir_node *new_right = transform_node(env, right); ir_node *vfdiv; - ir_node *projs[pn_DivMod_max]; - vfdiv = new_rd_ia32_vfdiv(env->dbg, env->irg, env->block, noreg, noreg, left, right, new_NoMem()); + vfdiv = new_rd_ia32_vfdiv(dbg, irg, block, noreg, noreg, new_left, new_right, new_NoMem()); clear_ia32_commutative(vfdiv); set_ia32_am_support(vfdiv, ia32_am_Source); - set_ia32_res_mode(vfdiv, mode); fold_immediate(env, vfdiv, 2, 3); - ia32_collect_Projs(node, projs, pn_DivMod_max); - ia32_renumber_Proj(projs, pn_Div_M, pn_ia32_vfdiv_M); - ia32_renumber_Proj(projs, pn_Div_res, pn_ia32_vfdiv_res); + SET_IA32_ORIG_NODE(vfdiv, ia32_get_old_node_name(env->cg, node)); FORCE_x87(env->cg); @@ -2803,35 +2986,39 @@ static ir_node *gen_ia32_l_vfdiv(ia32_transform_env_t *env) { * Transforms a l_MulS into a "real" MulS node. * * @param env The transformation environment - * @return the created ia32 MulS node + * @return the created ia32 Mul node */ -static ir_node *gen_ia32_l_MulS(ia32_transform_env_t *env) { +static ir_node *gen_ia32_l_Mul(ia32_transform_env_t *env, ir_node *node) { ir_node *noreg = ia32_new_NoReg_gp(env->cg); - ir_node *left = get_binop_left(env->irn); - ir_node *right = get_binop_right(env->irn); - ir_mode *mode = env->mode; + ir_graph *irg = env->irg; + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *block = transform_node(env, get_nodes_block(node)); + ir_node *left = get_binop_left(node); + ir_node *right = get_binop_right(node); + ir_node *new_left = transform_node(env, left); + ir_node *new_right = transform_node(env, right); ir_node *in[2]; - /* l_MulS is already a mode_T node, so we create the MulS in the normal way */ + /* l_Mul is already a mode_T node, so we create the Mul in the normal way */ /* and then skip the result Proj, because all needed Projs are already there. */ - - ir_node *muls = new_rd_ia32_MulS(env->dbg, env->irg, env->block, noreg, noreg, left, right, new_NoMem()); + ir_node *muls = new_rd_ia32_Mul(dbg, irg, block, noreg, noreg, new_left, new_right, new_NoMem()); clear_ia32_commutative(muls); set_ia32_am_support(muls, ia32_am_Source); - set_ia32_res_mode(muls, mode); fold_immediate(env, muls, 2, 3); /* check if EAX and EDX proj exist, add missing one */ - in[0] = new_rd_Proj(env->dbg, env->irg, env->block, muls, mode, pn_EAX); - in[1] = new_rd_Proj(env->dbg, env->irg, env->block, muls, mode, pn_EDX); - be_new_Keep(&ia32_reg_classes[CLASS_ia32_gp], env->irg, env->block, 2, in); + in[0] = new_rd_Proj(dbg, irg, block, muls, mode_Iu, pn_EAX); + in[1] = new_rd_Proj(dbg, 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)); return muls; } GEN_LOWERED_SHIFT_OP(Shl) GEN_LOWERED_SHIFT_OP(Shr) -GEN_LOWERED_SHIFT_OP(Shrs) +GEN_LOWERED_SHIFT_OP(Sar) /** * Transforms a l_ShlD/l_ShrD into a ShlD/ShrD. Those nodes have 3 data inputs: @@ -2840,30 +3027,35 @@ GEN_LOWERED_SHIFT_OP(Shrs) * op3 - shift count * Only op3 can be an immediate. */ -static ir_node *gen_lowered_64bit_shifts(ia32_transform_env_t *env, ir_node *op1, ir_node *op2, ir_node *count) { - ir_node *new_op = NULL; - ir_mode *mode = env->mode; - dbg_info *dbg = env->dbg; - ir_graph *irg = env->irg; - ir_node *block = env->block; - ir_node *noreg = ia32_new_NoReg_gp(env->cg); - ir_node *nomem = new_NoMem(); - ir_node *imm_op; - tarval *tv; +static ir_node *gen_lowered_64bit_shifts(ia32_transform_env_t *env, ir_node *node, + ir_node *op1, ir_node *op2, + ir_node *count) { + ir_node *new_op = NULL; + ir_graph *irg = env->irg; + ir_mode *mode = get_irn_mode(node); + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *block = transform_node(env, get_nodes_block(node)); + ir_node *noreg = ia32_new_NoReg_gp(env->cg); + ir_node *nomem = new_NoMem(); + ir_node *imm_op; + ir_node *new_op1 = transform_node(env, op1); + ir_node *new_op2 = transform_node(env, op2); + ir_node *new_count = transform_node(env, count); + tarval *tv; DEBUG_ONLY(firm_dbg_module_t *mod = env->mod;) assert(! mode_is_float(mode) && "Shift/Rotate with float not supported"); /* 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, 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) { tv = get_ia32_Immop_tarval(imm_op); if (tv) { - tv = tarval_mod(tv, new_tarval_from_long(32, mode_Iu)); + tv = tarval_mod(tv, new_tarval_from_long(32, get_tarval_mode(tv))); set_ia32_Immop_tarval(imm_op, tv); } else { @@ -2876,80 +3068,87 @@ static ir_node *gen_lowered_64bit_shifts(ia32_transform_env_t *env, ir_node *op1 /* This is ShiftD with const */ DB((mod, LEVEL_1, "ShiftD with immediate ...")); - if (is_ia32_l_ShlD(env->irn)) - new_op = new_rd_ia32_ShlD(dbg, irg, block, noreg, noreg, op1, op2, noreg, nomem, mode); + if (is_ia32_l_ShlD(node)) + new_op = new_rd_ia32_ShlD(dbg, irg, block, noreg, noreg, + new_op1, new_op2, noreg, nomem); else - new_op = new_rd_ia32_ShrD(dbg, irg, block, noreg, noreg, op1, op2, noreg, nomem, mode); - set_ia32_Immop_attr(new_op, imm_op); + new_op = new_rd_ia32_ShrD(dbg, irg, block, noreg, noreg, + new_op1, new_op2, noreg, nomem); + copy_ia32_Immop_attr(new_op, imm_op); } else { /* This is a normal ShiftD */ DB((mod, LEVEL_1, "ShiftD binop ...")); - if (is_ia32_l_ShlD(env->irn)) - new_op = new_rd_ia32_ShlD(dbg, irg, block, noreg, noreg, op1, op2, count, nomem, mode); + if (is_ia32_l_ShlD(node)) + new_op = new_rd_ia32_ShlD(dbg, irg, block, noreg, noreg, + new_op1, new_op2, new_count, nomem); else - new_op = new_rd_ia32_ShrD(dbg, irg, block, noreg, noreg, op1, op2, count, nomem, mode); + new_op = new_rd_ia32_ShrD(dbg, irg, block, noreg, noreg, + new_op1, new_op2, new_count, nomem); } /* set AM support */ - set_ia32_am_support(new_op, ia32_am_Dest); + // Matze: node has unsupported format (6inputs) + //set_ia32_am_support(new_op, ia32_am_Dest); - SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, env->irn)); + SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env->cg, node)); - set_ia32_res_mode(new_op, mode); set_ia32_emit_cl(new_op); return new_op; } -static ir_node *gen_ia32_l_ShlD(ia32_transform_env_t *env) { - return gen_lowered_64bit_shifts(env, get_irn_n(env->irn, 0), get_irn_n(env->irn, 1), get_irn_n(env->irn, 2)); +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), + get_irn_n(node, 1), get_irn_n(node, 2)); } -static ir_node *gen_ia32_l_ShrD(ia32_transform_env_t *env) { - return gen_lowered_64bit_shifts(env, get_irn_n(env->irn, 0), get_irn_n(env->irn, 1), get_irn_n(env->irn, 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), + 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) { +static ir_node *gen_ia32_l_X87toSSE(ia32_transform_env_t *env, ir_node *node) { ia32_code_gen_t *cg = env->cg; ir_node *res = NULL; - ir_node *ptr = get_irn_n(env->irn, 0); - ir_node *val = get_irn_n(env->irn, 1); - ir_node *mem = get_irn_n(env->irn, 2); + ir_graph *irg = env->irg; + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *block = transform_node(env, get_nodes_block(node)); + ir_node *ptr = get_irn_n(node, 0); + ir_node *val = get_irn_n(node, 1); + ir_node *new_val = transform_node(env, val); + ir_node *mem = get_irn_n(node, 2); + ir_node *noreg, *new_ptr, *new_mem; if (USE_SSE2(cg)) { - ir_node *noreg = ia32_new_NoReg_gp(cg); - - /* Store x87 -> MEM */ - res = new_rd_ia32_vfst(env->dbg, env->irg, env->block, ptr, noreg, val, mem); - set_ia32_frame_ent(res, get_ia32_frame_ent(env->irn)); - set_ia32_use_frame(res); - set_ia32_ls_mode(res, get_ia32_ls_mode(env->irn)); - set_ia32_am_support(res, ia32_am_Dest); - set_ia32_am_flavour(res, ia32_B); - set_ia32_op_type(res, ia32_AddrModeD); - - /* Load MEM -> SSE */ - res = new_rd_ia32_xLoad(env->dbg, env->irg, env->block, ptr, noreg, res); - set_ia32_frame_ent(res, get_ia32_frame_ent(env->irn)); - set_ia32_use_frame(res); - set_ia32_ls_mode(res, get_ia32_ls_mode(env->irn)); - 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(env->dbg, env->irg, env->block, res, get_ia32_ls_mode(env->irn), pn_ia32_xLoad_res); + return new_val; } - else { - /* SSE unit is not used -> skip this node. */ - int i; - edges_reroute(env->irn, val, env->irg); - for (i = get_irn_arity(env->irn) - 1; i >= 0; i--) - set_irn_n(env->irn, i, get_irg_bad(env->irg)); - } + noreg = ia32_new_NoReg_gp(cg); + new_mem = transform_node(env, mem); + new_ptr = transform_node(env, ptr); + + /* Store x87 -> MEM */ + res = new_rd_ia32_vfst(dbg, irg, block, new_ptr, noreg, new_val, new_mem); + 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); + + /* Load MEM -> SSE */ + res = new_rd_ia32_xLoad(dbg, irg, block, new_ptr, noreg, res); + 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(dbg, irg, block, res, mode_E, pn_ia32_xLoad_res); return res; } @@ -2957,58 +3156,60 @@ static ir_node *gen_ia32_l_X87toSSE(ia32_transform_env_t *env) { /** * 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) { +static ir_node *gen_ia32_l_SSEtoX87(ia32_transform_env_t *env, ir_node *node) { ia32_code_gen_t *cg = env->cg; + ir_graph *irg = env->irg; + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *block = transform_node(env, get_nodes_block(node)); ir_node *res = NULL; - ir_node *ptr = get_irn_n(env->irn, 0); - ir_node *val = get_irn_n(env->irn, 1); - ir_node *mem = get_irn_n(env->irn, 2); - ir_entity *fent = get_ia32_frame_ent(env->irn); - ir_mode *lsmode = get_ia32_ls_mode(env->irn); + ir_node *ptr = get_irn_n(node, 0); + ir_node *val = get_irn_n(node, 1); + ir_node *mem = get_irn_n(node, 2); + ir_entity *fent = get_ia32_frame_ent(node); + ir_mode *lsmode = get_ia32_ls_mode(node); + ir_node *new_val = transform_node(env, val); + ir_node *noreg, *new_ptr, *new_mem; int offs = 0; - if (USE_SSE2(cg)) { - ir_node *noreg = ia32_new_NoReg_gp(cg); + if (!USE_SSE2(cg)) { + /* SSE unit is not used -> skip this node. */ + return new_val; + } - /* Store SSE -> MEM */ - if (is_ia32_xLoad(skip_Proj(val))) { - ir_node *ld = skip_Proj(val); + noreg = ia32_new_NoReg_gp(cg); + new_val = transform_node(env, val); + new_ptr = transform_node(env, ptr); + new_mem = transform_node(env, mem); - /* we can vfld the value directly into the fpu */ - fent = get_ia32_frame_ent(ld); - ptr = get_irn_n(ld, 0); - offs = get_ia32_am_offs_int(ld); - } - else { - res = new_rd_ia32_xStore(env->dbg, env->irg, env->block, ptr, noreg, val, mem); - 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(env->dbg, env->irg, env->block, ptr, noreg, mem); + /* Store SSE -> MEM */ + if (is_ia32_xLoad(skip_Proj(new_val))) { + ir_node *ld = skip_Proj(new_val); + + /* we can vfld the value directly into the fpu */ + fent = get_ia32_frame_ent(ld); + ptr = get_irn_n(ld, 0); + offs = get_ia32_am_offs_int(ld); + } else { + res = new_rd_ia32_xStore(dbg, irg, block, new_ptr, noreg, new_val, new_mem); 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_support(res, ia32_am_Dest); set_ia32_am_flavour(res, ia32_B); - set_ia32_op_type(res, ia32_AddrModeS); - res = new_rd_Proj(env->dbg, env->irg, env->block, res, lsmode, pn_ia32_vfld_res); + set_ia32_op_type(res, ia32_AddrModeD); + mem = res; } - else { - /* SSE unit is not used -> skip this node. */ - int i; - edges_reroute(env->irn, val, env->irg); - for (i = get_irn_arity(env->irn) - 1; i >= 0; i--) - set_irn_n(env->irn, i, get_irg_bad(env->irg)); - } + /* Load MEM -> x87 */ + res = new_rd_ia32_vfld(dbg, irg, block, new_ptr, noreg, new_mem); + 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(dbg, irg, block, res, lsmode, pn_ia32_vfld_res); return res; } @@ -3026,24 +3227,455 @@ static ir_node *gen_ia32_l_SSEtoX87(ia32_transform_env_t *env) { /** * the BAD transformer. */ -static ir_node *bad_transform(ia32_transform_env_t *env) { - ir_fprintf(stderr, "Not implemented: %+F\n", env->irn); - assert(0); +static ir_node *bad_transform(ia32_transform_env_t *env, 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 *dbg = 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(dbg, 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 *dbg = 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(dbg, 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(dbg, 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_graph *irg = env->irg; + ir_node *block = transform_node(env, get_nodes_block(node)); + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *pred = get_Proj_pred(node); + ir_node *new_pred = transform_node(env, pred); + long proj = get_Proj_proj(node); + + if(proj == pn_be_AddSP_res) { + ir_node *res = new_rd_Proj(dbg, irg, block, new_pred, mode_Iu, pn_ia32_AddSP_stack); + 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(dbg, irg, block, new_pred, mode_M, pn_ia32_AddSP_M); + } + + assert(0); + 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_graph *irg = env->irg; + ir_node *block = transform_node(env, get_nodes_block(node)); + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *pred = get_Proj_pred(node); + ir_node *new_pred = transform_node(env, pred); + long proj = get_Proj_proj(node); + + if(proj == pn_be_SubSP_res) { + ir_node *res = new_rd_Proj(dbg, irg, block, new_pred, mode_Iu, pn_ia32_AddSP_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(dbg, irg, block, new_pred, mode_M, pn_ia32_SubSP_M); + } + + assert(0); + return new_rd_Unknown(irg, get_irn_mode(node)); +} + +static ir_node *gen_Proj_Load(ia32_transform_env_t *env, ir_node *node) { + ir_graph *irg = env->irg; + ir_node *block = transform_node(env, get_nodes_block(node)); + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *pred = get_Proj_pred(node); + ir_node *new_pred = transform_node(env, pred); + long proj = get_Proj_proj(node); + + /* renumber the proj */ + if(is_ia32_Load(new_pred)) { + if(proj == pn_Load_res) { + return new_rd_Proj(dbg, irg, block, new_pred, mode_Iu, pn_ia32_Load_res); + } else if(proj == pn_Load_M) { + return new_rd_Proj(dbg, irg, block, new_pred, mode_M, pn_ia32_Load_M); + } + } else if(is_ia32_xLoad(new_pred)) { + if(proj == pn_Load_res) { + return new_rd_Proj(dbg, irg, block, new_pred, mode_E, pn_ia32_xLoad_res); + } else if(proj == pn_Load_M) { + return new_rd_Proj(dbg, irg, block, new_pred, mode_M, pn_ia32_xLoad_M); + } + } else if(is_ia32_vfld(new_pred)) { + if(proj == pn_Load_res) { + return new_rd_Proj(dbg, irg, block, new_pred, mode_E, pn_ia32_vfld_res); + } else if(proj == pn_Load_M) { + return new_rd_Proj(dbg, irg, block, new_pred, mode_M, pn_ia32_vfld_M); + } + } + + assert(0); + return new_rd_Unknown(irg, get_irn_mode(node)); +} + +static ir_node *gen_Proj_DivMod(ia32_transform_env_t *env, ir_node *node) { + ir_graph *irg = env->irg; + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *block = transform_node(env, get_nodes_block(node)); + ir_mode *mode = get_irn_mode(node); + + ir_node *pred = get_Proj_pred(node); + ir_node *new_pred = transform_node(env, pred); + long proj = get_Proj_proj(node); + + assert(is_ia32_Div(new_pred) || is_ia32_IDiv(new_pred)); + + switch(get_irn_opcode(pred)) { + case iro_Div: + switch(proj) { + case pn_Div_M: + return new_rd_Proj(dbg, irg, block, new_pred, mode_M, pn_ia32_Div_M); + case pn_Div_res: + return new_rd_Proj(dbg, irg, block, new_pred, mode_Iu, pn_ia32_Div_div_res); + default: + break; + } + break; + case iro_Mod: + switch(proj) { + case pn_Mod_M: + return new_rd_Proj(dbg, irg, block, new_pred, mode_M, pn_ia32_Div_M); + case pn_Mod_res: + return new_rd_Proj(dbg, irg, block, new_pred, mode_Iu, pn_ia32_Div_mod_res); + default: + break; + } + break; + case iro_DivMod: + switch(proj) { + case pn_DivMod_M: + return new_rd_Proj(dbg, irg, block, new_pred, mode_M, pn_ia32_Div_M); + case pn_DivMod_res_div: + return new_rd_Proj(dbg, irg, block, new_pred, mode_Iu, pn_ia32_Div_div_res); + case pn_DivMod_res_mod: + return new_rd_Proj(dbg, irg, block, new_pred, mode_Iu, pn_ia32_Div_mod_res); + default: + break; + } + break; + default: + break; + } + + assert(0); + return new_rd_Unknown(irg, mode); +} + +static ir_node *gen_Proj_CopyB(ia32_transform_env_t *env, ir_node *node) +{ + ir_graph *irg = env->irg; + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *block = transform_node(env, get_nodes_block(node)); + ir_mode *mode = get_irn_mode(node); + + ir_node *pred = get_Proj_pred(node); + ir_node *new_pred = transform_node(env, pred); + long proj = get_Proj_proj(node); + + switch(proj) { + case pn_CopyB_M_regular: + if(is_ia32_CopyB_i(new_pred)) { + return new_rd_Proj(dbg, irg, block, new_pred, mode_M, + pn_ia32_CopyB_i_M); + } else if(is_ia32_CopyB(new_pred)) { + return new_rd_Proj(dbg, irg, block, new_pred, mode_M, + pn_ia32_CopyB_M); + } + break; + default: + break; + } + + assert(0); + return new_rd_Unknown(irg, mode); +} + +static ir_node *gen_Proj_l_vfdiv(ia32_transform_env_t *env, ir_node *node) +{ + ir_graph *irg = env->irg; + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *block = transform_node(env, get_nodes_block(node)); + ir_mode *mode = get_irn_mode(node); + + ir_node *pred = get_Proj_pred(node); + ir_node *new_pred = transform_node(env, pred); + long proj = get_Proj_proj(node); + + switch(proj) { + case pn_ia32_l_vfdiv_M: + return new_rd_Proj(dbg, irg, block, new_pred, mode_M, pn_ia32_vfdiv_M); + case pn_ia32_l_vfdiv_res: + return new_rd_Proj(dbg, irg, block, new_pred, mode_E, pn_ia32_vfdiv_res); + default: + assert(0); + } + + return new_rd_Unknown(irg, mode); +} + +static ir_node *gen_Proj_Quot(ia32_transform_env_t *env, ir_node *node) +{ + ir_graph *irg = env->irg; + dbg_info *dbg = get_irn_dbg_info(node); + ir_node *block = transform_node(env, get_nodes_block(node)); + ir_mode *mode = get_irn_mode(node); + + ir_node *pred = get_Proj_pred(node); + ir_node *new_pred = transform_node(env, pred); + long proj = get_Proj_proj(node); + + switch(proj) { + case pn_Quot_M: + if(is_ia32_xDiv(new_pred)) { + return new_rd_Proj(dbg, irg, block, new_pred, mode_M, + pn_ia32_xDiv_M); + } else if(is_ia32_vfdiv(new_pred)) { + return new_rd_Proj(dbg, irg, block, new_pred, mode_M, + pn_ia32_vfdiv_M); + } + break; + case pn_Quot_res: + if(is_ia32_xDiv(new_pred)) { + return new_rd_Proj(dbg, irg, block, new_pred, mode_E, + pn_ia32_xDiv_res); + } else if(is_ia32_vfdiv(new_pred)) { + return new_rd_Proj(dbg, irg, block, new_pred, mode_E, + pn_ia32_vfdiv_res); + } + break; + default: + break; + } + + assert(0); + return new_rd_Unknown(irg, mode); +} + +static ir_node *gen_Proj_tls(ia32_transform_env_t *env, ir_node *node) { + ir_graph *irg = env->irg; + //dbg_info *dbg = get_irn_dbg_info(node); + dbg_info *dbg = NULL; + ir_node *block = transform_node(env, get_nodes_block(node)); + + ir_node *res = new_rd_ia32_LdTls(dbg, irg, block, mode_Iu); + + return res; +} + +static ir_node *gen_Proj_be_Call(ia32_transform_env_t *env, ir_node *node) { + ir_graph *irg = env->irg; + dbg_info *dbg = get_irn_dbg_info(node); + long proj = get_Proj_proj(node); + ir_mode *mode = get_irn_mode(node); + ir_node *block = transform_node(env, get_nodes_block(node)); + ir_node *sse_load; + ir_node *call = get_Proj_pred(node); + ir_node *new_call = transform_node(env, call); + + /* The following is kinda tricky: If we're using SSE, then we have to + * move the result value of the call in floating point registers to an + * xmm register, we therefore construct a GetST0 -> xLoad sequence + * after the call, we have to make sure to correctly make the + * MemProj and the result Proj use these 2 nodes + */ + if(proj == pn_be_Call_M_regular) { + // get new node for result, are we doing the sse load/store hack? + ir_node *call_res = be_get_Proj_for_pn(call, pn_be_Call_first_res); + ir_node *call_res_new; + ir_node *call_res_pred = NULL; + + if(call_res != NULL) { + call_res_new = transform_node(env, call_res); + call_res_pred = get_Proj_pred(call_res_new); + } + + if(call_res_pred == NULL || be_is_Call(call_res_pred)) { + return new_rd_Proj(dbg, irg, block, new_call, mode_M, pn_be_Call_M_regular); + } else { + assert(is_ia32_xLoad(call_res_pred)); + return new_rd_Proj(dbg, 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)) { + ir_node *fstp; + ir_node *frame = get_irg_frame(irg); + 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]; + const arch_register_class_t *cls; + + /* in case there is no memory output: create one to serialize the copy FPU -> SSE */ + call_mem = new_rd_Proj(dbg, irg, block, new_call, mode_M, pn_be_Call_M_regular); + + /* store st(0) onto stack */ + fstp = new_rd_ia32_GetST0(dbg, irg, block, frame, noreg, call_mem); + + set_ia32_ls_mode(fstp, mode); + 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(dbg, irg, block, frame, noreg, fstp); + set_ia32_ls_mode(sse_load, mode); + 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); + + //mproj = new_rd_Proj(dbg, irg, block, sse_load, mode_M, pn_ia32_xLoad_M); + sse_load = new_rd_Proj(dbg, irg, block, sse_load, mode_E, pn_ia32_xLoad_res); + + /* now: create new Keep whith all former ins and one additional in - the result Proj */ + + /* get a Proj representing a caller save register */ + p = be_get_Proj_for_pn(call, pn_be_Call_first_res + 1); + assert(is_Proj(p) && "Proj expected."); + + /* user of the the proj is the Keep */ + p = get_edge_src_irn(get_irn_out_edge_first(p)); + assert(be_is_Keep(p) && "Keep expected."); + + /* keep the result */ + 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); + + return sse_load; + } + + /* transform call modes to the mode_Iu or mode_E */ + if(mode_is_float(mode)) { + mode = mode_E; + } else if(mode != mode_M) { + mode = mode_Iu; + } + + return new_rd_Proj(dbg, irg, block, new_call, mode, proj); +} + +static ir_node *gen_Proj(ia32_transform_env_t *env, ir_node *node) { + ir_graph *irg = env->irg; + dbg_info *dbg = 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); + } else { + assert(0); + return new_r_Bad(irg); + } + } else if(is_Load(pred) || be_is_FrameLoad(pred)) { + return gen_Proj_Load(env, node); + } else if(is_Div(pred) || is_Mod(pred) || is_DivMod(pred)) { + return gen_Proj_DivMod(env, node); + } else if(is_CopyB(pred)) { + return gen_Proj_CopyB(env, node); + } else if(is_Quot(pred)) { + return gen_Proj_Quot(env, node); + } else if(is_ia32_l_vfdiv(pred)) { + return gen_Proj_l_vfdiv(env, node); + } else if(be_is_SubSP(pred)) { + return gen_Proj_be_SubSP(env, node); + } else if(be_is_AddSP(pred)) { + return gen_Proj_be_AddSP(env, node); + } else if(be_is_Call(pred)) { + return gen_Proj_be_Call(env, 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; + + block = transform_node(env, block); + // we exchange the ProjX with a jump + jump = new_rd_Jmp(dbg, 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); + } + } + + return duplicate_node(env, node); +} + /** * Enters all transform functions into the generic pointer */ -void ia32_register_transformers(void) { +static void register_transformers(void) { ir_op *op_Max, *op_Min, *op_Mulh; /* first clear the generic function pointer for all ops */ clear_irp_opcodes_generic_func(); -#define GEN(a) op_##a->ops.generic = (op_func)gen_##a +#define GEN(a) { transform_func *func = gen_##a; op_##a->ops.generic = (op_func) func; } #define BAD(a) op_##a->ops.generic = (op_func)bad_transform -#define IGN(a) GEN(Add); GEN(Sub); @@ -3069,26 +3701,31 @@ void ia32_register_transformers(void) { GEN(Not); GEN(Load); - //GEN(Store); + GEN(Store); GEN(Cond); GEN(CopyB); - GEN(Mux); + //GEN(Mux); + BAD(Mux); GEN(Psi); GEN(Proj); + GEN(Phi); + + GEN(Block); + GEN(End); /* transform ops from intrinsic lowering */ GEN(ia32_l_Add); - GEN(ia32_l_AddC); + GEN(ia32_l_Adc); GEN(ia32_l_Sub); - GEN(ia32_l_SubC); - GEN(ia32_l_Minus); + GEN(ia32_l_Sbb); + GEN(ia32_l_Neg); GEN(ia32_l_Mul); - GEN(ia32_l_Eor); - GEN(ia32_l_MulS); + GEN(ia32_l_Xor); + GEN(ia32_l_IMul); GEN(ia32_l_Shl); GEN(ia32_l_Shr); - GEN(ia32_l_Shrs); + GEN(ia32_l_Sar); GEN(ia32_l_ShlD); GEN(ia32_l_ShrD); GEN(ia32_l_vfdiv); @@ -3102,23 +3739,8 @@ void ia32_register_transformers(void) { GEN(ia32_l_X87toSSE); GEN(ia32_l_SSEtoX87); - IGN(Call); - IGN(Alloc); - - //IGN(Proj); - IGN(Block); - IGN(Start); - IGN(End); - IGN(NoMem); - IGN(Phi); - IGN(IJmp); - IGN(Break); - IGN(Cmp); - - /* constant transformation happens earlier */ - IGN(Const); - IGN(SymConst); - IGN(Sync); + GEN(Const); + GEN(SymConst); /* we should never see these nodes */ BAD(Raise); @@ -3128,7 +3750,7 @@ void ia32_register_transformers(void) { BAD(Free); BAD(Tuple); BAD(Id); - BAD(Bad); + //BAD(Bad); BAD(Confirm); BAD(Filter); BAD(CallBegin); @@ -3137,10 +3759,10 @@ void ia32_register_transformers(void) { /* handle generic backend nodes */ GEN(be_FrameAddr); - GEN(be_Call); + //GEN(be_Call); GEN(be_Return); GEN(be_FrameLoad); - //GEN(be_FrameStore); + GEN(be_FrameStore); GEN(be_StackParam); GEN(be_AddSP); GEN(be_SubSP); @@ -3160,59 +3782,269 @@ void ia32_register_transformers(void) { #undef GEN #undef BAD -#undef IGN } -typedef ir_node *(transform_func)(ia32_transform_env_t *env); - -/** - * Transforms the given firm node (and maybe some other related nodes) - * into one or more assembler nodes. - * - * @param node the firm node - * @param env the debug module - */ -void ia32_transform_node(ir_node *node, void *env) { - ia32_code_gen_t *cg = (ia32_code_gen_t *)env; - ir_op *op = get_irn_op(node); - ir_node *asm_node = NULL; +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); - if (is_Block(node)) - return; + 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_graph *irg = env->irg; + dbg_info *dbg = get_irn_dbg_info(node); + ir_mode *mode = get_irn_mode(node); + ir_op *op = get_irn_op(node); + ir_node *block; + ir_node *new_node; + int i, arity; + + block = transform_node(env, get_nodes_block(node)); + + arity = get_irn_arity(node); + if(op->opar == oparity_dynamic) { + new_node = new_ir_node(dbg, 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(dbg, irg, block, op, mode, arity, ins); + } + + copy_node_attr(node, new_node); + duplicate_deps(env, node, new_node); + + return new_node; +} + +static ir_node *transform_node(ia32_transform_env_t *env, ir_node *node) +{ + ir_node *new_node; + ir_op *op = get_irn_op(node); - /* link arguments pointing to Unknown to the UNKNOWN Proj */ - for (i = get_irn_arity(node) - 1; i >= 0; i--) { - if (is_Unknown(get_irn_n(node, i))) - set_irn_n(node, i, be_get_unknown_for_mode(cg, get_irn_mode(get_irn_n(node, i)))); + if(irn_visited(node)) { + assert(get_new_node(node) != NULL); + return get_new_node(node); } - DBG((cg->mod, LEVEL_1, "check %+F ... ", node)); + mark_irn_visited(node); + DEBUG_ONLY(set_new_node(node, NULL)); + if (op->ops.generic) { - ia32_transform_env_t tenv; transform_func *transform = (transform_func *)op->ops.generic; - tenv.block = get_nodes_block(node); - tenv.dbg = get_irn_dbg_info(node); - tenv.irg = current_ir_graph; - tenv.irn = node; - tenv.mode = get_irn_mode(node); - tenv.cg = cg; - DEBUG_ONLY(tenv.mod = cg->mod;) + new_node = (*transform)(env, node); + assert(new_node != NULL); + } else { + new_node = duplicate_node(env, node); + } + //ir_fprintf(stderr, "%+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; +} + +static void fix_loops(ia32_transform_env_t *env, ir_node *node) +{ + int i, arity; - asm_node = (*transform)(&tenv); + 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); } - /* exchange nodes if a new one was generated */ - if (asm_node) { - exchange(node, asm_node); - DB((cg->mod, LEVEL_1, "created node %+F[%p]\n", asm_node, asm_node)); + arity = get_irn_arity(node); + for(i = 0; i < arity; ++i) { + ir_node *in = get_irn_n(node, i); + ir_node *new = (ir_node*) get_irn_link(in); + + if(new != NULL && new != in) { + set_irn_n(node, i, new); + in = new; + } + + fix_loops(env, in); } - else { - DB((cg->mod, LEVEL_1, "ignored\n")); + + arity = get_irn_deps(node); + for(i = 0; i < arity; ++i) { + ir_node *in = get_irn_dep(node, i); + ir_node *new = (ir_node*) get_irn_link(in); + + if(new != NULL && new != in) { + set_irn_dep(node, i, new); + in = new; + } + + 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); +} + +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])); + DEBUG_ONLY(env.mod = cg->mod); + + 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); +} + +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); + 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. */ @@ -3260,7 +4092,7 @@ static void transform_psi_cond(ir_node *cond, ir_mode *mode, ia32_code_gen_t *cg cmp_b = gen_sse_conv_f2d(cg, dbg, irg, block, cmp_b, cmp_b); } - new_op = new_rd_ia32_xCmp(dbg, irg, block, noreg, noreg, cmp_a, cmp_b, nomem, mode); + new_op = new_rd_ia32_xCmp(dbg, 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)); } @@ -3271,7 +4103,6 @@ static void transform_psi_cond(ir_node *cond, ir_mode *mode, ia32_code_gen_t *cg } else { /* integer Psi */ - ia32_transform_env_t tenv; construct_binop_func *set_func = NULL; if (mode_is_float(get_irn_mode(cmp_a))) { @@ -3294,15 +4125,10 @@ static void transform_psi_cond(ir_node *cond, ir_mode *mode, ia32_code_gen_t *cg set_func = new_rd_ia32_CmpSet; } - tenv.block = block; - tenv.cg = cg; - tenv.dbg = dbg; - tenv.irg = irg; - tenv.irn = cmp; - tenv.mode = mode; - DEBUG_ONLY(tenv.mod = cg->mod;) + new_op = set_func(dbg, irg, block, noreg, noreg, cmp_a, cmp_b, nomem); + if(!mode_is_signed(mode)) + pnc |= ia32_pn_Cmp_Unsigned; - new_op = gen_binop(&tenv, cmp_a, cmp_b, set_func); set_ia32_pncode(new_op, pnc); set_ia32_am_support(new_op, ia32_am_Source); } @@ -3340,6 +4166,7 @@ void ia32_transform_psi_cond_tree(ir_node *node, void *env) { return; //mode = get_irn_mode(node); + // TODO this is probably wrong... mode = mode_Iu; transform_psi_cond(psi_sel, mode, cg);