build TestJmp for compares with zero
[libfirm] / ir / be / ia32 / ia32_transform.c
index 7245f69..396efe8 100644 (file)
 #include "irdom.h"
 #include "archop.h"
 #include "error.h"
-#include "cgana.h"
-#include "irouts.h"
-#include "trouts.h"
-#include "irhooks.h"
 
 #include "../benode_t.h"
 #include "../besched.h"
 #include "../beabi.h"
 #include "../beutil.h"
 #include "../beirg_t.h"
+#include "../betranshlp.h"
 
 #include "bearch_ia32_t.h"
 #include "ia32_nodes_attr.h"
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
-typedef struct ia32_transform_env_t {
-       ir_graph          *irg;        /**< The irg, the node should be created in */
-       ia32_code_gen_t   *cg;         /**< The code generator */
-       int               visited;     /**< visited count that indicates whether a
-                                           node is already transformed */
-       pdeq              *worklist;   /**< worklist of nodes that still need to be
-                                                                       transformed */
-       ir_node          **old_anchors;/**< the list of anchors nodes in the old irg*/
-} ia32_transform_env_t;
-
-static ia32_transform_env_t env;
+/** hold the current code generator during transformation */
+static ia32_code_gen_t *env_cg = NULL;
 
 extern ir_op *get_op_Mulh(void);
 
@@ -107,12 +95,14 @@ typedef ir_node *construct_binop_func(dbg_info *db, ir_graph *irg,
         ir_node *block, ir_node *base, ir_node *index, ir_node *op1,
         ir_node *op2, ir_node *mem);
 
+typedef ir_node *construct_binop_float_func(dbg_info *db, ir_graph *irg,
+        ir_node *block, ir_node *base, ir_node *index, ir_node *op1,
+        ir_node *op2, ir_node *mem, ir_node *fpcw);
+
 typedef ir_node *construct_unop_func(dbg_info *db, ir_graph *irg,
         ir_node *block, ir_node *base, ir_node *index, ir_node *op,
         ir_node *mem);
 
-typedef ir_node *(transform_func)(ir_node *node);
-
 /****************************************************************************************************
  *                  _        _                        __                           _   _
  *                 | |      | |                      / _|                         | | (_)
@@ -123,29 +113,21 @@ typedef ir_node *(transform_func)(ir_node *node);
  *
  ****************************************************************************************************/
 
-static ir_node *duplicate_node(ir_node *node);
-static ir_node *transform_node(ir_node *node);
-static void duplicate_deps(ir_node *old_node, ir_node *new_node);
+static ir_node *try_create_Immediate(ir_node *node,
+                                     char immediate_constraint_type);
 
-static INLINE int mode_needs_gp_reg(ir_mode *mode)
-{
+static ir_node *create_immediate_or_transform(ir_node *node,
+                                              char immediate_constraint_type);
+
+/**
+ * Return true if a mode can be stored in the GP register set
+ */
+static INLINE int mode_needs_gp_reg(ir_mode *mode) {
        if(mode == mode_fpcw)
                return 0;
-
        return mode_is_int(mode) || mode_is_character(mode) || mode_is_reference(mode);
 }
 
-static INLINE void set_new_node(ir_node *old_node, ir_node *new_node)
-{
-       set_irn_link(old_node, new_node);
-}
-
-static INLINE ir_node *get_new_node(ir_node *old_node)
-{
-       assert(irn_visited(old_node));
-       return (ir_node*) get_irn_link(old_node);
-}
-
 /**
  * Returns 1 if irn is a Const representing 0, 0 otherwise
  */
@@ -219,6 +201,7 @@ static ir_type *get_prim_type(pmap *types, ir_mode *mode)
                char buf[64];
                snprintf(buf, sizeof(buf), "prim_type_%s", get_mode_name(mode));
                res = new_type_primitive(new_id_from_str(buf), mode);
+               set_type_alignment_bytes(res, 16);
                pmap_insert(types, mode, res);
        }
        else
@@ -264,24 +247,38 @@ static ir_entity *get_entity_for_tv(ia32_code_gen_t *cg, ir_node *cnst)
        return res;
 }
 
+static int is_Const_0(ir_node *node) {
+       if(!is_Const(node))
+               return 0;
+
+       return classify_Const(node) == CNST_NULL;
+}
+
+static int is_Const_1(ir_node *node) {
+       if(!is_Const(node))
+               return 0;
+
+       return classify_Const(node) == CNST_ONE;
+}
+
 /**
  * Transforms a Const.
  */
 static ir_node *gen_Const(ir_node *node) {
-       ir_graph        *irg   = env.irg;
-       ir_node         *block = transform_node(get_nodes_block(node));
+       ir_graph        *irg   = current_ir_graph;
+       ir_node         *block = be_transform_node(get_nodes_block(node));
        dbg_info        *dbgi  = get_irn_dbg_info(node);
        ir_mode         *mode  = get_irn_mode(node);
 
        if (mode_is_float(mode)) {
                ir_node   *res   = NULL;
-               ir_node   *noreg = ia32_new_NoReg_gp(env.cg);
+               ir_node   *noreg = ia32_new_NoReg_gp(env_cg);
                ir_node   *nomem = new_NoMem();
                ir_node   *load;
                ir_entity *floatent;
 
-               FP_USED(env.cg);
-               if (! USE_SSE2(env.cg)) {
+               FP_USED(env_cg);
+               if (! USE_SSE2(env_cg)) {
                        cnst_classify_t clss = classify_Const(node);
 
                        if (clss == CNST_NULL) {
@@ -291,30 +288,30 @@ static ir_node *gen_Const(ir_node *node) {
                                load = new_rd_ia32_vfld1(dbgi, irg, block);
                                res  = load;
                        } else {
-                               floatent = get_entity_for_tv(env.cg, node);
+                               floatent = get_entity_for_tv(env_cg, node);
 
-                               load     = new_rd_ia32_vfld(dbgi, irg, block, noreg, noreg, nomem);
-                               set_ia32_am_support(load, ia32_am_Source);
+                               load     = new_rd_ia32_vfld(dbgi, irg, block, noreg, noreg, nomem, mode);
                                set_ia32_op_type(load, ia32_AddrModeS);
                                set_ia32_am_flavour(load, ia32_am_N);
                                set_ia32_am_sc(load, floatent);
-                               res      = new_r_Proj(irg, block, load, mode_vfp, pn_ia32_vfld_res);
+                               set_ia32_flags(load, get_ia32_flags(load) | arch_irn_flags_rematerializable);
+                               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);
+                       floatent = get_entity_for_tv(env_cg, node);
 
                        load     = new_rd_ia32_xLoad(dbgi, irg, block, noreg, noreg, nomem);
-                       set_ia32_am_support(load, ia32_am_Source);
                        set_ia32_op_type(load, ia32_AddrModeS);
                        set_ia32_am_flavour(load, ia32_am_N);
                        set_ia32_am_sc(load, floatent);
                        set_ia32_ls_mode(load, mode);
+                       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));
+               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.
@@ -325,7 +322,7 @@ static ir_node *gen_Const(ir_node *node) {
                        add_irn_dep(load, get_irg_frame(irg));
                }
 
-               SET_IA32_ORIG_NODE(load, ia32_get_old_node_name(env.cg, node));
+               SET_IA32_ORIG_NODE(load, ia32_get_old_node_name(env_cg, node));
                return res;
        } else {
                ir_node *cnst = new_rd_ia32_Const(dbgi, irg, block);
@@ -336,7 +333,7 @@ static ir_node *gen_Const(ir_node *node) {
                }
 
                set_ia32_Const_attr(cnst, node);
-               SET_IA32_ORIG_NODE(cnst, ia32_get_old_node_name(env.cg, node));
+               SET_IA32_ORIG_NODE(cnst, ia32_get_old_node_name(env_cg, node));
                return cnst;
        }
 
@@ -348,19 +345,20 @@ static ir_node *gen_Const(ir_node *node) {
  * Transforms a SymConst.
  */
 static ir_node *gen_SymConst(ir_node *node) {
-       ir_graph *irg   = env.irg;
-       ir_node  *block = transform_node(get_nodes_block(node));
+       ir_graph *irg   = current_ir_graph;
+       ir_node  *block = be_transform_node(get_nodes_block(node));
        dbg_info *dbgi  = get_irn_dbg_info(node);
        ir_mode  *mode  = get_irn_mode(node);
        ir_node  *cnst;
 
        if (mode_is_float(mode)) {
-               FP_USED(env.cg);
-               if (USE_SSE2(env.cg))
+               FP_USED(env_cg);
+               if (USE_SSE2(env_cg))
                        cnst = new_rd_ia32_xConst(dbgi, irg, block);
                else
                        cnst = new_rd_ia32_vfConst(dbgi, irg, block);
-               set_ia32_ls_mode(cnst, mode);
+               //set_ia32_ls_mode(cnst, mode);
+               set_ia32_ls_mode(cnst, mode_E);
        } else {
                cnst = new_rd_ia32_Const(dbgi, irg, block);
        }
@@ -373,52 +371,11 @@ static ir_node *gen_SymConst(ir_node *node) {
        }
 
        set_ia32_Const_attr(cnst, node);
-       SET_IA32_ORIG_NODE(cnst, ia32_get_old_node_name(env.cg, node));
+       SET_IA32_ORIG_NODE(cnst, ia32_get_old_node_name(env_cg, node));
 
        return cnst;
 }
 
-/**
- * SSE convert of an integer node into a floating point node.
- */
-static ir_node *gen_sse_conv_int2float(ia32_code_gen_t *cg, dbg_info *dbgi,
-                                       ir_graph *irg, ir_node *block,
-                                       ir_node *in, ir_node *old_node, ir_mode *tgt_mode)
-{
-       ir_node *noreg    = ia32_new_NoReg_gp(cg);
-       ir_node *nomem    = new_rd_NoMem(irg);
-       ir_node *old_pred = get_Cmp_left(old_node);
-       ir_mode *in_mode  = get_irn_mode(old_pred);
-       int     in_bits   = get_mode_size_bits(in_mode);
-       ir_node *conv     = new_rd_ia32_Conv_I2FP(dbgi, irg, block, noreg, noreg, in, nomem);
-
-       set_ia32_ls_mode(conv, tgt_mode);
-       if (in_bits == 32) {
-               set_ia32_am_support(conv, ia32_am_Source);
-       }
-       SET_IA32_ORIG_NODE(conv, ia32_get_old_node_name(cg, old_node));
-
-       return conv;
-}
-
-/**
- * SSE convert of an float node into a double node.
- */
-static ir_node *gen_sse_conv_f2d(ia32_code_gen_t *cg, dbg_info *dbgi,
-                                 ir_graph *irg, ir_node *block,
-                                 ir_node *in, ir_node *old_node)
-{
-       ir_node *noreg = ia32_new_NoReg_gp(cg);
-       ir_node *nomem = new_rd_NoMem(irg);
-       ir_node *conv  = new_rd_ia32_Conv_FP2FP(dbgi, irg, block, noreg, noreg, in, nomem);
-
-       set_ia32_am_support(conv, ia32_am_Source);
-       set_ia32_ls_mode(conv, mode_xmm);
-       SET_IA32_ORIG_NODE(conv, ia32_get_old_node_name(cg, old_node));
-
-       return conv;
-}
-
 /* Generates an entity for a known FP const (used for FP Neg + Abs) */
 ir_entity *ia32_gen_fp_known_const(ia32_known_const_t kct) {
        static const struct {
@@ -504,7 +461,7 @@ static void fold_immediate(ir_node *node, int in1, int in2) {
        ir_node *left;
        ir_node *right;
 
-       if (!(env.cg->opt & IA32_OPT_IMMOPS))
+       if (!(env_cg->opt & IA32_OPT_IMMOPS))
                return;
 
        left = get_irn_n(node, in1);
@@ -515,16 +472,18 @@ static void fold_immediate(ir_node *node, int in1, int in2) {
                        return;
                /* exchange left/right */
                set_irn_n(node, in1, right);
-               set_irn_n(node, in2, ia32_get_admissible_noreg(env.cg, node, in2));
+               set_irn_n(node, in2, ia32_get_admissible_noreg(env_cg, node, in2));
                copy_ia32_Immop_attr(node, left);
        } else if(is_ia32_Cnst(right)) {
-               set_irn_n(node, in2, ia32_get_admissible_noreg(env.cg, node, in2));
+               set_irn_n(node, in2, ia32_get_admissible_noreg(env_cg, node, in2));
                copy_ia32_Immop_attr(node, right);
        } else {
                return;
        }
 
-       set_ia32_am_support(node, get_ia32_am_support(node) & ~ia32_am_Source);
+       clear_ia32_commutative(node);
+       set_ia32_am_support(node, get_ia32_am_support(node) & ~ia32_am_Source,
+                           get_ia32_am_arity(node));
 }
 
 /**
@@ -536,29 +495,32 @@ static void fold_immediate(ir_node *node, int in1, int in2) {
  * @return The constructed ia32 node.
  */
 static ir_node *gen_binop(ir_node *node, ir_node *op1, ir_node *op2,
-                          construct_binop_func *func)
+                          construct_binop_func *func, int commutative)
 {
-       ir_node  *block    = transform_node(get_nodes_block(node));
-       ir_node  *new_op1  = transform_node(op1);
-       ir_node  *new_op2  = transform_node(op2);
-       ir_node  *new_node = NULL;
-       ir_graph *irg      = env.irg;
+       ir_node  *block    = be_transform_node(get_nodes_block(node));
+       ir_graph *irg      = current_ir_graph;
        dbg_info *dbgi     = get_irn_dbg_info(node);
-       ir_node  *noreg_gp = ia32_new_NoReg_gp(env.cg);
+       ir_node  *noreg_gp = ia32_new_NoReg_gp(env_cg);
        ir_node  *nomem    = new_NoMem();
+       ir_node  *new_node;
+
+       ir_node *new_op1 = be_transform_node(op1);
+       ir_node *new_op2 = create_immediate_or_transform(op2, 0);
+       if (is_ia32_Immediate(new_op2)) {
+               commutative = 0;
+       }
 
        new_node = func(dbgi, irg, block, noreg_gp, noreg_gp, new_op1, new_op2, nomem);
        if (func == new_rd_ia32_IMul) {
-               set_ia32_am_support(new_node, ia32_am_Source);
+               set_ia32_am_support(new_node, ia32_am_Source, ia32_am_binary);
        } else {
-               set_ia32_am_support(new_node, ia32_am_Full);
+               set_ia32_am_support(new_node, ia32_am_Full, ia32_am_binary);
        }
 
-       SET_IA32_ORIG_NODE(new_node, ia32_get_old_node_name(env.cg, node));
-       if (is_op_commutative(get_irn_op(node))) {
+       SET_IA32_ORIG_NODE(new_node, ia32_get_old_node_name(env_cg, node));
+       if (commutative) {
                set_ia32_commutative(new_node);
        }
-       fold_immediate(new_node, 2, 3);
 
        return new_node;
 }
@@ -571,33 +533,71 @@ static ir_node *gen_binop(ir_node *node, ir_node *op1, ir_node *op2,
  * @param func  The node constructor function
  * @return The constructed ia32 node.
  */
-static ir_node *gen_binop_float(ir_node *node, ir_node *op1, ir_node *op2,
-                                construct_binop_func *func)
+static ir_node *gen_binop_sse_float(ir_node *node, ir_node *op1, ir_node *op2,
+                                    construct_binop_func *func)
 {
-       ir_node  *block    = transform_node(get_nodes_block(node));
-       ir_node  *new_op1  = transform_node(op1);
-       ir_node  *new_op2  = transform_node(op2);
+       ir_node  *block    = be_transform_node(get_nodes_block(node));
+       ir_node  *new_op1  = be_transform_node(op1);
+       ir_node  *new_op2  = be_transform_node(op2);
        ir_node  *new_node = NULL;
        dbg_info *dbgi     = get_irn_dbg_info(node);
-       ir_graph *irg      = env.irg;
+       ir_graph *irg      = current_ir_graph;
        ir_mode  *mode     = get_irn_mode(node);
-       ir_node  *noreg_gp = ia32_new_NoReg_gp(env.cg);
+       ir_node  *noreg_gp = ia32_new_NoReg_gp(env_cg);
        ir_node  *nomem    = new_NoMem();
 
-       new_node = func(dbgi, irg, block, noreg_gp, noreg_gp, new_op1, new_op2, nomem);
-       set_ia32_am_support(new_node, ia32_am_Source);
+       new_node = func(dbgi, irg, block, noreg_gp, noreg_gp, new_op1, new_op2,
+                       nomem);
+       set_ia32_am_support(new_node, ia32_am_Source, ia32_am_binary);
        if (is_op_commutative(get_irn_op(node))) {
                set_ia32_commutative(new_node);
        }
-       if (USE_SSE2(env.cg)) {
+       if (USE_SSE2(env_cg)) {
                set_ia32_ls_mode(new_node, mode);
        }
 
-       SET_IA32_ORIG_NODE(new_node, ia32_get_old_node_name(env.cg, node));
+       SET_IA32_ORIG_NODE(new_node, ia32_get_old_node_name(env_cg, node));
 
        return new_node;
 }
 
+/**
+ * Construct a standard binary operation, set AM and immediate if required.
+ *
+ * @param op1   The first operand
+ * @param op2   The second operand
+ * @param func  The node constructor function
+ * @return The constructed ia32 node.
+ */
+static ir_node *gen_binop_x87_float(ir_node *node, ir_node *op1, ir_node *op2,
+                                    construct_binop_float_func *func)
+{
+       ir_node  *block    = be_transform_node(get_nodes_block(node));
+       ir_node  *new_op1  = be_transform_node(op1);
+       ir_node  *new_op2  = be_transform_node(op2);
+       ir_node  *new_node = NULL;
+       dbg_info *dbgi     = get_irn_dbg_info(node);
+       ir_graph *irg      = current_ir_graph;
+       ir_mode  *mode     = get_irn_mode(node);
+       ir_node  *noreg_gp = ia32_new_NoReg_gp(env_cg);
+       ir_node  *nomem    = new_NoMem();
+       ir_node  *fpcw     = be_abi_get_ignore_irn(env_cg->birg->abi,
+                                                  &ia32_fp_cw_regs[REG_FPCW]);
+
+       new_node = func(dbgi, irg, block, noreg_gp, noreg_gp, new_op1, new_op2,
+                       nomem, fpcw);
+       set_ia32_am_support(new_node, ia32_am_Source, ia32_am_binary);
+       if (is_op_commutative(get_irn_op(node))) {
+               set_ia32_commutative(new_node);
+       }
+       if (USE_SSE2(env_cg)) {
+               set_ia32_ls_mode(new_node, mode);
+       }
+
+       SET_IA32_ORIG_NODE(new_node, ia32_get_old_node_name(env_cg, node));
+
+       return new_node;
+}
 
 /**
  * Construct a shift/rotate binary operation, sets AM and immediate if required.
@@ -610,63 +610,26 @@ static ir_node *gen_binop_float(ir_node *node, ir_node *op1, ir_node *op2,
 static ir_node *gen_shift_binop(ir_node *node, ir_node *op1, ir_node *op2,
                                 construct_binop_func *func)
 {
-       ir_node  *block   = transform_node(get_nodes_block(node));
-       ir_node  *new_op1 = transform_node(op1);
-       ir_node  *new_op2 = transform_node(op2);
+       ir_node  *block   = be_transform_node(get_nodes_block(node));
+       ir_node  *new_op1 = be_transform_node(op1);
+       ir_node  *new_op2;
        ir_node  *new_op  = NULL;
        dbg_info *dbgi    = get_irn_dbg_info(node);
-       ir_graph *irg     = env.irg;
-       ir_node  *noreg   = ia32_new_NoReg_gp(env.cg);
+       ir_graph *irg     = current_ir_graph;
+       ir_node  *noreg   = ia32_new_NoReg_gp(env_cg);
        ir_node  *nomem   = new_NoMem();
-       ir_node  *expr_op;
-       ir_node  *imm_op;
-       tarval   *tv;
 
        assert(! mode_is_float(get_irn_mode(node))
                 && "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, new_op2) : NULL;
-       expr_op = get_expr_op(new_op1, new_op2);
-
-       assert((expr_op || imm_op) && "invalid operands");
+       new_op2 = create_immediate_or_transform(op2, 'N');
 
-       if (!expr_op) {
-               /* We have two consts here: not yet supported */
-               imm_op = 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, get_tarval_mode(tv)));
-                       set_ia32_Immop_tarval(imm_op, tv);
-               }
-               else {
-                       imm_op = NULL;
-               }
-       }
-
-       /* integer operations */
-       if (imm_op) {
-               /* This is shift/rot with const */
-               DB((dbg, LEVEL_1, "Shift/Rot with immediate ..."));
-
-               new_op = func(dbgi, irg, block, noreg, noreg, expr_op, noreg, nomem);
-               copy_ia32_Immop_attr(new_op, imm_op);
-       } else {
-               /* This is a normal shift/rot */
-               DB((dbg, LEVEL_1, "Shift/Rot binop ..."));
-               new_op = func(dbgi, irg, block, noreg, noreg, new_op1, new_op2, nomem);
-       }
+       new_op = func(dbgi, irg, block, noreg, noreg, new_op1, new_op2, nomem);
 
        /* set AM support */
-       set_ia32_am_support(new_op, ia32_am_Dest);
+       set_ia32_am_support(new_op, ia32_am_Dest, ia32_am_binary);
 
-       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env.cg, node));
+       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
 
        set_ia32_emit_cl(new_op);
 
@@ -683,56 +646,55 @@ static ir_node *gen_shift_binop(ir_node *node, ir_node *op1, ir_node *op2,
  */
 static ir_node *gen_unop(ir_node *node, ir_node *op, construct_unop_func *func)
 {
-       ir_node  *block    = transform_node(get_nodes_block(node));
-       ir_node  *new_op   = transform_node(op);
+       ir_node  *block    = be_transform_node(get_nodes_block(node));
+       ir_node  *new_op   = be_transform_node(op);
        ir_node  *new_node = NULL;
-       ir_graph *irg      = env.irg;
+       ir_graph *irg      = current_ir_graph;
        dbg_info *dbgi     = get_irn_dbg_info(node);
-       ir_node  *noreg    = ia32_new_NoReg_gp(env.cg);
+       ir_node  *noreg    = ia32_new_NoReg_gp(env_cg);
        ir_node  *nomem    = new_NoMem();
 
        new_node = func(dbgi, irg, block, noreg, noreg, new_op, nomem);
        DB((dbg, LEVEL_1, "INT unop ..."));
-       set_ia32_am_support(new_node, ia32_am_Dest);
+       set_ia32_am_support(new_node, ia32_am_Dest, ia32_am_unary);
 
-       SET_IA32_ORIG_NODE(new_node, ia32_get_old_node_name(env.cg, node));
+       SET_IA32_ORIG_NODE(new_node, ia32_get_old_node_name(env_cg, node));
 
        return new_node;
 }
 
-
 /**
  * Creates an ia32 Add.
  *
  * @return the created ia32 Add node
  */
 static ir_node *gen_Add(ir_node *node) {
-       ir_node  *block   = transform_node(get_nodes_block(node));
+       ir_node  *block   = be_transform_node(get_nodes_block(node));
        ir_node  *op1     = get_Add_left(node);
-       ir_node  *new_op1 = transform_node(op1);
+       ir_node  *new_op1 = be_transform_node(op1);
        ir_node  *op2     = get_Add_right(node);
-       ir_node  *new_op2 = transform_node(op2);
+       ir_node  *new_op2 = be_transform_node(op2);
        ir_node  *new_op  = NULL;
-       ir_graph *irg     = env.irg;
+       ir_graph *irg     = current_ir_graph;
        dbg_info *dbgi    = get_irn_dbg_info(node);
        ir_mode  *mode    = get_irn_mode(node);
-       ir_node  *noreg   = ia32_new_NoReg_gp(env.cg);
+       ir_node  *noreg   = ia32_new_NoReg_gp(env_cg);
        ir_node  *nomem   = new_NoMem();
        ir_node  *expr_op, *imm_op;
 
        /* Check if immediate optimization is on and */
        /* if it's an operation with immediate.      */
-       imm_op  = (env.cg->opt & IA32_OPT_IMMOPS) ? get_immediate_op(new_op1, new_op2) : NULL;
+       imm_op  = (env_cg->opt & IA32_OPT_IMMOPS) ? get_immediate_op(new_op1, new_op2) : NULL;
        expr_op = get_expr_op(new_op1, new_op2);
 
        assert((expr_op || imm_op) && "invalid operands");
 
        if (mode_is_float(mode)) {
-               FP_USED(env.cg);
-               if (USE_SSE2(env.cg))
-                       return gen_binop_float(node, op1, op2, new_rd_ia32_xAdd);
+               FP_USED(env_cg);
+               if (USE_SSE2(env_cg))
+                       return gen_binop_sse_float(node, op1, op2, new_rd_ia32_xAdd);
                else
-                       return gen_binop_float(node, op1, op2, new_rd_ia32_vfadd);
+                       return gen_binop_x87_float(node, op1, op2, new_rd_ia32_vfadd);
        }
 
        /* integer ADD */
@@ -752,8 +714,7 @@ static ir_node *gen_Add(ir_node *node) {
                        /* this is the 2nd case */
                        new_op = new_rd_ia32_Lea(dbgi, irg, block, new_op1, noreg);
                        set_ia32_am_sc(new_op, get_ia32_Immop_symconst(new_op2));
-                       set_ia32_am_flavour(new_op, ia32_am_OB);
-                       set_ia32_am_support(new_op, ia32_am_Source);
+                       set_ia32_am_flavour(new_op, ia32_am_B);
                        set_ia32_op_type(new_op, ia32_AddrModeS);
 
                        DBG_OPT_LEA3(new_op1, new_op2, node, new_op);
@@ -767,8 +728,7 @@ static ir_node *gen_Add(ir_node *node) {
 
                        set_ia32_am_sc(new_op, get_ia32_Immop_symconst(new_op1));
                        add_ia32_am_offs_int(new_op, offs);
-                       set_ia32_am_flavour(new_op, ia32_am_O);
-                       set_ia32_am_support(new_op, ia32_am_Source);
+                       set_ia32_am_flavour(new_op, ia32_am_OB);
                        set_ia32_op_type(new_op, ia32_AddrModeS);
                } else if (tp2 == ia32_ImmSymConst) {
                        tarval *tv = get_ia32_Immop_tarval(new_op1);
@@ -780,8 +740,7 @@ static ir_node *gen_Add(ir_node *node) {
 
                        add_ia32_am_offs_int(new_op, offs);
                        set_ia32_am_sc(new_op, get_ia32_Immop_symconst(new_op2));
-                       set_ia32_am_flavour(new_op, ia32_am_O);
-                       set_ia32_am_support(new_op, ia32_am_Source);
+                       set_ia32_am_flavour(new_op, ia32_am_OB);
                        set_ia32_op_type(new_op, ia32_AddrModeS);
                } else {
                        tarval *tv1 = get_ia32_Immop_tarval(new_op1);
@@ -795,10 +754,10 @@ static ir_node *gen_Add(ir_node *node) {
                        DBG_OPT_LEA3(new_op1, new_op2, node, new_op);
                }
 
-               SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env.cg, node));
+               SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
                return new_op;
        } else if (imm_op) {
-               if ((env.cg->opt & IA32_OPT_INCDEC) && get_ia32_immop_type(imm_op) == ia32_ImmConst) {
+               if ((env_cg->opt & IA32_OPT_INCDEC) && get_ia32_immop_type(imm_op) == ia32_ImmConst) {
                        tarval_classification_t class_tv, class_negtv;
                        tarval *tv = get_ia32_Immop_tarval(imm_op);
 
@@ -809,12 +768,12 @@ static ir_node *gen_Add(ir_node *node) {
                        if (class_tv == TV_CLASSIFY_ONE) { /* + 1 == INC */
                                DB((dbg, LEVEL_2, "Add(1) to Inc ... "));
                                new_op     = new_rd_ia32_Inc(dbgi, irg, block, noreg, noreg, expr_op, nomem);
-                               SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env.cg, node));
+                               SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
                                return new_op;
                        } else if (class_tv == TV_CLASSIFY_ALL_ONE || class_negtv == TV_CLASSIFY_ONE) { /* + (-1) == DEC */
                                DB((dbg, LEVEL_2, "Add(-1) to Dec ... "));
                                new_op     = new_rd_ia32_Dec(dbgi, irg, block, noreg, noreg, expr_op, nomem);
-                               SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env.cg, node));
+                               SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
                                return new_op;
                        }
                }
@@ -824,46 +783,16 @@ static ir_node *gen_Add(ir_node *node) {
        new_op = new_rd_ia32_Add(dbgi, irg, block, noreg, noreg, new_op1, new_op2, nomem);
 
        /* set AM support */
-       set_ia32_am_support(new_op, ia32_am_Full);
+       set_ia32_am_support(new_op, ia32_am_Full, ia32_am_binary);
        set_ia32_commutative(new_op);
 
        fold_immediate(new_op, 2, 3);
 
-       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env.cg, node));
+       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
 
        return new_op;
 }
 
-#if 0
-static ir_node *create_ia32_Mul(ir_node *node) {
-       ir_graph *irg = env.irg;
-       dbg_info *dbgi = get_irn_dbg_info(node);
-       ir_node *block = transform_node(get_nodes_block(node));
-       ir_node *op1 = get_Mul_left(node);
-       ir_node *op2 = get_Mul_right(node);
-       ir_node *new_op1 = transform_node(op1);
-       ir_node *new_op2 = transform_node(op2);
-       ir_node *noreg = ia32_new_NoReg_gp(env.cg);
-       ir_node *proj_EAX, *proj_EDX, *res;
-       ir_node *in[1];
-
-       res = new_rd_ia32_Mul(dbgi, irg, block, noreg, noreg, new_op1, new_op2, new_NoMem());
-       set_ia32_commutative(res);
-       set_ia32_am_support(res, ia32_am_Source);
-
-       /* imediates are not supported, so no fold_immediate */
-       proj_EAX = new_rd_Proj(dbgi, irg, block, res, mode_Iu, pn_EAX);
-       proj_EDX = new_rd_Proj(dbgi, irg, block, res, mode_Iu, pn_EDX);
-
-       /* keep EAX */
-       in[0] = proj_EDX;
-       be_new_Keep(&ia32_reg_classes[CLASS_ia32_gp], irg, block, 1, in);
-
-       return proj_EAX;
-}
-#endif /* if 0 */
-
-
 /**
  * Creates an ia32 Mul.
  *
@@ -875,11 +804,11 @@ static ir_node *gen_Mul(ir_node *node) {
        ir_mode *mode = get_irn_mode(node);
 
        if (mode_is_float(mode)) {
-               FP_USED(env.cg);
-               if (USE_SSE2(env.cg))
-                       return gen_binop_float(node, op1, op2, new_rd_ia32_xMul);
+               FP_USED(env_cg);
+               if (USE_SSE2(env_cg))
+                       return gen_binop_sse_float(node, op1, op2, new_rd_ia32_xMul);
                else
-                       return gen_binop_float(node, op1, op2, new_rd_ia32_vfmul);
+                       return gen_binop_x87_float(node, op1, op2, new_rd_ia32_vfmul);
        }
 
        /*
@@ -887,7 +816,7 @@ static ir_node *gen_Mul(ir_node *node) {
                signed or unsigned multiplication so we use IMul as it has fewer
                constraints
        */
-       return gen_binop(node, op1, op2, new_rd_ia32_IMul);
+       return gen_binop(node, op1, op2, new_rd_ia32_IMul, 1);
 }
 
 /**
@@ -898,14 +827,14 @@ static ir_node *gen_Mul(ir_node *node) {
  * @return the created ia32 Mulh node
  */
 static ir_node *gen_Mulh(ir_node *node) {
-       ir_node  *block   = transform_node(get_nodes_block(node));
+       ir_node  *block   = be_transform_node(get_nodes_block(node));
        ir_node  *op1     = get_irn_n(node, 0);
-       ir_node  *new_op1 = transform_node(op1);
+       ir_node  *new_op1 = be_transform_node(op1);
        ir_node  *op2     = get_irn_n(node, 1);
-       ir_node  *new_op2 = transform_node(op2);
-       ir_graph *irg     = env.irg;
+       ir_node  *new_op2 = be_transform_node(op2);
+       ir_graph *irg     = current_ir_graph;
        dbg_info *dbgi    = get_irn_dbg_info(node);
-       ir_node  *noreg   = ia32_new_NoReg_gp(env.cg);
+       ir_node  *noreg   = ia32_new_NoReg_gp(env_cg);
        ir_mode  *mode    = get_irn_mode(node);
        ir_node  *proj_EAX, *proj_EDX, *res;
        ir_node  *in[1];
@@ -918,9 +847,7 @@ static ir_node *gen_Mulh(ir_node *node) {
        }
 
        set_ia32_commutative(res);
-       set_ia32_am_support(res, ia32_am_Source);
-
-       set_ia32_am_support(res, ia32_am_Source);
+       set_ia32_am_support(res, ia32_am_Source, ia32_am_binary);
 
        proj_EAX = new_rd_Proj(dbgi, irg, block, res, mode_Iu, pn_EAX);
        proj_EDX = new_rd_Proj(dbgi, irg, block, res, mode_Iu, pn_EDX);
@@ -944,7 +871,7 @@ static ir_node *gen_And(ir_node *node) {
        ir_node *op2 = get_And_right(node);
 
        assert (! mode_is_float(get_irn_mode(node)));
-       return gen_binop(node, op1, op2, new_rd_ia32_And);
+       return gen_binop(node, op1, op2, new_rd_ia32_And, 1);
 }
 
 
@@ -959,7 +886,7 @@ static ir_node *gen_Or(ir_node *node) {
        ir_node *op2 = get_Or_right(node);
 
        assert (! mode_is_float(get_irn_mode(node)));
-       return gen_binop(node, op1, op2, new_rd_ia32_Or);
+       return gen_binop(node, op1, op2, new_rd_ia32_Or, 1);
 }
 
 
@@ -974,7 +901,7 @@ static ir_node *gen_Eor(ir_node *node) {
        ir_node *op2 = get_Eor_right(node);
 
        assert(! mode_is_float(get_irn_mode(node)));
-       return gen_binop(node, op1, op2, new_rd_ia32_Xor);
+       return gen_binop(node, op1, op2, new_rd_ia32_Xor, 1);
 }
 
 
@@ -985,12 +912,12 @@ static ir_node *gen_Eor(ir_node *node) {
  * @return the created ia32 Max node
  */
 static ir_node *gen_Max(ir_node *node) {
-       ir_node  *block   = transform_node(get_nodes_block(node));
+       ir_node  *block   = be_transform_node(get_nodes_block(node));
        ir_node  *op1     = get_irn_n(node, 0);
-       ir_node  *new_op1 = transform_node(op1);
+       ir_node  *new_op1 = be_transform_node(op1);
        ir_node  *op2     = get_irn_n(node, 1);
-       ir_node  *new_op2 = transform_node(op2);
-       ir_graph *irg     = env.irg;
+       ir_node  *new_op2 = be_transform_node(op2);
+       ir_graph *irg     = current_ir_graph;
        ir_mode  *mode    = get_irn_mode(node);
        dbg_info *dbgi    = get_irn_dbg_info(node);
        ir_mode  *op_mode = get_irn_mode(op1);
@@ -999,9 +926,9 @@ static ir_node *gen_Max(ir_node *node) {
        assert(get_mode_size_bits(mode) == 32);
 
        if (mode_is_float(mode)) {
-               FP_USED(env.cg);
-               if (USE_SSE2(env.cg)) {
-                       new_op = gen_binop_float(node, new_op1, new_op2, new_rd_ia32_xMax);
+               FP_USED(env_cg);
+               if (USE_SSE2(env_cg)) {
+                       new_op = gen_binop_sse_float(node, new_op1, new_op2, new_rd_ia32_xMax);
                } else {
                        panic("Can't create Max node");
                }
@@ -1010,11 +937,10 @@ static ir_node *gen_Max(ir_node *node) {
                if (! mode_is_signed(op_mode)) {
                        pnc |= ia32_pn_Cmp_Unsigned;
                }
-               new_op = new_rd_ia32_CmpCMov(dbgi, irg, block, new_op1, new_op2, new_op1, new_op2);
-               set_ia32_pncode(new_op, pnc);
-               set_ia32_am_support(new_op, ia32_am_None);
+               new_op = new_rd_ia32_CmpCMov(dbgi, irg, block, new_op1, new_op2,
+                                            new_op1, new_op2, pnc);
        }
-       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env.cg, node));
+       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
 
        return new_op;
 }
@@ -1025,12 +951,12 @@ static ir_node *gen_Max(ir_node *node) {
  * @return the created ia32 Min node
  */
 static ir_node *gen_Min(ir_node *node) {
-       ir_node  *block   = transform_node(get_nodes_block(node));
+       ir_node  *block   = be_transform_node(get_nodes_block(node));
        ir_node  *op1     = get_irn_n(node, 0);
-       ir_node  *new_op1 = transform_node(op1);
+       ir_node  *new_op1 = be_transform_node(op1);
        ir_node  *op2     = get_irn_n(node, 1);
-       ir_node  *new_op2 = transform_node(op2);
-       ir_graph *irg     = env.irg;
+       ir_node  *new_op2 = be_transform_node(op2);
+       ir_graph *irg     = current_ir_graph;
        ir_mode  *mode    = get_irn_mode(node);
        dbg_info *dbgi    = get_irn_dbg_info(node);
        ir_mode  *op_mode = get_irn_mode(op1);
@@ -1039,9 +965,9 @@ static ir_node *gen_Min(ir_node *node) {
        assert(get_mode_size_bits(mode) == 32);
 
        if (mode_is_float(mode)) {
-               FP_USED(env.cg);
-               if (USE_SSE2(env.cg)) {
-                       new_op = gen_binop_float(node, op1, op2, new_rd_ia32_xMin);
+               FP_USED(env_cg);
+               if (USE_SSE2(env_cg)) {
+                       new_op = gen_binop_sse_float(node, op1, op2, new_rd_ia32_xMin);
                } else {
                        panic("can't create Min node");
                }
@@ -1050,11 +976,10 @@ static ir_node *gen_Min(ir_node *node) {
                if (! mode_is_signed(op_mode)) {
                        pnc |= ia32_pn_Cmp_Unsigned;
                }
-               new_op = new_rd_ia32_CmpCMov(dbgi, irg, block, new_op1, new_op2, new_op1, new_op2);
-               set_ia32_pncode(new_op, pnc);
-               set_ia32_am_support(new_op, ia32_am_None);
+               new_op = new_rd_ia32_CmpCMov(dbgi, irg, block, new_op1, new_op2,
+                                            new_op1, new_op2, pnc);
        }
-       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env.cg, node));
+       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
 
        return new_op;
 }
@@ -1066,32 +991,32 @@ static ir_node *gen_Min(ir_node *node) {
  * @return The created ia32 Sub node
  */
 static ir_node *gen_Sub(ir_node *node) {
-       ir_node  *block   = transform_node(get_nodes_block(node));
+       ir_node  *block   = be_transform_node(get_nodes_block(node));
        ir_node  *op1     = get_Sub_left(node);
-       ir_node  *new_op1 = transform_node(op1);
+       ir_node  *new_op1 = be_transform_node(op1);
        ir_node  *op2     = get_Sub_right(node);
-       ir_node  *new_op2 = transform_node(op2);
+       ir_node  *new_op2 = be_transform_node(op2);
        ir_node  *new_op  = NULL;
-       ir_graph *irg     = env.irg;
+       ir_graph *irg     = current_ir_graph;
        dbg_info *dbgi    = get_irn_dbg_info(node);
        ir_mode  *mode    = get_irn_mode(node);
-       ir_node  *noreg   = ia32_new_NoReg_gp(env.cg);
+       ir_node  *noreg   = ia32_new_NoReg_gp(env_cg);
        ir_node  *nomem   = new_NoMem();
        ir_node  *expr_op, *imm_op;
 
        /* Check if immediate optimization is on and */
        /* if it's an operation with immediate.      */
-       imm_op  = (env.cg->opt & IA32_OPT_IMMOPS) ? get_immediate_op(NULL, new_op2) : NULL;
+       imm_op  = (env_cg->opt & IA32_OPT_IMMOPS) ? get_immediate_op(NULL, new_op2) : NULL;
        expr_op = get_expr_op(new_op1, new_op2);
 
        assert((expr_op || imm_op) && "invalid operands");
 
        if (mode_is_float(mode)) {
-               FP_USED(env.cg);
-               if (USE_SSE2(env.cg))
-                       return gen_binop_float(node, op1, op2, new_rd_ia32_xSub);
+               FP_USED(env_cg);
+               if (USE_SSE2(env_cg))
+                       return gen_binop_sse_float(node, op1, op2, new_rd_ia32_xSub);
                else
-                       return gen_binop_float(node, op1, op2, new_rd_ia32_vfsub);
+                       return gen_binop_x87_float(node, op1, op2, new_rd_ia32_vfsub);
        }
 
        /* integer SUB */
@@ -1111,7 +1036,7 @@ static ir_node *gen_Sub(ir_node *node) {
                        new_op = new_rd_ia32_Lea(dbgi, irg, block, new_op1, noreg);
                        set_ia32_am_sc(new_op, get_ia32_Immop_symconst(op2));
                        set_ia32_am_sc_sign(new_op);
-                       set_ia32_am_flavour(new_op, ia32_am_OB);
+                       set_ia32_am_flavour(new_op, ia32_am_B);
 
                        DBG_OPT_LEA3(op1, op2, node, new_op);
                } else if (tp1 == ia32_ImmSymConst) {
@@ -1124,8 +1049,7 @@ static ir_node *gen_Sub(ir_node *node) {
 
                        set_ia32_am_sc(new_op, get_ia32_Immop_symconst(new_op1));
                        add_ia32_am_offs_int(new_op, -offs);
-                       set_ia32_am_flavour(new_op, ia32_am_O);
-                       set_ia32_am_support(new_op, ia32_am_Source);
+                       set_ia32_am_flavour(new_op, ia32_am_OB);
                        set_ia32_op_type(new_op, ia32_AddrModeS);
                } else if (tp2 == ia32_ImmSymConst) {
                        tarval *tv = get_ia32_Immop_tarval(new_op1);
@@ -1138,8 +1062,7 @@ static ir_node *gen_Sub(ir_node *node) {
                        add_ia32_am_offs_int(new_op, offs);
                        set_ia32_am_sc(new_op, get_ia32_Immop_symconst(new_op2));
                        set_ia32_am_sc_sign(new_op);
-                       set_ia32_am_flavour(new_op, ia32_am_O);
-                       set_ia32_am_support(new_op, ia32_am_Source);
+                       set_ia32_am_flavour(new_op, ia32_am_OB);
                        set_ia32_op_type(new_op, ia32_AddrModeS);
                } else {
                        tarval *tv1 = get_ia32_Immop_tarval(new_op1);
@@ -1153,10 +1076,10 @@ static ir_node *gen_Sub(ir_node *node) {
                        DBG_OPT_LEA3(new_op1, new_op2, node, new_op);
                }
 
-               SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env.cg, node));
+               SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
                return new_op;
        } else if (imm_op) {
-               if ((env.cg->opt & IA32_OPT_INCDEC) && get_ia32_immop_type(imm_op) == ia32_ImmConst) {
+               if ((env_cg->opt & IA32_OPT_INCDEC) && get_ia32_immop_type(imm_op) == ia32_ImmConst) {
                        tarval_classification_t class_tv, class_negtv;
                        tarval *tv = get_ia32_Immop_tarval(imm_op);
 
@@ -1167,12 +1090,12 @@ static ir_node *gen_Sub(ir_node *node) {
                        if (class_tv == TV_CLASSIFY_ONE) {
                                DB((dbg, LEVEL_2, "Sub(1) to Dec ... "));
                                new_op     = new_rd_ia32_Dec(dbgi, irg, block, noreg, noreg, expr_op, nomem);
-                               SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env.cg, node));
+                               SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
                                return new_op;
                        } else if (class_tv == TV_CLASSIFY_ALL_ONE || class_negtv == TV_CLASSIFY_ONE) {
                                DB((dbg, LEVEL_2, "Sub(-1) to Inc ... "));
                                new_op     = new_rd_ia32_Inc(dbgi, irg, block, noreg, noreg, expr_op, nomem);
-                               SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env.cg, node));
+                               SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
                                return new_op;
                        }
                }
@@ -1182,11 +1105,11 @@ static ir_node *gen_Sub(ir_node *node) {
        new_op = new_rd_ia32_Sub(dbgi, irg, block, noreg, noreg, new_op1, new_op2, nomem);
 
        /* set AM support */
-       set_ia32_am_support(new_op, ia32_am_Full);
+       set_ia32_am_support(new_op, ia32_am_Full, ia32_am_binary);
 
        fold_immediate(new_op, 2, 3);
 
-       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env.cg, node));
+       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
 
        return new_op;
 }
@@ -1205,15 +1128,15 @@ static ir_node *gen_Sub(ir_node *node) {
 static ir_node *generate_DivMod(ir_node *node, ir_node *dividend,
                                 ir_node *divisor, ia32_op_flavour_t dm_flav)
 {
-       ir_node  *block        = transform_node(get_nodes_block(node));
-       ir_node  *new_dividend = transform_node(dividend);
-       ir_node  *new_divisor  = transform_node(divisor);
-       ir_graph *irg          = env.irg;
+       ir_node  *block        = be_transform_node(get_nodes_block(node));
+       ir_node  *new_dividend = be_transform_node(dividend);
+       ir_node  *new_divisor  = be_transform_node(divisor);
+       ir_graph *irg          = current_ir_graph;
        dbg_info *dbgi         = get_irn_dbg_info(node);
        ir_mode  *mode         = get_irn_mode(node);
-       ir_node  *noreg        = ia32_new_NoReg_gp(env.cg);
+       ir_node  *noreg        = ia32_new_NoReg_gp(env_cg);
        ir_node  *res, *proj_div, *proj_mod;
-       ir_node  *edx_node, *cltd;
+       ir_node  *sign_extension;
        ir_node  *in_keep[2];
        ir_node  *mem, *new_mem;
        ir_node  *projs[pn_DivMod_max];
@@ -1246,35 +1169,35 @@ static ir_node *generate_DivMod(ir_node *node, ir_node *dividend,
                default:
                        panic("invalid divmod flavour!");
        }
-       new_mem = transform_node(mem);
+       new_mem = be_transform_node(mem);
 
        if (mode_is_signed(mode)) {
                /* in signed mode, we need to sign extend the dividend */
-               cltd         = new_rd_ia32_Cltd(dbgi, irg, block, new_dividend);
-               new_dividend = new_rd_Proj(dbgi, irg, block, cltd, mode_Iu, pn_ia32_Cltd_EAX);
-               edx_node     = new_rd_Proj(dbgi, irg, block, cltd, mode_Iu, pn_ia32_Cltd_EDX);
+               sign_extension = new_rd_ia32_Cltd(dbgi, irg, block, new_dividend);
        } else {
-               edx_node = new_rd_ia32_Const(dbgi, irg, block);
-               add_irn_dep(edx_node, be_abi_get_start_barrier(env.cg->birg->abi));
-               set_ia32_Immop_tarval(edx_node, get_tarval_null(mode_Iu));
+               sign_extension = new_rd_ia32_Const(dbgi, irg, block);
+               set_ia32_Immop_tarval(sign_extension, get_tarval_null(mode_Iu));
+
+               add_irn_dep(sign_extension, get_irg_frame(irg));
        }
 
        if (mode_is_signed(mode)) {
-               res = new_rd_ia32_IDiv(dbgi, irg, block, noreg, noreg, new_dividend, edx_node, new_divisor, new_mem, dm_flav);
+               res = new_rd_ia32_IDiv(dbgi, irg, block, noreg, noreg, new_dividend,
+                                      sign_extension, new_divisor, new_mem, dm_flav);
        } else {
-               res = new_rd_ia32_Div(dbgi, irg, block, noreg, noreg, new_dividend, edx_node, new_divisor, new_mem, dm_flav);
+               res = new_rd_ia32_Div(dbgi, irg, block, noreg, noreg, new_dividend,
+                                     sign_extension, new_divisor, new_mem, dm_flav);
        }
 
        set_ia32_exc_label(res, has_exc);
+       set_irn_pinned(res, get_irn_pinned(node));
 
        /* Matze: code can't handle this at the moment... */
 #if 0
        /* set AM support */
-       set_ia32_am_support(res, ia32_am_Source);
+       set_ia32_am_support(res, ia32_am_Source, ia32_am_binary);
 #endif
 
-       set_ia32_n_res(res, 2);
-
        /* check, which Proj-Keep, we need to add */
        i = 0;
        if (proj_div == NULL) {
@@ -1290,7 +1213,7 @@ static ir_node *generate_DivMod(ir_node *node, ir_node *dividend,
        if(i > 0)
                be_new_Keep(&ia32_reg_classes[CLASS_ia32_gp], irg, block, i, in_keep);
 
-       SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env.cg, node));
+       SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node));
 
        return res;
 }
@@ -1330,36 +1253,39 @@ static ir_node *gen_DivMod(ir_node *node) {
  * @return The created ia32 xDiv node
  */
 static ir_node *gen_Quot(ir_node *node) {
-       ir_node  *block   = transform_node(get_nodes_block(node));
+       ir_node  *block   = be_transform_node(get_nodes_block(node));
        ir_node  *op1     = get_Quot_left(node);
-       ir_node  *new_op1 = transform_node(op1);
+       ir_node  *new_op1 = be_transform_node(op1);
        ir_node  *op2     = get_Quot_right(node);
-       ir_node  *new_op2 = transform_node(op2);
-       ir_graph *irg     = env.irg;
+       ir_node  *new_op2 = be_transform_node(op2);
+       ir_graph *irg     = current_ir_graph;
        dbg_info *dbgi    = get_irn_dbg_info(node);
-       ir_node  *noreg   = ia32_new_NoReg_gp(env.cg);
-       ir_node  *nomem   = new_rd_NoMem(env.irg);
+       ir_node  *noreg   = ia32_new_NoReg_gp(env_cg);
+       ir_node  *nomem   = new_rd_NoMem(current_ir_graph);
        ir_node  *new_op;
 
-       FP_USED(env.cg);
-       if (USE_SSE2(env.cg)) {
+       FP_USED(env_cg);
+       if (USE_SSE2(env_cg)) {
                ir_mode *mode = get_irn_mode(op1);
                if (is_ia32_xConst(new_op2)) {
                        new_op = new_rd_ia32_xDiv(dbgi, irg, block, noreg, noreg, new_op1, noreg, nomem);
-                       set_ia32_am_support(new_op, ia32_am_None);
+                       set_ia32_am_support(new_op, ia32_am_None, ia32_am_arity_none);
                        copy_ia32_Immop_attr(new_op, new_op2);
                } else {
                        new_op = new_rd_ia32_xDiv(dbgi, irg, block, noreg, noreg, new_op1, new_op2, nomem);
                        // Matze: disabled for now, spillslot coalescer fails
-                       //set_ia32_am_support(new_op, ia32_am_Source);
+                       //set_ia32_am_support(new_op, ia32_am_Source | ia32_am_binary);
                }
                set_ia32_ls_mode(new_op, mode);
        } else {
-               new_op = new_rd_ia32_vfdiv(dbgi, irg, block, noreg, noreg, new_op1, new_op2, nomem);
+               ir_node  *fpcw = be_abi_get_ignore_irn(env_cg->birg->abi,
+                                                      &ia32_fp_cw_regs[REG_FPCW]);
+               new_op = new_rd_ia32_vfdiv(dbgi, irg, block, noreg, noreg, new_op1,
+                                          new_op2, nomem, fpcw);
                // Matze: disabled for now (spillslot coalescer fails)
-               //set_ia32_am_support(new_op, ia32_am_Source);
+               //set_ia32_am_support(new_op, ia32_am_Source | ia32_am_binary);
        }
-       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env.cg, node));
+       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
        return new_op;
 }
 
@@ -1394,8 +1320,24 @@ static ir_node *gen_Shr(ir_node *node) {
  * @return The created ia32 Shrs node
  */
 static ir_node *gen_Shrs(ir_node *node) {
-       return gen_shift_binop(node, get_Shrs_left(node),
-                              get_Shrs_right(node), new_rd_ia32_Sar);
+       ir_node *left  = get_Shrs_left(node);
+       ir_node *right = get_Shrs_right(node);
+       if(is_Const(right) && get_irn_mode(left) == mode_Is) {
+               tarval *tv = get_Const_tarval(right);
+               long val = get_tarval_long(tv);
+               if(val == 31) {
+                       /* this is a sign extension */
+                       ir_graph *irg    = current_ir_graph;
+                       dbg_info *dbgi   = get_irn_dbg_info(node);
+                       ir_node  *block  = be_transform_node(get_nodes_block(node));
+                       ir_node  *op     = left;
+                       ir_node  *new_op = be_transform_node(op);
+
+                       return new_rd_ia32_Cltd(dbgi, irg, block, new_op);
+               }
+       }
+
+       return gen_shift_binop(node, left, right, new_rd_ia32_Sar);
 }
 
 
@@ -1479,8 +1421,8 @@ static ir_node *gen_Rot(ir_node *node) {
  * @return The created ia32 Minus node
  */
 ir_node *gen_Minus_ex(ir_node *node, ir_node *op) {
-       ir_node   *block = transform_node(get_nodes_block(node));
-       ir_graph  *irg   = env.irg;
+       ir_node   *block = be_transform_node(get_nodes_block(node));
+       ir_graph  *irg   = current_ir_graph;
        dbg_info  *dbgi  = get_irn_dbg_info(node);
        ir_mode   *mode  = get_irn_mode(node);
        ir_entity *ent;
@@ -1488,11 +1430,11 @@ ir_node *gen_Minus_ex(ir_node *node, ir_node *op) {
        int       size;
 
        if (mode_is_float(mode)) {
-               ir_node *new_op = transform_node(op);
-               FP_USED(env.cg);
-               if (USE_SSE2(env.cg)) {
-                       ir_node *noreg_gp = ia32_new_NoReg_gp(env.cg);
-                       ir_node *noreg_fp = ia32_new_NoReg_fp(env.cg);
+               ir_node *new_op = be_transform_node(op);
+               FP_USED(env_cg);
+               if (USE_SSE2(env_cg)) {
+                       ir_node *noreg_gp = ia32_new_NoReg_gp(env_cg);
+                       ir_node *noreg_fp = ia32_new_NoReg_fp(env_cg);
                        ir_node *nomem    = new_rd_NoMem(irg);
 
                        res = new_rd_ia32_xXor(dbgi, irg, block, noreg_gp, noreg_gp, new_op, noreg_fp, nomem);
@@ -1510,7 +1452,7 @@ ir_node *gen_Minus_ex(ir_node *node, ir_node *op) {
                res = gen_unop(node, op, new_rd_ia32_Neg);
        }
 
-       SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env.cg, node));
+       SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node));
 
        return res;
 }
@@ -1545,22 +1487,22 @@ static ir_node *gen_Not(ir_node *node) {
  * @return The created ia32 Abs node
  */
 static ir_node *gen_Abs(ir_node *node) {
-       ir_node   *block    = transform_node(get_nodes_block(node));
+       ir_node   *block    = be_transform_node(get_nodes_block(node));
        ir_node   *op       = get_Abs_op(node);
-       ir_node   *new_op   = transform_node(op);
-       ir_graph  *irg      = env.irg;
+       ir_node   *new_op   = be_transform_node(op);
+       ir_graph  *irg      = current_ir_graph;
        dbg_info  *dbgi     = get_irn_dbg_info(node);
        ir_mode   *mode     = get_irn_mode(node);
-       ir_node   *noreg_gp = ia32_new_NoReg_gp(env.cg);
-       ir_node   *noreg_fp = ia32_new_NoReg_fp(env.cg);
+       ir_node   *noreg_gp = ia32_new_NoReg_gp(env_cg);
+       ir_node   *noreg_fp = ia32_new_NoReg_fp(env_cg);
        ir_node   *nomem    = new_NoMem();
-       ir_node   *res, *p_eax, *p_edx;
+       ir_node   *res;
        int       size;
        ir_entity *ent;
 
        if (mode_is_float(mode)) {
-               FP_USED(env.cg);
-               if (USE_SSE2(env.cg)) {
+               FP_USED(env_cg);
+               if (USE_SSE2(env_cg)) {
                        res = new_rd_ia32_xAnd(dbgi,irg, block, noreg_gp, noreg_gp, new_op, noreg_fp, nomem);
 
                        size = get_mode_size_bits(mode);
@@ -1568,28 +1510,28 @@ static ir_node *gen_Abs(ir_node *node) {
 
                        set_ia32_am_sc(res, ent);
 
-                       SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env.cg, node));
+                       SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node));
 
                        set_ia32_op_type(res, ia32_AddrModeS);
                        set_ia32_ls_mode(res, mode);
                }
                else {
                        res = new_rd_ia32_vfabs(dbgi, irg, block, new_op);
-                       SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env.cg, node));
+                       SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node));
                }
-       }
-       else {
-               res   = new_rd_ia32_Cltd(dbgi, irg, block, new_op);
-               SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env.cg, node));
-
-               p_eax = new_rd_Proj(dbgi, irg, block, res, mode_Iu, pn_EAX);
-               p_edx = new_rd_Proj(dbgi, irg, block, res, mode_Iu, pn_EDX);
-
-               res   = new_rd_ia32_Xor(dbgi, irg, block, noreg_gp, noreg_gp, p_eax, p_edx, nomem);
-               SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env.cg, node));
-
-               res   = new_rd_ia32_Sub(dbgi, irg, block, noreg_gp, noreg_gp, res, p_edx, nomem);
-               SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env.cg, node));
+       } else {
+               ir_node *xor;
+               ir_node *sign_extension = new_rd_ia32_Cltd(dbgi, irg, block, new_op);
+               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);
+               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);
+               SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node));
        }
 
        return res;
@@ -1603,15 +1545,16 @@ static ir_node *gen_Abs(ir_node *node) {
  * @return the created ia32 Load node
  */
 static ir_node *gen_Load(ir_node *node) {
-       ir_node  *block   = transform_node(get_nodes_block(node));
+       ir_node  *block   = be_transform_node(get_nodes_block(node));
        ir_node  *ptr     = get_Load_ptr(node);
-       ir_node  *new_ptr = transform_node(ptr);
+       ir_node  *new_ptr = be_transform_node(ptr);
        ir_node  *mem     = get_Load_mem(node);
-       ir_node  *new_mem = transform_node(mem);
-       ir_graph *irg     = env.irg;
+       ir_node  *new_mem = be_transform_node(mem);
+       ir_graph *irg     = current_ir_graph;
        dbg_info *dbgi    = get_irn_dbg_info(node);
-       ir_node  *noreg   = ia32_new_NoReg_gp(env.cg);
+       ir_node  *noreg   = ia32_new_NoReg_gp(env_cg);
        ir_mode  *mode    = get_Load_mode(node);
+       ir_mode  *res_mode;
        ir_node  *lptr    = new_ptr;
        int      is_imm   = 0;
        ir_node  *new_op;
@@ -1620,16 +1563,6 @@ static ir_node *gen_Load(ir_node *node) {
 
        ia32_collect_Projs(node, projs, pn_Load_max);
 
-       /*
-               check for special case: the loaded value might not be used (optimized, volatile, ...)
-               we add a Proj + Keep for volatile loads and ignore all other cases
-       */
-       if (! be_get_Proj_for_pn(node, pn_Load_res) && get_Load_volatility(node) == volatility_is_volatile) {
-               /* add a result proj and a Keep to produce a pseudo use */
-               ir_node *proj = new_r_Proj(irg, block, node, mode_Iu, pn_ia32_Load_res);
-               be_new_Keep(arch_get_irn_reg_class(env.cg->arch_env, proj, -1), irg, block, 1, &proj);
-       }
-
        /* address might be a constant (symconst or absolute address) */
        if (is_ia32_Const(new_ptr)) {
                lptr   = noreg;
@@ -1637,14 +1570,27 @@ static ir_node *gen_Load(ir_node *node) {
        }
 
        if (mode_is_float(mode)) {
-               FP_USED(env.cg);
-               if (USE_SSE2(env.cg)) {
-                       new_op = new_rd_ia32_xLoad(dbgi, irg, block, lptr, noreg, new_mem);
+               FP_USED(env_cg);
+               if (USE_SSE2(env_cg)) {
+                       new_op  = new_rd_ia32_xLoad(dbgi, irg, block, lptr, noreg, new_mem);
+                       res_mode = mode_xmm;
                } else {
-                       new_op = new_rd_ia32_vfld(dbgi, irg, block, lptr, noreg, new_mem);
+                       new_op   = new_rd_ia32_vfld(dbgi, irg, block, lptr, noreg, new_mem, mode);
+                       res_mode = mode_vfp;
                }
        } else {
-               new_op = new_rd_ia32_Load(dbgi, irg, block, lptr, noreg, new_mem);
+               new_op   = new_rd_ia32_Load(dbgi, irg, block, lptr, noreg, new_mem);
+               res_mode = mode_Iu;
+       }
+
+       /*
+               check for special case: the loaded value might not be used
+       */
+       if (be_get_Proj_for_pn(node, pn_Load_res) == NULL) {
+               /* add a result proj and a Keep to produce a pseudo use */
+               ir_node *proj = new_r_Proj(irg, block, new_op, mode_Iu,
+                                          pn_ia32_Load_res);
+               be_new_Keep(arch_get_irn_reg_class(env_cg->arch_env, proj, -1), irg, block, 1, &proj);
        }
 
        /* base is a constant address */
@@ -1661,7 +1607,7 @@ static ir_node *gen_Load(ir_node *node) {
                }
        }
 
-       set_ia32_am_support(new_op, ia32_am_Source);
+       set_irn_pinned(new_op, get_irn_pinned(node));
        set_ia32_op_type(new_op, ia32_AddrModeS);
        set_ia32_am_flavour(new_op, am_flav);
        set_ia32_ls_mode(new_op, mode);
@@ -1674,7 +1620,7 @@ static ir_node *gen_Load(ir_node *node) {
        }
 
        set_ia32_exc_label(new_op, be_get_Proj_for_pn(node, pn_Load_X_except) != NULL);
-       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env.cg, node));
+       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
 
        return new_op;
 }
@@ -1687,28 +1633,22 @@ static ir_node *gen_Load(ir_node *node) {
  * @return the created ia32 Store node
  */
 static ir_node *gen_Store(ir_node *node) {
-       ir_node  *block   = transform_node(get_nodes_block(node));
+       ir_node  *block   = be_transform_node(get_nodes_block(node));
        ir_node  *ptr     = get_Store_ptr(node);
-       ir_node  *new_ptr = transform_node(ptr);
+       ir_node  *new_ptr = be_transform_node(ptr);
        ir_node  *val     = get_Store_value(node);
-       ir_node  *new_val = transform_node(val);
+       ir_node  *new_val;
        ir_node  *mem     = get_Store_mem(node);
-       ir_node  *new_mem = transform_node(mem);
-       ir_graph *irg     = env.irg;
+       ir_node  *new_mem = be_transform_node(mem);
+       ir_graph *irg     = current_ir_graph;
        dbg_info *dbgi    = get_irn_dbg_info(node);
-       ir_node  *noreg   = ia32_new_NoReg_gp(env.cg);
+       ir_node  *noreg   = ia32_new_NoReg_gp(env_cg);
        ir_node  *sptr    = new_ptr;
        ir_mode  *mode    = get_irn_mode(val);
-       ir_node  *sval    = new_val;
        int      is_imm   = 0;
        ir_node  *new_op;
        ia32_am_flavour_t am_flav = ia32_am_B;
 
-       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(new_ptr)) {
                sptr   = noreg;
@@ -1716,22 +1656,26 @@ static ir_node *gen_Store(ir_node *node) {
        }
 
        if (mode_is_float(mode)) {
-               FP_USED(env.cg);
-               if (USE_SSE2(env.cg)) {
-                       new_op = new_rd_ia32_xStore(dbgi, irg, block, sptr, noreg, sval, new_mem);
+               FP_USED(env_cg);
+
+               new_val = be_transform_node(val);
+               if (USE_SSE2(env_cg)) {
+                       new_op = new_rd_ia32_xStore(dbgi, irg, block, sptr, noreg, new_val,
+                                                   new_mem);
                } else {
-                       new_op = new_rd_ia32_vfst(dbgi, irg, block, sptr, noreg, sval, new_mem);
+                       new_op = new_rd_ia32_vfst(dbgi, irg, block, sptr, noreg, new_val,
+                                                 new_mem, mode);
                }
-       } else if (get_mode_size_bits(mode) == 8) {
-               new_op = new_rd_ia32_Store8Bit(dbgi, irg, block, sptr, noreg, sval, new_mem);
        } else {
-               new_op = new_rd_ia32_Store(dbgi, irg, block, sptr, noreg, sval, new_mem);
-       }
+               new_val = create_immediate_or_transform(val, 0);
 
-       /* 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);
+               if (get_mode_size_bits(mode) == 8) {
+                       new_op = new_rd_ia32_Store8Bit(dbgi, irg, block, sptr, noreg,
+                                                      new_val, new_mem);
+               } else {
+                       new_op = new_rd_ia32_Store(dbgi, irg, block, sptr, noreg, new_val,
+                                                  new_mem);
+               }
        }
 
        /* base is an constant address */
@@ -1748,18 +1692,100 @@ static ir_node *gen_Store(ir_node *node) {
                }
        }
 
-       set_ia32_am_support(new_op, ia32_am_Dest);
+       set_irn_pinned(new_op, get_irn_pinned(node));
        set_ia32_op_type(new_op, ia32_AddrModeD);
        set_ia32_am_flavour(new_op, am_flav);
        set_ia32_ls_mode(new_op, mode);
 
        set_ia32_exc_label(new_op, be_get_Proj_for_pn(node, pn_Store_X_except) != NULL);
-       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env.cg, node));
+       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
 
        return new_op;
 }
 
+static ir_node *try_create_TestJmp(ir_node *block, ir_node *node, long pnc)
+{
+       ir_node  *cmp_a     = get_Cmp_left(node);
+       ir_node  *new_cmp_a;
+       ir_node  *cmp_b     = get_Cmp_right(node);
+       ir_node  *new_cmp_b;
+       ir_node  *and_left;
+       ir_node  *and_right;
+       ir_node  *res;
+       ir_node  *noreg;
+       ir_node  *nomem;
+       dbg_info *dbgi;
+       tarval  *tv;
+
+       if(!is_Const(cmp_b))
+               return NULL;
+
+       tv = get_Const_tarval(cmp_b);
+       if(!tarval_is_null(tv))
+               return NULL;
+
+
+       if(is_And(cmp_a) && (pnc == pn_Cmp_Eq || pnc == pn_Cmp_Lg)) {
+               and_left  = get_And_left(cmp_a);
+               and_right = get_And_right(cmp_a);
+
+               new_cmp_a = be_transform_node(and_left);
+               new_cmp_b = create_immediate_or_transform(and_right, 0);
+       } else {
+               new_cmp_a = be_transform_node(cmp_a);
+               new_cmp_b = be_transform_node(cmp_a);
+       }
+
+       dbgi      = get_irn_dbg_info(node);
+       noreg     = ia32_new_NoReg_gp(env_cg);
+       nomem     = new_NoMem();
+
+       res = new_rd_ia32_TestJmp(dbgi, current_ir_graph, block, noreg, noreg,
+                                 new_cmp_a, new_cmp_b, nomem, pnc);
+       set_ia32_am_support(res, ia32_am_Source, ia32_am_binary);
+       SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node));
+
+       return res;
+}
+
+static ir_node *create_Switch(ir_node *node)
+{
+       ir_graph *irg     = current_ir_graph;
+       dbg_info *dbgi    = get_irn_dbg_info(node);
+       ir_node  *block   = be_transform_node(get_nodes_block(node));
+       ir_node  *sel     = get_Cond_selector(node);
+       ir_node  *new_sel = be_transform_node(sel);
+       ir_node  *res;
+       int switch_min    = INT_MAX;
+       const ir_edge_t *edge;
+
+       /* determine the smallest switch case value */
+       foreach_out_edge(node, edge) {
+               ir_node *proj = get_edge_src_irn(edge);
+               int      pn   = get_Proj_proj(proj);
+               if(pn < switch_min)
+                       switch_min = pn;
+       }
+
+       if (switch_min != 0) {
+               ir_node  *noreg    = ia32_new_NoReg_gp(env_cg);
 
+               /* if smallest switch case is not 0 we need an additional sub */
+               new_sel = new_rd_ia32_Lea(dbgi, irg, block, new_sel, noreg);
+               add_ia32_am_offs_int(new_sel, -switch_min);
+               set_ia32_am_flavour(new_sel, ia32_am_OB);
+               set_ia32_op_type(new_sel, ia32_AddrModeS);
+
+               SET_IA32_ORIG_NODE(new_sel, ia32_get_old_node_name(env_cg, node));
+       }
+
+       res = new_rd_ia32_SwitchJmp(dbgi, irg, block, new_sel);
+       set_ia32_pncode(res, get_Cond_defaultProj(node));
+
+       SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node));
+
+       return res;
+}
 
 /**
  * Transforms a Cond -> Proj[b] -> Cmp into a CondJmp, CondJmp_i or TestJmp
@@ -1767,137 +1793,71 @@ static ir_node *gen_Store(ir_node *node) {
  * @return The transformed node.
  */
 static ir_node *gen_Cond(ir_node *node) {
-       ir_node  *block    = transform_node(get_nodes_block(node));
-       ir_graph *irg      = env.irg;
+       ir_node  *block    = be_transform_node(get_nodes_block(node));
+       ir_graph *irg      = current_ir_graph;
        dbg_info *dbgi     = get_irn_dbg_info(node);
        ir_node  *sel      = get_Cond_selector(node);
        ir_mode  *sel_mode = get_irn_mode(sel);
        ir_node  *res      = NULL;
-       ir_node  *noreg    = ia32_new_NoReg_gp(env.cg);
-       ir_node  *cnst, *expr;
-
-       if (is_Proj(sel) && sel_mode == mode_b) {
-               ir_node *pred      = get_Proj_pred(sel);
-               ir_node *cmp_a     = get_Cmp_left(pred);
-               ir_node *new_cmp_a = transform_node(cmp_a);
-               ir_node *cmp_b     = get_Cmp_right(pred);
-               ir_node *new_cmp_b = transform_node(cmp_b);
-               ir_mode *cmp_mode  = get_irn_mode(cmp_a);
-               ir_node *nomem     = new_NoMem();
-
-               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(new_cmp_a, new_cmp_b) : NULL;
-               expr = get_expr_op(new_cmp_a, new_cmp_b);
-
-               if (cnst != NULL && expr != NULL) {
-                       /* immop has to be the right operand, we might need to flip pnc */
-                       if(cnst != new_cmp_b) {
-                               pnc = get_inversed_pnc(pnc);
-                       }
+       ir_node  *noreg    = ia32_new_NoReg_gp(env_cg);
+       ir_node  *cmp;
+       ir_node  *cmp_a;
+       ir_node  *cmp_b;
+       ir_node  *new_cmp_a;
+       ir_node  *new_cmp_b;
+       ir_mode  *cmp_mode;
+       ir_node  *nomem = new_NoMem();
+       long      pnc;
 
-                       if ((pnc == pn_Cmp_Eq || pnc == pn_Cmp_Lg) && mode_needs_gp_reg(get_irn_mode(expr))) {
-                               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;
-                                       int is_and = 0;
-
-                                       /* check, if expr is an only once used And operation */
-                                       if (is_ia32_And(expr) && get_irn_n_edges(expr)) {
-                                               op1 = get_irn_n(expr, 2);
-                                               op2 = get_irn_n(expr, 3);
-
-                                               is_and = (is_ia32_ImmConst(expr) || is_ia32_ImmSymConst(expr));
-                                       }
-                                       res = new_rd_ia32_TestJmp(dbgi, irg, block, op1, op2);
-                                       set_ia32_pncode(res, pnc);
-
-                                       if (is_and) {
-                                               copy_ia32_Immop_attr(res, expr);
-                                       }
-
-                                       SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env.cg, node));
-                                       return res;
-                               }
-                       }
+       if (sel_mode != mode_b) {
+               return create_Switch(node);
+       }
 
-                       if (mode_is_float(cmp_mode)) {
-                               FP_USED(env.cg);
-                               if (USE_SSE2(env.cg)) {
-                                       res = new_rd_ia32_xCondJmp(dbgi, irg, block, noreg, noreg, expr, noreg, nomem);
-                                       set_ia32_ls_mode(res, cmp_mode);
-                               } else {
-                                       assert(0);
-                               }
-                       }
-                       else {
-                               assert(get_mode_size_bits(cmp_mode) == 32);
-                               res = new_rd_ia32_CondJmp(dbgi, irg, block, noreg, noreg, expr, noreg, nomem);
-                       }
-                       copy_ia32_Immop_attr(res, cnst);
-               }
-               else {
-                       ir_mode *cmp_mode = get_irn_mode(cmp_a);
-
-                       if (mode_is_float(cmp_mode)) {
-                               FP_USED(env.cg);
-                               if (USE_SSE2(env.cg)) {
-                                       res = new_rd_ia32_xCondJmp(dbgi, irg, block, noreg, noreg, cmp_a, cmp_b, nomem);
-                                       set_ia32_ls_mode(res, cmp_mode);
-                               } else {
-                                       ir_node *proj_eax;
-                                       res = new_rd_ia32_vfCondJmp(dbgi, irg, block, noreg, noreg, cmp_a, cmp_b, nomem);
-                                       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);
-                               }
-                       }
-                       else {
-                               assert(get_mode_size_bits(cmp_mode) == 32);
-                               res = new_rd_ia32_CondJmp(dbgi, irg, block, noreg, noreg, cmp_a, cmp_b, nomem);
-                               set_ia32_commutative(res);
-                       }
-               }
+       cmp      = get_Proj_pred(sel);
+       cmp_a    = get_Cmp_left(cmp);
+       cmp_b    = get_Cmp_right(cmp);
+       cmp_mode = get_irn_mode(cmp_a);
+       pnc = get_Proj_proj(sel);
+       if(mode_is_float(cmp_mode) || !mode_is_signed(cmp_mode)) {
+               pnc |= ia32_pn_Cmp_Unsigned;
+       }
 
-               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);
+       if(mode_needs_gp_reg(cmp_mode)) {
+               res = try_create_TestJmp(block, cmp, pnc);
+               if(res != NULL)
+                       return res;
        }
-       else {
-               /* determine the smallest switch case value */
-               ir_node *new_sel = transform_node(sel);
-               int switch_min = INT_MAX;
-               const ir_edge_t *edge;
-
-               foreach_out_edge(node, edge) {
-                       int pn = get_Proj_proj(get_edge_src_irn(edge));
-                       switch_min = pn < switch_min ? pn : switch_min;
-               }
 
-               if (switch_min) {
-                       /* if smallest switch case is not 0 we need an additional sub */
-                       res = new_rd_ia32_Lea(dbgi, irg, block, new_sel, noreg);
-                       SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env.cg, node));
-                       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);
+       new_cmp_a = be_transform_node(cmp_a);
+       new_cmp_b = create_immediate_or_transform(cmp_b, 0);
+
+       if (mode_is_float(cmp_mode)) {
+               FP_USED(env_cg);
+               if (USE_SSE2(env_cg)) {
+                       res = new_rd_ia32_xCondJmp(dbgi, irg, block, noreg, noreg, cmp_a,
+                                                  cmp_b, nomem, pnc);
+                       set_ia32_commutative(res);
+                       set_ia32_am_support(res, ia32_am_Source, ia32_am_binary);
+                       set_ia32_ls_mode(res, cmp_mode);
+               } else {
+                       ir_node *proj_eax;
+                       res = new_rd_ia32_vfCondJmp(dbgi, irg, block, cmp_a, cmp_b, pnc);
+                       set_ia32_commutative(res);
+                       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);
                }
-
-               res = new_rd_ia32_SwitchJmp(dbgi, irg, block, switch_min ? res : new_sel, mode_T);
-               set_ia32_pncode(res, get_Cond_defaultProj(node));
+       } else {
+               assert(get_mode_size_bits(cmp_mode) == 32);
+               res = new_rd_ia32_CondJmp(dbgi, irg, block, noreg, noreg,
+                                         new_cmp_a, new_cmp_b, nomem, pnc);
+               set_ia32_commutative(res);
+               set_ia32_am_support(res, ia32_am_Source, ia32_am_binary);
        }
 
-       SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env.cg, node));
+       SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node));
+
        return res;
 }
 
@@ -1909,15 +1869,15 @@ static ir_node *gen_Cond(ir_node *node) {
  * @return The transformed node.
  */
 static ir_node *gen_CopyB(ir_node *node) {
-       ir_node  *block    = transform_node(get_nodes_block(node));
+       ir_node  *block    = be_transform_node(get_nodes_block(node));
        ir_node  *src      = get_CopyB_src(node);
-       ir_node  *new_src  = transform_node(src);
+       ir_node  *new_src  = be_transform_node(src);
        ir_node  *dst      = get_CopyB_dst(node);
-       ir_node  *new_dst  = transform_node(dst);
+       ir_node  *new_dst  = be_transform_node(dst);
        ir_node  *mem      = get_CopyB_mem(node);
-       ir_node  *new_mem  = transform_node(mem);
+       ir_node  *new_mem  = be_transform_node(mem);
        ir_node  *res      = NULL;
-       ir_graph *irg      = env.irg;
+       ir_graph *irg      = current_ir_graph;
        dbg_info *dbgi     = get_irn_dbg_info(node);
        int      size      = get_type_size_bytes(get_CopyB_type(node));
        ir_mode  *dst_mode = get_irn_mode(dst);
@@ -1932,7 +1892,7 @@ static ir_node *gen_CopyB(ir_node *node) {
                size >>= 2;
 
                res = new_rd_ia32_Const(dbgi, irg, block);
-               add_irn_dep(res, be_abi_get_start_barrier(env.cg->birg->abi));
+               add_irn_dep(res, be_abi_get_start_barrier(env_cg->birg->abi));
                set_ia32_Immop_tarval(res, new_tarval_from_long(size, mode_Is));
 
                res = new_rd_ia32_CopyB(dbgi, irg, block, new_dst, new_src, res, new_mem);
@@ -1954,11 +1914,24 @@ static ir_node *gen_CopyB(ir_node *node) {
                be_new_Keep(&ia32_reg_classes[CLASS_ia32_gp], irg, block, 2, in);
        }
 
-       SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env.cg, node));
+       SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node));
 
        return res;
 }
 
+static
+ir_node *gen_be_Copy(ir_node *node)
+{
+       ir_node *result = be_duplicate_node(node);
+       ir_mode *mode   = get_irn_mode(result);
+
+       if (mode_needs_gp_reg(mode)) {
+               set_irn_mode(result, mode_Iu);
+       }
+
+       return result;
+}
+
 
 #if 0
 /**
@@ -1967,10 +1940,10 @@ static ir_node *gen_CopyB(ir_node *node) {
  * @return The transformed node.
  */
 static ir_node *gen_Mux(ir_node *node) {
-       ir_node *new_op = new_rd_ia32_CMov(env.dbgi, env.irg, env.block, \
+       ir_node *new_op = new_rd_ia32_CMov(env.dbgi, current_ir_graph, env.block, \
                get_Mux_sel(node), get_Mux_false(node), get_Mux_true(node), env.mode);
 
-       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env.cg, node));
+       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
 
        return new_op;
 }
@@ -1986,156 +1959,64 @@ typedef ir_node *cmov_func_t(dbg_info *db, ir_graph *irg, ir_node *block,
  * @return The transformed node.
  */
 static ir_node *gen_Psi(ir_node *node) {
-       ir_node  *block           = transform_node(get_nodes_block(node));
+       ir_node  *block           = be_transform_node(get_nodes_block(node));
        ir_node  *psi_true        = get_Psi_val(node, 0);
-       ir_node  *new_psi_true    = transform_node(psi_true);
        ir_node  *psi_default     = get_Psi_default(node);
-       ir_node  *new_psi_default = transform_node(psi_default);
-       ia32_code_gen_t *cg       = env.cg;
-       ir_graph *irg             = env.irg;
+       ia32_code_gen_t *cg       = env_cg;
+       ir_graph *irg             = current_ir_graph;
        dbg_info *dbgi            = get_irn_dbg_info(node);
-       ir_mode  *mode            = get_irn_mode(node);
-       ir_node  *cmp_proj        = get_Mux_sel(node);
-       ir_node  *noreg           = ia32_new_NoReg_gp(cg);
-       ir_node  *nomem           = new_rd_NoMem(irg);
-       ir_node  *cmp, *cmp_a, *cmp_b, *and1, *and2, *new_op = NULL;
+       ir_node  *cond            = get_Psi_cond(node, 0);
+       ir_node  *noreg           = ia32_new_NoReg_gp(env_cg);
+       ir_node  *nomem           = new_NoMem();
+       ir_node  *new_op;
+       ir_node  *cmp, *cmp_a, *cmp_b;
        ir_node  *new_cmp_a, *new_cmp_b;
        ir_mode  *cmp_mode;
-       int      pnc;
-
-       assert(get_irn_mode(cmp_proj) == mode_b && "Condition for Psi must have mode_b");
-
-       cmp       = get_Proj_pred(cmp_proj);
-       cmp_a     = get_Cmp_left(cmp);
-       cmp_b     = get_Cmp_right(cmp);
-       cmp_mode  = get_irn_mode(cmp_a);
-       new_cmp_a = transform_node(cmp_a);
-       new_cmp_b = transform_node(cmp_b);
-
-       pnc   = get_Proj_proj(cmp_proj);
-       if (mode_is_float(cmp_mode) || !mode_is_signed(cmp_mode)) {
-               pnc |= ia32_pn_Cmp_Unsigned;
-       }
+       int       pnc;
+
+       assert(get_Psi_n_conds(node) == 1);
+       assert(get_irn_mode(cond) == mode_b);
+
+       if(is_And(cond) || is_Or(cond)) {
+               ir_node *new_cond = be_transform_node(cond);
+               ir_node *zero     = new_rd_ia32_Immediate(NULL, irg, block, NULL, 0, 0);
+               arch_set_irn_register(env_cg->arch_env, zero,
+                                     &ia32_gp_regs[REG_GP_NOREG]);
+
+               /* we have to compare the result against zero */
+               new_cmp_a = new_cond;
+               new_cmp_b = zero;
+               cmp_mode  = mode_Iu;
+               pnc       = pn_Cmp_Lg;
+       } else {
+               cmp       = get_Proj_pred(cond);
+               cmp_a     = get_Cmp_left(cmp);
+               cmp_b     = get_Cmp_right(cmp);
+               cmp_mode  = get_irn_mode(cmp_a);
+               pnc       = get_Proj_proj(cond);
 
-       if (mode_is_float(mode)) {
-               /* floating point psi */
-               FP_USED(cg);
-
-               /* 1st case: compare operands are float too */
-               if (USE_SSE2(cg)) {
-                       /* psi(cmp(a, b), t, f) can be done as: */
-                       /* tmp = cmp a, b                       */
-                       /* tmp2 = t and tmp                     */
-                       /* tmp3 = f and not tmp                 */
-                       /* res  = tmp2 or tmp3                  */
-
-                       /* in case the compare operands are int, we move them into xmm register */
-                       if (! mode_is_float(get_irn_mode(cmp_a))) {
-                               new_cmp_a = gen_sse_conv_int2float(cg, dbgi, irg, block, new_cmp_a, node, mode_xmm);
-                               new_cmp_b = gen_sse_conv_int2float(cg, dbgi, irg, block, new_cmp_b, node, mode_xmm);
-
-                               pnc |= 8;  /* transform integer compare to fp compare */
-                       }
+               new_cmp_a = be_transform_node(cmp_a);
+               new_cmp_b = create_immediate_or_transform(cmp_b, 0);
 
-                       new_op = new_rd_ia32_xCmp(dbgi, irg, block, noreg, noreg, new_cmp_a, new_cmp_b, nomem);
-                       set_ia32_pncode(new_op, pnc);
-                       set_ia32_am_support(new_op, ia32_am_Source);
-                       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(cg, node));
-
-                       and1 = new_rd_ia32_xAnd(dbgi, irg, block, noreg, noreg, new_psi_true, new_op, nomem);
-                       set_ia32_am_support(and1, ia32_am_None);
-                       set_ia32_commutative(and1);
-                       SET_IA32_ORIG_NODE(and1, ia32_get_old_node_name(cg, node));
-
-                       and2 = new_rd_ia32_xAndNot(dbgi, irg, block, noreg, noreg, new_op, new_psi_default, nomem);
-                       set_ia32_am_support(and2, ia32_am_None);
-                       set_ia32_commutative(and2);
-                       SET_IA32_ORIG_NODE(and2, ia32_get_old_node_name(cg, node));
-
-                       new_op = new_rd_ia32_xOr(dbgi, irg, block, noreg, noreg, and1, and2, nomem);
-                       set_ia32_am_support(new_op, ia32_am_None);
-                       set_ia32_commutative(new_op);
-                       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(cg, node));
-               }
-               else {
-                       /* x87 FPU */
-                       new_op = new_rd_ia32_vfCMov(dbgi, irg, block, new_cmp_a, new_cmp_b, new_psi_true, new_psi_default);
-                       set_ia32_pncode(new_op, pnc);
-                       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env.cg, node));
+               if (!mode_is_signed(cmp_mode)) {
+                       pnc |= ia32_pn_Cmp_Unsigned;
                }
        }
-       else {
-               /* integer psi */
-               construct_binop_func *set_func  = NULL;
-               cmov_func_t          *cmov_func = NULL;
-
-               if (mode_is_float(get_irn_mode(cmp_a))) {
-                       /* 1st case: compare operands are floats */
-                       FP_USED(cg);
-
-                       if (USE_SSE2(cg)) {
-                               /* SSE FPU */
-                               set_func  = new_rd_ia32_xCmpSet;
-                               cmov_func = new_rd_ia32_xCmpCMov;
-                       }
-                       else {
-                               /* x87 FPU */
-                               set_func  = new_rd_ia32_vfCmpSet;
-                               cmov_func = new_rd_ia32_vfCmpCMov;
-                       }
-
-                       pnc &= ~0x8; /* fp compare -> int compare */
-               }
-               else {
-                       /* 2nd case: compare operand are integer too */
-                       set_func  = new_rd_ia32_CmpSet;
-                       cmov_func = new_rd_ia32_CmpCMov;
-               }
 
-               /* check for special case first: And/Or -- Cmp with 0 -- Psi */
-               if (is_ia32_Const_0(new_cmp_b) && is_Proj(new_cmp_a) && (is_ia32_And(get_Proj_pred(new_cmp_a)) || is_ia32_Or(get_Proj_pred(new_cmp_a)))) {
-                       if (is_ia32_Const_1(psi_true) && is_ia32_Const_0(psi_default)) {
-                               /* first case for SETcc: default is 0, set to 1 iff condition is true */
-                               new_op = new_rd_ia32_PsiCondSet(dbgi, irg, block, new_cmp_a);
-                               set_ia32_pncode(new_op, pnc);
-                       }
-                       else if (is_ia32_Const_0(psi_true) && is_ia32_Const_1(psi_default)) {
-                               /* second case for SETcc: default is 1, set to 0 iff condition is true: */
-                               /*                        we invert condition and set default to 0      */
-                               new_op = new_rd_ia32_PsiCondSet(dbgi, irg, block, new_cmp_a);
-                               set_ia32_pncode(new_op, get_inversed_pnc(pnc));
-                       }
-                       else {
-                               /* otherwise: use CMOVcc */
-                               new_op = new_rd_ia32_PsiCondCMov(dbgi, irg, block, new_cmp_a, new_psi_true, new_psi_default);
-                               set_ia32_pncode(new_op, pnc);
-                       }
-
-                       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(cg, node));
-               }
-               else {
-                       if (is_ia32_Const_1(psi_true) && is_ia32_Const_0(psi_default)) {
-                               /* first case for SETcc: default is 0, set to 1 iff condition is true */
-                               new_op = gen_binop(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(node, cmp_a, cmp_b, set_func);
-                               set_ia32_pncode(new_op, get_inversed_pnc(pnc));
-                               set_ia32_am_support(new_op, ia32_am_Source);
-                       }
-                       else {
-                               /* otherwise: use CMOVcc */
-                               new_op = cmov_func(dbgi, irg, block, new_cmp_a, new_cmp_b, new_psi_true, new_psi_default);
-                               set_ia32_pncode(new_op, pnc);
-                               SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(cg, node));
-                       }
-               }
+       if(is_Const_1(psi_true) && is_Const_0(psi_default)) {
+               new_op = new_rd_ia32_CmpSet(dbgi, irg, block, noreg, noreg,
+                                           new_cmp_a, new_cmp_b, nomem, pnc);
+       } else if(is_Const_0(psi_true) && is_Const_1(psi_default)) {
+               pnc = get_negated_pnc(pnc, cmp_mode);
+               new_op = new_rd_ia32_CmpSet(dbgi, irg, block, noreg, noreg,
+                                           new_cmp_a, new_cmp_b, nomem, pnc);
+       } else {
+               ir_node *new_psi_true    = be_transform_node(psi_true);
+               ir_node *new_psi_default = be_transform_node(psi_default);
+               new_op = new_rd_ia32_CmpCMov(dbgi, irg, block, new_cmp_a, new_cmp_b,
+                                        new_psi_true, new_psi_default, pnc);
        }
-
+       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(cg, node));
        return new_op;
 }
 
@@ -2172,11 +2053,11 @@ static ir_node *gen_Psi(ir_node *node) {
  * Create a conversion from x87 state register to general purpose.
  */
 static ir_node *gen_x87_fp_to_gp(ir_node *node) {
-       ir_node         *block      = transform_node(get_nodes_block(node));
+       ir_node         *block      = be_transform_node(get_nodes_block(node));
        ir_node         *op         = get_Conv_op(node);
-       ir_node         *new_op     = transform_node(op);
-       ia32_code_gen_t *cg         = env.cg;
-       ir_graph        *irg        = env.irg;
+       ir_node         *new_op     = be_transform_node(op);
+       ia32_code_gen_t *cg         = env_cg;
+       ir_graph        *irg        = current_ir_graph;
        dbg_info        *dbgi       = get_irn_dbg_info(node);
        ir_node         *noreg      = ia32_new_NoReg_gp(cg);
        ir_node         *trunc_mode = ia32_new_Fpu_truncate(cg);
@@ -2186,8 +2067,8 @@ static ir_node *gen_x87_fp_to_gp(ir_node *node) {
        fist = new_rd_ia32_vfist(dbgi, irg, block,
                        get_irg_frame(irg), noreg, new_op, trunc_mode, new_NoMem());
 
+       set_irn_pinned(fist, op_pin_state_floats);
        set_ia32_use_frame(fist);
-       set_ia32_am_support(fist, ia32_am_Dest);
        set_ia32_op_type(fist, ia32_AddrModeD);
        set_ia32_am_flavour(fist, ia32_am_B);
        set_ia32_ls_mode(fist, mode_Iu);
@@ -2196,8 +2077,8 @@ static ir_node *gen_x87_fp_to_gp(ir_node *node) {
        /* do a Load */
        load = new_rd_ia32_Load(dbgi, irg, block, get_irg_frame(irg), noreg, fist);
 
+       set_irn_pinned(load, op_pin_state_floats);
        set_ia32_use_frame(load);
-       set_ia32_am_support(load, ia32_am_Source);
        set_ia32_op_type(load, ia32_AddrModeS);
        set_ia32_am_flavour(load, ia32_am_B);
        set_ia32_ls_mode(load, mode_Iu);
@@ -2210,12 +2091,12 @@ static ir_node *gen_x87_fp_to_gp(ir_node *node) {
  * Create a conversion from general purpose to x87 register
  */
 static ir_node *gen_x87_gp_to_fp(ir_node *node, ir_mode *src_mode) {
-       ir_node   *block  = transform_node(get_nodes_block(node));
+       ir_node   *block  = be_transform_node(get_nodes_block(node));
        ir_node   *op     = get_Conv_op(node);
-       ir_node   *new_op = transform_node(op);
-       ir_graph  *irg    = env.irg;
+       ir_node   *new_op = be_transform_node(op);
+       ir_graph  *irg    = current_ir_graph;
        dbg_info  *dbgi   = get_irn_dbg_info(node);
-       ir_node   *noreg  = ia32_new_NoReg_gp(env.cg);
+       ir_node   *noreg  = ia32_new_NoReg_gp(env_cg);
        ir_node   *nomem  = new_NoMem();
        ir_node   *fild, *store;
        int       src_bits;
@@ -2224,21 +2105,20 @@ static ir_node *gen_x87_gp_to_fp(ir_node *node, ir_mode *src_mode) {
        src_bits = get_mode_size_bits(src_mode);
        if (src_bits == 8) {
                new_op = new_rd_ia32_Conv_I2I8Bit(dbgi, irg, block, noreg, noreg, new_op, nomem);
-               set_ia32_am_support(new_op, ia32_am_Source);
+               set_ia32_am_support(new_op, ia32_am_Source, ia32_am_unary);
                set_ia32_ls_mode(new_op, src_mode);
-               SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env.cg, node));
+               SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
        } else if (src_bits < 32) {
                new_op = new_rd_ia32_Conv_I2I(dbgi, irg, block, noreg, noreg, new_op, nomem);
-               set_ia32_am_support(new_op, ia32_am_Source);
+               set_ia32_am_support(new_op, ia32_am_Source, ia32_am_unary);
                set_ia32_ls_mode(new_op, src_mode);
-               SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env.cg, node));
+               SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
        }
 
        /* do a store */
        store = new_rd_ia32_Store(dbgi, irg, block, get_irg_frame(irg), noreg, new_op, nomem);
 
        set_ia32_use_frame(store);
-       set_ia32_am_support(store, ia32_am_Dest);
        set_ia32_op_type(store, ia32_AddrModeD);
        set_ia32_am_flavour(store, ia32_am_OB);
        set_ia32_ls_mode(store, mode_Iu);
@@ -2247,7 +2127,6 @@ static ir_node *gen_x87_gp_to_fp(ir_node *node, ir_mode *src_mode) {
        fild = new_rd_ia32_vfild(dbgi, irg, block, get_irg_frame(irg), noreg, store);
 
        set_ia32_use_frame(fild);
-       set_ia32_am_support(fild, ia32_am_Source);
        set_ia32_op_type(fild, ia32_AddrModeS);
        set_ia32_am_flavour(fild, ia32_am_OB);
        set_ia32_ls_mode(fild, mode_Iu);
@@ -2255,29 +2134,64 @@ static ir_node *gen_x87_gp_to_fp(ir_node *node, ir_mode *src_mode) {
        return new_r_Proj(irg, block, fild, mode_vfp, pn_ia32_vfild_res);
 }
 
+static ir_node *create_Strict_conv(ir_mode *src_mode, ir_mode *tgt_mode,
+                                   ir_node *node)
+{
+       ir_node  *block    = get_nodes_block(node);
+       ir_graph *irg      = current_ir_graph;
+       dbg_info *dbgi     = get_irn_dbg_info(node);
+       ir_node  *noreg    = ia32_new_NoReg_gp(env_cg);
+       ir_node  *nomem    = new_NoMem();
+       int       src_bits = get_mode_size_bits(src_mode);
+       int       tgt_bits = get_mode_size_bits(tgt_mode);
+       ir_node  *frame    = get_irg_frame(irg);
+       ir_mode  *smaller_mode;
+       ir_node  *store, *load;
+       ir_node  *res;
+
+       if(src_bits <= tgt_bits)
+               smaller_mode = src_mode;
+       else
+               smaller_mode = tgt_mode;
+
+       store = new_rd_ia32_vfst(dbgi, irg, block, frame, noreg, node, nomem,
+                                smaller_mode);
+       set_ia32_use_frame(store);
+       set_ia32_op_type(store, ia32_AddrModeD);
+       set_ia32_am_flavour(store, ia32_am_OB);
+
+       load = new_rd_ia32_vfld(dbgi, irg, block, frame, noreg, store,
+                               smaller_mode);
+       set_ia32_use_frame(load);
+       set_ia32_op_type(load, ia32_AddrModeS);
+       set_ia32_am_flavour(load, ia32_am_OB);
+
+       res = new_r_Proj(irg, block, load, mode_E, pn_ia32_vfld_res);
+       return res;
+}
+
 /**
  * Transforms a Conv node.
  *
- * @param env   The transformation environment
  * @return The created ia32 Conv node
  */
 static ir_node *gen_Conv(ir_node *node) {
-       ir_node  *block    = transform_node(get_nodes_block(node));
+       ir_node  *block    = be_transform_node(get_nodes_block(node));
        ir_node  *op       = get_Conv_op(node);
-       ir_node  *new_op   = transform_node(op);
-       ir_graph *irg      = env.irg;
+       ir_node  *new_op   = be_transform_node(op);
+       ir_graph *irg      = current_ir_graph;
        dbg_info *dbgi     = get_irn_dbg_info(node);
        ir_mode  *src_mode = get_irn_mode(op);
        ir_mode  *tgt_mode = get_irn_mode(node);
        int      src_bits  = get_mode_size_bits(src_mode);
        int      tgt_bits  = get_mode_size_bits(tgt_mode);
-       ir_node  *noreg    = ia32_new_NoReg_gp(env.cg);
+       ir_node  *noreg    = ia32_new_NoReg_gp(env_cg);
        ir_node  *nomem    = new_rd_NoMem(irg);
        ir_node  *res;
 
        if (src_mode == tgt_mode) {
                if (get_Conv_strict(node)) {
-                       if (USE_SSE2(env.cg)) {
+                       if (USE_SSE2(env_cg)) {
                                /* when we are in SSE mode, we can kill all strict no-op conversion */
                                return new_op;
                        }
@@ -2292,21 +2206,31 @@ static ir_node *gen_Conv(ir_node *node) {
        if (mode_is_float(src_mode)) {
                /* we convert from float ... */
                if (mode_is_float(tgt_mode)) {
+                       if(src_mode == mode_E && tgt_mode == mode_D
+                                       && !get_Conv_strict(node)) {
+                               DB((dbg, LEVEL_1, "killed Conv(mode, mode) ..."));
+                               return new_op;
+                       }
+
                        /* ... to float */
-                       if (USE_SSE2(env.cg)) {
+                       if (USE_SSE2(env_cg)) {
                                DB((dbg, LEVEL_1, "create Conv(float, float) ..."));
                                res = new_rd_ia32_Conv_FP2FP(dbgi, irg, block, noreg, noreg, new_op, nomem);
                                set_ia32_ls_mode(res, tgt_mode);
                        } else {
                                // Matze: TODO what about strict convs?
-                               DEBUG_ONLY(ir_fprintf(stderr, "Debug warning: strict conv %+F ignored yet\n", node));
+                               if(get_Conv_strict(node)) {
+                                       res = create_Strict_conv(src_mode, tgt_mode, new_op);
+                                       SET_IA32_ORIG_NODE(get_Proj_pred(res), ia32_get_old_node_name(env_cg, node));
+                                       return res;
+                               }
                                DB((dbg, LEVEL_1, "killed Conv(float, float) ..."));
                                return new_op;
                        }
                } else {
                        /* ... to int */
                        DB((dbg, LEVEL_1, "create Conv(float, int) ..."));
-                       if (USE_SSE2(env.cg)) {
+                       if (USE_SSE2(env_cg)) {
                                res = new_rd_ia32_Conv_FP2I(dbgi, irg, block, noreg, noreg, new_op, nomem);
                                set_ia32_ls_mode(res, src_mode);
                        } else {
@@ -2316,14 +2240,14 @@ static ir_node *gen_Conv(ir_node *node) {
        } else {
                /* we convert from int ... */
                if (mode_is_float(tgt_mode)) {
-                       FP_USED(env.cg);
+                       FP_USED(env_cg);
                        /* ... to float */
                        DB((dbg, LEVEL_1, "create Conv(int, float) ..."));
-                       if (USE_SSE2(env.cg)) {
+                       if (USE_SSE2(env_cg)) {
                                res = new_rd_ia32_Conv_I2FP(dbgi, irg, block, noreg, noreg, new_op, nomem);
                                set_ia32_ls_mode(res, tgt_mode);
                                if(src_bits == 32) {
-                                       set_ia32_am_support(res, ia32_am_Source);
+                                       set_ia32_am_support(res, ia32_am_Source, ia32_am_unary);
                                }
                        } else {
                                return gen_x87_gp_to_fp(node, src_mode);
@@ -2354,23 +2278,18 @@ static ir_node *gen_Conv(ir_node *node) {
                                res = new_rd_ia32_Conv_I2I(dbgi, irg, block, noreg, noreg, new_op, nomem);
                                set_ia32_ls_mode(res, smaller_mode);
                        }
-                       set_ia32_am_support(res, ia32_am_Source);
+                       set_ia32_am_support(res, ia32_am_Source, ia32_am_unary);
                }
        }
 
-       SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env.cg, node));
+       SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node));
 
        return res;
 }
 
 static
-int check_immediate_constraint(tarval *tv, char immediate_constraint_type)
+int check_immediate_constraint(long val, char immediate_constraint_type)
 {
-       long val;
-
-       assert(tarval_is_long(tv));
-       val = get_tarval_long(tv);
-
        switch (immediate_constraint_type) {
        case 0:
                return 1;
@@ -2395,11 +2314,13 @@ int check_immediate_constraint(tarval *tv, char immediate_constraint_type)
        return 0;
 }
 
+static
 ir_node *try_create_Immediate(ir_node *node, char immediate_constraint_type)
 {
        int          minus         = 0;
        tarval      *offset        = NULL;
        int          offset_sign   = 0;
+       long         val = 0;
        ir_entity   *symconst_ent  = NULL;
        int          symconst_sign = 0;
        ir_mode     *mode;
@@ -2409,7 +2330,6 @@ ir_node *try_create_Immediate(ir_node *node, char immediate_constraint_type)
        ir_graph    *irg;
        dbg_info    *dbgi;
        ir_node     *block;
-       ia32_attr_t *attr;
 
        mode = get_irn_mode(node);
        if(!mode_is_int(mode) && !mode_is_character(mode) &&
@@ -2445,8 +2365,8 @@ ir_node *try_create_Immediate(ir_node *node, char immediate_constraint_type)
                        offset_sign   = minus;
                }
        } else if(is_Sub(node)) {
-               ir_node *left  = get_Add_left(node);
-               ir_node *right = get_Add_right(node);
+               ir_node *left  = get_Sub_left(node);
+               ir_node *right = get_Sub_right(node);
                if(is_Const(left) && is_SymConst(right)) {
                        cnst          = left;
                        symconst      = right;
@@ -2464,13 +2384,17 @@ ir_node *try_create_Immediate(ir_node *node, char immediate_constraint_type)
 
        if(cnst != NULL) {
                offset = get_Const_tarval(cnst);
-               if(!tarval_is_long(offset)) {
+               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);
                        return NULL;
                }
 
-               if(!check_immediate_constraint(offset, immediate_constraint_type))
+               if(!check_immediate_constraint(val, immediate_constraint_type))
                        return NULL;
        }
        if(symconst != NULL) {
@@ -2483,29 +2407,36 @@ ir_node *try_create_Immediate(ir_node *node, char immediate_constraint_type)
                        return NULL;
                symconst_ent = get_SymConst_entity(symconst);
        }
+       if(cnst == NULL && symconst == NULL)
+               return NULL;
+
+       if(offset_sign && offset != NULL) {
+               offset = tarval_neg(offset);
+       }
 
-       irg   = env.irg;
+       irg   = current_ir_graph;
        dbgi  = get_irn_dbg_info(node);
        block = get_irg_start_block(irg);
-       res   = new_rd_ia32_Immediate(dbgi, irg, block);
-       arch_set_irn_register(env.cg->arch_env, res, &ia32_gp_regs[REG_GP_NOREG]);
+       res   = new_rd_ia32_Immediate(dbgi, irg, block, symconst_ent, symconst_sign,
+                                     val);
+       arch_set_irn_register(env_cg->arch_env, res, &ia32_gp_regs[REG_GP_NOREG]);
 
        /* make sure we don't schedule stuff before the barrier */
        add_irn_dep(res, get_irg_frame(irg));
 
-       /* misuse some fields for now... */
-       attr                  = get_ia32_attr(res);
-       attr->am_sc           = symconst_ent;
-       attr->data.am_sc_sign = symconst_sign;
-       if(offset_sign && offset != NULL) {
-               offset = tarval_neg(offset);
-       }
-       attr->cnst_val.tv = offset;
-       attr->data.imm_tp = ia32_ImmConst;
-
        return res;
 }
 
+static
+ir_node *create_immediate_or_transform(ir_node *node, char immediate_constraint_type)
+{
+       ir_node *new_node = try_create_Immediate(node, immediate_constraint_type);
+       if (new_node == NULL) {
+               new_node = be_transform_node(node);
+       }
+       return new_node;
+}
+
 typedef struct constraint_t constraint_t;
 struct constraint_t {
        int                         is_in;
@@ -2517,8 +2448,7 @@ struct constraint_t {
        char                        immediate_type;
 };
 
-void parse_asm_constraint(ir_node *node, int pos, constraint_t *constraint,
-                          const char *c)
+void parse_asm_constraint(int pos, constraint_t *constraint, const char *c)
 {
        int                          immediate_possible = 0;
        char                         immediate_type     = 0;
@@ -2612,6 +2542,7 @@ void parse_asm_constraint(ir_node *node, int pos, constraint_t *constraint,
                case 'f':
                case 't':
                case 'u':
+                       /* TODO: mark values so the x87 simulator knows about t and u */
                        assert(cls == NULL);
                        cls = &ia32_reg_classes[CLASS_ia32_vfp];
                        break;
@@ -2728,7 +2659,7 @@ void parse_asm_constraint(ir_node *node, int pos, constraint_t *constraint,
        }
        /* todo: check types (no float input on 'r' constrainted in and such... */
 
-       irg  = env.irg;
+       irg  = current_ir_graph;
        obst = get_irg_obstack(irg);
 
        if(limited != 0) {
@@ -2757,28 +2688,33 @@ static
 void parse_clobber(ir_node *node, int pos, constraint_t *constraint,
                    const char *c)
 {
+       (void) node;
+       (void) pos;
+       (void) constraint;
+       (void) c;
        panic("Clobbers not supported yet");
 }
 
 ir_node *gen_ASM(ir_node *node)
 {
        int                   i, arity;
-       ir_graph             *irg   = env.irg;
-       ir_node              *block = transform_node(get_nodes_block(node));
+       ir_graph             *irg   = current_ir_graph;
+       ir_node              *block = be_transform_node(get_nodes_block(node));
        dbg_info             *dbgi  = get_irn_dbg_info(node);
        ir_node             **in;
        ir_node              *res;
        int                   out_arity;
        int                   n_outs;
        int                   n_clobbers;
-       ia32_attr_t          *attr;
+       void                 *generic_attr;
+       ia32_asm_attr_t      *attr;
        const arch_register_req_t **out_reqs;
        const arch_register_req_t **in_reqs;
        struct obstack       *obst;
        constraint_t          parsed_constraint;
 
        /* assembler could contain float statements */
-       FP_USED(env.cg);
+       FP_USED(env_cg);
 
        /* transform inputs */
        arity = get_irn_arity(node);
@@ -2802,7 +2738,7 @@ ir_node *gen_ASM(ir_node *node)
                        const ir_asm_constraint *constraint;
                        constraint = & get_ASM_output_constraints(node) [i];
                        c = get_id_str(constraint->constraint);
-                       parse_asm_constraint(node, i, &parsed_constraint, c);
+                       parse_asm_constraint(i, &parsed_constraint, c);
                } else {
                        ident *glob_id = get_ASM_clobbers(node) [i - n_outs];
                        c = get_id_str(glob_id);
@@ -2821,7 +2757,7 @@ ir_node *gen_ASM(ir_node *node)
                constraint = & get_ASM_input_constraints(node) [i];
                constr_id  = constraint->constraint;
                c          = get_id_str(constr_id);
-               parse_asm_constraint(node, i, &parsed_constraint, c);
+               parse_asm_constraint(i, &parsed_constraint, c);
                in_reqs[i] = parsed_constraint.req;
 
                if(parsed_constraint.immediate_possible) {
@@ -2844,19 +2780,19 @@ ir_node *gen_ASM(ir_node *node)
                        continue;
 
                pred        = get_irn_n(node, i);
-               transformed = transform_node(pred);
+               transformed = be_transform_node(pred);
                in[i]       = transformed;
        }
 
        res = new_rd_ia32_Asm(dbgi, irg, block, arity, in, out_arity);
 
-       attr                    = get_ia32_attr(res);
-       attr->cnst_val.asm_text = get_ASM_text(node);
-       attr->data.imm_tp       = ia32_ImmAsm;
+       generic_attr   = get_irn_generic_attr(res);
+       attr           = CAST_IA32_ATTR(ia32_asm_attr_t, generic_attr);
+       attr->asm_text = get_ASM_text(node);
        set_ia32_out_req_all(res, out_reqs);
        set_ia32_in_req_all(res, in_reqs);
 
-       SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env.cg, node));
+       SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node));
 
        return res;
 }
@@ -2872,27 +2808,27 @@ ir_node *gen_ASM(ir_node *node)
  ********************************************/
 
 static ir_node *gen_be_StackParam(ir_node *node) {
-       ir_node  *block      = transform_node(get_nodes_block(node));
+       ir_node  *block      = be_transform_node(get_nodes_block(node));
        ir_node   *ptr       = get_irn_n(node, be_pos_StackParam_ptr);
-       ir_node   *new_ptr   = transform_node(ptr);
+       ir_node   *new_ptr   = be_transform_node(ptr);
        ir_node   *new_op    = NULL;
-       ir_graph  *irg       = env.irg;
+       ir_graph  *irg       = current_ir_graph;
        dbg_info  *dbgi      = get_irn_dbg_info(node);
-       ir_node   *nomem     = new_rd_NoMem(env.irg);
-       ir_entity *ent       = arch_get_frame_entity(env.cg->arch_env, node);
+       ir_node   *nomem     = new_rd_NoMem(current_ir_graph);
+       ir_entity *ent       = arch_get_frame_entity(env_cg->arch_env, node);
        ir_mode   *load_mode = get_irn_mode(node);
-       ir_node   *noreg     = ia32_new_NoReg_gp(env.cg);
+       ir_node   *noreg     = ia32_new_NoReg_gp(env_cg);
        ir_mode   *proj_mode;
        long      pn_res;
 
        if (mode_is_float(load_mode)) {
-               FP_USED(env.cg);
-               if (USE_SSE2(env.cg)) {
+               FP_USED(env_cg);
+               if (USE_SSE2(env_cg)) {
                        new_op = new_rd_ia32_xLoad(dbgi, irg, block, new_ptr, noreg, nomem);
                        pn_res    = pn_ia32_xLoad_res;
                        proj_mode = mode_xmm;
                } else {
-                       new_op = new_rd_ia32_vfld(dbgi, irg, block, new_ptr, noreg, nomem);
+                       new_op = new_rd_ia32_vfld(dbgi, irg, block, new_ptr, noreg, nomem, load_mode);
                        pn_res    = pn_ia32_vfld_res;
                        proj_mode = mode_vfp;
                }
@@ -2902,16 +2838,16 @@ static ir_node *gen_be_StackParam(ir_node *node) {
                pn_res = pn_ia32_Load_res;
        }
 
+       set_irn_pinned(new_op, op_pin_state_floats);
        set_ia32_frame_ent(new_op, ent);
        set_ia32_use_frame(new_op);
 
-       set_ia32_am_support(new_op, ia32_am_Source);
        set_ia32_op_type(new_op, ia32_AddrModeS);
        set_ia32_am_flavour(new_op, ia32_am_B);
        set_ia32_ls_mode(new_op, load_mode);
        set_ia32_flags(new_op, get_ia32_flags(new_op) | arch_irn_flags_rematerializable);
 
-       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env.cg, node));
+       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
 
        return new_rd_Proj(dbgi, irg, block, new_op, proj_mode, pn_res);
 }
@@ -2920,21 +2856,20 @@ static ir_node *gen_be_StackParam(ir_node *node) {
  * Transforms a FrameAddr into an ia32 Add.
  */
 static ir_node *gen_be_FrameAddr(ir_node *node) {
-       ir_node  *block  = transform_node(get_nodes_block(node));
-       ir_node  *op     = get_irn_n(node, be_pos_FrameAddr_ptr);
-       ir_node  *new_op = transform_node(op);
-       ir_graph *irg    = env.irg;
+       ir_node  *block  = be_transform_node(get_nodes_block(node));
+       ir_node  *op     = be_get_FrameAddr_frame(node);
+       ir_node  *new_op = be_transform_node(op);
+       ir_graph *irg    = current_ir_graph;
        dbg_info *dbgi   = get_irn_dbg_info(node);
-       ir_node  *noreg  = ia32_new_NoReg_gp(env.cg);
+       ir_node  *noreg  = ia32_new_NoReg_gp(env_cg);
        ir_node  *res;
 
        res = new_rd_ia32_Lea(dbgi, irg, block, new_op, noreg);
-       set_ia32_frame_ent(res, arch_get_frame_entity(env.cg->arch_env, node));
-       set_ia32_am_support(res, ia32_am_Full);
+       set_ia32_frame_ent(res, arch_get_frame_entity(env_cg->arch_env, node));
        set_ia32_use_frame(res);
        set_ia32_am_flavour(res, ia32_am_OB);
 
-       SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env.cg, node));
+       SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(env_cg, node));
 
        return res;
 }
@@ -2943,43 +2878,44 @@ static ir_node *gen_be_FrameAddr(ir_node *node) {
  * Transforms a FrameLoad into an ia32 Load.
  */
 static ir_node *gen_be_FrameLoad(ir_node *node) {
-       ir_node   *block   = transform_node(get_nodes_block(node));
+       ir_node   *block   = be_transform_node(get_nodes_block(node));
        ir_node   *mem     = get_irn_n(node, be_pos_FrameLoad_mem);
-       ir_node   *new_mem = transform_node(mem);
+       ir_node   *new_mem = be_transform_node(mem);
        ir_node   *ptr     = get_irn_n(node, be_pos_FrameLoad_ptr);
-       ir_node   *new_ptr = transform_node(ptr);
+       ir_node   *new_ptr = be_transform_node(ptr);
        ir_node   *new_op  = NULL;
-       ir_graph  *irg     = env.irg;
+       ir_graph  *irg     = current_ir_graph;
        dbg_info  *dbgi    = get_irn_dbg_info(node);
-       ir_node   *noreg   = ia32_new_NoReg_gp(env.cg);
-       ir_entity *ent     = arch_get_frame_entity(env.cg->arch_env, node);
+       ir_node   *noreg   = ia32_new_NoReg_gp(env_cg);
+       ir_entity *ent     = arch_get_frame_entity(env_cg->arch_env, node);
        ir_mode   *mode    = get_type_mode(get_entity_type(ent));
        ir_node   *projs[pn_Load_max];
 
        ia32_collect_Projs(node, projs, pn_Load_max);
 
        if (mode_is_float(mode)) {
-               FP_USED(env.cg);
-               if (USE_SSE2(env.cg)) {
+               FP_USED(env_cg);
+               if (USE_SSE2(env_cg)) {
                        new_op = new_rd_ia32_xLoad(dbgi, irg, block, new_ptr, noreg, new_mem);
                }
                else {
-                       new_op = new_rd_ia32_vfld(dbgi, irg, block, new_ptr, noreg, new_mem);
+                       new_op = new_rd_ia32_vfld(dbgi, irg, block, new_ptr, noreg, new_mem, mode);
                }
        }
        else {
                new_op = new_rd_ia32_Load(dbgi, irg, block, new_ptr, noreg, new_mem);
        }
 
+       set_irn_pinned(new_op, op_pin_state_floats);
        set_ia32_frame_ent(new_op, ent);
        set_ia32_use_frame(new_op);
 
-       set_ia32_am_support(new_op, ia32_am_Source);
        set_ia32_op_type(new_op, ia32_AddrModeS);
        set_ia32_am_flavour(new_op, ia32_am_B);
        set_ia32_ls_mode(new_op, mode);
+       set_ia32_flags(new_op, get_ia32_flags(new_op) | arch_irn_flags_rematerializable);
 
-       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env.cg, node));
+       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
 
        return new_op;
 }
@@ -2989,26 +2925,26 @@ static ir_node *gen_be_FrameLoad(ir_node *node) {
  * Transforms a FrameStore into an ia32 Store.
  */
 static ir_node *gen_be_FrameStore(ir_node *node) {
-       ir_node   *block   = transform_node(get_nodes_block(node));
+       ir_node   *block   = be_transform_node(get_nodes_block(node));
        ir_node   *mem     = get_irn_n(node, be_pos_FrameStore_mem);
-       ir_node   *new_mem = transform_node(mem);
+       ir_node   *new_mem = be_transform_node(mem);
        ir_node   *ptr     = get_irn_n(node, be_pos_FrameStore_ptr);
-       ir_node   *new_ptr = transform_node(ptr);
+       ir_node   *new_ptr = be_transform_node(ptr);
        ir_node   *val     = get_irn_n(node, be_pos_FrameStore_val);
-       ir_node   *new_val = transform_node(val);
+       ir_node   *new_val = be_transform_node(val);
        ir_node   *new_op  = NULL;
-       ir_graph  *irg     = env.irg;
+       ir_graph  *irg     = current_ir_graph;
        dbg_info  *dbgi    = get_irn_dbg_info(node);
-       ir_node   *noreg   = ia32_new_NoReg_gp(env.cg);
-       ir_entity *ent     = arch_get_frame_entity(env.cg->arch_env, node);
+       ir_node   *noreg   = ia32_new_NoReg_gp(env_cg);
+       ir_entity *ent     = arch_get_frame_entity(env_cg->arch_env, node);
        ir_mode   *mode    = get_irn_mode(val);
 
        if (mode_is_float(mode)) {
-               FP_USED(env.cg);
-               if (USE_SSE2(env.cg)) {
+               FP_USED(env_cg);
+               if (USE_SSE2(env_cg)) {
                        new_op = new_rd_ia32_xStore(dbgi, irg, block, new_ptr, noreg, new_val, new_mem);
                } else {
-                       new_op = new_rd_ia32_vfst(dbgi, irg, block, new_ptr, noreg, new_val, new_mem);
+                       new_op = new_rd_ia32_vfst(dbgi, irg, block, new_ptr, noreg, new_val, new_mem, mode);
                }
        } else if (get_mode_size_bits(mode) == 8) {
                new_op = new_rd_ia32_Store8Bit(dbgi, irg, block, new_ptr, noreg, new_val, new_mem);
@@ -3019,12 +2955,11 @@ static ir_node *gen_be_FrameStore(ir_node *node) {
        set_ia32_frame_ent(new_op, ent);
        set_ia32_use_frame(new_op);
 
-       set_ia32_am_support(new_op, ia32_am_Dest);
        set_ia32_op_type(new_op, ia32_AddrModeD);
        set_ia32_am_flavour(new_op, ia32_am_B);
        set_ia32_ls_mode(new_op, mode);
 
-       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env.cg, node));
+       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
 
        return new_op;
 }
@@ -3033,7 +2968,7 @@ static ir_node *gen_be_FrameStore(ir_node *node) {
  * In case SSE is used we need to copy the result from XMM0 to FPU TOS before return.
  */
 static ir_node *gen_be_Return(ir_node *node) {
-       ir_graph  *irg     = env.irg;
+       ir_graph  *irg     = current_ir_graph;
        ir_node   *ret_val = get_irn_n(node, be_pos_Return_val);
        ir_node   *ret_mem = get_irn_n(node, be_pos_Return_mem);
        ir_entity *ent     = get_irg_entity(irg);
@@ -3049,19 +2984,19 @@ static ir_node *gen_be_Return(ir_node *node) {
        int       pn_ret_val, pn_ret_mem, arity, i;
 
        assert(ret_val != NULL);
-       if (be_Return_get_n_rets(node) < 1 || ! USE_SSE2(env.cg)) {
-               return duplicate_node(node);
+       if (be_Return_get_n_rets(node) < 1 || ! USE_SSE2(env_cg)) {
+               return be_duplicate_node(node);
        }
 
        res_type = get_method_res_type(tp, 0);
 
        if (! is_Primitive_type(res_type)) {
-               return duplicate_node(node);
+               return be_duplicate_node(node);
        }
 
        mode = get_type_mode(res_type);
        if (! mode_is_float(mode)) {
-               return duplicate_node(node);
+               return be_duplicate_node(node);
        }
 
        assert(get_method_n_ress(tp) == 1);
@@ -3074,18 +3009,18 @@ static ir_node *gen_be_Return(ir_node *node) {
 
        /* get result input of the Barrier */
        ret_val     = get_irn_n(barrier, pn_ret_val);
-       new_ret_val = transform_node(ret_val);
+       new_ret_val = be_transform_node(ret_val);
 
        /* get memory input of the Barrier */
        ret_mem     = get_irn_n(barrier, pn_ret_mem);
-       new_ret_mem = transform_node(ret_mem);
+       new_ret_mem = be_transform_node(ret_mem);
 
        frame = get_irg_frame(irg);
 
        dbgi  = get_irn_dbg_info(barrier);
-       block = transform_node(get_nodes_block(barrier));
+       block = be_transform_node(get_nodes_block(barrier));
 
-       noreg = ia32_new_NoReg_gp(env.cg);
+       noreg = ia32_new_NoReg_gp(env_cg);
 
        /* store xmm0 onto stack */
        sse_store = new_rd_ia32_xStoreSimple(dbgi, irg, block, frame, noreg, new_ret_val, new_ret_mem);
@@ -3093,7 +3028,6 @@ static ir_node *gen_be_Return(ir_node *node) {
        set_ia32_op_type(sse_store, ia32_AddrModeD);
        set_ia32_use_frame(sse_store);
        set_ia32_am_flavour(sse_store, ia32_am_B);
-       set_ia32_am_support(sse_store, ia32_am_Dest);
 
        /* load into st0 */
        fld = new_rd_ia32_SetST0(dbgi, irg, block, frame, noreg, sse_store);
@@ -3101,11 +3035,10 @@ static ir_node *gen_be_Return(ir_node *node) {
        set_ia32_op_type(fld, ia32_AddrModeS);
        set_ia32_use_frame(fld);
        set_ia32_am_flavour(fld, ia32_am_B);
-       set_ia32_am_support(fld, ia32_am_Source);
 
        mproj = new_r_Proj(irg, block, fld, mode_M, pn_ia32_SetST0_M);
        fld   = new_r_Proj(irg, block, fld, mode_vfp, pn_ia32_SetST0_res);
-       arch_set_irn_register(env.cg->arch_env, fld, &ia32_vfp_regs[REG_VF0]);
+       arch_set_irn_register(env_cg->arch_env, fld, &ia32_vfp_regs[REG_VF0]);
 
        /* create a new barrier */
        arity = get_irn_arity(barrier);
@@ -3119,7 +3052,7 @@ static ir_node *gen_be_Return(ir_node *node) {
                        new_in = mproj;
                } else {
                        ir_node *in = get_irn_n(barrier, i);
-                       new_in = transform_node(in);
+                       new_in = be_transform_node(in);
                }
                in[i] = new_in;
        }
@@ -3128,35 +3061,36 @@ static ir_node *gen_be_Return(ir_node *node) {
                                  get_irn_op(barrier), get_irn_mode(barrier),
                                  arity, in);
        copy_node_attr(barrier, new_barrier);
-       duplicate_deps(barrier, new_barrier);
-       set_new_node(barrier, new_barrier);
+       be_duplicate_deps(barrier, new_barrier);
+       be_set_transformed_node(barrier, new_barrier);
        mark_irn_visited(barrier);
 
        /* transform normally */
-       return duplicate_node(node);
+       return be_duplicate_node(node);
 }
 
 /**
  * Transform a be_AddSP into an ia32_AddSP. Eat up const sizes.
  */
 static ir_node *gen_be_AddSP(ir_node *node) {
-       ir_node  *block  = transform_node(get_nodes_block(node));
+       ir_node  *block  = be_transform_node(get_nodes_block(node));
        ir_node  *sz     = get_irn_n(node, be_pos_AddSP_size);
-       ir_node  *new_sz = transform_node(sz);
+       ir_node  *new_sz;
        ir_node  *sp     = get_irn_n(node, be_pos_AddSP_old_sp);
-       ir_node  *new_sp = transform_node(sp);
-       ir_graph *irg    = env.irg;
+       ir_node  *new_sp = be_transform_node(sp);
+       ir_graph *irg    = current_ir_graph;
        dbg_info *dbgi   = get_irn_dbg_info(node);
-       ir_node  *noreg  = ia32_new_NoReg_gp(env.cg);
+       ir_node  *noreg  = ia32_new_NoReg_gp(env_cg);
        ir_node  *nomem  = new_NoMem();
        ir_node  *new_op;
 
-       /* ia32 stack grows in reverse direction, make a SubSP */
-       new_op = new_rd_ia32_SubSP(dbgi, irg, block, noreg, noreg, new_sp, new_sz, nomem);
-       set_ia32_am_support(new_op, ia32_am_Source);
-       fold_immediate(new_op, 2, 3);
+       new_sz = create_immediate_or_transform(sz, 0);
 
-       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env.cg, node));
+       /* ia32 stack grows in reverse direction, make a SubSP */
+       new_op = new_rd_ia32_SubSP(dbgi, irg, block, noreg, noreg, new_sp, new_sz,
+                                  nomem);
+       set_ia32_am_support(new_op, ia32_am_Source, ia32_am_binary);
+       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
 
        return new_op;
 }
@@ -3165,23 +3099,23 @@ static ir_node *gen_be_AddSP(ir_node *node) {
  * Transform a be_SubSP into an ia32_SubSP. Eat up const sizes.
  */
 static ir_node *gen_be_SubSP(ir_node *node) {
-       ir_node  *block  = transform_node(get_nodes_block(node));
+       ir_node  *block  = be_transform_node(get_nodes_block(node));
        ir_node  *sz     = get_irn_n(node, be_pos_SubSP_size);
-       ir_node  *new_sz = transform_node(sz);
+       ir_node  *new_sz;
        ir_node  *sp     = get_irn_n(node, be_pos_SubSP_old_sp);
-       ir_node  *new_sp = transform_node(sp);
-       ir_graph *irg    = env.irg;
+       ir_node  *new_sp = be_transform_node(sp);
+       ir_graph *irg    = current_ir_graph;
        dbg_info *dbgi   = get_irn_dbg_info(node);
-       ir_node  *noreg  = ia32_new_NoReg_gp(env.cg);
+       ir_node  *noreg  = ia32_new_NoReg_gp(env_cg);
        ir_node  *nomem  = new_NoMem();
        ir_node  *new_op;
 
+       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);
-       set_ia32_am_support(new_op, ia32_am_Source);
-       fold_immediate(new_op, 2, 3);
-
-       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env.cg, node));
+       set_ia32_am_support(new_op, ia32_am_Source, ia32_am_binary);
+       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
 
        return new_op;
 }
@@ -3195,12 +3129,12 @@ static ir_node *gen_Unknown(ir_node *node) {
        ir_mode *mode = get_irn_mode(node);
 
        if (mode_is_float(mode)) {
-               if (USE_SSE2(env.cg))
-                       return ia32_new_Unknown_xmm(env.cg);
+               if (USE_SSE2(env_cg))
+                       return ia32_new_Unknown_xmm(env_cg);
                else
-                       return ia32_new_Unknown_vfp(env.cg);
+                       return ia32_new_Unknown_vfp(env_cg);
        } else if (mode_needs_gp_reg(mode)) {
-               return ia32_new_Unknown_gp(env.cg);
+               return ia32_new_Unknown_gp(env_cg);
        } else {
                assert(0 && "unsupported Unknown-Mode");
        }
@@ -3212,12 +3146,11 @@ static ir_node *gen_Unknown(ir_node *node) {
  * Change some phi modes
  */
 static ir_node *gen_Phi(ir_node *node) {
-       ir_node  *block = transform_node(get_nodes_block(node));
-       ir_graph *irg   = env.irg;
+       ir_node  *block = be_transform_node(get_nodes_block(node));
+       ir_graph *irg   = current_ir_graph;
        dbg_info *dbgi  = get_irn_dbg_info(node);
        ir_mode  *mode  = get_irn_mode(node);
        ir_node  *phi;
-       int      i, arity;
 
        if(mode_needs_gp_reg(mode)) {
                /* we shouldn't have any 64bit stuff around anymore */
@@ -3225,8 +3158,7 @@ static ir_node *gen_Phi(ir_node *node) {
                /* all integer operations are on 32bit registers now */
                mode = mode_Iu;
        } else if(mode_is_float(mode)) {
-               assert(mode == mode_D || mode == mode_F);
-               if (USE_SSE2(env.cg)) {
+               if (USE_SSE2(env_cg)) {
                        mode = mode_xmm;
                } else {
                        mode = mode_vfp;
@@ -3237,16 +3169,10 @@ static ir_node *gen_Phi(ir_node *node) {
         * and fix this later */
        phi = new_ir_node(dbgi, irg, block, op_Phi, mode, get_irn_arity(node), get_irn_in(node) + 1);
        copy_node_attr(node, phi);
-       duplicate_deps(node, phi);
-
-       set_new_node(node, phi);
+       be_duplicate_deps(node, phi);
 
-       /* put the preds in the worklist */
-       arity = get_irn_arity(node);
-       for (i = 0; i < arity; ++i) {
-               ir_node *pred = get_irn_n(node, i);
-               pdeq_putr(env.worklist, pred);
-       }
+       be_set_transformed_node(node, phi);
+       be_enqueue_preds(node);
 
        return phi;
 }
@@ -3273,15 +3199,15 @@ 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(ir_node *node, construct_load_func func, char fp_unit) {
-       ir_node  *block   = transform_node(get_nodes_block(node));
+       ir_node  *block   = be_transform_node(get_nodes_block(node));
        ir_node  *ptr     = get_irn_n(node, 0);
-       ir_node  *new_ptr = transform_node(ptr);
+       ir_node  *new_ptr = be_transform_node(ptr);
        ir_node  *mem     = get_irn_n(node, 1);
-       ir_node  *new_mem = transform_node(mem);
-       ir_graph *irg     = env.irg;
+       ir_node  *new_mem = be_transform_node(mem);
+       ir_graph *irg     = current_ir_graph;
        dbg_info *dbgi    = get_irn_dbg_info(node);
        ir_mode  *mode    = get_ia32_ls_mode(node);
-       ir_node  *noreg   = ia32_new_NoReg_gp(env.cg);
+       ir_node  *noreg   = ia32_new_NoReg_gp(env_cg);
        ir_node  *new_op;
 
        /*
@@ -3289,14 +3215,13 @@ static ir_node *gen_lowered_Load(ir_node *node, construct_load_func func, char f
                lowering we have x87 nodes, so we need to enforce simulation.
        */
        if (mode_is_float(mode)) {
-               FP_USED(env.cg);
+               FP_USED(env_cg);
                if (fp_unit == fp_x87)
-                       FORCE_x87(env.cg);
+                       FORCE_x87(env_cg);
        }
 
        new_op  = func(dbgi, irg, block, new_ptr, noreg, new_mem);
 
-       set_ia32_am_support(new_op, ia32_am_Source);
        set_ia32_op_type(new_op, ia32_AddrModeS);
        set_ia32_am_flavour(new_op, ia32_am_OB);
        set_ia32_am_offs_int(new_op, 0);
@@ -3310,7 +3235,7 @@ static ir_node *gen_lowered_Load(ir_node *node, construct_load_func func, char f
                set_ia32_use_frame(new_op);
        }
 
-       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env.cg, node));
+       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
 
        return new_op;
 }
@@ -3319,16 +3244,16 @@ static ir_node *gen_lowered_Load(ir_node *node, construct_load_func func, char f
 * Transforms a lowered Store into a "real" one.
 */
 static ir_node *gen_lowered_Store(ir_node *node, construct_store_func func, char fp_unit) {
-       ir_node  *block   = transform_node(get_nodes_block(node));
+       ir_node  *block   = be_transform_node(get_nodes_block(node));
        ir_node  *ptr     = get_irn_n(node, 0);
-       ir_node  *new_ptr = transform_node(ptr);
+       ir_node  *new_ptr = be_transform_node(ptr);
        ir_node  *val     = get_irn_n(node, 1);
-       ir_node  *new_val = transform_node(val);
+       ir_node  *new_val = be_transform_node(val);
        ir_node  *mem     = get_irn_n(node, 2);
-       ir_node  *new_mem = transform_node(mem);
-       ir_graph *irg     = env.irg;
+       ir_node  *new_mem = be_transform_node(mem);
+       ir_graph *irg     = current_ir_graph;
        dbg_info *dbgi    = get_irn_dbg_info(node);
-       ir_node  *noreg   = ia32_new_NoReg_gp(env.cg);
+       ir_node  *noreg   = ia32_new_NoReg_gp(env_cg);
        ir_mode  *mode    = get_ia32_ls_mode(node);
        ir_node  *new_op;
        long     am_offs;
@@ -3339,9 +3264,9 @@ static ir_node *gen_lowered_Store(ir_node *node, construct_store_func func, char
                lowering we have x87 nodes, so we need to enforce simulation.
        */
        if (mode_is_float(mode)) {
-               FP_USED(env.cg);
+               FP_USED(env_cg);
                if (fp_unit == fp_x87)
-                       FORCE_x87(env.cg);
+                       FORCE_x87(env_cg);
        }
 
        new_op = func(dbgi, irg, block, new_ptr, noreg, new_val, new_mem);
@@ -3351,14 +3276,13 @@ static ir_node *gen_lowered_Store(ir_node *node, construct_store_func func, char
                add_ia32_am_offs_int(new_op, am_offs);
        }
 
-       set_ia32_am_support(new_op, ia32_am_Dest);
        set_ia32_op_type(new_op, ia32_AddrModeD);
        set_ia32_am_flavour(new_op, am_flav);
        set_ia32_ls_mode(new_op, mode);
        set_ia32_frame_ent(new_op, get_ia32_frame_ent(node));
        set_ia32_use_frame(new_op);
 
-       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env.cg, node));
+       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
 
        return new_op;
 }
@@ -3370,21 +3294,21 @@ static ir_node *gen_lowered_Store(ir_node *node, construct_store_func func, char
  * @param env   The transformation environment
  * @return the created ia32 XXX node
  */
-#define GEN_LOWERED_OP(op)                                                     \
-       static ir_node *gen_ia32_l_##op(ir_node *node) {\
-               ir_mode *mode = get_irn_mode(node);                                    \
-               if (mode_is_float(mode))                                               \
-                       FP_USED(env.cg);                                                  \
+#define GEN_LOWERED_OP(op)                                                \
+       static ir_node *gen_ia32_l_##op(ir_node *node) {                      \
+               ir_mode *mode = get_irn_mode(node);                               \
+               if (mode_is_float(mode))                                          \
+                       FP_USED(env_cg);                                              \
                return gen_binop(node, get_binop_left(node),                      \
-                                get_binop_right(node), new_rd_ia32_##op);             \
+                                get_binop_right(node), new_rd_ia32_##op,0);      \
        }
 
 #define GEN_LOWERED_x87_OP(op)                                                 \
-       static ir_node *gen_ia32_l_##op(ir_node *node) {\
+       static ir_node *gen_ia32_l_##op(ir_node *node) {                           \
                ir_node *new_op;                                                       \
-               FORCE_x87(env.cg);                                                    \
-               new_op = gen_binop_float(node, get_binop_left(node),              \
-                                        get_binop_right(node), new_rd_ia32_##op);     \
+               FORCE_x87(env_cg);                                                     \
+               new_op = gen_binop_x87_float(node, get_binop_left(node),               \
+                                            get_binop_right(node), new_rd_ia32_##op); \
                return new_op;                                                         \
        }
 
@@ -3429,24 +3353,26 @@ GEN_LOWERED_LOAD(Load, fp_none)
 GEN_LOWERED_STORE(Store, fp_none)
 
 static ir_node *gen_ia32_l_vfdiv(ir_node *node) {
-       ir_node  *block     = transform_node(get_nodes_block(node));
+       ir_node  *block     = be_transform_node(get_nodes_block(node));
        ir_node  *left      = get_binop_left(node);
-       ir_node  *new_left  = transform_node(left);
+       ir_node  *new_left  = be_transform_node(left);
        ir_node  *right     = get_binop_right(node);
-       ir_node  *new_right = transform_node(right);
-       ir_node  *noreg     = ia32_new_NoReg_gp(env.cg);
-       ir_graph *irg       = env.irg;
+       ir_node  *new_right = be_transform_node(right);
+       ir_node  *noreg     = ia32_new_NoReg_gp(env_cg);
+       ir_graph *irg       = current_ir_graph;
        dbg_info *dbgi      = get_irn_dbg_info(node);
+       ir_node  *fpcw      = be_abi_get_ignore_irn(env_cg->birg->abi,
+                                                   &ia32_fp_cw_regs[REG_FPCW]);
        ir_node  *vfdiv;
 
-       vfdiv = new_rd_ia32_vfdiv(dbgi, irg, block, noreg, noreg, new_left, new_right, new_NoMem());
+       vfdiv = new_rd_ia32_vfdiv(dbgi, irg, block, noreg, noreg, new_left,
+                                 new_right, new_NoMem(), fpcw);
        clear_ia32_commutative(vfdiv);
-       set_ia32_am_support(vfdiv, ia32_am_Source);
-       fold_immediate(vfdiv, 2, 3);
+       set_ia32_am_support(vfdiv, ia32_am_Source, ia32_am_binary);
 
-       SET_IA32_ORIG_NODE(vfdiv, ia32_get_old_node_name(env.cg, node));
+       SET_IA32_ORIG_NODE(vfdiv, ia32_get_old_node_name(env_cg, node));
 
-       FORCE_x87(env.cg);
+       FORCE_x87(env_cg);
 
        return vfdiv;
 }
@@ -3458,29 +3384,29 @@ static ir_node *gen_ia32_l_vfdiv(ir_node *node) {
  * @return the created ia32 Mul node
  */
 static ir_node *gen_ia32_l_Mul(ir_node *node) {
-       ir_node  *block     = transform_node(get_nodes_block(node));
+       ir_node  *block     = be_transform_node(get_nodes_block(node));
        ir_node  *left      = get_binop_left(node);
-       ir_node  *new_left  = transform_node(left);
+       ir_node  *new_left  = be_transform_node(left);
        ir_node  *right     = get_binop_right(node);
-       ir_node  *new_right = transform_node(right);
-       ir_node  *noreg     = ia32_new_NoReg_gp(env.cg);
-       ir_graph *irg       = env.irg;
+       ir_node  *new_right = be_transform_node(right);
+       ir_node  *noreg     = ia32_new_NoReg_gp(env_cg);
+       ir_graph *irg       = current_ir_graph;
        dbg_info *dbgi      = get_irn_dbg_info(node);
        ir_node  *in[2];
 
        /* 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_left,
+                                       new_right, new_NoMem());
        clear_ia32_commutative(muls);
-       set_ia32_am_support(muls, ia32_am_Source);
-       fold_immediate(muls, 2, 3);
+       set_ia32_am_support(muls, ia32_am_Source, ia32_am_binary);
 
        /* check if EAX and EDX proj exist, add missing one */
        in[0] = new_rd_Proj(dbgi, irg, block, muls, mode_Iu, pn_EAX);
        in[1] = new_rd_Proj(dbgi, irg, block, muls, mode_Iu, pn_EDX);
        be_new_Keep(&ia32_reg_classes[CLASS_ia32_gp], irg, block, 2, in);
 
-       SET_IA32_ORIG_NODE(muls, ia32_get_old_node_name(env.cg, node));
+       SET_IA32_ORIG_NODE(muls, ia32_get_old_node_name(env_cg, node));
 
        return muls;
 }
@@ -3499,14 +3425,14 @@ GEN_LOWERED_SHIFT_OP(Sar)
 static ir_node *gen_lowered_64bit_shifts(ir_node *node, ir_node *op1,
                                          ir_node *op2, ir_node *count)
 {
-       ir_node  *block     = transform_node(get_nodes_block(node));
-       ir_node  *new_op1   = transform_node(op1);
-       ir_node  *new_op2   = transform_node(op2);
-       ir_node  *new_count = transform_node(count);
+       ir_node  *block     = be_transform_node(get_nodes_block(node));
+       ir_node  *new_op1   = be_transform_node(op1);
+       ir_node  *new_op2   = be_transform_node(op2);
+       ir_node  *new_count = be_transform_node(count);
        ir_node  *new_op    = NULL;
-       ir_graph *irg       = env.irg;
+       ir_graph *irg       = current_ir_graph;
        dbg_info *dbgi      = get_irn_dbg_info(node);
-       ir_node  *noreg     = ia32_new_NoReg_gp(env.cg);
+       ir_node  *noreg     = ia32_new_NoReg_gp(env_cg);
        ir_node  *nomem     = new_NoMem();
        ir_node  *imm_op;
        tarval   *tv;
@@ -3515,7 +3441,7 @@ static ir_node *gen_lowered_64bit_shifts(ir_node *node, ir_node *op1,
 
        /* Check if immediate optimization is on and */
        /* if it's an operation with immediate.      */
-       imm_op  = (env.cg->opt & IA32_OPT_IMMOPS) ? get_immediate_op(NULL, new_count) : NULL;
+       imm_op  = (env_cg->opt & IA32_OPT_IMMOPS) ? get_immediate_op(NULL, new_count) : NULL;
 
        /* Limit imm_op within range imm8 */
        if (imm_op) {
@@ -3555,10 +3481,9 @@ static ir_node *gen_lowered_64bit_shifts(ir_node *node, ir_node *op1,
        }
 
        /* set AM support */
-       // Matze: node has unsupported format (6inputs)
-       //set_ia32_am_support(new_op, ia32_am_Dest);
+       set_ia32_am_support(new_op, ia32_am_Dest, ia32_am_binary);
 
-       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env.cg, node));
+       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
 
        set_ia32_emit_cl(new_op);
 
@@ -3579,12 +3504,12 @@ static ir_node *gen_ia32_l_ShrD(ir_node *node) {
  * In case SSE Unit is used, the node is transformed into a vfst + xLoad.
  */
 static ir_node *gen_ia32_l_X87toSSE(ir_node *node) {
-       ir_node         *block   = transform_node(get_nodes_block(node));
+       ir_node         *block   = be_transform_node(get_nodes_block(node));
        ir_node         *val     = get_irn_n(node, 1);
-       ir_node         *new_val = transform_node(val);
-       ia32_code_gen_t *cg      = env.cg;
+       ir_node         *new_val = be_transform_node(val);
+       ia32_code_gen_t *cg      = env_cg;
        ir_node         *res     = NULL;
-       ir_graph        *irg     = env.irg;
+       ir_graph        *irg     = current_ir_graph;
        dbg_info        *dbgi;
        ir_node         *noreg, *new_ptr, *new_mem;
        ir_node         *ptr, *mem;
@@ -3594,18 +3519,17 @@ static ir_node *gen_ia32_l_X87toSSE(ir_node *node) {
        }
 
        mem     = get_irn_n(node, 2);
-       new_mem = transform_node(mem);
+       new_mem = be_transform_node(mem);
        ptr     = get_irn_n(node, 0);
-       new_ptr = transform_node(ptr);
+       new_ptr = be_transform_node(ptr);
        noreg   = ia32_new_NoReg_gp(cg);
        dbgi    = get_irn_dbg_info(node);
 
        /* Store x87 -> MEM */
-       res = new_rd_ia32_vfst(dbgi, irg, block, new_ptr, noreg, new_val, new_mem);
+       res = new_rd_ia32_vfst(dbgi, irg, block, new_ptr, noreg, new_val, new_mem, get_ia32_ls_mode(node));
        set_ia32_frame_ent(res, get_ia32_frame_ent(node));
        set_ia32_use_frame(res);
        set_ia32_ls_mode(res, get_ia32_ls_mode(node));
-       set_ia32_am_support(res, ia32_am_Dest);
        set_ia32_am_flavour(res, ia32_B);
        set_ia32_op_type(res, ia32_AddrModeD);
 
@@ -3614,7 +3538,6 @@ static ir_node *gen_ia32_l_X87toSSE(ir_node *node) {
        set_ia32_frame_ent(res, get_ia32_frame_ent(node));
        set_ia32_use_frame(res);
        set_ia32_ls_mode(res, get_ia32_ls_mode(node));
-       set_ia32_am_support(res, ia32_am_Source);
        set_ia32_am_flavour(res, ia32_B);
        set_ia32_op_type(res, ia32_AddrModeS);
        res = new_rd_Proj(dbgi, irg, block, res, mode_xmm, pn_ia32_xLoad_res);
@@ -3626,11 +3549,11 @@ static ir_node *gen_ia32_l_X87toSSE(ir_node *node) {
  * In case SSE Unit is used, the node is transformed into a xStore + vfld.
  */
 static ir_node *gen_ia32_l_SSEtoX87(ir_node *node) {
-       ir_node         *block   = transform_node(get_nodes_block(node));
+       ir_node         *block   = be_transform_node(get_nodes_block(node));
        ir_node         *val     = get_irn_n(node, 1);
-       ir_node         *new_val = transform_node(val);
-       ia32_code_gen_t *cg      = env.cg;
-       ir_graph        *irg     = env.irg;
+       ir_node         *new_val = be_transform_node(val);
+       ia32_code_gen_t *cg      = env_cg;
+       ir_graph        *irg     = current_ir_graph;
        ir_node         *res     = NULL;
        ir_entity       *fent    = get_ia32_frame_ent(node);
        ir_mode         *lsmode  = get_ia32_ls_mode(node);
@@ -3645,9 +3568,9 @@ static ir_node *gen_ia32_l_SSEtoX87(ir_node *node) {
        }
 
        ptr     = get_irn_n(node, 0);
-       new_ptr = transform_node(ptr);
+       new_ptr = be_transform_node(ptr);
        mem     = get_irn_n(node, 2);
-       new_mem = transform_node(mem);
+       new_mem = be_transform_node(mem);
        noreg   = ia32_new_NoReg_gp(cg);
        dbgi    = get_irn_dbg_info(node);
 
@@ -3664,19 +3587,16 @@ static ir_node *gen_ia32_l_SSEtoX87(ir_node *node) {
                set_ia32_frame_ent(res, fent);
                set_ia32_use_frame(res);
                set_ia32_ls_mode(res, lsmode);
-               set_ia32_am_support(res, ia32_am_Dest);
                set_ia32_am_flavour(res, ia32_B);
                set_ia32_op_type(res, ia32_AddrModeD);
                mem = res;
        }
 
        /* Load MEM -> x87 */
-       res = new_rd_ia32_vfld(dbgi, irg, block, new_ptr, noreg, new_mem);
+       res = new_rd_ia32_vfld(dbgi, irg, block, new_ptr, noreg, new_mem, lsmode);
        set_ia32_frame_ent(res, fent);
        set_ia32_use_frame(res);
-       set_ia32_ls_mode(res, lsmode);
        add_ia32_am_offs_int(res, offs);
-       set_ia32_am_support(res, ia32_am_Source);
        set_ia32_am_flavour(res, ia32_B);
        set_ia32_op_type(res, ia32_AddrModeS);
        res = new_rd_Proj(dbgi, irg, block, res, mode_vfp, pn_ia32_vfld_res);
@@ -3702,80 +3622,20 @@ static ir_node *bad_transform(ir_node *node) {
        return NULL;
 }
 
-static ir_node *gen_End(ir_node *node) {
-       /* end has to be duplicated manually because we need a dynamic in array */
-       ir_graph *irg   = env.irg;
-       dbg_info *dbgi  = get_irn_dbg_info(node);
-       ir_node  *block = transform_node(get_nodes_block(node));
-       int      i, arity;
-       ir_node  *new_end;
-
-       new_end = new_ir_node(dbgi, irg, block, op_End, mode_X, -1, NULL);
-       copy_node_attr(node, new_end);
-       duplicate_deps(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(in);
-
-               add_End_keepalive(new_end, new_in);
-       }
-
-       return new_end;
-}
-
-static ir_node *gen_Block(ir_node *node) {
-       ir_graph *irg         = env.irg;
-       dbg_info *dbgi        = get_irn_dbg_info(node);
-       ir_node  *start_block = env.old_anchors[anchor_start_block];
-       ir_node  *block;
-       int      i, arity;
-
-       /*
-        * We replace the ProjX from the start node with a jump,
-        * so the startblock has no preds anymore now
-        */
-       if (node == start_block) {
-               return new_rd_Block(dbgi, irg, 0, NULL);
-       }
-
-       /* we use the old blocks for now, because jumps allow cycles in the graph
-        * we have to fix this later */
-       block = new_ir_node(dbgi, irg, NULL, get_irn_op(node), get_irn_mode(node),
-                           get_irn_arity(node), get_irn_in(node) + 1);
-       copy_node_attr(node, block);
-
-#ifdef DEBUG_libfirm
-       block->node_nr = node->node_nr;
-#endif
-       set_new_node(node, block);
-
-       /* put the preds in the worklist */
-       arity = get_irn_arity(node);
-       for (i = 0; i < arity; ++i) {
-               ir_node *in = get_irn_n(node, i);
-               pdeq_putr(env.worklist, in);
-       }
-
-       return block;
-}
-
+/**
+ * Transform the Projs of an AddSP.
+ */
 static ir_node *gen_Proj_be_AddSP(ir_node *node) {
-       ir_node  *block    = transform_node(get_nodes_block(node));
+       ir_node  *block    = be_transform_node(get_nodes_block(node));
        ir_node  *pred     = get_Proj_pred(node);
-       ir_node  *new_pred = transform_node(pred);
-       ir_graph *irg      = env.irg;
+       ir_node  *new_pred = be_transform_node(pred);
+       ir_graph *irg      = current_ir_graph;
        dbg_info *dbgi     = get_irn_dbg_info(node);
        long     proj      = get_Proj_proj(node);
 
        if (proj == pn_be_AddSP_res) {
                ir_node *res = new_rd_Proj(dbgi, irg, block, new_pred, mode_Iu, pn_ia32_AddSP_stack);
-               arch_set_irn_register(env.cg->arch_env, res, &ia32_gp_regs[REG_ESP]);
+               arch_set_irn_register(env_cg->arch_env, res, &ia32_gp_regs[REG_ESP]);
                return res;
        } else if (proj == pn_be_AddSP_M) {
                return new_rd_Proj(dbgi, irg, block, new_pred, mode_M, pn_ia32_AddSP_M);
@@ -3785,17 +3645,20 @@ static ir_node *gen_Proj_be_AddSP(ir_node *node) {
        return new_rd_Unknown(irg, get_irn_mode(node));
 }
 
+/**
+ * Transform the Projs of a SubSP.
+ */
 static ir_node *gen_Proj_be_SubSP(ir_node *node) {
-       ir_node  *block    = transform_node(get_nodes_block(node));
+       ir_node  *block    = be_transform_node(get_nodes_block(node));
        ir_node  *pred     = get_Proj_pred(node);
-       ir_node  *new_pred = transform_node(pred);
-       ir_graph *irg      = env.irg;
+       ir_node  *new_pred = be_transform_node(pred);
+       ir_graph *irg      = current_ir_graph;
        dbg_info *dbgi     = get_irn_dbg_info(node);
        long     proj      = get_Proj_proj(node);
 
        if (proj == pn_be_SubSP_res) {
-               ir_node *res = new_rd_Proj(dbgi, irg, block, new_pred, mode_Iu, pn_ia32_AddSP_stack);
-               arch_set_irn_register(env.cg->arch_env, res, &ia32_gp_regs[REG_ESP]);
+               ir_node *res = new_rd_Proj(dbgi, irg, block, new_pred, mode_Iu, pn_ia32_SubSP_stack);
+               arch_set_irn_register(env_cg->arch_env, res, &ia32_gp_regs[REG_ESP]);
                return res;
        } else if (proj == pn_be_SubSP_M) {
                return new_rd_Proj(dbgi, irg, block, new_pred, mode_M, pn_ia32_SubSP_M);
@@ -3805,11 +3668,14 @@ static ir_node *gen_Proj_be_SubSP(ir_node *node) {
        return new_rd_Unknown(irg, get_irn_mode(node));
 }
 
+/**
+ * Transform and renumber the Projs from a Load.
+ */
 static ir_node *gen_Proj_Load(ir_node *node) {
-       ir_node  *block    = transform_node(get_nodes_block(node));
+       ir_node  *block    = be_transform_node(get_nodes_block(node));
        ir_node  *pred     = get_Proj_pred(node);
-       ir_node  *new_pred = transform_node(pred);
-       ir_graph *irg      = env.irg;
+       ir_node  *new_pred = be_transform_node(pred);
+       ir_graph *irg      = current_ir_graph;
        dbg_info *dbgi     = get_irn_dbg_info(node);
        long     proj      = get_Proj_proj(node);
 
@@ -3838,11 +3704,14 @@ static ir_node *gen_Proj_Load(ir_node *node) {
        return new_rd_Unknown(irg, get_irn_mode(node));
 }
 
+/**
+ * Transform and renumber the Projs from a DivMod like instruction.
+ */
 static ir_node *gen_Proj_DivMod(ir_node *node) {
-       ir_node  *block    = transform_node(get_nodes_block(node));
+       ir_node  *block    = be_transform_node(get_nodes_block(node));
        ir_node  *pred     = get_Proj_pred(node);
-       ir_node  *new_pred = transform_node(pred);
-       ir_graph *irg      = env.irg;
+       ir_node  *new_pred = be_transform_node(pred);
+       ir_graph *irg      = current_ir_graph;
        dbg_info *dbgi     = get_irn_dbg_info(node);
        ir_mode  *mode     = get_irn_mode(node);
        long     proj      = get_Proj_proj(node);
@@ -3890,11 +3759,14 @@ static ir_node *gen_Proj_DivMod(ir_node *node) {
        return new_rd_Unknown(irg, mode);
 }
 
+/**
+ * Transform and renumber the Projs from a CopyB.
+ */
 static ir_node *gen_Proj_CopyB(ir_node *node) {
-       ir_node  *block    = transform_node(get_nodes_block(node));
+       ir_node  *block    = be_transform_node(get_nodes_block(node));
        ir_node  *pred     = get_Proj_pred(node);
-       ir_node  *new_pred = transform_node(pred);
-       ir_graph *irg      = env.irg;
+       ir_node  *new_pred = be_transform_node(pred);
+       ir_graph *irg      = current_ir_graph;
        dbg_info *dbgi     = get_irn_dbg_info(node);
        ir_mode  *mode     = get_irn_mode(node);
        long     proj      = get_Proj_proj(node);
@@ -3915,11 +3787,14 @@ static ir_node *gen_Proj_CopyB(ir_node *node) {
        return new_rd_Unknown(irg, mode);
 }
 
+/**
+ * Transform and renumber the Projs from a vfdiv.
+ */
 static ir_node *gen_Proj_l_vfdiv(ir_node *node) {
-       ir_node  *block    = transform_node(get_nodes_block(node));
+       ir_node  *block    = be_transform_node(get_nodes_block(node));
        ir_node  *pred     = get_Proj_pred(node);
-       ir_node  *new_pred = transform_node(pred);
-       ir_graph *irg      = env.irg;
+       ir_node  *new_pred = be_transform_node(pred);
+       ir_graph *irg      = current_ir_graph;
        dbg_info *dbgi     = get_irn_dbg_info(node);
        ir_mode  *mode     = get_irn_mode(node);
        long     proj      = get_Proj_proj(node);
@@ -3936,11 +3811,14 @@ static ir_node *gen_Proj_l_vfdiv(ir_node *node) {
        return new_rd_Unknown(irg, mode);
 }
 
+/**
+ * Transform and renumber the Projs from a Quot.
+ */
 static ir_node *gen_Proj_Quot(ir_node *node) {
-       ir_node  *block    = transform_node(get_nodes_block(node));
+       ir_node  *block    = be_transform_node(get_nodes_block(node));
        ir_node  *pred     = get_Proj_pred(node);
-       ir_node  *new_pred = transform_node(pred);
-       ir_graph *irg      = env.irg;
+       ir_node  *new_pred = be_transform_node(pred);
+       ir_graph *irg      = current_ir_graph;
        dbg_info *dbgi     = get_irn_dbg_info(node);
        ir_mode  *mode     = get_irn_mode(node);
        long     proj      = get_Proj_proj(node);
@@ -3968,20 +3846,26 @@ static ir_node *gen_Proj_Quot(ir_node *node) {
        return new_rd_Unknown(irg, mode);
 }
 
+/**
+ * Transform the Thread Local Storage Proj.
+ */
 static ir_node *gen_Proj_tls(ir_node *node) {
-       ir_node  *block = transform_node(get_nodes_block(node));
-       ir_graph *irg   = env.irg;
+       ir_node  *block = be_transform_node(get_nodes_block(node));
+       ir_graph *irg   = current_ir_graph;
        dbg_info *dbgi  = NULL;
        ir_node  *res   = new_rd_ia32_LdTls(dbgi, irg, block, mode_Iu);
 
        return res;
 }
 
+/**
+ * Transform the Projs from a be_Call.
+ */
 static ir_node *gen_Proj_be_Call(ir_node *node) {
-       ir_node  *block    = transform_node(get_nodes_block(node));
+       ir_node  *block    = be_transform_node(get_nodes_block(node));
        ir_node  *call     = get_Proj_pred(node);
-       ir_node  *new_call = transform_node(call);
-       ir_graph *irg      = env.irg;
+       ir_node  *new_call = be_transform_node(call);
+       ir_graph *irg      = current_ir_graph;
        dbg_info *dbgi     = get_irn_dbg_info(node);
        long     proj      = get_Proj_proj(node);
        ir_mode  *mode     = get_irn_mode(node);
@@ -4001,7 +3885,7 @@ static ir_node *gen_Proj_be_Call(ir_node *node) {
                ir_node *call_res_pred = NULL;
 
                if (call_res != NULL) {
-                       call_res_new  = transform_node(call_res);
+                       call_res_new  = be_transform_node(call_res);
                        call_res_pred = get_Proj_pred(call_res_new);
                }
 
@@ -4012,10 +3896,10 @@ static ir_node *gen_Proj_be_Call(ir_node *node) {
                        return new_rd_Proj(dbgi, irg, block, call_res_pred, mode_M, pn_ia32_xLoad_M);
                }
        }
-       if (proj == pn_be_Call_first_res && mode_is_float(mode) && USE_SSE2(env.cg)) {
+       if (proj == pn_be_Call_first_res && mode_is_float(mode) && USE_SSE2(env_cg)) {
                ir_node *fstp;
                ir_node *frame = get_irg_frame(irg);
-               ir_node *noreg = ia32_new_NoReg_gp(env.cg);
+               ir_node *noreg = ia32_new_NoReg_gp(env_cg);
                ir_node *p;
                ir_node *call_mem = be_get_Proj_for_pn(call, pn_be_Call_M_regular);
                ir_node *keepin[1];
@@ -4031,7 +3915,6 @@ static ir_node *gen_Proj_be_Call(ir_node *node) {
                set_ia32_op_type(fstp, ia32_AddrModeD);
                set_ia32_use_frame(fstp);
                set_ia32_am_flavour(fstp, ia32_am_B);
-               set_ia32_am_support(fstp, ia32_am_Dest);
 
                /* load into SSE register */
                sse_load = new_rd_ia32_xLoad(dbgi, irg, block, frame, noreg, fstp);
@@ -4039,7 +3922,6 @@ static ir_node *gen_Proj_be_Call(ir_node *node) {
                set_ia32_op_type(sse_load, ia32_AddrModeS);
                set_ia32_use_frame(sse_load);
                set_ia32_am_flavour(sse_load, ia32_am_B);
-               set_ia32_am_support(sse_load, ia32_am_Source);
 
                sse_load = new_rd_Proj(dbgi, irg, block, sse_load, mode_xmm, pn_ia32_xLoad_res);
 
@@ -4054,7 +3936,7 @@ static ir_node *gen_Proj_be_Call(ir_node *node) {
                assert(be_is_Keep(p) && "Keep expected.");
 
                /* keep the result */
-               cls = arch_get_irn_reg_class(env.cg->arch_env, sse_load, -1);
+               cls = arch_get_irn_reg_class(env_cg->arch_env, sse_load, -1);
                keepin[0] = sse_load;
                be_new_Keep(cls, irg, block, 1, keepin);
 
@@ -4063,22 +3945,81 @@ static ir_node *gen_Proj_be_Call(ir_node *node) {
 
        /* transform call modes */
        if (mode_is_data(mode)) {
-               cls = arch_get_irn_reg_class(env.cg->arch_env, node, -1);
+               cls = arch_get_irn_reg_class(env_cg->arch_env, node, -1);
                mode = cls->mode;
        }
 
        return new_rd_Proj(dbgi, irg, block, new_call, mode, proj);
 }
 
+/**
+ * Transform the Projs from a Cmp.
+ */
+static ir_node *gen_Proj_Cmp(ir_node *node)
+{
+       /* normally Cmps are processed when looking at Cond nodes, but this case
+        * can happen in complicated Psi conditions */
+
+       ir_graph *irg           = current_ir_graph;
+       dbg_info *dbgi          = get_irn_dbg_info(node);
+       ir_node  *block         = be_transform_node(get_nodes_block(node));
+       ir_node  *cmp           = get_Proj_pred(node);
+       long      pnc           = get_Proj_proj(node);
+       ir_node  *cmp_left      = get_Cmp_left(cmp);
+       ir_node  *cmp_right     = get_Cmp_right(cmp);
+       ir_node  *new_cmp_left;
+       ir_node  *new_cmp_right;
+       ir_node  *noreg         = ia32_new_NoReg_gp(env_cg);
+       ir_node  *nomem         = new_rd_NoMem(irg);
+       ir_mode  *cmp_mode      = get_irn_mode(cmp_left);
+       ir_node  *new_op;
+
+       assert(!mode_is_float(cmp_mode));
+
+       /* (a != b) -> (a ^ b) */
+       if(pnc == pn_Cmp_Lg) {
+               if(is_Const_0(cmp_left)) {
+                       new_op = be_transform_node(cmp_right);
+               } else if(is_Const_0(cmp_right)) {
+                       new_op = be_transform_node(cmp_left);
+               } else {
+                       new_op = gen_binop(cmp, cmp_left, cmp_right, new_rd_ia32_Xor, 1);
+               }
+
+               return new_op;
+       }
+       /* TODO:
+        * (a == b) -> !(a ^ b)
+        * (a < 0)  -> (a & 0x80000000) oder a >> 31
+        * (a >= 0) -> (a >> 31) ^ 1
+        */
+
+       if(!mode_is_signed(cmp_mode)) {
+               pnc |= ia32_pn_Cmp_Unsigned;
+       }
+
+       new_cmp_left = be_transform_node(cmp_left);
+       new_cmp_right = create_immediate_or_transform(cmp_right, 0);
+
+       new_op = new_rd_ia32_CmpSet(dbgi, irg, block, noreg, noreg, new_cmp_left,
+                                   new_cmp_right, nomem, pnc);
+       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, cmp));
+
+       return new_op;
+}
+
+/**
+ * Transform and potentially renumber Proj nodes.
+ */
 static ir_node *gen_Proj(ir_node *node) {
-       ir_graph *irg  = env.irg;
+       ir_graph *irg  = current_ir_graph;
        dbg_info *dbgi = get_irn_dbg_info(node);
        ir_node  *pred = get_Proj_pred(node);
        long     proj  = get_Proj_proj(node);
 
        if (is_Store(pred) || be_is_FrameStore(pred)) {
                if (proj == pn_Store_M) {
-                       return transform_node(pred);
+                       return be_transform_node(pred);
                } else {
                        assert(0);
                        return new_r_Bad(irg);
@@ -4099,23 +4040,24 @@ static ir_node *gen_Proj(ir_node *node) {
                return gen_Proj_be_AddSP(node);
        } else if (be_is_Call(pred)) {
                return gen_Proj_be_Call(node);
+       } else if (is_Cmp(pred)) {
+               return gen_Proj_Cmp(node);
        } else if (get_irn_op(pred) == op_Start) {
                if (proj == pn_Start_X_initial_exec) {
                        ir_node *block = get_nodes_block(pred);
                        ir_node *jump;
 
                        /* we exchange the ProjX with a jump */
-                       block = transform_node(block);
+                       block = be_transform_node(block);
                        jump  = new_rd_Jmp(dbgi, irg, block);
-                       ir_fprintf(stderr, "created jump: %+F\n", jump);
                        return jump;
                }
-               if (node == env.old_anchors[anchor_tls]) {
+               if (node == be_get_old_anchor(anchor_tls)) {
                        return gen_Proj_tls(node);
                }
        } else {
-               ir_node *new_pred = transform_node(pred);
-               ir_node *block    = transform_node(get_nodes_block(node));
+               ir_node *new_pred = be_transform_node(pred);
+               ir_node *block    = be_transform_node(get_nodes_block(node));
                ir_mode *mode     = get_irn_mode(node);
                if (mode_needs_gp_reg(mode)) {
                        ir_node *new_proj = new_r_Proj(irg, block, new_pred, mode_Iu,
@@ -4127,7 +4069,7 @@ static ir_node *gen_Proj(ir_node *node) {
                }
        }
 
-       return duplicate_node(node);
+       return be_duplicate_node(node);
 }
 
 /**
@@ -4139,7 +4081,7 @@ static void register_transformers(void) {
        /* first clear the generic function pointer for all ops */
        clear_irp_opcodes_generic_func();
 
-#define GEN(a)   { transform_func *func = gen_##a; op_##a->ops.generic = (op_func) func; }
+#define GEN(a)   { be_transform_func *func = gen_##a; op_##a->ops.generic = (op_func) func; }
 #define BAD(a)   op_##a->ops.generic = (op_func)bad_transform
 
        GEN(Add);
@@ -4177,9 +4119,6 @@ static void register_transformers(void) {
        GEN(Proj);
        GEN(Phi);
 
-       GEN(Block);
-       GEN(End);
-
        /* transform ops from intrinsic lowering */
        GEN(ia32_l_Add);
        GEN(ia32_l_Adc);
@@ -4232,6 +4171,7 @@ static void register_transformers(void) {
        GEN(be_StackParam);
        GEN(be_AddSP);
        GEN(be_SubSP);
+       GEN(be_Copy);
 
        /* set the register for all Unknown nodes */
        GEN(Unknown);
@@ -4250,418 +4190,25 @@ static void register_transformers(void) {
 #undef BAD
 }
 
-static void duplicate_deps(ir_node *old_node, ir_node *new_node)
-{
-       int i;
-       int deps = get_irn_deps(old_node);
-
-       for (i = 0; i < deps; ++i) {
-               ir_node *dep     = get_irn_dep(old_node, i);
-               ir_node *new_dep = transform_node(dep);
-
-               add_irn_dep(new_node, new_dep);
-       }
-}
-
-static ir_node *duplicate_node(ir_node *node)
-{
-       ir_node  *block = transform_node(get_nodes_block(node));
-       ir_graph *irg   = env.irg;
-       dbg_info *dbgi  = get_irn_dbg_info(node);
-       ir_mode  *mode  = get_irn_mode(node);
-       ir_op    *op    = get_irn_op(node);
-       ir_node  *new_node;
-       int      i, arity;
-
-       arity = get_irn_arity(node);
-       if (op->opar == oparity_dynamic) {
-               new_node = new_ir_node(dbgi, irg, block, op, mode, -1, NULL);
-               for (i = 0; i < arity; ++i) {
-                       ir_node *in = get_irn_n(node, i);
-                       in = transform_node(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(in);
-               }
-
-               new_node = new_ir_node(dbgi, irg, block, op, mode, arity, ins);
-       }
-
-       copy_node_attr(node, new_node);
-       duplicate_deps(node, new_node);
-
-#ifdef DEBUG_libfirm
-       new_node->node_nr = node->node_nr;
-#endif
-
-       return new_node;
-}
-
-/**
- * Calls transformation function for given node and marks it visited.
- */
-static ir_node *transform_node(ir_node *node) {
-       ir_node *new_node;
-       ir_op   *op;
-
-       if (irn_visited(node)) {
-               new_node = get_new_node(node);
-               assert(new_node != NULL);
-               return new_node;
-       }
-
-       mark_irn_visited(node);
-       DEBUG_ONLY(set_new_node(node, NULL));
-
-       op = get_irn_op(node);
-       if (op->ops.generic) {
-               transform_func *transform = (transform_func *)op->ops.generic;
-
-               new_node = transform(node);
-               assert(new_node != NULL);
-       } else {
-               new_node = duplicate_node(node);
-       }
-       DB((dbg, LEVEL_4, "%+F -> %+F\n", node, new_node));
-
-       set_new_node(node, new_node);
-       mark_irn_visited(new_node);
-       hook_dead_node_elim_subst(current_ir_graph, node, new_node);
-       return new_node;
-}
-
 /**
- * Rewire nodes which are potential loops (like Phis) to avoid endless loops.
+ * Pre-transform all unknown and noreg nodes.
  */
-static void fix_loops(ir_node *node) {
-       int i, arity;
-
-       if (irn_visited(node))
-               return;
-
-       mark_irn_visited(node);
-
-       assert(node_is_in_irgs_storage(env.irg, node));
-
-       if (! is_Block(node)) {
-               ir_node *block     = get_nodes_block(node);
-               ir_node *new_block = (ir_node *)get_irn_link(block);
-
-               if (new_block != NULL) {
-                       set_nodes_block(node, new_block);
-                       block = new_block;
-               }
-
-               fix_loops(block);
-       }
-
-       arity = get_irn_arity(node);
-       for (i = 0; i < arity; ++i) {
-               ir_node *in = get_irn_n(node, i);
-               ir_node *nw = (ir_node *)get_irn_link(in);
-
-               if (nw != NULL && nw != in) {
-                       set_irn_n(node, i, nw);
-                       in = nw;
-               }
-
-               fix_loops(in);
-       }
-
-       arity = get_irn_deps(node);
-       for (i = 0; i < arity; ++i) {
-               ir_node *in = get_irn_dep(node, i);
-               ir_node *nw = (ir_node *)get_irn_link(in);
-
-               if (nw != NULL && nw != in) {
-                       set_irn_dep(node, i, nw);
-                       in = nw;
-               }
-
-               fix_loops(in);
-       }
+static void ia32_pretransform_node(void *arch_cg) {
+       ia32_code_gen_t *cg = arch_cg;
+
+       cg->unknown_gp  = be_pre_transform_node(cg->unknown_gp);
+       cg->unknown_vfp = be_pre_transform_node(cg->unknown_vfp);
+       cg->unknown_xmm = be_pre_transform_node(cg->unknown_xmm);
+       cg->noreg_gp    = be_pre_transform_node(cg->noreg_gp);
+       cg->noreg_vfp   = be_pre_transform_node(cg->noreg_vfp);
+       cg->noreg_xmm   = be_pre_transform_node(cg->noreg_xmm);
 }
 
-static void pre_transform_node(ir_node **place)
-{
-       if (*place == NULL)
-               return;
-
-       *place = transform_node(*place);
-}
-
-/**
- * Transforms all nodes. Deletes the old obstack and creates a new one.
- */
-static void transform_nodes(ia32_code_gen_t *cg) {
-       int      i;
-       ir_graph *irg = cg->irg;
-       ir_node  *old_end;
-
-       hook_dead_node_elim(irg, 1);
-
-       inc_irg_visited(irg);
-
-       env.irg         = irg;
-       env.cg          = cg;
-       env.visited     = get_irg_visited(irg);
-       env.worklist    = new_pdeq();
-       env.old_anchors = alloca(anchor_max * sizeof(env.old_anchors[0]));
-
-       old_end = get_irg_end(irg);
-
-       /* put all anchor nodes in the worklist */
-       for (i = 0; i < anchor_max; ++i) {
-               ir_node *anchor = irg->anchors[i];
-
-               if (anchor == NULL)
-                       continue;
-               pdeq_putr(env.worklist, anchor);
-
-               /* remember anchor */
-               env.old_anchors[i] = anchor;
-               /* and set it to NULL to make sure we don't accidently use it */
-               irg->anchors[i] = NULL;
-       }
-
-       /* pre transform some anchors (so they are available in the other transform
-        * functions) */
-       set_irg_bad(irg, transform_node(env.old_anchors[anchor_bad]));
-       set_irg_no_mem(irg, transform_node(env.old_anchors[anchor_no_mem]));
-       set_irg_start_block(irg, transform_node(env.old_anchors[anchor_start_block]));
-       set_irg_start(irg, transform_node(env.old_anchors[anchor_start]));
-       set_irg_frame(irg, transform_node(env.old_anchors[anchor_frame]));
-
-       pre_transform_node(&cg->unknown_gp);
-       pre_transform_node(&cg->unknown_vfp);
-       pre_transform_node(&cg->unknown_xmm);
-       pre_transform_node(&cg->noreg_gp);
-       pre_transform_node(&cg->noreg_vfp);
-       pre_transform_node(&cg->noreg_xmm);
-
-       /* process worklist (this should transform all nodes in the graph) */
-       while (! pdeq_empty(env.worklist)) {
-               ir_node *node = pdeq_getl(env.worklist);
-               transform_node(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(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);
+/* do the transformation */
+void ia32_transform_graph(ia32_code_gen_t *cg) {
        register_transformers();
-
-       /* most analysis info is wrong after transformation */
-       free_callee_info(irg);
-       free_irg_outs(irg);
-       irg->outs_state = outs_none;
-       free_trouts();
-       free_loop_information(irg);
-       set_irg_doms_inconsistent(irg);
-       be_invalidate_liveness(birg);
-       be_invalidate_dom_front(birg);
-
-       /* create a new obstack */
-       old_obst = irg->obst;
-       new_obst = xmalloc(sizeof(*new_obst));
-       obstack_init(new_obst);
-       irg->obst = new_obst;
-       irg->last_node_idx = 0;
-
-       /* create new value table for CSE */
-       del_identities(irg->value_table);
-       irg->value_table = new_identities();
-
-       /* do the main transformation */
-       transform_nodes(cg);
-
-       /* we don't want the globals anchor anymore */
-       set_irg_globals(irg, new_r_Bad(irg));
-
-       /* free the old obstack */
-       obstack_free(old_obst, 0);
-       xfree(old_obst);
-
-       /* restore state */
-       current_ir_graph = old_current_ir_graph;
-       set_interprocedural_view(old_interprocedural_view);
-
-       /* recalculate edges */
-       edges_deactivate(irg);
-       edges_activate(irg);
-}
-
-/**
- * Transforms a psi condition.
- */
-static void transform_psi_cond(ir_node *cond, ir_mode *mode, ia32_code_gen_t *cg) {
-       int i;
-
-       /* if the mode is target mode, we have already seen this part of the tree */
-       if (get_irn_mode(cond) == mode)
-               return;
-
-       assert(get_irn_mode(cond) == mode_b && "logical operator for condition must be mode_b");
-
-       set_irn_mode(cond, mode);
-
-       for (i = get_irn_arity(cond) - 1; i >= 0; i--) {
-               ir_node *in = get_irn_n(cond, i);
-
-               /* if in is a compare: transform into Set/xCmp */
-               if (is_Proj(in)) {
-                       ir_node  *new_op = NULL;
-                       ir_node  *cmp    = get_Proj_pred(in);
-                       ir_node  *cmp_a  = get_Cmp_left(cmp);
-                       ir_node  *cmp_b  = get_Cmp_right(cmp);
-                       dbg_info *dbgi   = get_irn_dbg_info(cmp);
-                       ir_graph *irg    = get_irn_irg(cmp);
-                       ir_node  *block  = get_nodes_block(cmp);
-                       ir_node  *noreg  = ia32_new_NoReg_gp(cg);
-                       ir_node  *nomem  = new_rd_NoMem(irg);
-                       int      pnc     = get_Proj_proj(in);
-
-                       /* this is a compare */
-                       if (mode_is_float(mode)) {
-                               /* Psi is float, we need a floating point compare */
-
-                               if (USE_SSE2(cg)) {
-                                       ir_mode *m = get_irn_mode(cmp_a);
-                                       /* SSE FPU */
-                                       if (! mode_is_float(m)) {
-                                               cmp_a = gen_sse_conv_int2float(cg, dbgi, irg, block, cmp_a, cmp_a, mode);
-                                               cmp_b = gen_sse_conv_int2float(cg, dbgi, irg, block, cmp_b, cmp_b, mode);
-                                       } else if (m == mode_F) {
-                                               /* we convert cmp values always to double, to get correct bitmask with cmpsd */
-                                               cmp_a = gen_sse_conv_f2d(cg, dbgi, irg, block, cmp_a, cmp_a);
-                                               cmp_b = gen_sse_conv_f2d(cg, dbgi, irg, block, cmp_b, cmp_b);
-                                       }
-
-                                       new_op = new_rd_ia32_xCmp(dbgi, irg, block, noreg, noreg, cmp_a, cmp_b, nomem);
-                                       set_ia32_pncode(new_op, pnc);
-                                       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(cg, cmp));
-                               } else {
-                                       /* x87 FPU */
-                                       assert(0);
-                               }
-                       } else {
-                               /* integer Psi */
-                               construct_binop_func *set_func  = NULL;
-
-                               if (mode_is_float(get_irn_mode(cmp_a))) {
-                                       /* 1st case: compare operands are floats */
-                                       FP_USED(cg);
-
-                                       if (USE_SSE2(cg)) {
-                                               /* SSE FPU */
-                                               set_func  = new_rd_ia32_xCmpSet;
-                                       } else {
-                                               /* x87 FPU */
-                                               set_func  = new_rd_ia32_vfCmpSet;
-                                       }
-
-                                       pnc &= 7; /* fp compare -> int compare */
-                               } else {
-                                       /* 2nd case: compare operand are integer too */
-                                       set_func  = new_rd_ia32_CmpSet;
-                               }
-
-                               new_op = set_func(dbgi, irg, block, noreg, noreg, cmp_a, cmp_b, nomem);
-                               if (! mode_is_signed(mode))
-                                       pnc |= ia32_pn_Cmp_Unsigned;
-
-                               set_ia32_pncode(new_op, pnc);
-                               set_ia32_am_support(new_op, ia32_am_Source);
-                       }
-
-                       /* the the new compare as in */
-                       set_irn_n(cond, i, new_op);
-               } else {
-                       /* another complex condition */
-                       transform_psi_cond(in, mode, cg);
-               }
-       }
-}
-
-/**
- * The Psi selector can be a tree of compares combined with "And"s and "Or"s.
- * We create a Set node, respectively a xCmp in case the Psi is a float, for
- * each compare, which causes the compare result to be stored in a register. The
- * "And"s and "Or"s are transformed later, we just have to set their mode right.
- */
-void ia32_transform_psi_cond_tree(ir_node *node, void *env) {
-       ia32_code_gen_t *cg = env;
-       ir_node         *psi_sel, *new_cmp, *block;
-       ir_graph        *irg;
-       ir_mode         *mode;
-
-       /* check for Psi */
-       if (get_irn_opcode(node) != iro_Psi)
-               return;
-
-       psi_sel = get_Psi_cond(node, 0);
-
-       /* if psi_cond is a cmp: do nothing, this case is covered by gen_Psi */
-       if (is_Proj(psi_sel)) {
-               assert(is_Cmp(get_Proj_pred(psi_sel)));
-               return;
-       }
-
-       //mode = get_irn_mode(node);
-       // TODO probably wrong...
-       mode = mode_Iu;
-
-       transform_psi_cond(psi_sel, mode, cg);
-
-       irg   = get_irn_irg(node);
-       block = get_nodes_block(node);
-
-       /* we need to compare the evaluated condition tree with 0 */
-       mode = get_irn_mode(node);
-       if (mode_is_float(mode)) {
-               /* BEWARE: new_r_Const_long works for floating point as well */
-               ir_node *zero = new_r_Const_long(irg, block, mode, 0);
-
-               psi_sel = gen_sse_conv_int2float(cg, NULL, irg, block, psi_sel, NULL, mode);
-               new_cmp = new_r_Cmp(irg, block, psi_sel, zero);
-               new_cmp = new_r_Proj(irg, block, new_cmp, mode_b, pn_Cmp_Ne);
-       } else {
-               ir_node *zero = new_r_Const_long(irg, block, mode_Iu, 0);
-               new_cmp = new_r_Cmp(irg, block, psi_sel, zero);
-               new_cmp = new_r_Proj(irg, block, new_cmp, mode_b, pn_Cmp_Gt | pn_Cmp_Lt);
-       }
-
-       set_Psi_cond(node, 0, new_cmp);
+       env_cg = cg;
+       be_transform_graph(cg->birg, ia32_pretransform_node, cg);
 }
 
 void ia32_init_transform(void)