Remove dead code: tarval_is_long() returns true for mode_P null constants.
[libfirm] / ir / be / ia32 / ia32_transform.c
index 1c9d64e..f0d8e56 100644 (file)
 
 #include "gen_ia32_regalloc_if.h"
 
-#define SFP_SIGN "0x80000000"
-#define DFP_SIGN "0x8000000000000000"
-#define SFP_ABS  "0x7FFFFFFF"
-#define DFP_ABS  "0x7FFFFFFFFFFFFFFF"
+#define SFP_SIGN   "0x80000000"
+#define DFP_SIGN   "0x8000000000000000"
+#define SFP_ABS    "0x7FFFFFFF"
+#define DFP_ABS    "0x7FFFFFFFFFFFFFFF"
+#define DFP_INTMAX "9223372036854775807"
 
 #define TP_SFP_SIGN "ia32_sfp_sign"
 #define TP_DFP_SIGN "ia32_dfp_sign"
 #define TP_SFP_ABS  "ia32_sfp_abs"
 #define TP_DFP_ABS  "ia32_dfp_abs"
+#define TP_INT_MAX  "ia32_int_max"
 
 #define ENT_SFP_SIGN "IA32_SFP_SIGN"
 #define ENT_DFP_SIGN "IA32_DFP_SIGN"
 #define ENT_SFP_ABS  "IA32_SFP_ABS"
 #define ENT_DFP_ABS  "IA32_DFP_ABS"
+#define ENT_INT_MAX  "IA32_INT_MAX"
 
 #define mode_vfp       (ia32_reg_classes[CLASS_ia32_vfp].mode)
 #define mode_xmm    (ia32_reg_classes[CLASS_ia32_xmm].mode)
@@ -96,22 +99,22 @@ static heights_t       *heights      = NULL;
 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_node *block, ir_node *base, ir_node *index, ir_node *mem,
+        ir_node *op1, ir_node *op2);
 
 typedef ir_node *construct_shift_func(dbg_info *db, ir_graph *irg,
         ir_node *block, ir_node *op1, ir_node *op2);
 
 typedef ir_node *construct_binop_dest_func(dbg_info *db, ir_graph *irg,
-        ir_node *block, ir_node *base, ir_node *index, ir_node *op,
-        ir_node *mem);
+        ir_node *block, ir_node *base, ir_node *index, ir_node *mem,
+        ir_node *op);
 
 typedef ir_node *construct_unop_dest_func(dbg_info *db, ir_graph *irg,
         ir_node *block, ir_node *base, ir_node *index, ir_node *mem);
 
 typedef ir_node *construct_binop_float_func(dbg_info *db, ir_graph *irg,
-        ir_node *block, ir_node *base, ir_node *index, ir_node *op1,
-        ir_node *op2, ir_node *mem, ir_node *fpcw);
+        ir_node *block, ir_node *base, ir_node *index, ir_node *mem,
+        ir_node *op1, ir_node *op2, ir_node *fpcw);
 
 typedef ir_node *construct_unop_func(dbg_info *db, ir_graph *irg,
         ir_node *block, ir_node *op);
@@ -133,8 +136,8 @@ static ir_node *create_immediate_or_transform(ir_node *node,
                                               char immediate_constraint_type);
 
 static ir_node *create_I2I_Conv(ir_mode *src_mode, ir_mode *tgt_mode,
-                                dbg_info *dbgi, ir_node *new_block,
-                                ir_node *new_op);
+                                dbg_info *dbgi, ir_node *block,
+                                ir_node *op, ir_node *orig_node);
 
 /**
  * Return true if a mode can be stored in the GP register set
@@ -181,12 +184,12 @@ static ir_type *get_prim_type(pmap *types, ir_mode *mode)
 }
 
 /**
- * Get an entity that is initialized with a tarval
+ * Get an atomic entity that is initialized with a tarval
  */
-static ir_entity *get_entity_for_tv(ia32_code_gen_t *cg, ir_node *cnst)
+static ir_entity *ia32_get_entity_for_tv(ia32_isa_t *isa, ir_node *cnst)
 {
        tarval *tv    = get_Const_tarval(cnst);
-       pmap_entry *e = pmap_find(cg->isa->tv_ent, tv);
+       pmap_entry *e = pmap_find(isa->tv_ent, tv);
        ir_entity *res;
        ir_graph *rem;
 
@@ -194,7 +197,7 @@ static ir_entity *get_entity_for_tv(ia32_code_gen_t *cg, ir_node *cnst)
                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);
+                       tp = get_prim_type(isa->types, mode);
 
                res = new_entity(get_glob_type(), unique_id(".LC%u"), tp);
 
@@ -210,7 +213,7 @@ static ir_entity *get_entity_for_tv(ia32_code_gen_t *cg, ir_node *cnst)
                set_atomic_ent_value(res, new_Const_type(tv, tp));
                current_ir_graph = rem;
 
-               pmap_insert(cg->isa->tv_ent, tv, res);
+               pmap_insert(isa->tv_ent, tv, res);
        } else {
                res = e->value;
        }
@@ -219,17 +222,11 @@ static ir_entity *get_entity_for_tv(ia32_code_gen_t *cg, ir_node *cnst)
 }
 
 static int is_Const_0(ir_node *node) {
-       if(!is_Const(node))
-               return 0;
-
-       return classify_Const(node) == CNST_NULL;
+       return is_Const(node) && is_Const_null(node);
 }
 
 static int is_Const_1(ir_node *node) {
-       if(!is_Const(node))
-               return 0;
-
-       return classify_Const(node) == CNST_ONE;
+       return is_Const(node) && is_Const_one(node);
 }
 
 static int is_Const_Minus_1(ir_node *node) {
@@ -245,7 +242,7 @@ static int is_Const_Minus_1(ir_node *node) {
        tv = get_Const_tarval(node);
        tv = tarval_neg(tv);
 
-       return classify_tarval(tv) == CNST_ONE;
+       return tarval_is_one(tv);
 }
 
 /**
@@ -265,17 +262,30 @@ static ir_node *gen_Const(ir_node *node) {
                ir_node   *load;
                ir_entity *floatent;
 
-               if (! USE_SSE2(env_cg)) {
-                       cnst_classify_t clss = classify_Const(node);
+               if (USE_SSE2(env_cg)) {
+                       if (is_Const_null(node)) {
+                               load = new_rd_ia32_xZero(dbgi, irg, block);
+                               set_ia32_ls_mode(load, mode);
+                               res  = load;
+                       } else {
+                               floatent = ia32_get_entity_for_tv(env_cg->isa, node);
 
-                       if (clss == CNST_NULL) {
+                               load     = new_rd_ia32_xLoad(dbgi, irg, block, noreg, noreg, nomem,
+                                                                                        mode);
+                               set_ia32_op_type(load, ia32_AddrModeS);
+                               set_ia32_am_sc(load, floatent);
+                               set_ia32_flags(load, get_ia32_flags(load) | arch_irn_flags_rematerializable);
+                               res = new_r_Proj(irg, block, load, mode_xmm, pn_ia32_xLoad_res);
+                       }
+               } else {
+                       if (is_Const_null(node)) {
                                load = new_rd_ia32_vfldz(dbgi, irg, block);
                                res  = load;
-                       } else if (clss == CNST_ONE) {
+                       } else if (is_Const_one(node)) {
                                load = new_rd_ia32_vfld1(dbgi, irg, block);
                                res  = load;
                        } else {
-                               floatent = get_entity_for_tv(env_cg, node);
+                               floatent = ia32_get_entity_for_tv(env_cg->isa, node);
 
                                load     = new_rd_ia32_vfld(dbgi, irg, block, noreg, noreg, nomem, mode);
                                set_ia32_op_type(load, ia32_AddrModeS);
@@ -284,16 +294,6 @@ static ir_node *gen_Const(ir_node *node) {
                                res = new_r_Proj(irg, block, load, mode_vfp, pn_ia32_vfld_res);
                        }
                        set_ia32_ls_mode(load, mode);
-               } else {
-                       floatent = get_entity_for_tv(env_cg, node);
-
-                       load     = new_rd_ia32_xLoad(dbgi, irg, block, noreg, noreg, nomem,
-                                                    mode);
-                       set_ia32_op_type(load, ia32_AddrModeS);
-                       set_ia32_am_sc(load, floatent);
-                       set_ia32_flags(load, get_ia32_flags(load) | arch_irn_flags_rematerializable);
-
-                       res = new_r_Proj(irg, block, load, mode_xmm, pn_ia32_xLoad_res);
                }
 
                SET_IA32_ORIG_NODE(load, ia32_get_old_node_name(env_cg, node));
@@ -354,6 +354,7 @@ static ir_node *gen_SymConst(ir_node *node) {
                else
                        cnst = new_rd_ia32_vfld(dbgi, irg, block, noreg, noreg, nomem, mode_E);
                set_ia32_am_sc(cnst, get_SymConst_entity(node));
+               set_ia32_use_frame(cnst);
        } else {
                ir_entity *entity;
 
@@ -382,11 +383,14 @@ ir_entity *ia32_gen_fp_known_const(ia32_known_const_t kct) {
                const char *tp_name;
                const char *ent_name;
                const char *cnst_str;
+               char mode;
+               char align;
        } names [ia32_known_const_max] = {
-               { TP_SFP_SIGN, ENT_SFP_SIGN, SFP_SIGN },        /* ia32_SSIGN */
-               { TP_DFP_SIGN, ENT_DFP_SIGN, DFP_SIGN },        /* ia32_DSIGN */
-               { TP_SFP_ABS,  ENT_SFP_ABS,  SFP_ABS },         /* ia32_SABS */
-               { TP_DFP_ABS,  ENT_DFP_ABS,  DFP_ABS }          /* ia32_DABS */
+               { TP_SFP_SIGN, ENT_SFP_SIGN, SFP_SIGN,   0, 16 },       /* ia32_SSIGN */
+               { TP_DFP_SIGN, ENT_DFP_SIGN, DFP_SIGN,   1, 16 },       /* ia32_DSIGN */
+               { TP_SFP_ABS,  ENT_SFP_ABS,  SFP_ABS,    0, 16 },       /* ia32_SABS */
+               { TP_DFP_ABS,  ENT_DFP_ABS,  DFP_ABS,    1, 16 },       /* ia32_DABS */
+               { TP_INT_MAX,  ENT_INT_MAX,  DFP_INTMAX, 2, 4 }         /* ia32_INTMAX */
        };
        static ir_entity *ent_cache[ia32_known_const_max];
 
@@ -403,10 +407,16 @@ ir_entity *ia32_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 = mode_xmm;
+               switch (names[kct].mode) {
+               case 0:  mode = mode_Iu; break;
+               case 1:  mode = mode_Lu; break;
+               default: mode = mode_F; break;
+               }
                tv  = new_tarval_from_str(cnst_str, strlen(cnst_str), mode);
                tp  = new_type_primitive(new_id_from_str(tp_name), mode);
+               /* set the specified alignment */
+               set_type_alignment_bytes(tp, names[kct].align);
+
                ent = new_entity(get_glob_type(), new_id_from_str(ent_name), tp);
 
                set_entity_ld_ident(ent, get_entity_ident(ent));
@@ -465,7 +475,7 @@ static int use_source_address_mode(ir_node *block, ir_node *node,
        mode = get_irn_mode(node);
        if(!mode_needs_gp_reg(mode))
                return 0;
-       if(get_mode_size_bits(mode) != 32)
+       if(other != NULL && get_Load_mode(load) != get_irn_mode(other))
                return 0;
 
        /* don't do AM if other node inputs depend on the load (via mem-proj) */
@@ -547,7 +557,8 @@ static void set_am_attributes(ir_node *node, ia32_address_mode_t *am)
 
 static void match_arguments(ia32_address_mode_t *am, ir_node *block,
                             ir_node *op1, ir_node *op2, int commutative,
-                            int use_am_and_immediates)
+                            int use_am_and_immediates, int use_am,
+                            int use_8_16_bit_am)
 {
        ia32_address_t *addr     = &am->addr;
        ir_node        *noreg_gp = ia32_new_NoReg_gp(env_cg);
@@ -556,14 +567,17 @@ static void match_arguments(ia32_address_mode_t *am, ir_node *block,
 
        memset(am, 0, sizeof(am[0]));
 
+       if(!use_8_16_bit_am && get_mode_size_bits(get_irn_mode(op1)) < 32)
+               use_am = 0;
+
        new_op2 = try_create_Immediate(op2, 0);
-       if(new_op2 == NULL && use_source_address_mode(block, op2, op1)) {
+       if(new_op2 == NULL && use_am && use_source_address_mode(block, op2, op1)) {
                build_address(am, op2);
                new_op1     = be_transform_node(op1);
                new_op2     = noreg_gp;
                am->op_type = ia32_AddrModeS;
        } else if(commutative && (new_op2 == NULL || use_am_and_immediates) &&
-                     use_source_address_mode(block, op1, op2)) {
+                     use_am && use_source_address_mode(block, op1, op2)) {
                build_address(am, op1);
                if(new_op2 != NULL) {
                        new_op1 = noreg_gp;
@@ -609,7 +623,7 @@ static ir_node *fix_mem_proj(ir_node *node, ia32_address_mode_t *am)
 
        if(mode != mode_T) {
                set_irn_mode(node, mode_T);
-               return new_rd_Proj(NULL, irg, get_nodes_block(node), node, mode, 0);
+               return new_rd_Proj(NULL, irg, get_nodes_block(node), node, mode, pn_ia32_res);
        } else {
                return node;
        }
@@ -634,10 +648,10 @@ static ir_node *gen_binop(ir_node *node, ir_node *op1, ir_node *op2,
        ia32_address_mode_t  am;
        ia32_address_t      *addr = &am.addr;
 
-       match_arguments(&am, src_block, op1, op2, commutative, 0);
+       match_arguments(&am, src_block, op1, op2, commutative, 0, 1, 0);
 
-       new_node = func(dbgi, irg, block, addr->base, addr->index, am.new_op1,
-                       am.new_op2, addr->mem);
+       new_node = func(dbgi, irg, block, addr->base, addr->index, addr->mem,
+                       am.new_op1, am.new_op2);
        set_am_attributes(new_node, &am);
        /* we can't use source address mode anymore when using immediates */
        if(is_ia32_Immediate(am.new_op1) || is_ia32_Immediate(am.new_op2))
@@ -670,8 +684,8 @@ static ir_node *gen_binop_sse_float(ir_node *node, ir_node *op1, ir_node *op2,
        ir_node  *noreg_gp = ia32_new_NoReg_gp(env_cg);
        ir_node  *nomem    = new_NoMem();
 
-       new_node = func(dbgi, irg, block, noreg_gp, noreg_gp, new_op1, new_op2,
-                       nomem);
+       new_node = func(dbgi, irg, block, noreg_gp, noreg_gp, nomem, new_op1,
+                       new_op2);
        if (is_op_commutative(get_irn_op(node))) {
                set_ia32_commutative(new_node);
        }
@@ -715,8 +729,8 @@ static ir_node *gen_binop_x87_float(ir_node *node, ir_node *op1, ir_node *op2,
        ir_node  *noreg_gp = ia32_new_NoReg_gp(env_cg);
        ir_node  *nomem    = new_NoMem();
 
-       new_node = func(dbgi, irg, block, noreg_gp, noreg_gp, new_op1, new_op2,
-                       nomem, get_fpcw());
+       new_node = func(dbgi, irg, block, noreg_gp, noreg_gp, nomem, new_op1, new_op2,
+                       get_fpcw());
        if (is_op_commutative(get_irn_op(node))) {
                set_ia32_commutative(new_node);
        }
@@ -895,8 +909,8 @@ static ir_node *gen_Add(ir_node *node) {
        /* construct an Add with source address mode */
        if(new_op1 != NULL) {
                ia32_address_t *am_addr = &am.addr;
-               new_op = new_rd_ia32_Add(dbgi, irg, block, am_addr->base,
-                                        am_addr->index, new_op1, noreg, am_addr->mem);
+               new_op = new_rd_ia32_Add(dbgi, irg, block, am_addr->base, am_addr->index,
+                                        am_addr->mem, new_op1, noreg);
                set_address(new_op, am_addr);
                set_ia32_op_type(new_op, ia32_AddrModeS);
                set_ia32_ls_mode(new_op, am.ls_mode);
@@ -960,11 +974,11 @@ static ir_node *gen_Mulh(ir_node *node) {
 
        assert(!mode_is_float(mode) && "Mulh with float not supported");
        if (mode_is_signed(mode)) {
-               res = new_rd_ia32_IMul1OP(dbgi, irg, block, noreg, noreg, new_op1,
-                                         new_op2, new_NoMem());
+               res = new_rd_ia32_IMul1OP(dbgi, irg, block, noreg, noreg, new_NoMem(),
+                                         new_op1, new_op2);
        } else {
-               res = new_rd_ia32_Mul(dbgi, irg, block, noreg, noreg, new_op1, new_op2,
-                                     new_NoMem());
+               res = new_rd_ia32_Mul(dbgi, irg, block, noreg, noreg, new_NoMem(), new_op1,
+                                     new_op2);
        }
 
        set_ia32_commutative(res);
@@ -993,8 +1007,7 @@ static ir_node *gen_And(ir_node *node) {
 
                if (v == 0xFF || v == 0xFFFF) {
                        dbg_info *dbgi   = get_irn_dbg_info(node);
-                       ir_node  *block  = be_transform_node(get_nodes_block(node));
-                       ir_node  *new_op = be_transform_node(op1);
+                       ir_node  *block  = get_nodes_block(node);
                        ir_mode  *src_mode;
                        ir_node  *res;
 
@@ -1004,8 +1017,7 @@ static ir_node *gen_And(ir_node *node) {
                                assert(v == 0xFFFF);
                                src_mode = mode_Hu;
                        }
-                       res = create_I2I_Conv(src_mode, mode_Iu, dbgi, block, new_op);
-                       SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node));
+                       res = create_I2I_Conv(src_mode, mode_Iu, dbgi, block, op1, node);
 
                        return res;
                }
@@ -1135,11 +1147,11 @@ static ir_node *generate_DivMod(ir_node *node, ir_node *dividend,
        }
 
        if (mode_is_signed(mode)) {
-               res = new_rd_ia32_IDiv(dbgi, irg, block, noreg, noreg, new_dividend,
-                                      sign_extension, new_divisor, new_mem, dm_flav);
+               res = new_rd_ia32_IDiv(dbgi, irg, block, noreg, noreg, new_mem,
+                                      new_dividend, sign_extension, new_divisor, dm_flav);
        } else {
-               res = new_rd_ia32_Div(dbgi, irg, block, noreg, noreg, new_dividend,
-                                     sign_extension, new_divisor, new_mem, dm_flav);
+               res = new_rd_ia32_Div(dbgi, irg, block, noreg, noreg, new_mem, new_dividend,
+                                     sign_extension, new_divisor, dm_flav);
        }
 
        set_ia32_exc_label(res, has_exc);
@@ -1198,12 +1210,12 @@ static ir_node *gen_Quot(ir_node *node) {
 
        if (USE_SSE2(env_cg)) {
                ir_mode *mode = get_irn_mode(op1);
-               new_op = new_rd_ia32_xDiv(dbgi, irg, block, noreg, noreg, new_op1,
-                                         new_op2, nomem);
+               new_op = new_rd_ia32_xDiv(dbgi, irg, block, noreg, noreg, nomem, new_op1,
+                                         new_op2);
                set_ia32_ls_mode(new_op, mode);
        } else {
-               new_op = new_rd_ia32_vfdiv(dbgi, irg, block, noreg, noreg, new_op1,
-                                          new_op2, nomem, get_fpcw());
+               new_op = new_rd_ia32_vfdiv(dbgi, irg, block, noreg, noreg, nomem, new_op1,
+                                          new_op2, get_fpcw());
        }
        SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
        return new_op;
@@ -1229,9 +1241,7 @@ static ir_node *gen_Shl(ir_node *node) {
                                ir_node  *block  = be_transform_node(get_nodes_block(node));
                                ir_node  *base   = ia32_new_NoReg_gp(env_cg);
                                ir_node  *index  = be_transform_node(get_Shl_left(node));
-
-                               ir_node  *res
-                                  = new_rd_ia32_Lea(dbgi, irg, block, base, index);
+                               ir_node  *res    = new_rd_ia32_Lea(dbgi, irg, block, base, index);
                                set_ia32_am_scale(res, val);
                                SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node));
                                return res;
@@ -1294,8 +1304,7 @@ static ir_node *gen_Shrs(ir_node *node) {
                                long val = get_tarval_long(tv1);
                                if(val == 16 || val == 24) {
                                        dbg_info *dbgi   = get_irn_dbg_info(node);
-                                       ir_node  *block  = be_transform_node(get_nodes_block(node));
-                                       ir_node  *new_op = be_transform_node(shl_left);
+                                       ir_node  *block  = get_nodes_block(node);
                                        ir_mode  *src_mode;
                                        ir_node  *res;
 
@@ -1306,9 +1315,7 @@ static ir_node *gen_Shrs(ir_node *node) {
                                                src_mode = mode_Hs;
                                        }
                                        res = create_I2I_Conv(src_mode, mode_Is, dbgi, block,
-                                                             new_op);
-                                       SET_IA32_ORIG_NODE(res,
-                                                          ia32_get_old_node_name(env_cg, node));
+                                                             shl_left, node);
 
                                        return res;
                                }
@@ -1415,7 +1422,8 @@ ir_node *gen_Minus_ex(ir_node *node, ir_node *op) {
                        ir_node *noreg_fp = ia32_new_NoReg_fp(env_cg);
                        ir_node *nomem    = new_rd_NoMem(irg);
 
-                       res = new_rd_ia32_xXor(dbgi, irg, block, noreg_gp, noreg_gp, new_op, noreg_fp, nomem);
+                       res = new_rd_ia32_xXor(dbgi, irg, block, noreg_gp, noreg_gp, nomem,
+                                              new_op, noreg_fp);
 
                        size = get_mode_size_bits(mode);
                        ent  = ia32_gen_fp_known_const(size == 32 ? ia32_SSIGN : ia32_DSIGN);
@@ -1465,7 +1473,7 @@ static ir_node *gen_bin_Not(ir_node *node)
        ir_node  *nomem  = new_NoMem();
        ir_node  *one    = create_Immediate_from_int(1);
 
-       return new_rd_ia32_Xor(dbgi, irg, block, noreg, noreg, new_op, one, nomem);
+       return new_rd_ia32_Xor(dbgi, irg, block, noreg, noreg, nomem, new_op, one);
 }
 
 /**
@@ -1508,7 +1516,7 @@ static ir_node *gen_Abs(ir_node *node) {
 
        if (mode_is_float(mode)) {
                if (USE_SSE2(env_cg)) {
-                       res = new_rd_ia32_xAnd(dbgi,irg, block, noreg_gp, noreg_gp, new_op, noreg_fp, nomem);
+                       res = new_rd_ia32_xAnd(dbgi,irg, block, noreg_gp, noreg_gp, nomem, new_op, noreg_fp);
 
                        size = get_mode_size_bits(mode);
                        ent  = ia32_gen_fp_known_const(size == 32 ? ia32_SABS : ia32_DABS);
@@ -1534,12 +1542,12 @@ static ir_node *gen_Abs(ir_node *node) {
                SET_IA32_ORIG_NODE(sign_extension,
                                   ia32_get_old_node_name(env_cg, node));
 
-               xor = new_rd_ia32_Xor(dbgi, irg, block, noreg_gp, noreg_gp, new_op,
-                                     sign_extension, nomem);
+               xor = new_rd_ia32_Xor(dbgi, irg, block, noreg_gp, noreg_gp, nomem, new_op,
+                                     sign_extension);
                SET_IA32_ORIG_NODE(xor, ia32_get_old_node_name(env_cg, node));
 
-               res = new_rd_ia32_Sub(dbgi, irg, block, noreg_gp, noreg_gp, xor,
-                                     sign_extension, nomem);
+               res = new_rd_ia32_Sub(dbgi, irg, block, noreg_gp, noreg_gp, nomem, xor,
+                                     sign_extension);
                SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node));
        }
 
@@ -1601,8 +1609,8 @@ static ir_node *gen_Load(ir_node *node) {
 
                /* create a conv node with address mode for smaller modes */
                if(get_mode_size_bits(mode) < 32) {
-                       new_op = new_rd_ia32_Conv_I2I(dbgi, irg, block, base, index, noreg,
-                                                     new_mem, mode);
+                       new_op = new_rd_ia32_Conv_I2I(dbgi, irg, block, base, index, new_mem,
+                                                     noreg, mode);
                } else {
                        new_op = new_rd_ia32_Load(dbgi, irg, block, base, index, new_mem);
                }
@@ -1696,8 +1704,7 @@ static ir_node *dest_am_binop(ir_node *node, ir_node *op1, ir_node *op2,
 
        dbgi     = get_irn_dbg_info(node);
        block    = be_transform_node(src_block);
-       new_node = func(dbgi, irg, block, addr->base, addr->index, new_op,
-                       addr->mem);
+       new_node = func(dbgi, irg, block, addr->base, addr->index, addr->mem, new_op);
        set_address(new_node, addr);
        set_ia32_op_type(new_node, ia32_AddrModeD);
        set_ia32_ls_mode(new_node, mode);
@@ -1755,7 +1762,9 @@ static ir_node *try_create_dest_am(ir_node *node) {
        /* handle only GP modes for now... */
        if(!mode_needs_gp_reg(mode))
                return NULL;
-       if(get_mode_size_bits(mode) != 32)
+
+       /* TODO0000 8bit operations have stricter constraints. This is not handled yet */
+       if (get_mode_size_bits(mode) < 16)
                return NULL;
 
        /* store must be the only user of the val node */
@@ -1871,7 +1880,7 @@ static ir_node *gen_Store(ir_node *node) {
        if(new_op != NULL)
                return new_op;
 
-       /* construct load address */
+       /* construct store address */
        memset(&addr, 0, sizeof(addr));
        ia32_create_address_mode(&addr, ptr, 0);
        base  = addr.base;
@@ -1892,11 +1901,11 @@ static ir_node *gen_Store(ir_node *node) {
        if (mode_is_float(mode)) {
                new_val = be_transform_node(val);
                if (USE_SSE2(env_cg)) {
-                       new_op = new_rd_ia32_xStore(dbgi, irg, block, base, index, new_val,
-                                                   new_mem);
+                       new_op = new_rd_ia32_xStore(dbgi, irg, block, base, index, new_mem,
+                                                   new_val);
                } else {
-                       new_op = new_rd_ia32_vfst(dbgi, irg, block, base, index, new_val,
-                                                 new_mem, mode);
+                       new_op = new_rd_ia32_vfst(dbgi, irg, block, base, index, new_mem, new_val,
+                                                 mode);
                }
        } else {
                new_val = create_immediate_or_transform(val, 0);
@@ -1904,11 +1913,11 @@ static ir_node *gen_Store(ir_node *node) {
                        mode = mode_Iu;
 
                if (get_mode_size_bits(mode) == 8) {
-                       new_op = new_rd_ia32_Store8Bit(dbgi, irg, block, base, index,
-                                                      new_val, new_mem);
+                       new_op = new_rd_ia32_Store8Bit(dbgi, irg, block, base, index, new_mem,
+                                                      new_val);
                } else {
-                       new_op = new_rd_ia32_Store(dbgi, irg, block, base, index, new_val,
-                                                  new_mem);
+                       new_op = new_rd_ia32_Store(dbgi, irg, block, base, index, new_mem,
+                                                  new_val);
                }
        }
 
@@ -1924,7 +1933,8 @@ static ir_node *gen_Store(ir_node *node) {
 }
 
 static ir_node *try_create_TestJmp(ir_node *block, dbg_info *dbgi, long pnc,
-                                   ir_node *cmp_left, ir_node *cmp_right)
+                                   ir_node *cmp_left, ir_node *cmp_right,
+                                   int use_am)
 {
        ir_node  *arg_left;
        ir_node  *arg_right;
@@ -1951,18 +1961,18 @@ static ir_node *try_create_TestJmp(ir_node *block, dbg_info *dbgi, long pnc,
                mode = mode_Iu;
 
        assert(get_mode_size_bits(mode) <= 32);
-       match_arguments(&am, block, arg_left, arg_right, 1, 1);
+       match_arguments(&am, block, arg_left, arg_right, 1, 1, use_am, 1);
        if(am.flipped)
                pnc = get_inversed_pnc(pnc);
 
        if(get_mode_size_bits(mode) == 8) {
                res = new_rd_ia32_TestJmp8Bit(dbgi, current_ir_graph, block, addr->base,
-                                             addr->index, am.new_op1, am.new_op2,
-                                             addr->mem, pnc);
+                                             addr->index, addr->mem, am.new_op1,
+                                             am.new_op2, pnc);
        } else {
                res = new_rd_ia32_TestJmp(dbgi, current_ir_graph, block, addr->base,
-                                         addr->index, am.new_op1, am.new_op2,
-                                         addr->mem, pnc);
+                                         addr->index, addr->mem, am.new_op1, am.new_op2,
+                                         pnc);
        }
        set_am_attributes(res, &am);
        set_ia32_ls_mode(res, mode);
@@ -2034,6 +2044,7 @@ static ir_node *gen_Cond(ir_node *node) {
        ir_node  *new_cmp_b;
        ir_mode  *cmp_mode;
        long      pnc;
+       int       use_am;
 
        if (sel_mode != mode_b) {
                return create_Switch(node);
@@ -2042,11 +2053,14 @@ static ir_node *gen_Cond(ir_node *node) {
        if(!is_Proj(sel) || !is_Cmp(get_Proj_pred(sel))) {
                /* it's some mode_b value but not a direct comparison -> create a
                 * testjmp */
-               res = try_create_TestJmp(block, dbgi, pn_Cmp_Lg, sel, NULL);
+               res = try_create_TestJmp(block, dbgi, pn_Cmp_Lg, sel, NULL, 1);
                SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node));
                return res;
        }
 
+       /* address mode makes only sense when we're the only user of the cmp */
+       use_am   = get_irn_n_edges(node) <= 1;
+
        cmp      = get_Proj_pred(sel);
        cmp_a    = get_Cmp_left(cmp);
        cmp_b    = get_Cmp_right(cmp);
@@ -2057,7 +2071,7 @@ static ir_node *gen_Cond(ir_node *node) {
        }
 
        if(mode_needs_gp_reg(cmp_mode)) {
-               res = try_create_TestJmp(block, dbgi, pnc, cmp_a, cmp_b);
+               res = try_create_TestJmp(block, dbgi, pnc, cmp_a, cmp_b, use_am);
                if(res != NULL) {
                        SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node));
                        return res;
@@ -2068,8 +2082,8 @@ static ir_node *gen_Cond(ir_node *node) {
                new_cmp_a = be_transform_node(cmp_a);
                new_cmp_b = create_immediate_or_transform(cmp_b, 0);
                if (USE_SSE2(env_cg)) {
-                       res = new_rd_ia32_xCmpJmp(dbgi, irg, block, noreg, noreg, cmp_a,
-                                                 cmp_b, nomem, pnc);
+                       res = new_rd_ia32_xCmpJmp(dbgi, irg, block, noreg, noreg, nomem, cmp_a,
+                                                 cmp_b, pnc);
                        set_ia32_commutative(res);
                        set_ia32_ls_mode(res, cmp_mode);
                } else {
@@ -2079,17 +2093,16 @@ static ir_node *gen_Cond(ir_node *node) {
        } else {
                ia32_address_mode_t  am;
                ia32_address_t      *addr = &am.addr;
-               match_arguments(&am, src_block, cmp_a, cmp_b, 1, 1);
+               match_arguments(&am, src_block, cmp_a, cmp_b, 1, 1, use_am, 1);
                if(am.flipped)
                        pnc = get_inversed_pnc(pnc);
 
                if(get_mode_size_bits(cmp_mode) == 8) {
-                       res = new_rd_ia32_CmpJmp8Bit(dbgi, irg, block, addr->base,
-                                                    addr->index, am.new_op1, am.new_op2,
-                                                    addr->mem, pnc);
+                       res = new_rd_ia32_CmpJmp8Bit(dbgi, irg, block, addr->base, addr->index,
+                                                    addr->mem, am.new_op1, am.new_op2, pnc);
                } else {
                        res = new_rd_ia32_CmpJmp(dbgi, irg, block, addr->base, addr->index,
-                                                am.new_op1, am.new_op2, addr->mem, pnc);
+                                                addr->mem, am.new_op1, am.new_op2, pnc);
                }
                set_am_attributes(res, &am);
                assert(cmp_mode != NULL);
@@ -2161,7 +2174,7 @@ ir_node *gen_be_Copy(ir_node *node)
 
 
 static ir_node *create_set(long pnc, ir_node *cmp_left, ir_node *cmp_right,
-                           dbg_info *dbgi, ir_node *block)
+                           dbg_info *dbgi, ir_node *block, int use_am)
 {
        ir_graph *irg       = current_ir_graph;
        ir_node  *new_block = be_transform_node(block);
@@ -2193,26 +2206,25 @@ static ir_node *create_set(long pnc, ir_node *cmp_left, ir_node *cmp_right,
 
                assert(get_mode_size_bits(mode) <= 32);
 
-               match_arguments(&am, block, arg_left, arg_right, 1, 1);
+               match_arguments(&am, block, arg_left, arg_right, 1, 1, use_am, 1);
                if(am.flipped)
                        pnc = get_inversed_pnc(pnc);
 
                if(get_mode_size_bits(mode) == 8) {
                        res = new_rd_ia32_TestSet8Bit(dbgi, irg, new_block, addr->base,
-                                                                     addr->index, am.new_op1, am.new_op2,
-                                                                                 addr->mem, pnc);
+                                                     addr->index, addr->mem, am.new_op1,
+                                                     am.new_op2, pnc);
                } else {
-                       res = new_rd_ia32_TestSet(dbgi, irg, new_block, addr->base,
-                                                 addr->index, am.new_op1, am.new_op2,
-                                                 addr->mem, pnc);
+                       res = new_rd_ia32_TestSet(dbgi, irg, new_block, addr->base, addr->index,
+                                                 addr->mem, am.new_op1, am.new_op2, pnc);
                }
                set_am_attributes(res, &am);
                set_ia32_ls_mode(res, mode);
 
                res = fix_mem_proj(res, &am);
 
-               res = new_rd_ia32_Conv_I2I8Bit(dbgi, irg, new_block, noreg, noreg, res,
-                                                                          nomem, mode_Bu);
+               res = new_rd_ia32_Conv_I2I8Bit(dbgi, irg, new_block, noreg, noreg, nomem,
+                                              res, mode_Bu);
 
                return res;
        }
@@ -2220,25 +2232,24 @@ static ir_node *create_set(long pnc, ir_node *cmp_left, ir_node *cmp_right,
        mode = get_irn_mode(cmp_left);
        assert(get_mode_size_bits(mode) <= 32);
 
-       match_arguments(&am, block, cmp_left, cmp_right, 1, 1);
+       match_arguments(&am, block, cmp_left, cmp_right, 1, 1, use_am, 1);
        if(am.flipped)
                pnc = get_inversed_pnc(pnc);
 
        if(get_mode_size_bits(mode) == 8) {
-               res = new_rd_ia32_CmpSet8Bit(dbgi, irg, new_block, addr->base,
-                                            addr->index, am.new_op1, am.new_op2,
-                                            addr->mem, pnc);
+               res = new_rd_ia32_CmpSet8Bit(dbgi, irg, new_block, addr->base, addr->index,
+                                            addr->mem, am.new_op1, am.new_op2, pnc);
        } else {
                res = new_rd_ia32_CmpSet(dbgi, irg, new_block, addr->base, addr->index,
-                                        am.new_op1, am.new_op2, addr->mem, pnc);
+                                        addr->mem, am.new_op1, am.new_op2, pnc);
        }
        set_am_attributes(res, &am);
        set_ia32_ls_mode(res, mode);
 
        res = fix_mem_proj(res, &am);
 
-       res = new_rd_ia32_Conv_I2I8Bit(dbgi, irg, new_block, noreg, noreg, res,
-                                      nomem, mode_Bu);
+       res = new_rd_ia32_Conv_I2I8Bit(dbgi, irg, new_block, noreg, noreg, nomem, res,
+                                      mode_Bu);
 
        return res;
 }
@@ -2292,14 +2303,13 @@ static ir_node *create_cmov(long pnc, ir_node *cmp_left, ir_node *cmp_right,
                assert(get_mode_size_bits(mode) <= 32);
 
                if(get_mode_size_bits(mode) == 8) {
-                       res = new_rd_ia32_TestCMov8Bit(dbgi, current_ir_graph, new_block,
-                                                      noreg, noreg, new_cmp_left,
-                                                      new_cmp_right, nomem, new_val_true,
-                                                      new_val_false, pnc);
+                       res = new_rd_ia32_TestCMov8Bit(dbgi, current_ir_graph, new_block, noreg,
+                                                      noreg, nomem, new_cmp_left, new_cmp_right,
+                                                      new_val_true, new_val_false, pnc);
                } else {
                        res = new_rd_ia32_TestCMov(dbgi, current_ir_graph, new_block, noreg,
-                                                  noreg, new_cmp_left, new_cmp_right,
-                                                  nomem, new_val_true, new_val_false, pnc);
+                                                  noreg, nomem, new_cmp_left, new_cmp_right,
+                                                  new_val_true, new_val_false, pnc);
                }
                set_ia32_ls_mode(res, mode);
 
@@ -2314,13 +2324,13 @@ static ir_node *create_cmov(long pnc, ir_node *cmp_left, ir_node *cmp_right,
        assert(get_mode_size_bits(mode) <= 32);
 
        if(get_mode_size_bits(mode) == 8) {
-               res = new_rd_ia32_CmpCMov8Bit(dbgi, irg, new_block, noreg, noreg,
-                                             new_cmp_left, new_cmp_right, nomem,
-                                             new_val_true, new_val_false, pnc);
+               res = new_rd_ia32_CmpCMov8Bit(dbgi, irg, new_block, noreg, noreg, nomem,
+                                             new_cmp_left, new_cmp_right, new_val_true,
+                                             new_val_false, pnc);
        } else {
-               res = new_rd_ia32_CmpCMov(dbgi, irg, new_block, noreg, noreg,
-                                         new_cmp_left, new_cmp_right, nomem,
-                                         new_val_true, new_val_false, pnc);
+               res = new_rd_ia32_CmpCMov(dbgi, irg, new_block, noreg, noreg, nomem,
+                                         new_cmp_left, new_cmp_right, new_val_true,
+                                         new_val_false, pnc);
        }
        set_ia32_ls_mode(res, mode);
 
@@ -2372,10 +2382,10 @@ static ir_node *gen_Psi(ir_node *node) {
        }
 
        if(is_Const_1(psi_true) && is_Const_0(psi_default)) {
-               new_op = create_set(pnc, cmp_left, cmp_right, dbgi, block);
+               new_op = create_set(pnc, cmp_left, cmp_right, dbgi, block, 1);
        } else if(is_Const_0(psi_true) && is_Const_1(psi_default)) {
                pnc = get_negated_pnc(pnc, cmp_mode);
-               new_op = create_set(pnc, cmp_left, cmp_right, dbgi, block);
+               new_op = create_set(pnc, cmp_left, cmp_right, dbgi, block, 1);
        } else {
                new_op = create_cmov(pnc, cmp_left, cmp_right, psi_true, psi_default,
                                     dbgi, block);
@@ -2401,8 +2411,8 @@ static ir_node *gen_x87_fp_to_gp(ir_node *node) {
        ir_node         *fist, *load;
 
        /* do a fist */
-       fist = new_rd_ia32_vfist(dbgi, irg, block,
-                       get_irg_frame(irg), noreg, new_op, trunc_mode, new_NoMem());
+       fist = new_rd_ia32_vfist(dbgi, irg, block, get_irg_frame(irg), noreg,
+                                new_NoMem(), new_op, trunc_mode);
 
        set_irn_pinned(fist, op_pin_state_floats);
        set_ia32_use_frame(fist);
@@ -2451,7 +2461,7 @@ static ir_node *gen_x87_strict_conv(ir_mode *tgt_mode, ir_node *node)
        ir_node  *store, *load;
        ir_node  *res;
 
-       store = new_rd_ia32_vfst(dbgi, irg, block, frame, noreg, node, nomem,
+       store = new_rd_ia32_vfst(dbgi, irg, block, frame, noreg, nomem, node,
                                 tgt_mode);
        set_ia32_use_frame(store);
        set_ia32_op_type(store, ia32_AddrModeD);
@@ -2487,12 +2497,13 @@ static ir_node *gen_x87_gp_to_fp(ir_node *node, ir_mode *src_mode) {
        /* first convert to 32 bit signed if necessary */
        src_bits = get_mode_size_bits(src_mode);
        if (src_bits == 8) {
-               new_op = new_rd_ia32_Conv_I2I8Bit(dbgi, irg, block, noreg, noreg, new_op, nomem,
-                                                 src_mode);
+               new_op = new_rd_ia32_Conv_I2I8Bit(dbgi, irg, block, noreg, noreg, nomem,
+                                                 new_op, src_mode);
                SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
                mode = mode_Is;
        } else if (src_bits < 32) {
-               new_op = new_rd_ia32_Conv_I2I(dbgi, irg, block, noreg, noreg, new_op, nomem, src_mode);
+               new_op = new_rd_ia32_Conv_I2I(dbgi, irg, block, noreg, noreg, nomem,
+                                             new_op, src_mode);
                SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
                mode = mode_Is;
        }
@@ -2500,7 +2511,8 @@ static ir_node *gen_x87_gp_to_fp(ir_node *node, ir_mode *src_mode) {
        assert(get_mode_size_bits(mode) == 32);
 
        /* do a store */
-       store = new_rd_ia32_Store(dbgi, irg, block, get_irg_frame(irg), noreg, new_op, nomem);
+       store = new_rd_ia32_Store(dbgi, irg, block, get_irg_frame(irg), noreg, nomem,
+                                 new_op);
 
        set_ia32_use_frame(store);
        set_ia32_op_type(store, ia32_AddrModeD);
@@ -2512,8 +2524,9 @@ static ir_node *gen_x87_gp_to_fp(ir_node *node, ir_mode *src_mode) {
                /* store a zero */
                ir_node *zero_const = create_Immediate_from_int(0);
 
-               ir_node *zero_store = new_rd_ia32_Store(dbgi, irg, block, get_irg_frame(irg), noreg,
-                                                       zero_const, nomem);
+               ir_node *zero_store = new_rd_ia32_Store(dbgi, irg, block,
+                                                       get_irg_frame(irg), noreg, nomem,
+                                                       zero_const);
 
                set_ia32_use_frame(zero_store);
                set_ia32_op_type(zero_store, ia32_AddrModeD);
@@ -2545,17 +2558,20 @@ static ir_node *gen_x87_gp_to_fp(ir_node *node, ir_mode *src_mode) {
  * Crete a conversion from one integer mode into another one
  */
 static ir_node *create_I2I_Conv(ir_mode *src_mode, ir_mode *tgt_mode,
-                                dbg_info *dbgi, ir_node *new_block,
-                                ir_node *new_op)
+                                dbg_info *dbgi, ir_node *block, ir_node *op,
+                                ir_node *node)
 {
-       ir_graph *irg      = current_ir_graph;
-       int       src_bits = get_mode_size_bits(src_mode);
-       int       tgt_bits = get_mode_size_bits(tgt_mode);
-       ir_node  *noreg    = ia32_new_NoReg_gp(env_cg);
-       ir_node  *nomem    = new_rd_NoMem(irg);
+       ir_graph *irg       = current_ir_graph;
+       int       src_bits  = get_mode_size_bits(src_mode);
+       int       tgt_bits  = get_mode_size_bits(tgt_mode);
+       ir_node  *new_block = be_transform_node(block);
+       ir_node  *noreg     = ia32_new_NoReg_gp(env_cg);
+       ir_node  *new_op;
        ir_node  *res;
        ir_mode  *smaller_mode;
        int       smaller_bits;
+       ia32_address_mode_t  am;
+       ia32_address_t      *addr = &am.addr;
 
        if (src_bits < tgt_bits) {
                smaller_mode = src_mode;
@@ -2565,15 +2581,38 @@ static ir_node *create_I2I_Conv(ir_mode *src_mode, ir_mode *tgt_mode,
                smaller_bits = tgt_bits;
        }
 
+       memset(&am, 0, sizeof(am));
+       if(use_source_address_mode(block, op, NULL)) {
+               build_address(&am, op);
+               new_op     = noreg;
+               am.op_type = ia32_AddrModeS;
+       } else {
+               new_op = be_transform_node(op);
+               am.op_type = ia32_Normal;
+       }
+       if(addr->base == NULL)
+               addr->base = noreg;
+       if(addr->index == NULL)
+               addr->index = noreg;
+       if(addr->mem == NULL)
+               addr->mem = new_NoMem();
+
        DB((dbg, LEVEL_1, "create Conv(int, int) ...", src_mode, tgt_mode));
        if (smaller_bits == 8) {
-               res = new_rd_ia32_Conv_I2I8Bit(dbgi, irg, new_block, noreg, noreg,
-                                              new_op, nomem, smaller_mode);
+               res = new_rd_ia32_Conv_I2I8Bit(dbgi, irg, new_block, addr->base,
+                                              addr->index, addr->mem, new_op,
+                                              smaller_mode);
        } else {
-               res = new_rd_ia32_Conv_I2I(dbgi, irg, new_block, noreg, noreg, new_op,
-                                          nomem, smaller_mode);
+               res = new_rd_ia32_Conv_I2I(dbgi, irg, new_block, addr->base,
+                                          addr->index, addr->mem, new_op,
+                                          smaller_mode);
        }
 
+       set_am_attributes(res, &am);
+       set_ia32_ls_mode(res, smaller_mode);
+       SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node));
+       res = fix_mem_proj(res, &am);
+
        return res;
 }
 
@@ -2583,40 +2622,42 @@ static ir_node *create_I2I_Conv(ir_mode *src_mode, ir_mode *tgt_mode,
  * @return The created ia32 Conv node
  */
 static ir_node *gen_Conv(ir_node *node) {
-       ir_node  *block    = be_transform_node(get_nodes_block(node));
-       ir_node  *op       = get_Conv_op(node);
-       ir_node  *new_op   = be_transform_node(op);
-       ir_graph *irg      = current_ir_graph;
-       dbg_info *dbgi     = get_irn_dbg_info(node);
-       ir_mode  *src_mode = get_irn_mode(op);
-       ir_mode  *tgt_mode = get_irn_mode(node);
-       int       src_bits = get_mode_size_bits(src_mode);
-       int       tgt_bits = get_mode_size_bits(tgt_mode);
-       ir_node  *noreg    = ia32_new_NoReg_gp(env_cg);
-       ir_node  *nomem    = new_rd_NoMem(irg);
-       ir_node  *res;
+       ir_node  *block     = get_nodes_block(node);
+       ir_node  *new_block = be_transform_node(block);
+       ir_node  *op        = get_Conv_op(node);
+       ir_node  *new_op    = NULL;
+       ir_graph *irg       = current_ir_graph;
+       dbg_info *dbgi      = get_irn_dbg_info(node);
+       ir_mode  *src_mode  = get_irn_mode(op);
+       ir_mode  *tgt_mode  = get_irn_mode(node);
+       int       src_bits  = get_mode_size_bits(src_mode);
+       int       tgt_bits  = get_mode_size_bits(tgt_mode);
+       ir_node  *noreg     = ia32_new_NoReg_gp(env_cg);
+       ir_node  *nomem     = new_rd_NoMem(irg);
+       ir_node  *res       = NULL;
 
        if (src_mode == mode_b) {
                assert(mode_is_int(tgt_mode));
                /* nothing to do, we already model bools as 0/1 ints */
-               return new_op;
+               return be_transform_node(op);
        }
 
        if (src_mode == tgt_mode) {
                if (get_Conv_strict(node)) {
                        if (USE_SSE2(env_cg)) {
                                /* when we are in SSE mode, we can kill all strict no-op conversion */
-                               return new_op;
+                               return be_transform_node(op);
                        }
                } else {
                        /* this should be optimized already, but who knows... */
                        DEBUG_ONLY(ir_fprintf(stderr, "Debug warning: conv %+F is pointless\n", node));
                        DB((dbg, LEVEL_1, "killed Conv(mode, mode) ..."));
-                       return new_op;
+                       return be_transform_node(op);
                }
        }
 
        if (mode_is_float(src_mode)) {
+               new_op = be_transform_node(op);
                /* we convert from float ... */
                if (mode_is_float(tgt_mode)) {
                        if(src_mode == mode_E && tgt_mode == mode_D
@@ -2628,7 +2669,8 @@ static ir_node *gen_Conv(ir_node *node) {
                        /* ... to float */
                        if (USE_SSE2(env_cg)) {
                                DB((dbg, LEVEL_1, "create Conv(float, float) ..."));
-                               res = new_rd_ia32_Conv_FP2FP(dbgi, irg, block, noreg, noreg, new_op, nomem);
+                               res = new_rd_ia32_Conv_FP2FP(dbgi, irg, new_block, noreg, noreg,
+                                                            nomem, new_op);
                                set_ia32_ls_mode(res, tgt_mode);
                        } else {
                                if(get_Conv_strict(node)) {
@@ -2643,7 +2685,8 @@ static ir_node *gen_Conv(ir_node *node) {
                        /* ... to int */
                        DB((dbg, LEVEL_1, "create Conv(float, int) ..."));
                        if (USE_SSE2(env_cg)) {
-                               res = new_rd_ia32_Conv_FP2I(dbgi, irg, block, noreg, noreg, new_op, nomem);
+                               res = new_rd_ia32_Conv_FP2I(dbgi, irg, new_block, noreg, noreg,
+                                                           nomem, new_op);
                                set_ia32_ls_mode(res, src_mode);
                        } else {
                                return gen_x87_fp_to_gp(node);
@@ -2655,7 +2698,9 @@ static ir_node *gen_Conv(ir_node *node) {
                        /* ... to float */
                        DB((dbg, LEVEL_1, "create Conv(int, float) ..."));
                        if (USE_SSE2(env_cg)) {
-                               res = new_rd_ia32_Conv_I2FP(dbgi, irg, block, noreg, noreg, new_op, nomem);
+                               new_op = be_transform_node(op);
+                               res = new_rd_ia32_Conv_I2FP(dbgi, irg, new_block, noreg, noreg,
+                                                           nomem, new_op);
                                set_ia32_ls_mode(res, tgt_mode);
                        } else {
                                res = gen_x87_gp_to_fp(node, src_mode);
@@ -2670,21 +2715,20 @@ static ir_node *gen_Conv(ir_node *node) {
                        /* mode_b lowering already took care that we only have 0/1 values */
                        DB((dbg, LEVEL_1, "omitting unnecessary Conv(%+F, %+F) ...",
                            src_mode, tgt_mode));
-                       return new_op;
+                       return be_transform_node(op);
                } else {
                        /* to int */
                        if (src_bits == tgt_bits) {
                                DB((dbg, LEVEL_1, "omitting unnecessary Conv(%+F, %+F) ...",
                                    src_mode, tgt_mode));
-                               return new_op;
+                               return be_transform_node(op);
                        }
 
-                       res = create_I2I_Conv(src_mode, tgt_mode, dbgi, block, new_op);
+                       res = create_I2I_Conv(src_mode, tgt_mode, dbgi, block, op, node);
+                       return res;
                }
        }
 
-       SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node));
-
        return res;
 }
 
@@ -2786,8 +2830,6 @@ ir_node *try_create_Immediate(ir_node *node, char immediate_constraint_type)
                offset = get_Const_tarval(cnst);
                if(tarval_is_long(offset)) {
                        val = get_tarval_long(offset);
-               } else if(tarval_is_null(offset)) {
-                       val = 0;
                } else {
                        ir_fprintf(stderr, "Optimisation Warning: tarval from %+F is not a "
                                   "long?\n", cnst);
@@ -3282,7 +3324,7 @@ static ir_node *gen_be_Return(ir_node *node) {
 
        /* store xmm0 onto stack */
        sse_store = new_rd_ia32_xStoreSimple(dbgi, irg, block, frame, noreg,
-                                            new_ret_val, new_ret_mem);
+                                            new_ret_mem, new_ret_val);
        set_ia32_ls_mode(sse_store, mode);
        set_ia32_op_type(sse_store, ia32_AddrModeD);
        set_ia32_use_frame(sse_store);
@@ -3342,8 +3384,8 @@ static ir_node *gen_be_AddSP(ir_node *node) {
        new_sz = create_immediate_or_transform(sz, 0);
 
        /* ia32 stack grows in reverse direction, make a SubSP */
-       new_op = new_rd_ia32_SubSP(dbgi, irg, block, noreg, noreg, new_sp, new_sz,
-                                  nomem);
+       new_op = new_rd_ia32_SubSP(dbgi, irg, block, noreg, noreg, nomem, new_sp,
+                                  new_sz);
        SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
 
        return new_op;
@@ -3367,7 +3409,8 @@ static ir_node *gen_be_SubSP(ir_node *node) {
        new_sz = create_immediate_or_transform(sz, 0);
 
        /* ia32 stack grows in reverse direction, make an AddSP */
-       new_op = new_rd_ia32_AddSP(dbgi, irg, block, noreg, noreg, new_sp, new_sz, nomem);
+       new_op = new_rd_ia32_AddSP(dbgi, irg, block, noreg, noreg, nomem, new_sp,
+                                  new_sz);
        SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
 
        return new_op;
@@ -3559,11 +3602,6 @@ static ir_node *gen_lowered_Store(ir_node *node, construct_store_func func)
                                       get_irn_n(node, 1), new_rd_ia32_##op);          \
        }
 
-GEN_LOWERED_OP(Adc)
-GEN_LOWERED_OP(Add)
-GEN_LOWERED_OP(Sbb)
-GEN_LOWERED_OP(Sub)
-GEN_LOWERED_OP(Xor)
 GEN_LOWERED_x87_OP(vfprem)
 GEN_LOWERED_x87_OP(vfmul)
 GEN_LOWERED_x87_OP(vfsub)
@@ -3572,6 +3610,48 @@ GEN_LOWERED_SHIFT_OP(l_ShrDep, Shr)
 GEN_LOWERED_SHIFT_OP(l_Sar,    Sar)
 GEN_LOWERED_SHIFT_OP(l_SarDep, Sar)
 
+static ir_node *gen_ia32_l_Add(ir_node *node) {
+       ir_node *left    = get_irn_n(node, n_ia32_l_Add_left);
+       ir_node *right   = get_irn_n(node, n_ia32_l_Add_right);
+       ir_node *lowered = gen_binop(node, left, right, new_rd_ia32_Add, 1);
+
+       if(is_Proj(lowered)) {
+               lowered = get_Proj_pred(lowered);
+       } else {
+               assert(is_ia32_Add(lowered));
+               set_irn_mode(lowered, mode_T);
+       }
+
+       return lowered;
+}
+
+static ir_node *gen_ia32_l_Adc(ir_node *node) {
+       ir_node  *src_block = get_nodes_block(node);
+       ir_node  *block     = be_transform_node(src_block);
+       ir_node  *op1       = get_irn_n(node, n_ia32_l_Adc_left);
+       ir_node  *op2       = get_irn_n(node, n_ia32_l_Adc_right);
+       ir_node  *flags     = get_irn_n(node, n_ia32_l_Adc_eflags);
+       ir_node  *new_flags = be_transform_node(flags);
+       ir_graph *irg       = current_ir_graph;
+       dbg_info *dbgi      = get_irn_dbg_info(node);
+       ir_node  *new_node;
+       ia32_address_mode_t  am;
+       ia32_address_t      *addr = &am.addr;
+
+       match_arguments(&am, src_block, op1, op2, 1, 0, 1, 0);
+
+       new_node = new_rd_ia32_Adc(dbgi, irg, block, addr->base, addr->index,
+                                  addr->mem, am.new_op1, am.new_op2, new_flags);
+       set_am_attributes(new_node, &am);
+       /* we can't use source address mode anymore when using immediates */
+       if(is_ia32_Immediate(am.new_op1) || is_ia32_Immediate(am.new_op2))
+               set_ia32_am_support(new_node, ia32_am_None, ia32_am_arity_none);
+       SET_IA32_ORIG_NODE(new_node, ia32_get_old_node_name(env_cg, node));
+
+       new_node = fix_mem_proj(new_node, &am);
+
+       return new_node;
+}
 
 /**
  * Transforms an ia32_l_Neg into a "real" ia32_Neg node
@@ -3635,8 +3715,8 @@ static ir_node *gen_ia32_l_vfist(ir_node *node) {
        ir_node  *new_op;
        long     am_offs;
 
-       new_op = new_rd_ia32_vfist(dbgi, irg, block, new_ptr, noreg, new_val,
-                                  trunc_mode, new_mem);
+       new_op = new_rd_ia32_vfist(dbgi, irg, block, new_ptr, noreg, new_mem,
+                                  new_val, trunc_mode);
 
        am_offs = get_ia32_am_offs_int(node);
        add_ia32_am_offs_int(new_op, am_offs);
@@ -3669,8 +3749,8 @@ static ir_node *gen_ia32_l_vfdiv(ir_node *node) {
        ir_node  *fpcw      = get_fpcw();
        ir_node  *vfdiv;
 
-       vfdiv = new_rd_ia32_vfdiv(dbgi, irg, block, noreg, noreg, new_left,
-                                 new_right, new_NoMem(), fpcw);
+       vfdiv = new_rd_ia32_vfdiv(dbgi, irg, block, noreg, noreg, new_NoMem(),
+                                 new_left, new_right, fpcw);
        clear_ia32_commutative(vfdiv);
 
        SET_IA32_ORIG_NODE(vfdiv, ia32_get_old_node_name(env_cg, node));
@@ -3696,8 +3776,8 @@ static ir_node *gen_ia32_l_Mul(ir_node *node) {
 
        /* 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_Mul(dbgi, irg, block, noreg, noreg, new_left,
-                                       new_right, new_NoMem());
+       ir_node *muls = new_rd_ia32_Mul(dbgi, irg, block, noreg, noreg, new_NoMem(),
+                                       new_left, new_right);
        clear_ia32_commutative(muls);
 
        SET_IA32_ORIG_NODE(muls, ia32_get_old_node_name(env_cg, node));
@@ -3723,16 +3803,43 @@ static ir_node *gen_ia32_l_IMul(ir_node *node) {
 
        /* l_IMul is already a mode_T node, so we create the IMul1OP in the normal way   */
        /* and then skip the result Proj, because all needed Projs are already there. */
-       ir_node *muls = new_rd_ia32_IMul1OP(dbgi, irg, block, noreg, noreg, new_left,
-                                       new_right, new_NoMem());
+       ir_node *muls = new_rd_ia32_IMul1OP(dbgi, irg, block, noreg, noreg,
+                                           new_NoMem(), new_left, new_right);
        clear_ia32_commutative(muls);
-       set_ia32_am_support(muls, ia32_am_Source, ia32_am_binary);
 
        SET_IA32_ORIG_NODE(muls, ia32_get_old_node_name(env_cg, node));
 
        return muls;
 }
 
+static ir_node *gen_ia32_Add64Bit(ir_node *node)
+{
+       ir_node  *a_l    = be_transform_node(get_irn_n(node, 0));
+       ir_node  *a_h    = be_transform_node(get_irn_n(node, 1));
+       ir_node  *b_l    = create_immediate_or_transform(get_irn_n(node, 2), 0);
+       ir_node  *b_h    = create_immediate_or_transform(get_irn_n(node, 3), 0);
+       ir_node  *block  = be_transform_node(get_nodes_block(node));
+       dbg_info *dbgi   = get_irn_dbg_info(node);
+       ir_graph *irg    = current_ir_graph;
+       ir_node  *new_op = new_rd_ia32_Add64Bit(dbgi, irg, block, a_l, a_h, b_l, b_h);
+       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
+       return new_op;
+}
+
+static ir_node *gen_ia32_Sub64Bit(ir_node *node)
+{
+       ir_node  *a_l    = be_transform_node(get_irn_n(node, 0));
+       ir_node  *a_h    = be_transform_node(get_irn_n(node, 1));
+       ir_node  *b_l    = create_immediate_or_transform(get_irn_n(node, 2), 0);
+       ir_node  *b_h    = create_immediate_or_transform(get_irn_n(node, 3), 0);
+       ir_node  *block  = be_transform_node(get_nodes_block(node));
+       dbg_info *dbgi   = get_irn_dbg_info(node);
+       ir_graph *irg    = current_ir_graph;
+       ir_node  *new_op = new_rd_ia32_Sub64Bit(dbgi, irg, block, a_l, a_h, b_l, b_h);
+       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
+       return new_op;
+}
+
 /**
  * Transforms a l_ShlD/l_ShrD into a ShlD/ShrD. Those nodes have 3 data inputs:
  * op1 - target to be shifted
@@ -3748,8 +3855,8 @@ static ir_node *gen_lowered_64bit_shifts(ir_node *node, ir_node *op1,
        ir_graph *irg       = current_ir_graph;
        dbg_info *dbgi      = get_irn_dbg_info(node);
        ir_node  *new_op1   = be_transform_node(op1);
-       ir_node  *new_op2   = create_immediate_or_transform(op2, 'I');
-       ir_node  *new_count = be_transform_node(count);
+       ir_node  *new_op2   = be_transform_node(op2);
+       ir_node  *new_count = create_immediate_or_transform(count, 'I');
 
        /* TODO proper AM support */
 
@@ -3799,7 +3906,8 @@ static ir_node *gen_ia32_l_X87toSSE(ir_node *node) {
        dbgi    = get_irn_dbg_info(node);
 
        /* Store x87 -> MEM */
-       res = new_rd_ia32_vfst(dbgi, irg, block, new_ptr, noreg, new_val, new_mem, get_ia32_ls_mode(node));
+       res = new_rd_ia32_vfst(dbgi, irg, block, new_ptr, noreg, new_mem, new_val,
+                              get_ia32_ls_mode(node));
        set_ia32_frame_ent(res, get_ia32_frame_ent(node));
        set_ia32_use_frame(res);
        set_ia32_ls_mode(res, get_ia32_ls_mode(node));
@@ -3854,7 +3962,8 @@ static ir_node *gen_ia32_l_SSEtoX87(ir_node *node) {
                ptr  = get_irn_n(ld, 0);
                offs = get_ia32_am_offs_int(ld);
        } else {
-               res = new_rd_ia32_xStore(dbgi, irg, block, new_ptr, noreg, new_val, new_mem);
+               res = new_rd_ia32_xStore(dbgi, irg, block, new_ptr, noreg, new_mem,
+                                        new_val);
                set_ia32_frame_ent(res, fent);
                set_ia32_use_frame(res);
                set_ia32_ls_mode(res, lsmode);
@@ -3985,9 +4094,9 @@ static ir_node *gen_Proj_Load(ir_node *node) {
        } else if(is_ia32_Conv_I2I(new_pred)) {
                set_irn_mode(new_pred, mode_T);
                if (proj == pn_Load_res) {
-                       return new_rd_Proj(dbgi, irg, block, new_pred, mode_Iu, 0);
+                       return new_rd_Proj(dbgi, irg, block, new_pred, mode_Iu, pn_ia32_res);
                } else if (proj == pn_Load_M) {
-                       return new_rd_Proj(dbgi, irg, block, new_pred, mode_M, 1);
+                       return new_rd_Proj(dbgi, irg, block, new_pred, mode_M, pn_ia32_mem);
                }
        } else if (is_ia32_xLoad(new_pred)) {
                if (proj == pn_Load_res) {
@@ -4236,8 +4345,8 @@ static ir_node *gen_Proj_be_Call(ir_node *node) {
                                       pn_be_Call_first_res);
 
                /* store st(0) onto stack */
-               fstp = new_rd_ia32_vfst(dbgi, irg, block, frame, noreg, call_res,
-                                       call_mem, mode);
+               fstp = new_rd_ia32_vfst(dbgi, irg, block, frame, noreg, call_mem,
+                                       call_res, mode);
                set_ia32_op_type(fstp, ia32_AddrModeD);
                set_ia32_use_frame(fstp);
 
@@ -4278,6 +4387,7 @@ static ir_node *gen_Proj_Cmp(ir_node *node)
        dbg_info *dbgi      = get_irn_dbg_info(cmp);
        ir_node  *block     = get_nodes_block(node);
        ir_node  *res;
+       int       use_am;
 
        assert(!mode_is_float(cmp_mode));
 
@@ -4285,7 +4395,12 @@ static ir_node *gen_Proj_Cmp(ir_node *node)
                pnc |= ia32_pn_Cmp_Unsigned;
        }
 
-       res = create_set(pnc, cmp_left, cmp_right, dbgi, block);
+       /**
+        * address mode makes only sense when we'll be the only node using the cmp
+        */
+       use_am = get_irn_n_edges(cmp) <= 1;
+
+       res = create_set(pnc, cmp_left, cmp_right, dbgi, block, use_am);
        SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, cmp));
 
        return res;
@@ -4408,14 +4523,13 @@ static void register_transformers(void)
        GEN(IJmp);
 
        /* transform ops from intrinsic lowering */
+       GEN(ia32_Add64Bit);
+       GEN(ia32_Sub64Bit);
        GEN(ia32_l_Add);
        GEN(ia32_l_Adc);
-       GEN(ia32_l_Sub);
-       GEN(ia32_l_Sbb);
        GEN(ia32_l_Neg);
        GEN(ia32_l_Mul);
        GEN(ia32_l_IMul);
-       GEN(ia32_l_Xor);
        GEN(ia32_l_ShlDep);
        GEN(ia32_l_ShrDep);
        GEN(ia32_l_Sar);
@@ -4534,6 +4648,9 @@ void add_missing_keep_walker(ir_node *node, void *data)
                if(class == NULL) {
                        continue;
                }
+               if(class == &ia32_reg_classes[CLASS_ia32_flags]) {
+                       continue;
+               }
 
                block = get_nodes_block(node);
                in[0] = new_r_Proj(current_ir_graph, block, node,
@@ -4542,6 +4659,9 @@ void add_missing_keep_walker(ir_node *node, void *data)
                        be_Keep_add_node(last_keep, class, in[0]);
                } else {
                        last_keep = be_new_Keep(class, current_ir_graph, block, 1, in);
+                       if(sched_is_scheduled(node)) {
+                               sched_add_after(node, last_keep);
+                       }
                }
        }
 }
@@ -4550,8 +4670,7 @@ void add_missing_keep_walker(ir_node *node, void *data)
  * Adds missing keeps to nodes. Adds missing Proj nodes for unused outputs
  * and keeps them.
  */
-static
-void add_missing_keeps(ia32_code_gen_t *cg)
+void ia32_add_missing_keeps(ia32_code_gen_t *cg)
 {
        ir_graph *irg = be_get_birg_irg(cg->birg);
        irg_walk_graph(irg, add_missing_keep_walker, NULL, NULL);
@@ -4569,7 +4688,6 @@ void ia32_transform_graph(ia32_code_gen_t *cg) {
 
        heights_free(heights);
        heights = NULL;
-       add_missing_keeps(cg);
 }
 
 void ia32_init_transform(void)