rbitset: Let rbitset_alloca() return the new raw bitset.
[libfirm] / ir / ir / iropt.c
index bbcfc0d..3469253 100644 (file)
@@ -50,6 +50,7 @@
 #include "firm_types.h"
 #include "bitfiddle.h"
 #include "be.h"
+#include "error.h"
 
 #include "entity_t.h"
 
@@ -736,49 +737,6 @@ ir_tarval *computed_value(const ir_node *n)
        return tarval_bad;
 }
 
-void firm_set_default_computed_value(ir_opcode code, ir_op_ops *ops)
-{
-#define CASE(a)                                        \
-       case iro_##a:                                      \
-               ops->computed_value      = computed_value_##a; \
-               break
-#define CASE_PROJ(a)                                        \
-       case iro_##a:                                           \
-               ops->computed_value_Proj = computed_value_Proj_##a; \
-               break
-
-       switch (code) {
-       CASE(Add);
-       CASE(And);
-       CASE(Borrow);
-       CASE(Carry);
-       CASE(Cmp);
-       CASE(Confirm);
-       CASE(Const);
-       CASE(Conv);
-       CASE(Eor);
-       CASE(Minus);
-       CASE(Mul);
-       CASE(Mux);
-       CASE(Not);
-       CASE(Or);
-       CASE(Proj);
-       CASE(Rotl);
-       CASE(Shl);
-       CASE(Shr);
-       CASE(Shrs);
-       CASE(Sub);
-       CASE(SymConst);
-       CASE_PROJ(Div);
-       CASE_PROJ(Mod);
-       default:
-               /* leave NULL */
-               break;
-       }
-#undef CASE_PROJ
-#undef CASE
-}
-
 /**
  * Optimize operations that are commutative and have neutral 0,
  * so a op 0 = 0 op a = a.
@@ -942,11 +900,6 @@ static ir_node *equivalent_node_left_zero(ir_node *n)
        return n;
 }
 
-#define equivalent_node_Shl   equivalent_node_left_zero
-#define equivalent_node_Shr   equivalent_node_left_zero
-#define equivalent_node_Shrs  equivalent_node_left_zero
-#define equivalent_node_Rotl  equivalent_node_left_zero
-
 /**
  * Optimize a - 0 and (a + x) - x (for modes with wrap-around).
  *
@@ -994,26 +947,17 @@ static ir_node *equivalent_node_Sub(ir_node *n)
  *   We handle it anyway here but the better way would be a
  *   flag. This would be needed for Pascal for instance.
  */
-static ir_node *equivalent_node_idempotent_unop(ir_node *n)
+static ir_node *equivalent_node_involution(ir_node *n)
 {
        ir_node *oldn = n;
        ir_node *pred = get_unop_op(n);
-
-       /* optimize symmetric unop */
        if (get_irn_op(pred) == get_irn_op(n)) {
                n = get_unop_op(pred);
-               DBG_OPT_ALGSIM2(oldn, pred, n, FS_OPT_IDEM_UNARY);
+               DBG_OPT_ALGSIM2(oldn, pred, n, FS_OPT_INVOLUTION);
        }
        return n;
 }
 
-/** Optimize Not(Not(x)) == x. */
-#define equivalent_node_Not    equivalent_node_idempotent_unop
-
-/** -(-x) == x       ??? Is this possible or can --x raise an
-                       out of bounds exception if min =! max? */
-#define equivalent_node_Minus  equivalent_node_idempotent_unop
-
 /**
  * Optimize a * 1 = 1 * a = a.
  */
@@ -1111,9 +1055,9 @@ static ir_node *equivalent_node_And(ir_node *n)
                                /* Check Conv(all_one) & Const = all_one */
                                ir_tarval *one  = get_mode_all_one(convopmode);
                                ir_tarval *conv = tarval_convert_to(one, mode);
-                               ir_tarval *and  = tarval_and(conv, tv);
+                               ir_tarval *tand = tarval_and(conv, tv);
 
-                               if (tarval_is_all_one(and)) {
+                               if (tarval_is_all_one(tand)) {
                                        /* Conv(X) & Const = X */
                                        n = a;
                                        DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_AND);
@@ -1156,121 +1100,18 @@ static ir_node *equivalent_node_Conv(ir_node *n)
        ir_mode *n_mode = get_irn_mode(n);
        ir_mode *a_mode = get_irn_mode(a);
 
-restart:
        if (n_mode == a_mode) { /* No Conv necessary */
-               if (get_Conv_strict(n)) {
-                       ir_node *p = a;
-
-                       /* neither Minus nor Confirm change the precision,
-                          so we can "look-through" */
-                       for (;;) {
-                               if (is_Minus(p)) {
-                                       p = get_Minus_op(p);
-                               } else if (is_Confirm(p)) {
-                                       p = get_Confirm_value(p);
-                               } else {
-                                       /* stop here */
-                                       break;
-                               }
-                       }
-                       if (is_Conv(p) && get_Conv_strict(p)) {
-                               /* we known already, that a_mode == n_mode, and neither
-                                  Minus change the mode, so the second Conv
-                                  can be kicked */
-                               assert(get_irn_mode(p) == n_mode);
-                               n = a;
-                               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_CONV);
-                               return n;
-                       }
-                       if (is_Proj(p)) {
-                               ir_node *pred = get_Proj_pred(p);
-                               if (is_Load(pred)) {
-                                       /* Loads always return with the exact precision of n_mode */
-                                       assert(get_Load_mode(pred) == n_mode);
-                                       n = a;
-                                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_CONV);
-                                       return n;
-                               }
-                               if (is_Proj(pred) && get_Proj_proj(pred) == pn_Start_T_args) {
-                                       pred = get_Proj_pred(pred);
-                                       if (is_Start(pred)) {
-                                               /* Arguments always return with the exact precision,
-                                                  as strictConv's are place before Call -- if the
-                                                  caller was compiled with the same setting.
-                                                  Otherwise, the semantics is probably still right. */
-                                               assert(get_irn_mode(p) == n_mode);
-                                               n = a;
-                                               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_CONV);
-                                               return n;
-                                       }
-                               }
-                       }
-                       if (is_Conv(a)) {
-                               /* special case: the immediate predecessor is also a Conv */
-                               if (! get_Conv_strict(a)) {
-                                       /* first one is not strict, kick it */
-                                       a = get_Conv_op(a);
-                                       a_mode = get_irn_mode(a);
-                                       set_Conv_op(n, a);
-                                       goto restart;
-                               }
-                               /* else both are strict conv, second is superfluous */
-                               n = a;
-                               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_CONV);
-                               return n;
-                       }
-               } else {
-                       n = a;
-                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_CONV);
-                       return n;
-               }
+               n = a;
+               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_CONV);
+               return n;
        } else if (is_Conv(a)) { /* Conv(Conv(b)) */
                ir_node *b      = get_Conv_op(a);
                ir_mode *b_mode = get_irn_mode(b);
 
-               if (get_Conv_strict(n) && get_Conv_strict(a)) {
-                       /* both are strict conv */
-                       if (smaller_mode(a_mode, n_mode)) {
-                               /* both are strict, but the first is smaller, so
-                                  the second cannot remove more precision, remove the
-                                  strict bit */
-                               set_Conv_strict(n, 0);
-                       }
-               }
-               if (n_mode == b_mode) {
-                       if (! get_Conv_strict(n) && ! get_Conv_strict(a)) {
-                               if (n_mode == mode_b) {
-                                       n = b; /* Convb(Conv*(xxxb(...))) == xxxb(...) */
-                                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_CONV);
-                                       return n;
-                               } else if (get_mode_arithmetic(n_mode) == get_mode_arithmetic(a_mode)) {
-                                       if (values_in_mode(b_mode, a_mode)) {
-                                               n = b;        /* ConvS(ConvL(xxxS(...))) == xxxS(...) */
-                                               DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_CONV);
-                                               return n;
-                                       }
-                               }
-                       }
-                       if (mode_is_int(n_mode) && get_mode_arithmetic(a_mode) == irma_ieee754) {
-                               /* ConvI(ConvF(I)) -> I, iff float mantissa >= int mode */
-                               unsigned int_mantissa   = get_mode_size_bits(n_mode) - (mode_is_signed(n_mode) ? 1 : 0);
-                               unsigned float_mantissa = get_mode_mantissa_size(a_mode);
-
-                               if (float_mantissa >= int_mantissa) {
-                                       n = b;
-                                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_CONV);
-                                       return n;
-                               }
-                       }
-                       if (is_Conv(b)) {
-                               if (smaller_mode(b_mode, a_mode)) {
-                                       if (get_Conv_strict(n))
-                                               set_Conv_strict(b, 1);
-                                       n = b; /* ConvA(ConvB(ConvA(...))) == ConvA(...) */
-                                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_CONV);
-                                       return n;
-                               }
-                       }
+               if (n_mode == b_mode && values_in_mode(b_mode, a_mode)) {
+                       n = b;
+                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_CONV);
+                       return n;
                }
        }
        return n;
@@ -1288,7 +1129,7 @@ static ir_node *equivalent_node_Phi(ir_node *n)
        ir_node *first_val = NULL; /* to shutup gcc */
 
        if (!get_opt_optimize() &&
-                       get_irg_phase_state(get_irn_irg(n)) != phase_building)
+           !irg_is_constrained(get_irn_irg(n), IR_GRAPH_CONSTRAINT_CONSTRUCTION))
                return n;
 
        n_preds = get_Phi_n_preds(n);
@@ -1613,48 +1454,6 @@ ir_node *equivalent_node(ir_node *n)
        return n;
 }
 
-void firm_set_default_equivalent_node(ir_opcode code, ir_op_ops *ops)
-{
-#define CASE(a)                                      \
-       case iro_##a:                                    \
-               ops->equivalent_node  = equivalent_node_##a; \
-               break
-#define CASE_PROJ(a)                                          \
-       case iro_##a:                                             \
-               ops->equivalent_node_Proj = equivalent_node_Proj_##a; \
-               break
-
-       switch (code) {
-       CASE(Eor);
-       CASE(Add);
-       CASE(Shl);
-       CASE(Shr);
-       CASE(Shrs);
-       CASE(Rotl);
-       CASE(Sub);
-       CASE(Not);
-       CASE(Minus);
-       CASE(Mul);
-       CASE(Or);
-       CASE(And);
-       CASE(Conv);
-       CASE(Phi);
-       CASE_PROJ(Tuple);
-       CASE_PROJ(Div);
-       CASE_PROJ(CopyB);
-       CASE_PROJ(Bound);
-       CASE(Proj);
-       CASE(Id);
-       CASE(Mux);
-       CASE(Confirm);
-       default:
-               /* leave NULL */
-               break;
-       }
-#undef CASE
-#undef CASE_PROJ
-}
-
 /**
  * Returns non-zero if a node is a Phi node
  * with all predecessors constant.
@@ -1710,44 +1509,40 @@ static ir_tarval *do_eval(eval_func eval, ir_tarval *a, ir_tarval *b, ir_mode *m
  */
 static ir_node *apply_binop_on_phi(ir_node *phi, ir_tarval *other, eval_func eval, ir_mode *mode, int left)
 {
-       ir_tarval *tv;
-       void      **res;
-       ir_node   *pred;
-       ir_graph  *irg;
-       int       i, n = get_irn_arity(phi);
-
-       NEW_ARR_A(void *, res, n);
+       int         n   = get_irn_arity(phi);
+       ir_tarval **tvs = ALLOCAN(ir_tarval*, n);
        if (left) {
-               for (i = 0; i < n; ++i) {
-                       pred = get_irn_n(phi, i);
-                       tv   = get_Const_tarval(pred);
-                       tv   = do_eval(eval, other, tv, mode);
+               for (int i = 0; i < n; ++i) {
+                       ir_node   *pred = get_irn_n(phi, i);
+                       ir_tarval *tv   = get_Const_tarval(pred);
+                       tv = do_eval(eval, other, tv, mode);
 
                        if (tv == tarval_bad) {
                                /* folding failed, bad */
                                return NULL;
                        }
-                       res[i] = tv;
+                       tvs[i] = tv;
                }
        } else {
-               for (i = 0; i < n; ++i) {
-                       pred = get_irn_n(phi, i);
-                       tv   = get_Const_tarval(pred);
-                       tv   = do_eval(eval, tv, other, mode);
+               for (int i = 0; i < n; ++i) {
+                       ir_node   *pred = get_irn_n(phi, i);
+                       ir_tarval *tv   = get_Const_tarval(pred);
+                       tv = do_eval(eval, tv, other, mode);
 
                        if (tv == tarval_bad) {
                                /* folding failed, bad */
                                return 0;
                        }
-                       res[i] = tv;
+                       tvs[i] = tv;
                }
        }
-       irg = get_irn_irg(phi);
-       for (i = 0; i < n; ++i) {
-               pred = get_irn_n(phi, i);
-               res[i] = new_r_Const(irg, (ir_tarval*)res[i]);
+       ir_graph *irg = get_irn_irg(phi);
+       ir_node **res = ALLOCAN(ir_node*, n);
+       for (int i = 0; i < n; ++i) {
+               res[i] = new_r_Const(irg, tvs[i]);
        }
-       return new_r_Phi(get_nodes_block(phi), n, (ir_node **)res, mode);
+       ir_node *block = get_nodes_block(phi);
+       return new_r_Phi(block, n, res, mode);
 }
 
 /**
@@ -1762,37 +1557,31 @@ static ir_node *apply_binop_on_phi(ir_node *phi, ir_tarval *other, eval_func eva
  */
 static ir_node *apply_binop_on_2_phis(ir_node *a, ir_node *b, eval_func eval, ir_mode *mode)
 {
-       ir_tarval *tv_l, *tv_r, *tv;
-       void     **res;
-       ir_node  *pred;
-       ir_graph *irg;
-       int      i, n;
-
        if (get_nodes_block(a) != get_nodes_block(b))
                return NULL;
 
-       n = get_irn_arity(a);
-       NEW_ARR_A(void *, res, n);
-
-       for (i = 0; i < n; ++i) {
-               pred = get_irn_n(a, i);
-               tv_l = get_Const_tarval(pred);
-               pred = get_irn_n(b, i);
-               tv_r = get_Const_tarval(pred);
-               tv   = do_eval(eval, tv_l, tv_r, mode);
+       int         n   = get_irn_arity(a);
+       ir_tarval **tvs = ALLOCAN(ir_tarval*, n);
+       for (int i = 0; i < n; ++i) {
+               ir_node   *pred_a = get_irn_n(a, i);
+               ir_tarval *tv_l   = get_Const_tarval(pred_a);
+               ir_node   *pred_b = get_irn_n(b, i);
+               ir_tarval *tv_r   = get_Const_tarval(pred_b);
+               ir_tarval *tv     = do_eval(eval, tv_l, tv_r, mode);
 
                if (tv == tarval_bad) {
                        /* folding failed, bad */
                        return NULL;
                }
-               res[i] = tv;
+               tvs[i] = tv;
        }
-       irg = get_irn_irg(a);
-       for (i = 0; i < n; ++i) {
-               pred = get_irn_n(a, i);
-               res[i] = new_r_Const(irg, (ir_tarval*)res[i]);
+       ir_graph *irg = get_irn_irg(a);
+       ir_node **res = ALLOCAN(ir_node*, n);
+       for (int i = 0; i < n; ++i) {
+               res[i] = new_r_Const(irg, tvs[i]);
        }
-       return new_r_Phi(get_nodes_block(a), n, (ir_node **)res, mode);
+       ir_node *block = get_nodes_block(a);
+       return new_r_Phi(block, n, res, mode);
 }
 
 /**
@@ -1805,32 +1594,27 @@ static ir_node *apply_binop_on_2_phis(ir_node *a, ir_node *b, eval_func eval, ir
  */
 static ir_node *apply_unop_on_phi(ir_node *phi, ir_tarval *(*eval)(ir_tarval *))
 {
-       ir_tarval *tv;
-       void     **res;
-       ir_node  *pred;
-       ir_mode  *mode;
-       ir_graph *irg;
-       int      i, n = get_irn_arity(phi);
-
-       NEW_ARR_A(void *, res, n);
-       for (i = 0; i < n; ++i) {
-               pred = get_irn_n(phi, i);
-               tv   = get_Const_tarval(pred);
-               tv   = eval(tv);
+       int         n   = get_irn_arity(phi);
+       ir_tarval **tvs = ALLOCAN(ir_tarval*, n);
+       for (int i = 0; i < n; ++i) {
+               ir_node   *pred = get_irn_n(phi, i);
+               ir_tarval *tv   = get_Const_tarval(pred);
+               tv = eval(tv);
 
                if (tv == tarval_bad) {
                        /* folding failed, bad */
                        return 0;
                }
-               res[i] = tv;
+               tvs[i] = tv;
        }
-       mode = get_irn_mode(phi);
-       irg  = get_irn_irg(phi);
-       for (i = 0; i < n; ++i) {
-               pred = get_irn_n(phi, i);
-               res[i] = new_r_Const(irg, (ir_tarval*)res[i]);
+       ir_graph *irg  = get_irn_irg(phi);
+       ir_node **res  = ALLOCAN(ir_node*, n);
+       for (int i = 0; i < n; ++i) {
+               res[i] = new_r_Const(irg, tvs[i]);
        }
-       return new_r_Phi(get_nodes_block(phi), n, (ir_node **)res, mode);
+       ir_node *block = get_nodes_block(phi);
+       ir_mode *mode  = get_irn_mode(phi);
+       return new_r_Phi(block, n, res, mode);
 }
 
 /**
@@ -1842,30 +1626,26 @@ static ir_node *apply_unop_on_phi(ir_node *phi, ir_tarval *(*eval)(ir_tarval *))
  */
 static ir_node *apply_conv_on_phi(ir_node *phi, ir_mode *mode)
 {
-       ir_tarval *tv;
-       void     **res;
-       ir_node  *pred;
-       ir_graph *irg;
-       int      i, n = get_irn_arity(phi);
-
-       NEW_ARR_A(void *, res, n);
-       for (i = 0; i < n; ++i) {
-               pred = get_irn_n(phi, i);
-               tv   = get_Const_tarval(pred);
-               tv   = tarval_convert_to(tv, mode);
+       int         n   = get_irn_arity(phi);
+       ir_tarval **tvs = ALLOCAN(ir_tarval*, n);
+       for (int i = 0; i < n; ++i) {
+               ir_node   *pred = get_irn_n(phi, i);
+               ir_tarval *tv   = get_Const_tarval(pred);
+               tv = tarval_convert_to(tv, mode);
 
                if (tv == tarval_bad) {
                        /* folding failed, bad */
                        return 0;
                }
-               res[i] = tv;
+               tvs[i] = tv;
        }
-       irg = get_irn_irg(phi);
-       for (i = 0; i < n; ++i) {
-               pred = get_irn_n(phi, i);
-               res[i] = new_r_Const(irg, (ir_tarval*)res[i]);
+       ir_graph *irg = get_irn_irg(phi);
+       ir_node **res = ALLOCAN(ir_node*, n);
+       for (int i = 0; i < n; ++i) {
+               res[i] = new_r_Const(irg, tvs[i]);
        }
-       return new_r_Phi(get_nodes_block(phi), n, (ir_node **)res, mode);
+       ir_node *block = get_nodes_block(phi);
+       return new_r_Phi(block, n, res, mode);
 }
 
 /**
@@ -2143,7 +1923,7 @@ static ir_node *transform_node_Or_bf_store(ir_node *irn_or)
                }
 
                /* ok, all conditions met */
-               block = get_irn_n(irn_or, -1);
+               block = get_nodes_block(irn_or);
                irg   = get_irn_irg(block);
 
                new_and = new_r_And(block, value, new_r_Const(irg, tarval_and(tv4, tv2)), mode);
@@ -2559,9 +2339,9 @@ static ir_node *transform_node_Or_(ir_node *n)
                                ir_node  *xora   = new_rd_Eor(dbgi, block, a_left, a_right, a_mode);
                                ir_node  *xorb   = new_rd_Eor(dbgi, block, b_left, b_right, b_mode);
                                ir_node  *conv   = new_rd_Conv(dbgi, block, xora, b_mode);
-                               ir_node  *or     = new_rd_Or(dbgi, block, conv, xorb, b_mode);
+                               ir_node  *orn    = new_rd_Or(dbgi, block, conv, xorb, b_mode);
                                ir_node  *zero   = create_zero_const(irg, b_mode);
-                               return new_rd_Cmp(dbgi, block, or, zero, ir_relation_less_greater);
+                               return new_rd_Cmp(dbgi, block, orn, zero, ir_relation_less_greater);
                        }
                        if (values_in_mode(get_irn_mode(b_left), get_irn_mode(a_left))) {
                                ir_graph *irg    = get_irn_irg(n);
@@ -2572,9 +2352,9 @@ static ir_node *transform_node_Or_(ir_node *n)
                                ir_node  *xora   = new_rd_Eor(dbgi, block, a_left, a_right, a_mode);
                                ir_node  *xorb   = new_rd_Eor(dbgi, block, b_left, b_right, b_mode);
                                ir_node  *conv   = new_rd_Conv(dbgi, block, xorb, a_mode);
-                               ir_node  *or     = new_rd_Or(dbgi, block, xora, conv, a_mode);
+                               ir_node  *orn    = new_rd_Or(dbgi, block, xora, conv, a_mode);
                                ir_node  *zero   = create_zero_const(irg, a_mode);
-                               return new_rd_Cmp(dbgi, block, or, zero, ir_relation_less_greater);
+                               return new_rd_Cmp(dbgi, block, orn, zero, ir_relation_less_greater);
                        }
                }
        }
@@ -3151,8 +2931,8 @@ restart:
                                ir_node  *block = get_nodes_block(n);
                                ir_mode  *mode  = get_irn_mode(n);
                                ir_node  *notn  = new_rd_Not(dbgi, block, and_right, mode);
-                               ir_node  *and   = new_rd_And(dbgi, block, a, notn, mode);
-                               return and;
+                               ir_node  *andn  = new_rd_And(dbgi, block, a, notn, mode);
+                               return andn;
                        }
                }
        }
@@ -3189,7 +2969,7 @@ static ir_node *transform_node_Mul2n(ir_node *n, ir_mode *mode)
        }
        if (tb == get_mode_one(smode)) {
                /* (L)a * (L)1 = (L)a */
-               ir_node *blk = get_irn_n(a, -1);
+               ir_node *blk = get_nodes_block(a);
                n = new_rd_Conv(get_irn_dbg_info(n), blk, a, mode);
                DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_NEUTRAL_1);
                return n;
@@ -3566,8 +3346,6 @@ static ir_node *transform_node_Cond(ir_node *n)
                        set_Tuple_pred(n, pn_Cond_false, jmp);
                        set_Tuple_pred(n, pn_Cond_true, new_r_Bad(irg, mode_X));
                }
-               /* We might generate an endless loop, so keep it alive. */
-               add_End_keepalive(get_irg_end(irg), blk);
                clear_irg_properties(irg, IR_GRAPH_PROPERTY_NO_UNREACHABLE_CODE);
        }
        return n;
@@ -3746,10 +3524,10 @@ static ir_node *transform_node_And(ir_node *n)
                                ir_node  *xora   = new_rd_Eor(dbgi, block, a_left, a_right, a_mode);
                                ir_node  *xorb   = new_rd_Eor(dbgi, block, b_left, b_right, b_mode);
                                ir_node  *conv   = new_rd_Conv(dbgi, block, xora, b_mode);
-                               ir_node  *or     = new_rd_Or(dbgi, block, conv, xorb, b_mode);
+                               ir_node  *orn    = new_rd_Or(dbgi, block, conv, xorb, b_mode);
                                ir_graph *irg    = get_irn_irg(n);
                                ir_node  *zero   = create_zero_const(irg, b_mode);
-                               return new_rd_Cmp(dbgi, block, or, zero, ir_relation_equal);
+                               return new_rd_Cmp(dbgi, block, orn, zero, ir_relation_equal);
                        }
                        if (values_in_mode(get_irn_mode(b_left), get_irn_mode(a_left))) {
                                dbg_info *dbgi   = get_irn_dbg_info(n);
@@ -3759,10 +3537,10 @@ static ir_node *transform_node_And(ir_node *n)
                                ir_node  *xora   = new_rd_Eor(dbgi, block, a_left, a_right, a_mode);
                                ir_node  *xorb   = new_rd_Eor(dbgi, block, b_left, b_right, b_mode);
                                ir_node  *conv   = new_rd_Conv(dbgi, block, xorb, a_mode);
-                               ir_node  *or     = new_rd_Or(dbgi, block, xora, conv, a_mode);
+                               ir_node  *orn    = new_rd_Or(dbgi, block, xora, conv, a_mode);
                                ir_graph *irg    = get_irn_irg(n);
                                ir_node  *zero   = create_zero_const(irg, a_mode);
-                               return new_rd_Cmp(dbgi, block, or, zero, ir_relation_equal);
+                               return new_rd_Cmp(dbgi, block, orn, zero, ir_relation_equal);
                        }
                }
        }
@@ -4209,7 +3987,7 @@ static ir_node *transform_node_Proj_Mod(ir_node *proj)
                switch (proj_nr) {
 
                case pn_Mod_X_regular:
-                       return new_r_Jmp(get_irn_n(mod, -1));
+                       return new_r_Jmp(get_nodes_block(mod));
 
                case pn_Mod_X_except: {
                        ir_graph *irg = get_irn_irg(proj);
@@ -4310,53 +4088,56 @@ static ir_node *transform_node_Cmp(ir_node *n)
        }
 
        /* Remove unnecessary conversions */
-       if (is_Conv(left) && is_Conv(right)) {
-               ir_node *op_left    = get_Conv_op(left);
-               ir_node *op_right   = get_Conv_op(right);
-               ir_mode *mode_left  = get_irn_mode(op_left);
-               ir_mode *mode_right = get_irn_mode(op_right);
-
-               if (smaller_mode(mode_left, mode) && smaller_mode(mode_right, mode)
-                               && mode_left != mode_b && mode_right != mode_b) {
-                       ir_node *block = get_nodes_block(n);
-
-                       if (mode_left == mode_right) {
-                               left    = op_left;
-                               right   = op_right;
-                               changed = true;
-                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CONV_CONV);
-                       } else if (smaller_mode(mode_left, mode_right)) {
-                               left    = new_r_Conv(block, op_left, mode_right);
-                               right   = op_right;
-                               changed = true;
-                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CONV);
-                       } else if (smaller_mode(mode_right, mode_left)) {
-                               left    = op_left;
-                               right   = new_r_Conv(block, op_right, mode_left);
-                               changed = true;
-                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CONV);
+       if (!mode_is_float(mode)
+           || be_get_backend_param()->mode_float_arithmetic == NULL) {
+               if (is_Conv(left) && is_Conv(right)) {
+                       ir_node *op_left    = get_Conv_op(left);
+                       ir_node *op_right   = get_Conv_op(right);
+                       ir_mode *mode_left  = get_irn_mode(op_left);
+                       ir_mode *mode_right = get_irn_mode(op_right);
+
+                       if (smaller_mode(mode_left, mode) && smaller_mode(mode_right, mode)
+                                       && mode_left != mode_b && mode_right != mode_b) {
+                               ir_node *block = get_nodes_block(n);
+
+                               if (mode_left == mode_right) {
+                                       left    = op_left;
+                                       right   = op_right;
+                                       changed = true;
+                                       DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CONV_CONV);
+                               } else if (smaller_mode(mode_left, mode_right)) {
+                                       left    = new_r_Conv(block, op_left, mode_right);
+                                       right   = op_right;
+                                       changed = true;
+                                       DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CONV);
+                               } else if (smaller_mode(mode_right, mode_left)) {
+                                       left    = op_left;
+                                       right   = new_r_Conv(block, op_right, mode_left);
+                                       changed = true;
+                                       DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CONV);
+                               }
+                               mode = get_irn_mode(left);
                        }
-                       mode = get_irn_mode(left);
-               }
-       }
-       if (is_Conv(left) && is_Const(right)) {
-               ir_node   *op_left   = get_Conv_op(left);
-               ir_mode   *mode_left = get_irn_mode(op_left);
-               if (smaller_mode(mode_left, mode) && mode_left != mode_b) {
-                       ir_tarval *tv        = get_Const_tarval(right);
-                       tarval_int_overflow_mode_t last_mode
-                               = tarval_get_integer_overflow_mode();
-                       ir_tarval *new_tv;
-                       tarval_set_integer_overflow_mode(TV_OVERFLOW_BAD);
-                       new_tv = tarval_convert_to(tv, mode_left);
-                       tarval_set_integer_overflow_mode(last_mode);
-                       if (new_tv != tarval_bad) {
-                               ir_graph *irg = get_irn_irg(n);
-                               left    = op_left;
-                               right   = new_r_Const(irg, new_tv);
-                               mode    = get_irn_mode(left);
-                               changed = true;
-                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CONV);
+               }
+               if (is_Conv(left) && is_Const(right)) {
+                       ir_node   *op_left   = get_Conv_op(left);
+                       ir_mode   *mode_left = get_irn_mode(op_left);
+                       if (smaller_mode(mode_left, mode) && mode_left != mode_b) {
+                               ir_tarval *tv        = get_Const_tarval(right);
+                               tarval_int_overflow_mode_t last_mode
+                                       = tarval_get_integer_overflow_mode();
+                               ir_tarval *new_tv;
+                               tarval_set_integer_overflow_mode(TV_OVERFLOW_BAD);
+                               new_tv = tarval_convert_to(tv, mode_left);
+                               tarval_set_integer_overflow_mode(last_mode);
+                               if (new_tv != tarval_bad) {
+                                       ir_graph *irg = get_irn_irg(n);
+                                       left    = op_left;
+                                       right   = new_r_Const(irg, new_tv);
+                                       mode    = get_irn_mode(left);
+                                       changed = true;
+                                       DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CONV);
+                               }
                        }
                }
        }
@@ -5002,7 +4783,7 @@ is_bittest: {
                                if (tarval_is_single_bit(tv)) {
                                        /* special case: (x % 2^n) CMP 0 ==> x & (2^n-1) CMP 0 */
                                        ir_node *v    = get_binop_left(op);
-                                       ir_node *blk  = get_irn_n(op, -1);
+                                       ir_node *blk  = get_nodes_block(op);
                                        ir_graph *irg = get_irn_irg(op);
                                        ir_mode *mode = get_irn_mode(v);
 
@@ -5216,7 +4997,6 @@ static ir_node *transform_node_Phi(ir_node *phi)
                                return phi;
 
                        /* Move the Pin nodes "behind" the Phi. */
-                       block   = get_irn_n(phi, -1);
                        new_phi = new_r_Phi(block, n, in, mode_M);
                        return new_r_Pin(block, new_phi);
                }
@@ -5228,7 +5008,7 @@ static ir_node *transform_node_Phi(ir_node *phi)
                /* Beware of Phi0 */
                if (n > 0) {
                        ir_node    *pred = get_irn_n(phi, 0);
-                       ir_node    *bound, *new_phi, *block, **in;
+                       ir_node    *bound, *new_phi, **in;
                        ir_relation relation;
                        bool        has_confirm = false;
 
@@ -5260,7 +5040,6 @@ static ir_node *transform_node_Phi(ir_node *phi)
                                return phi;
 
                        /* move the Confirm nodes "behind" the Phi */
-                       block = get_irn_n(phi, -1);
                        new_phi = new_r_Phi(block, n, in, get_irn_mode(phi));
                        return new_r_Confirm(block, new_phi, bound, relation);
                }
@@ -5662,6 +5441,77 @@ static ir_node *transform_node_Rotl(ir_node *n)
        return n;
 }
 
+/**
+ * returns mode size for may_leave_out_middle_mode
+ */
+static unsigned get_significand_size(ir_mode *mode)
+{
+       const ir_mode_arithmetic arithmetic = get_mode_arithmetic(mode);
+       switch (arithmetic) {
+       case irma_ieee754:
+       case irma_x86_extended_float:
+               return get_mode_mantissa_size(mode) + 1;
+       case irma_twos_complement:
+               return get_mode_size_bits(mode);
+       case irma_none:
+               panic("Conv node with irma_none mode?");
+       }
+       panic("unexpected mode_arithmetic in get_significand_size");
+}
+
+/**
+ * Returns true if a conversion from mode @p m0 to @p m1 has the same effect
+ * as converting from @p m0 to @p m1 and then to @p m2.
+ * Classifying the 3 modes as the big(b), middle(m) and small(s) mode this
+ * gives the following truth table:
+ * s -> b -> m  : true
+ * s -> m -> b  : !signed(s) || signed(m)
+ * m -> b -> s  : true
+ * m -> s -> b  : false
+ * b -> s -> m  : false
+ * b -> m -> s  : true
+ *
+ * s -> b -> b  : true
+ * s -> s -> b  : false
+ *
+ * additional float constraints:
+ * F -> F -> F: fine
+ * F -> I -> I: signedness of Is must match
+ * I -> F -> I: signedness of Is must match
+ * I -> I -> F: signedness of Is must match
+ * F -> I -> F: bad
+ * I -> F -> F: fine
+ * F -> F -> I: fine
+ * at least 1 float involved: signedness must match
+ */
+bool may_leave_out_middle_conv(ir_mode *m0, ir_mode *m1, ir_mode *m2)
+{
+       int n_floats = mode_is_float(m0) + mode_is_float(m1) + mode_is_float(m2);
+       if (n_floats == 1) {
+#if 0
+               int n_signed = mode_is_signed(m0) + mode_is_signed(m1)
+                            + mode_is_signed(m2);
+               /* we assume that float modes are always signed */
+               if ((n_signed & 1) != 1)
+                       return false;
+#else
+               /* because overflow gives strange results we don't touch this case */
+               return false;
+#endif
+       } else if (n_floats == 2 && !mode_is_float(m1)) {
+               return false;
+       }
+
+       unsigned size0 = get_significand_size(m0);
+       unsigned size1 = get_significand_size(m1);
+       unsigned size2 = get_significand_size(m2);
+       if (size1 < size2 && size0 >= size1)
+               return false;
+       if (size1 >= size2)
+               return true;
+       return !mode_is_signed(m0) || mode_is_signed(m1);
+}
+
 /**
  * Transform a Conv.
  */
@@ -5671,6 +5521,17 @@ static ir_node *transform_node_Conv(ir_node *n)
        ir_mode *mode = get_irn_mode(n);
        ir_node *a    = get_Conv_op(n);
 
+       if (is_Conv(a)) {
+               ir_mode *a_mode = get_irn_mode(a);
+               ir_node *b      = get_Conv_op(a);
+               ir_mode *b_mode = get_irn_mode(b);
+               if (may_leave_out_middle_conv(b_mode, a_mode, mode)) {
+                       dbg_info *dbgi  = get_irn_dbg_info(n);
+                       ir_node  *block = get_nodes_block(n);
+                       return new_rd_Conv(dbgi, block, b, mode);
+               }
+       }
+
        if (mode != mode_b && is_const_Phi(a)) {
                /* Do NOT optimize mode_b Conv's, this leads to remaining
                 * Phib nodes later, because the conv_b_lower operation
@@ -6213,66 +6074,87 @@ static ir_node *transform_node_Sync(ir_node *n)
        return n;
 }
 
+static ir_node *create_load_replacement_tuple(ir_node *n, ir_node *mem,
+                                              ir_node *res)
+{
+       ir_node  *block = get_nodes_block(n);
+       ir_graph *irg   = get_irn_irg(n);
+       ir_node  *in[pn_Load_max+1];
+       size_t    n_in  = 2;
+       in[pn_Load_M]   = mem;
+       in[pn_Load_res] = res;
+       if (ir_throws_exception(n)) {
+               in[pn_Load_X_regular] = new_r_Jmp(block);
+               in[pn_Load_X_except]  = new_r_Bad(irg, mode_X);
+               n_in                  = 4;
+               assert(pn_Load_max == 4);
+       }
+       ir_node  *tuple = new_r_Tuple(block, n_in, in);
+       return tuple;
+}
+
 static ir_node *transform_node_Load(ir_node *n)
 {
+       /* don't touch volatile loads */
+       if (get_Load_volatility(n) == volatility_is_volatile)
+               return n;
+
+       ir_node *ptr = get_Load_ptr(n);
+       const ir_node *confirm;
+       if (value_not_zero(ptr, &confirm) && confirm == NULL) {
+               set_irn_pinned(n, op_pin_state_floats);
+       }
+
        /* if our memory predecessor is a load from the same address, then reuse the
         * previous result */
        ir_node *mem = get_Load_mem(n);
-       ir_node *mem_pred;
-
        if (!is_Proj(mem))
                return n;
-       /* don't touch volatile loads */
-       if (get_Load_volatility(n) == volatility_is_volatile)
-               return n;
-       mem_pred = get_Proj_pred(mem);
+       ir_node *mem_pred = get_Proj_pred(mem);
        if (is_Load(mem_pred)) {
                ir_node *pred_load = mem_pred;
 
                /* conservatively compare the 2 loads. TODO: This could be less strict
                 * with fixup code in some situations (like smaller/bigger modes) */
-               if (get_Load_ptr(pred_load) != get_Load_ptr(n))
+               if (get_Load_ptr(pred_load) != ptr)
                        return n;
                if (get_Load_mode(pred_load) != get_Load_mode(n))
                        return n;
                /* all combinations of aligned/unaligned pred/n should be fine so we do
                 * not compare the unaligned attribute */
-               {
-                       ir_node  *block = get_nodes_block(n);
-                       ir_node  *jmp   = new_r_Jmp(block);
-                       ir_graph *irg   = get_irn_irg(n);
-                       ir_node  *bad   = new_r_Bad(irg, mode_X);
-                       ir_mode  *mode  = get_Load_mode(n);
-                       ir_node  *res   = new_r_Proj(pred_load, mode, pn_Load_res);
-                       ir_node  *in[]  = { mem, res, jmp, bad };
-                       ir_node  *tuple = new_r_Tuple(block, ARRAY_SIZE(in), in);
-                       return tuple;
-               }
+               ir_mode  *mode  = get_Load_mode(n);
+               ir_node  *res   = new_r_Proj(pred_load, mode, pn_Load_res);
+               return create_load_replacement_tuple(n, mem, res);
        } else if (is_Store(mem_pred)) {
                ir_node *pred_store = mem_pred;
                ir_node *value      = get_Store_value(pred_store);
 
-               if (get_Store_ptr(pred_store) != get_Load_ptr(n))
+               if (get_Store_ptr(pred_store) != ptr)
                        return n;
                if (get_irn_mode(value) != get_Load_mode(n))
                        return n;
                /* all combinations of aligned/unaligned pred/n should be fine so we do
                 * not compare the unaligned attribute */
-               {
-                       ir_node  *block = get_nodes_block(n);
-                       ir_node  *jmp   = new_r_Jmp(block);
-                       ir_graph *irg   = get_irn_irg(n);
-                       ir_node  *bad   = new_r_Bad(irg, mode_X);
-                       ir_node  *res   = value;
-                       ir_node  *in[]  = { mem, res, jmp, bad };
-                       ir_node  *tuple = new_r_Tuple(block, ARRAY_SIZE(in), in);
-                       return tuple;
-               }
+               return create_load_replacement_tuple(n, mem, value);
        }
 
        return n;
 }
 
+static ir_node *transform_node_Store(ir_node *n)
+{
+       /* don't touch volatile stores */
+       if (get_Store_volatility(n) == volatility_is_volatile)
+               return n;
+
+       ir_node *ptr = get_Store_ptr(n);
+       const ir_node *confirm;
+       if (value_not_zero(ptr, &confirm) && confirm == NULL) {
+               set_irn_pinned(n, op_pin_state_floats);
+       }
+       return n;
+}
+
 /**
  * optimize a trampoline Call into a direct Call
  */
@@ -6343,60 +6225,6 @@ static ir_node *transform_node_Call(ir_node *call)
        return res;
 }
 
-void firm_set_default_transform_node(ir_opcode code, ir_op_ops *ops)
-{
-#define CASE(a)                                         \
-       case iro_##a:                                       \
-               ops->transform_node      = transform_node_##a;  \
-               break
-#define CASE_PROJ(a)                                         \
-       case iro_##a:                                            \
-               ops->transform_node_Proj = transform_node_Proj_##a;  \
-               break
-#define CASE_PROJ_EX(a)                                      \
-       case iro_##a:                                            \
-               ops->transform_node      = transform_node_##a;       \
-               ops->transform_node_Proj = transform_node_Proj_##a;  \
-               break
-
-       switch (code) {
-       CASE(Add);
-       CASE(And);
-       CASE(Block);
-       CASE(Call);
-       CASE(Cmp);
-       CASE(Cond);
-       CASE(Conv);
-       CASE(End);
-       CASE(Eor);
-       CASE(Minus);
-       CASE(Mul);
-       CASE(Mux);
-       CASE(Not);
-       CASE(Or);
-       CASE(Phi);
-       CASE(Proj);
-       CASE(Rotl);
-       CASE(Shl);
-       CASE(Shr);
-       CASE(Shrs);
-       CASE(Sub);
-       CASE(Switch);
-       CASE(Sync);
-       CASE_PROJ(Bound);
-       CASE_PROJ(CopyB);
-       CASE_PROJ(Store);
-       CASE_PROJ_EX(Div);
-       CASE_PROJ_EX(Load);
-       CASE_PROJ_EX(Mod);
-       default:
-               break;
-       }
-#undef CASE_PROJ_EX
-#undef CASE_PROJ
-#undef CASE
-}
-
 /**
  * Tries several [inplace] [optimizing] transformations and returns an
  * equivalent node.  The difference to equivalent_node() is that these
@@ -6454,291 +6282,138 @@ restart:
        return n;
 }
 
+static void register_computed_value_func(ir_op *op, computed_value_func func)
+{
+       assert(op->ops.computed_value == NULL || op->ops.computed_value == func);
+       op->ops.computed_value = func;
+}
+
+static void register_computed_value_func_proj(ir_op *op,
+                                              computed_value_func func)
+{
+       assert(op->ops.computed_value_Proj == NULL
+           || op->ops.computed_value_Proj == func);
+       op->ops.computed_value_Proj = func;
+}
+
+static void register_equivalent_node_func(ir_op *op, equivalent_node_func func)
+{
+       assert(op->ops.equivalent_node == NULL || op->ops.equivalent_node == func);
+       op->ops.equivalent_node = func;
+}
+
+static void register_equivalent_node_func_proj(ir_op *op,
+                                               equivalent_node_func func)
+{
+       assert(op->ops.equivalent_node_Proj == NULL
+           || op->ops.equivalent_node_Proj == func);
+       op->ops.equivalent_node_Proj = func;
+}
+
+static void register_transform_node_func(ir_op *op, transform_node_func func)
+{
+       assert(op->ops.transform_node == NULL || op->ops.transform_node == func);
+       op->ops.transform_node = func;
+}
+
+static void register_transform_node_func_proj(ir_op *op,
+                                              transform_node_func func)
+{
+       assert(op->ops.transform_node_Proj == NULL
+           || op->ops.transform_node_Proj == func);
+       op->ops.transform_node_Proj = func;
+}
+
+void ir_register_opt_node_ops(void)
+{
+       register_computed_value_func(op_Add,      computed_value_Add);
+       register_computed_value_func(op_And,      computed_value_And);
+       register_computed_value_func(op_Borrow,   computed_value_Borrow);
+       register_computed_value_func(op_Carry,    computed_value_Carry);
+       register_computed_value_func(op_Cmp,      computed_value_Cmp);
+       register_computed_value_func(op_Confirm,  computed_value_Confirm);
+       register_computed_value_func(op_Const,    computed_value_Const);
+       register_computed_value_func(op_Conv,     computed_value_Conv);
+       register_computed_value_func(op_Eor,      computed_value_Eor);
+       register_computed_value_func(op_Minus,    computed_value_Minus);
+       register_computed_value_func(op_Mul,      computed_value_Mul);
+       register_computed_value_func(op_Mux,      computed_value_Mux);
+       register_computed_value_func(op_Not,      computed_value_Not);
+       register_computed_value_func(op_Or,       computed_value_Or);
+       register_computed_value_func(op_Proj,     computed_value_Proj);
+       register_computed_value_func(op_Rotl,     computed_value_Rotl);
+       register_computed_value_func(op_Shl,      computed_value_Shl);
+       register_computed_value_func(op_Shr,      computed_value_Shr);
+       register_computed_value_func(op_Shrs,     computed_value_Shrs);
+       register_computed_value_func(op_Sub,      computed_value_Sub);
+       register_computed_value_func(op_SymConst, computed_value_SymConst);
+       register_computed_value_func_proj(op_Div, computed_value_Proj_Div);
+       register_computed_value_func_proj(op_Mod, computed_value_Proj_Mod);
+
+       register_equivalent_node_func(op_Add,     equivalent_node_Add);
+       register_equivalent_node_func(op_And,     equivalent_node_And);
+       register_equivalent_node_func(op_Confirm, equivalent_node_Confirm);
+       register_equivalent_node_func(op_Conv,    equivalent_node_Conv);
+       register_equivalent_node_func(op_Eor,     equivalent_node_Eor);
+       register_equivalent_node_func(op_Id,      equivalent_node_Id);
+       register_equivalent_node_func(op_Minus,   equivalent_node_involution);
+       register_equivalent_node_func(op_Mul,     equivalent_node_Mul);
+       register_equivalent_node_func(op_Mux,     equivalent_node_Mux);
+       register_equivalent_node_func(op_Not,     equivalent_node_involution);
+       register_equivalent_node_func(op_Or,      equivalent_node_Or);
+       register_equivalent_node_func(op_Phi,     equivalent_node_Phi);
+       register_equivalent_node_func(op_Proj,    equivalent_node_Proj);
+       register_equivalent_node_func(op_Rotl,    equivalent_node_left_zero);
+       register_equivalent_node_func(op_Shl,     equivalent_node_left_zero);
+       register_equivalent_node_func(op_Shr,     equivalent_node_left_zero);
+       register_equivalent_node_func(op_Shrs,    equivalent_node_left_zero);
+       register_equivalent_node_func(op_Sub,     equivalent_node_Sub);
+       register_equivalent_node_func_proj(op_Bound, equivalent_node_Proj_Bound);
+       register_equivalent_node_func_proj(op_CopyB, equivalent_node_Proj_CopyB);
+       register_equivalent_node_func_proj(op_Div,   equivalent_node_Proj_Div);
+       register_equivalent_node_func_proj(op_Tuple, equivalent_node_Proj_Tuple);
+
+       register_transform_node_func(op_Add,    transform_node_Add);
+       register_transform_node_func(op_And,    transform_node_And);
+       register_transform_node_func(op_Block,  transform_node_Block);
+       register_transform_node_func(op_Call,   transform_node_Call);
+       register_transform_node_func(op_Cmp,    transform_node_Cmp);
+       register_transform_node_func(op_Cond,   transform_node_Cond);
+       register_transform_node_func(op_Conv,   transform_node_Conv);
+       register_transform_node_func(op_Div,    transform_node_Div);
+       register_transform_node_func(op_End,    transform_node_End);
+       register_transform_node_func(op_Eor,    transform_node_Eor);
+       register_transform_node_func(op_Load,   transform_node_Load);
+       register_transform_node_func(op_Minus,  transform_node_Minus);
+       register_transform_node_func(op_Mod,    transform_node_Mod);
+       register_transform_node_func(op_Mul,    transform_node_Mul);
+       register_transform_node_func(op_Mux,    transform_node_Mux);
+       register_transform_node_func(op_Not,    transform_node_Not);
+       register_transform_node_func(op_Or,     transform_node_Or);
+       register_transform_node_func(op_Phi,    transform_node_Phi);
+       register_transform_node_func(op_Proj,   transform_node_Proj);
+       register_transform_node_func(op_Rotl,   transform_node_Rotl);
+       register_transform_node_func(op_Shl,    transform_node_Shl);
+       register_transform_node_func(op_Shrs,   transform_node_Shrs);
+       register_transform_node_func(op_Shr,    transform_node_Shr);
+       register_transform_node_func(op_Store,  transform_node_Store);
+       register_transform_node_func(op_Sub,    transform_node_Sub);
+       register_transform_node_func(op_Switch, transform_node_Switch);
+       register_transform_node_func(op_Sync,   transform_node_Sync);
+       register_transform_node_func_proj(op_Bound, transform_node_Proj_Bound);
+       register_transform_node_func_proj(op_CopyB, transform_node_Proj_CopyB);
+       register_transform_node_func_proj(op_Div,   transform_node_Proj_Div);
+       register_transform_node_func_proj(op_Load,  transform_node_Proj_Load);
+       register_transform_node_func_proj(op_Mod,   transform_node_Proj_Mod);
+       register_transform_node_func_proj(op_Store, transform_node_Proj_Store);
+}
+
 /* **************** Common Subexpression Elimination **************** */
 
 /** The size of the hash table used, should estimate the number of nodes
     in a graph. */
 #define N_IR_NODES 512
 
-/** Compares two exception attributes */
-static int node_cmp_exception(const ir_node *a, const ir_node *b)
-{
-       const except_attr *ea = &a->attr.except;
-       const except_attr *eb = &b->attr.except;
-       return ea->pin_state != eb->pin_state;
-}
-
-/** Compares the attributes of two Const nodes. */
-static int node_cmp_attr_Const(const ir_node *a, const ir_node *b)
-{
-       return get_Const_tarval(a) != get_Const_tarval(b);
-}
-
-/** Compares the attributes of two Proj nodes. */
-static int node_cmp_attr_Proj(const ir_node *a, const ir_node *b)
-{
-       return a->attr.proj.proj != b->attr.proj.proj;
-}
-
-/** Compares the attributes of two Alloc nodes. */
-static int node_cmp_attr_Alloc(const ir_node *a, const ir_node *b)
-{
-       const alloc_attr *pa = &a->attr.alloc;
-       const alloc_attr *pb = &b->attr.alloc;
-       if (pa->where != pb->where || pa->type != pb->type)
-               return 1;
-       return node_cmp_exception(a, b);
-}
-
-/** Compares the attributes of two Free nodes. */
-static int node_cmp_attr_Free(const ir_node *a, const ir_node *b)
-{
-       const free_attr *pa = &a->attr.free;
-       const free_attr *pb = &b->attr.free;
-       return (pa->where != pb->where) || (pa->type != pb->type);
-}
-
-/** Compares the attributes of two SymConst nodes. */
-static int node_cmp_attr_SymConst(const ir_node *a, const ir_node *b)
-{
-       const symconst_attr *pa = &a->attr.symc;
-       const symconst_attr *pb = &b->attr.symc;
-       return (pa->kind       != pb->kind)
-           || (pa->sym.type_p != pb->sym.type_p);
-}
-
-/** Compares the attributes of two Call nodes. */
-static int node_cmp_attr_Call(const ir_node *a, const ir_node *b)
-{
-       const call_attr *pa = &a->attr.call;
-       const call_attr *pb = &b->attr.call;
-       if (pa->type != pb->type)
-               return 1;
-       return node_cmp_exception(a, b);
-}
-
-/** Compares the attributes of two Sel nodes. */
-static int node_cmp_attr_Sel(const ir_node *a, const ir_node *b)
-{
-       const ir_entity *a_ent = get_Sel_entity(a);
-       const ir_entity *b_ent = get_Sel_entity(b);
-       return a_ent != b_ent;
-}
-
-/** Compares the attributes of two Phi nodes. */
-static int node_cmp_attr_Phi(const ir_node *a, const ir_node *b)
-{
-       (void) b;
-       /* do not CSE Phi-nodes without any inputs when building new graphs */
-       if (get_irn_arity(a) == 0 &&
-           get_irg_phase_state(get_irn_irg(a)) == phase_building) {
-           return 1;
-       }
-       return 0;
-}
-
-/** Compares the attributes of two Conv nodes. */
-static int node_cmp_attr_Conv(const ir_node *a, const ir_node *b)
-{
-       return get_Conv_strict(a) != get_Conv_strict(b);
-}
-
-/** Compares the attributes of two Cast nodes. */
-static int node_cmp_attr_Cast(const ir_node *a, const ir_node *b)
-{
-       return get_Cast_type(a) != get_Cast_type(b);
-}
-
-/** Compares the attributes of two Load nodes. */
-static int node_cmp_attr_Load(const ir_node *a, const ir_node *b)
-{
-       if (get_Load_volatility(a) == volatility_is_volatile ||
-           get_Load_volatility(b) == volatility_is_volatile)
-               /* NEVER do CSE on volatile Loads */
-               return 1;
-       /* do not CSE Loads with different alignment. Be conservative. */
-       if (get_Load_unaligned(a) != get_Load_unaligned(b))
-               return 1;
-       if (get_Load_mode(a) != get_Load_mode(b))
-               return 1;
-       return node_cmp_exception(a, b);
-}
-
-/** Compares the attributes of two Store nodes. */
-static int node_cmp_attr_Store(const ir_node *a, const ir_node *b)
-{
-       /* do not CSE Stores with different alignment. Be conservative. */
-       if (get_Store_unaligned(a) != get_Store_unaligned(b))
-               return 1;
-       /* NEVER do CSE on volatile Stores */
-       if (get_Store_volatility(a) == volatility_is_volatile ||
-           get_Store_volatility(b) == volatility_is_volatile)
-               return 1;
-       return node_cmp_exception(a, b);
-}
-
-static int node_cmp_attr_CopyB(const ir_node *a, const ir_node *b)
-{
-       if (get_CopyB_type(a) != get_CopyB_type(b))
-               return 1;
-
-       return node_cmp_exception(a, b);
-}
-
-static int node_cmp_attr_Bound(const ir_node *a, const ir_node *b)
-{
-       return node_cmp_exception(a, b);
-}
-
-/** Compares the attributes of two Div nodes. */
-static int node_cmp_attr_Div(const ir_node *a, const ir_node *b)
-{
-       const div_attr *ma = &a->attr.div;
-       const div_attr *mb = &b->attr.div;
-       if (ma->resmode != mb->resmode || ma->no_remainder  != mb->no_remainder)
-               return 1;
-       return node_cmp_exception(a, b);
-}
-
-/** Compares the attributes of two Mod nodes. */
-static int node_cmp_attr_Mod(const ir_node *a, const ir_node *b)
-{
-       const mod_attr *ma = &a->attr.mod;
-       const mod_attr *mb = &b->attr.mod;
-       if (ma->resmode != mb->resmode)
-               return 1;
-       return node_cmp_exception(a, b);
-}
-
-static int node_cmp_attr_Cmp(const ir_node *a, const ir_node *b)
-{
-       const cmp_attr *ma = &a->attr.cmp;
-       const cmp_attr *mb = &b->attr.cmp;
-       return ma->relation != mb->relation;
-}
-
-/** Compares the attributes of two Confirm nodes. */
-static int node_cmp_attr_Confirm(const ir_node *a, const ir_node *b)
-{
-       const confirm_attr *ma = &a->attr.confirm;
-       const confirm_attr *mb = &b->attr.confirm;
-       return ma->relation != mb->relation;
-}
-
-/** Compares the attributes of two Builtin nodes. */
-static int node_cmp_attr_Builtin(const ir_node *a, const ir_node *b)
-{
-       if (get_Builtin_kind(a) != get_Builtin_kind(b))
-               return 1;
-       if (get_Builtin_type(a) != get_Builtin_type(b))
-               return 1;
-       return node_cmp_exception(a, b);
-}
-
-/** Compares the attributes of two ASM nodes. */
-static int node_cmp_attr_ASM(const ir_node *a, const ir_node *b)
-{
-       size_t n;
-       size_t i;
-       const ir_asm_constraint *ca;
-       const ir_asm_constraint *cb;
-       ident **cla, **clb;
-
-       if (get_ASM_text(a) != get_ASM_text(b))
-               return 1;
-
-       /* Should we really check the constraints here? Should be better, but is strange. */
-       n = get_ASM_n_input_constraints(a);
-       if (n != get_ASM_n_input_constraints(b))
-               return 1;
-
-       ca = get_ASM_input_constraints(a);
-       cb = get_ASM_input_constraints(b);
-       for (i = 0; i < n; ++i) {
-               if (ca[i].pos != cb[i].pos || ca[i].constraint != cb[i].constraint
-                   || ca[i].mode != cb[i].mode)
-                       return 1;
-       }
-
-       n = get_ASM_n_output_constraints(a);
-       if (n != get_ASM_n_output_constraints(b))
-               return 1;
-
-       ca = get_ASM_output_constraints(a);
-       cb = get_ASM_output_constraints(b);
-       for (i = 0; i < n; ++i) {
-               if (ca[i].pos != cb[i].pos || ca[i].constraint != cb[i].constraint
-                   || ca[i].mode != cb[i].mode)
-                       return 1;
-       }
-
-       n = get_ASM_n_clobbers(a);
-       if (n != get_ASM_n_clobbers(b))
-               return 1;
-
-       cla = get_ASM_clobbers(a);
-       clb = get_ASM_clobbers(b);
-       for (i = 0; i < n; ++i) {
-               if (cla[i] != clb[i])
-                       return 1;
-       }
-
-       return node_cmp_exception(a, b);
-}
-
-/** Compares the inexistent attributes of two Dummy nodes. */
-static int node_cmp_attr_Dummy(const ir_node *a, const ir_node *b)
-{
-       (void) a;
-       (void) b;
-       /* Dummy nodes never equal by definition */
-       return 1;
-}
-
-static int node_cmp_attr_InstOf(const ir_node *a, const ir_node *b)
-{
-       if (get_InstOf_type(a) != get_InstOf_type(b))
-               return 1;
-       return node_cmp_exception(a, b);
-}
-
-void firm_set_default_node_cmp_attr(ir_opcode code, ir_op_ops *ops)
-{
-#define CASE(a)                              \
-       case iro_##a:                              \
-               ops->node_cmp_attr  = node_cmp_attr_##a; \
-               break
-
-       switch (code) {
-       CASE(ASM);
-       CASE(Alloc);
-       CASE(Bound);
-       CASE(Builtin);
-       CASE(Call);
-       CASE(Cast);
-       CASE(Cmp);
-       CASE(Confirm);
-       CASE(Const);
-       CASE(Conv);
-       CASE(CopyB);
-       CASE(Div);
-       CASE(Dummy);
-       CASE(Free);
-       CASE(InstOf);
-       CASE(Load);
-       CASE(Mod);
-       CASE(Phi);
-       CASE(Proj);
-       CASE(Sel);
-       CASE(Store);
-       CASE(SymConst);
-       default:
-               /* leave NULL */
-               break;
-       }
-#undef CASE
-}
-
 int identities_cmp(const void *elt, const void *key)
 {
        ir_node *a = (ir_node *)elt;
@@ -6761,7 +6436,7 @@ int identities_cmp(const void *elt, const void *key)
 
        if (get_irn_pinned(a) == op_pin_state_pinned) {
                /* for pinned nodes, the block inputs must be equal */
-               if (get_irn_n(a, -1) != get_irn_n(b, -1))
+               if (get_nodes_block(a) != get_nodes_block(b))
                        return 1;
        } else {
                ir_node *block_a = get_nodes_block(a);
@@ -6779,6 +6454,10 @@ int identities_cmp(const void *elt, const void *key)
                        if (!block_dominates(block_a, block_b)
                            && !block_dominates(block_b, block_a))
                            return 1;
+                       /* respect the workaround rule: do not move nodes which are only
+                        * held by keepalive edges */
+                       if (only_used_by_keepalive(a) || only_used_by_keepalive(b))
+                               return 1;
                }
        }
 
@@ -6924,11 +6603,10 @@ void add_identities(ir_node *node)
 
 void visit_all_identities(ir_graph *irg, irg_walk_func visit, void *env)
 {
-       ir_node  *node;
        ir_graph *rem = current_ir_graph;
 
        current_ir_graph = irg;
-       foreach_pset(irg->value_table, ir_node*, node) {
+       foreach_pset(irg->value_table, ir_node, node) {
                visit(node, env);
        }
        current_ir_graph = rem;
@@ -7072,8 +6750,6 @@ ir_node *optimize_in_place_2(ir_node *n)
 ir_node *optimize_in_place(ir_node *n)
 {
        ir_graph *irg = get_irn_irg(n);
-       /* Handle graph state */
-       assert(get_irg_phase_state(irg) != phase_building);
 
        if (get_opt_global_cse())
                set_irg_pinned(irg, op_pin_state_floats);
@@ -7083,50 +6759,3 @@ ir_node *optimize_in_place(ir_node *n)
        clear_irg_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_DOMINANCE);
        return optimize_in_place_2(n);
 }
-
-/**
- * Calculate a hash value of a Const node.
- */
-static unsigned hash_Const(const ir_node *node)
-{
-       unsigned h;
-
-       /* special value for const, as they only differ in their tarval. */
-       h = hash_ptr(node->attr.con.tarval);
-
-       return h;
-}
-
-/**
- * Calculate a hash value of a SymConst node.
- */
-static unsigned hash_SymConst(const ir_node *node)
-{
-       unsigned h;
-
-       /* all others are pointers */
-       h = hash_ptr(node->attr.symc.sym.type_p);
-
-       return h;
-}
-
-void firm_set_default_hash(unsigned code, ir_op_ops *ops)
-{
-#define CASE(a)                                    \
-       case iro_##a:                                  \
-               ops->hash  = hash_##a; \
-               break
-
-       /* hash function already set */
-       if (ops->hash != NULL)
-               return;
-
-       switch (code) {
-       CASE(Const);
-       CASE(SymConst);
-       default:
-               /* use input/mode default hash if no function was given */
-               ops->hash = firm_default_hash;
-       }
-#undef CASE
-}