Add missing returns.
[libfirm] / ir / ir / iropt.c
index eab72e6..518b903 100644 (file)
@@ -48,7 +48,7 @@
 #include "opt_confirms.h"
 #include "opt_polymorphy.h"
 #include "irtools.h"
-#include "xmalloc.h"
+#include "array_t.h"
 
 /* Make types visible to allow most efficient access */
 #include "entity_t.h"
@@ -418,17 +418,6 @@ static tarval *computed_value_Mux(const ir_node *n) {
        return tarval_bad;
 }  /* computed_value_Mux */
 
-/**
- * Calculate the value of a Psi: can be evaluated, if a condition is true
- * and all previous conditions are false. If all conditions are false
- * we evaluate to the default one.
- */
-static tarval *computed_value_Psi(const ir_node *n) {
-       if (is_Mux(n))
-               return computed_value_Mux(n);
-       return tarval_bad;
-}  /* computed_value_Psi */
-
 /**
  * Calculate the value of a Confirm: can be evaluated,
  * if it has the form Confirm(x, '=', Const).
@@ -533,31 +522,29 @@ static tarval *computed_value_Proj_Cmp(const ir_node *n) {
                 * the Cmp result.
                 */
                else {
-                       ir_node *aaa = skip_Id(skip_Proj(aa));
-                       ir_node *aba = skip_Id(skip_Proj(ab));
+                       ir_node *aaa = skip_Proj(aa);
+                       ir_node *aba = skip_Proj(ab);
 
                        if (   (   (/* aa is ProjP and aaa is Alloc */
                                       is_Proj(aa)
                                    && mode_is_reference(get_irn_mode(aa))
                                    && is_Alloc(aaa))
                                && (   (/* ab is NULL */
-                                          is_Const(ab)
-                                       && mode_is_reference(get_irn_mode(ab))
-                                       && is_Const_null(ab))
+                                       mode_is_reference(get_irn_mode(ab))
+                                       && tarval_is_null(tab))
                                    || (/* ab is other Alloc */
                                           is_Proj(ab)
                                        && mode_is_reference(get_irn_mode(ab))
                                        && is_Alloc(aba)
                                        && (aaa != aba))))
                            || (/* aa is NULL and aba is Alloc */
-                                  is_Const(aa)
-                               && mode_is_reference(get_irn_mode(aa))
-                               && is_Const_null(aa)
+                               mode_is_reference(get_irn_mode(aa))
+                               && tarval_is_null(taa)
                                && is_Proj(ab)
                                && mode_is_reference(get_irn_mode(ab))
                                && is_Alloc(aba)))
                                /* 3.: */
-                       return new_tarval_from_long(proj_nr & pn_Cmp_Ne, mode_b);
+                       return new_tarval_from_long(proj_nr & pn_Cmp_Lg, mode_b);
                }
        }
        return computed_value_Cmp_Confirm(a, aa, ab, proj_nr);
@@ -581,9 +568,9 @@ static tarval *do_computed_value_Quot(const ir_node *a, const ir_node *b) {
  * Special case: 0 / b
  */
 static tarval *do_computed_value_Div(const ir_node *a, const ir_node *b) {
-       tarval  *ta = value_of(a);
-       tarval  *tb;
-       ir_node *dummy;
+       tarval        *ta = value_of(a);
+       tarval        *tb;
+       const ir_node *dummy;
 
        /* Compute c1 / c2 or 0 / a, a != 0 */
        if (tarval_is_null(ta) && value_not_zero(b, &dummy))
@@ -729,7 +716,6 @@ static ir_op_ops *firm_set_default_computed_value(ir_opcode code, ir_op_ops *ops
        CASE(Rotl);
        CASE(Conv);
        CASE(Mux);
-       CASE(Psi);
        CASE(Confirm);
        CASE_PROJ(Cmp);
        CASE_PROJ(DivMod);
@@ -1233,17 +1219,18 @@ restart:
                                        goto restart;
                                }
                                /* else both are strict conv, second is superfluous */
-                       } else if (is_Proj(a)) {
-                               ir_node *pred = get_Proj_pred(a);
-                               if (is_Load(pred)) {
-                                       /* loads always return with the exact precision of n_mode */
-                                       assert(get_Load_mode(pred) == n_mode);
-                                       return a;
+                       } else {
+                               if (is_Proj(a)) {
+                                       ir_node *pred = get_Proj_pred(a);
+                                       if (is_Load(pred)) {
+                                               /* loads always return with the exact precision of n_mode */
+                                               assert(get_Load_mode(pred) == n_mode);
+                                               return a;
+                                       }
                                }
+                               /* leave strict floating point Conv's */
+                               return n;
                        }
-
-                       /* leave strict floating point Conv's */
-                       return n;
                }
                n = a;
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_CONV);
@@ -1265,25 +1252,21 @@ restart:
                                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 (smaller_mode(b_mode, 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) && mode_is_float(a_mode)) {
+                       if (mode_is_int(n_mode) && get_mode_arithmetic(a_mode) == irma_ieee754) {
                                /* ConvI(ConvF(I)) -> I, iff float mantissa >= int mode */
-                               size_t int_mantissa = get_mode_size_bits(n_mode) - (mode_is_signed(n_mode) ? 1 : 0);
-                               size_t float_mantissa;
-                               /* FIXME There is no way to get the mantissa size of a mode */
-                               switch (get_mode_size_bits(a_mode)) {
-                                       case 32: float_mantissa = 23 + 1; break; // + 1 for implicit 1
-                                       case 64: float_mantissa = 52 + 1; break;
-                                       case 80: float_mantissa = 64 + 1; break;
-                                       default: float_mantissa = 0;      break;
-                               }
-                               if (float_mantissa != 0 && float_mantissa >= int_mantissa) {
+                               unsigned int_mantissa   = get_mode_size_bits(n_mode) - (mode_is_signed(n_mode) ? 1 : 0);
+                               unsigned float_mantissa = tarval_ieee754_get_mantissa_size(a_mode);
+
+                               if (float_mantissa >= int_mantissa) {
                                        n = b;
                                        DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_CONV);
                                        return n;
@@ -1295,6 +1278,7 @@ restart:
                                                set_Conv_strict(b, 1);
                                        n = b; /* ConvA(ConvB(ConvA(...))) == ConvA(...) */
                                        DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_CONV);
+                                       return n;
                                }
                        }
                }
@@ -1624,8 +1608,8 @@ static ir_node *equivalent_node_Proj_Load(ir_node *proj) {
                        ir_node *load = get_Proj_pred(proj);
 
                        /* get the Load address */
-                       ir_node *addr = get_Load_ptr(load);
-                       ir_node *confirm;
+                       const ir_node *addr = get_Load_ptr(load);
+                       const ir_node *confirm;
 
                        if (value_not_null(addr, &confirm)) {
                                if (get_Proj_proj(proj) == pn_Load_X_except) {
@@ -1647,8 +1631,8 @@ static ir_node *equivalent_node_Proj_Store(ir_node *proj) {
                        ir_node *store = get_Proj_pred(proj);
 
                        /* get the load/store address */
-                       ir_node *addr = get_Store_ptr(store);
-                       ir_node *confirm;
+                       const ir_node *addr = get_Store_ptr(store);
+                       const ir_node *confirm;
 
                        if (value_not_null(addr, &confirm)) {
                                if (get_Proj_proj(proj) == pn_Store_X_except) {
@@ -1733,8 +1717,8 @@ static ir_node *equivalent_node_Mux(ir_node *n)
 
                        switch (proj_nr) {
                                case pn_Cmp_Eq:
-                                       if ((cmp_l == t && cmp_r == f) || /* Psi(t == f, t, f) -> f */
-                                                       (cmp_l == f && cmp_r == t)) { /* Psi(f == t, t, f) -> f */
+                                       if ((cmp_l == t && cmp_r == f) || /* Mux(t == f, t, f) -> f */
+                                                       (cmp_l == f && cmp_r == t)) { /* Mux(f == t, t, f) -> f */
                                                n = f;
                                                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_TRANSFORM);
                                                return n;
@@ -1743,8 +1727,8 @@ static ir_node *equivalent_node_Mux(ir_node *n)
 
                                case pn_Cmp_Lg:
                                case pn_Cmp_Ne:
-                                       if ((cmp_l == t && cmp_r == f) || /* Psi(t != f, t, f) -> t */
-                                                       (cmp_l == f && cmp_r == t)) { /* Psi(f != t, t, f) -> t */
+                                       if ((cmp_l == t && cmp_r == f) || /* Mux(t != f, t, f) -> t */
+                                                       (cmp_l == f && cmp_r == t)) { /* Mux(f != t, t, f) -> t */
                                                n = t;
                                                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_TRANSFORM);
                                                return n;
@@ -1776,17 +1760,6 @@ static ir_node *equivalent_node_Mux(ir_node *n)
        return n;
 }  /* equivalent_node_Mux */
 
-/**
- * Returns a equivalent node of a Psi: if a condition is true
- * and all previous conditions are false we know its value.
- * If all conditions are false its value is the default one.
- */
-static ir_node *equivalent_node_Psi(ir_node *n) {
-       if (is_Mux(n))
-               return equivalent_node_Mux(n);
-       return n;
-}  /* equivalent_node_Psi */
-
 /**
  * Remove Confirm nodes if setting is on.
  * Replace Confirms(x, '=', Constlike) by Constlike.
@@ -1873,7 +1846,6 @@ static ir_op_ops *firm_set_default_equivalent_node(ir_opcode code, ir_op_ops *op
        CASE(Proj);
        CASE(Id);
        CASE(Mux);
-       CASE(Psi);
        CASE(Confirm);
        default:
                /* leave NULL */;
@@ -1893,10 +1865,11 @@ static int is_const_Phi(ir_node *n) {
 
        if (! is_Phi(n) || get_irn_arity(n) == 0)
                return 0;
-       for (i = get_irn_arity(n) - 1; i >= 0; --i)
+       for (i = get_irn_arity(n) - 1; i >= 0; --i) {
                if (! is_Const(get_irn_n(n, i)))
                        return 0;
-               return 1;
+       }
+       return 1;
 }  /* is_const_Phi */
 
 typedef tarval *(*tarval_sub_type)(tarval *a, tarval *b, ir_mode *mode);
@@ -2248,7 +2221,7 @@ static ir_node *transform_node_Add(ir_node *n) {
                        n = new_rd_Sub(
                                        get_irn_dbg_info(n),
                                        current_ir_graph,
-                                       get_irn_n(n, -1),
+                                       get_nodes_block(n),
                                        b,
                                        get_Minus_op(a),
                                        mode);
@@ -2259,7 +2232,7 @@ static ir_node *transform_node_Add(ir_node *n) {
                        n = new_rd_Sub(
                                        get_irn_dbg_info(n),
                                        current_ir_graph,
-                                       get_irn_n(n, -1),
+                                       get_nodes_block(n),
                                        a,
                                        get_Minus_op(b),
                                        mode);
@@ -2273,14 +2246,14 @@ static ir_node *transform_node_Add(ir_node *n) {
 
                                if (is_Const(b) && is_Const_one(b)) {
                                        /* ~x + 1 = -x */
-                                       ir_node *blk = get_irn_n(n, -1);
+                                       ir_node *blk = get_nodes_block(n);
                                        n = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, blk, op, mode);
                                        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_NOT_PLUS_1);
                                        return n;
                                }
                                if (op == b) {
                                        /* ~x + x = -1 */
-                                       ir_node *blk = get_irn_n(n, -1);
+                                       ir_node *blk = get_nodes_block(n);
                                        n = new_r_Const(current_ir_graph, blk, mode, get_mode_minus_one(mode));
                                        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_X_NOT_X);
                                        return n;
@@ -2291,7 +2264,7 @@ static ir_node *transform_node_Add(ir_node *n) {
 
                                if (op == a) {
                                        /* x + ~x = -1 */
-                                       ir_node *blk = get_irn_n(n, -1);
+                                       ir_node *blk = get_nodes_block(n);
                                        n = new_r_Const(current_ir_graph, blk, mode, get_mode_minus_one(mode));
                                        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_X_NOT_X);
                                        return n;
@@ -2343,7 +2316,20 @@ static ir_node *transform_node_Sub(ir_node *n) {
                if (is_Const(b) && is_Const_null(b) && mode_is_reference(lmode)) {
                        /* a Sub(a, NULL) is a hidden Conv */
                        dbg_info *dbg = get_irn_dbg_info(n);
-                       return new_rd_Conv(dbg, current_ir_graph, get_nodes_block(n), a, mode);
+                       n = new_rd_Conv(dbg, current_ir_graph, get_nodes_block(n), a, mode);
+                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_TO_CONV);
+                       return n;
+               }
+
+               if (mode == lmode                                     &&
+                   get_mode_arithmetic(mode) == irma_twos_complement &&
+                   is_Const(a)                                       &&
+                   get_Const_tarval(a) == get_mode_minus_one(mode)) {
+                       /* -1 - x -> ~x */
+                       dbg_info *dbg = get_irn_dbg_info(n);
+                       n = new_rd_Not(dbg, current_ir_graph, get_nodes_block(n), b, mode);
+                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_TO_NOT);
+                       return n;
                }
        }
 
@@ -2387,18 +2373,30 @@ restart:
                n = new_rd_Add(dbg, irg, block, a, right, mode);
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_MINUS);
                return n;
-       } else if (is_Sub(b)) { /* a - (b - c) -> a + (c - b) */
+       } else if (is_Sub(b)) {
+               /* a - (b - c) -> a + (c - b)
+                *             -> (a - b) + c iff (b - c) is a pointer */
                ir_graph *irg     = current_ir_graph;
                dbg_info *s_dbg   = get_irn_dbg_info(b);
                ir_node  *s_block = get_nodes_block(b);
-               ir_node  *s_left  = get_Sub_right(b);
-               ir_node  *s_right = get_Sub_left(b);
+               ir_node  *s_left  = get_Sub_left(b);
+               ir_node  *s_right = get_Sub_right(b);
                ir_mode  *s_mode  = get_irn_mode(b);
-               ir_node  *sub     = new_rd_Sub(s_dbg, irg, s_block, s_left, s_right, s_mode);
-               dbg_info *a_dbg   = get_irn_dbg_info(n);
-               ir_node  *a_block = get_nodes_block(n);
+               if (s_mode == mode_P) {
+                       ir_node  *sub     = new_rd_Sub(s_dbg, irg, s_block, a, s_left, mode);
+                       dbg_info *a_dbg   = get_irn_dbg_info(n);
+                       ir_node  *a_block = get_nodes_block(n);
+
+                       if (s_mode != mode)
+                               s_right = new_r_Conv(irg, a_block, s_right, mode);
+                       n = new_rd_Add(a_dbg, irg, a_block, sub, s_right, mode);
+               } else {
+                       ir_node  *sub     = new_rd_Sub(s_dbg, irg, s_block, s_right, s_left, s_mode);
+                       dbg_info *a_dbg   = get_irn_dbg_info(n);
+                       ir_node  *a_block = get_nodes_block(n);
 
-               n = new_rd_Add(a_dbg, irg, a_block, a, sub, mode);
+                       n = new_rd_Add(a_dbg, irg, a_block, a, sub, mode);
+               }
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_TO_ADD);
                return n;
        } else if (is_Mul(b)) { /* a - (b * C) -> a + (b * -C) */
@@ -2427,7 +2425,7 @@ restart:
                n = new_rd_Minus(
                                get_irn_dbg_info(n),
                                current_ir_graph,
-                               get_irn_n(n, -1),
+                               get_nodes_block(n),
                                b,
                                mode);
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_0_A);
@@ -2442,7 +2440,7 @@ restart:
                        if (left == b) {
                                if (mode != get_irn_mode(right)) {
                                        /* This Sub is an effective Cast */
-                                       right = new_r_Conv(get_irn_irg(n), get_irn_n(n, -1), right, mode);
+                                       right = new_r_Conv(get_irn_irg(n), get_nodes_block(n), right, mode);
                                }
                                n = right;
                                DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_ADD_SUB);
@@ -2450,7 +2448,7 @@ restart:
                        } else if (right == b) {
                                if (mode != get_irn_mode(left)) {
                                        /* This Sub is an effective Cast */
-                                       left = new_r_Conv(get_irn_irg(n), get_irn_n(n, -1), left, mode);
+                                       left = new_r_Conv(get_irn_irg(n), get_nodes_block(n), left, mode);
                                }
                                n = left;
                                DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_ADD_SUB);
@@ -2467,20 +2465,20 @@ restart:
                        if (left == a) {
                                ir_mode *r_mode = get_irn_mode(right);
 
-                               n = new_r_Minus(get_irn_irg(n), get_irn_n(n, -1), right, r_mode);
+                               n = new_r_Minus(get_irn_irg(n), get_nodes_block(n), right, r_mode);
                                if (mode != r_mode) {
                                        /* This Sub is an effective Cast */
-                                       n = new_r_Conv(get_irn_irg(n), get_irn_n(n, -1), n, mode);
+                                       n = new_r_Conv(get_irn_irg(n), get_nodes_block(n), n, mode);
                                }
                                DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_ADD_SUB);
                                return n;
                        } else if (right == a) {
                                ir_mode *l_mode = get_irn_mode(left);
 
-                               n = new_r_Minus(get_irn_irg(n), get_irn_n(n, -1), left, l_mode);
+                               n = new_r_Minus(get_irn_irg(n), get_nodes_block(n), left, l_mode);
                                if (mode != l_mode) {
                                        /* This Sub is an effective Cast */
-                                       n = new_r_Conv(get_irn_irg(n), get_irn_n(n, -1), n, mode);
+                                       n = new_r_Conv(get_irn_irg(n), get_nodes_block(n), n, mode);
                                }
                                DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_ADD_SUB);
                                return n;
@@ -2515,7 +2513,7 @@ restart:
                ir_node *mb = get_Mul_right(a);
 
                if (ma == b) {
-                       ir_node *blk = get_irn_n(n, -1);
+                       ir_node *blk = get_nodes_block(n);
                        n = new_rd_Mul(
                                        get_irn_dbg_info(n),
                                        current_ir_graph, blk,
@@ -2530,7 +2528,7 @@ restart:
                        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_MUL_A_X_A);
                        return n;
                } else if (mb == b) {
-                       ir_node *blk = get_irn_n(n, -1);
+                       ir_node *blk = get_nodes_block(n);
                        n = new_rd_Mul(
                                        get_irn_dbg_info(n),
                                        current_ir_graph, blk,
@@ -2549,7 +2547,7 @@ restart:
        if (is_Sub(a)) { /* (x - y) - b -> x - (y + b) */
                ir_node *x   =      get_Sub_left(a);
                ir_node *y        = get_Sub_right(a);
-               ir_node *blk      = get_irn_n(n, -1);
+               ir_node *blk      = get_nodes_block(n);
                ir_mode *m_b      = get_irn_mode(b);
                ir_mode *m_y      = get_irn_mode(y);
                ir_mode *add_mode;
@@ -2586,7 +2584,7 @@ restart:
 
                        tv = tarval_add(tv, get_mode_one(mode));
                        if (tv != tarval_bad) {
-                               ir_node *blk = get_irn_n(n, -1);
+                               ir_node *blk = get_nodes_block(n);
                                ir_node *c = new_r_Const(current_ir_graph, blk, mode, tv);
                                n = new_rd_Add(get_irn_dbg_info(n), current_ir_graph, blk, get_Not_op(b), c, mode);
                                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_C_NOT_X);
@@ -2611,14 +2609,14 @@ static ir_node *transform_node_Mul2n(ir_node *n, ir_mode *mode) {
 
        if (ta == get_mode_one(smode)) {
                /* (L)1 * (L)b = (L)b */
-               ir_node *blk = get_irn_n(n, -1);
+               ir_node *blk = get_nodes_block(n);
                n = new_rd_Conv(get_irn_dbg_info(n), current_ir_graph, blk, b, mode);
                DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_NEUTRAL_1);
                return n;
        }
        else if (ta == get_mode_minus_one(smode)) {
                /* (L)-1 * (L)b = (L)b */
-               ir_node *blk = get_irn_n(n, -1);
+               ir_node *blk = get_nodes_block(n);
                n = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, blk, b, smode);
                n = new_rd_Conv(get_irn_dbg_info(n), current_ir_graph, blk, n, mode);
                DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_MUL_MINUS_1);
@@ -2633,7 +2631,7 @@ static ir_node *transform_node_Mul2n(ir_node *n, ir_mode *mode) {
        }
        else if (tb == get_mode_minus_one(smode)) {
                /* (L)a * (L)-1 = (L)-a */
-               ir_node *blk = get_irn_n(n, -1);
+               ir_node *blk = get_nodes_block(n);
                n = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, blk, a, smode);
                n = new_rd_Conv(get_irn_dbg_info(n), current_ir_graph, blk, n, mode);
                DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_MUL_MINUS_1);
@@ -2669,7 +2667,7 @@ static ir_node *transform_node_Mul(ir_node *n) {
                else if (value_of(b) == get_mode_minus_one(mode))
                        r = a;
                if (r) {
-                       n = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, get_irn_n(n, -1), r, mode);
+                       n = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, get_nodes_block(n), r, mode);
                        DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_MUL_MINUS_1);
                        return n;
                }
@@ -2717,7 +2715,8 @@ static ir_node *transform_node_Mul(ir_node *n) {
        if (get_mode_arithmetic(mode) == irma_ieee754) {
                if (is_Const(a)) {
                        tarval *tv = get_Const_tarval(a);
-                       if (tarval_ieee754_get_exponent(tv) == 1 && tarval_ieee754_zero_mantissa(tv)) {
+                       if (tarval_ieee754_get_exponent(tv) == 1 && tarval_ieee754_zero_mantissa(tv)
+                                       && !tarval_is_negative(tv)) {
                                /* 2.0 * b = b + b */
                                n = new_rd_Add(get_irn_dbg_info(n), current_ir_graph, get_nodes_block(n), b, b, mode);
                                DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_ADD_A_A);
@@ -2726,7 +2725,8 @@ static ir_node *transform_node_Mul(ir_node *n) {
                }
                else if (is_Const(b)) {
                        tarval *tv = get_Const_tarval(b);
-                       if (tarval_ieee754_get_exponent(tv) == 1 && tarval_ieee754_zero_mantissa(tv)) {
+                       if (tarval_ieee754_get_exponent(tv) == 1 && tarval_ieee754_zero_mantissa(tv)
+                                       && !tarval_is_negative(tv)) {
                                /* a * 2.0 = a + a */
                                n = new_rd_Add(get_irn_dbg_info(n), current_ir_graph, get_nodes_block(n), a, a, mode);
                                DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_ADD_A_A);
@@ -2780,9 +2780,9 @@ static ir_node *transform_node_Div(ir_node *n) {
                DBG_OPT_CSTEVAL(n, value);
                goto make_tuple;
        } else {
-               ir_node *a = get_Div_left(n);
-               ir_node *b = get_Div_right(n);
-               ir_node *dummy;
+               ir_node       *a = get_Div_left(n);
+               ir_node       *b = get_Div_right(n);
+               const ir_node *dummy;
 
                if (a == b && value_not_zero(a, &dummy)) {
                        /* BEWARE: we can optimize a/a to 1 only if this cannot cause a exception */
@@ -2795,7 +2795,7 @@ static ir_node *transform_node_Div(ir_node *n) {
 
                                if (tv == get_mode_minus_one(mode)) {
                                        /* a / -1 */
-                                       value = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, get_irn_n(n, -1), a, mode);
+                                       value = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, get_nodes_block(n), a, mode);
                                        DBG_OPT_CSTEVAL(n, value);
                                        goto make_tuple;
                                }
@@ -2811,11 +2811,10 @@ static ir_node *transform_node_Div(ir_node *n) {
 make_tuple:
                /* Turn Div into a tuple (mem, jmp, bad, value) */
                mem = get_Div_mem(n);
-               blk = get_irn_n(n, -1);
+               blk = get_nodes_block(n);
 
                /* skip a potential Pin */
-               if (is_Pin(mem))
-                       mem = get_Pin_op(mem);
+               mem = skip_Pin(mem);
                turn_into_tuple(n, pn_Div_max);
                set_Tuple_pred(n, pn_Div_M,         mem);
                set_Tuple_pred(n, pn_Div_X_regular, new_r_Jmp(current_ir_graph, blk));
@@ -2868,9 +2867,9 @@ static ir_node *transform_node_Mod(ir_node *n) {
                DBG_OPT_CSTEVAL(n, value);
                goto make_tuple;
        } else {
-               ir_node *a = get_Mod_left(n);
-               ir_node *b = get_Mod_right(n);
-               ir_node *dummy;
+               ir_node       *a = get_Mod_left(n);
+               ir_node       *b = get_Mod_right(n);
+               const ir_node *dummy;
 
                if (a == b && value_not_zero(a, &dummy)) {
                        /* BEWARE: we can optimize a%a to 0 only if this cannot cause a exception */
@@ -2899,11 +2898,10 @@ static ir_node *transform_node_Mod(ir_node *n) {
 make_tuple:
                /* Turn Mod into a tuple (mem, jmp, bad, value) */
                mem = get_Mod_mem(n);
-               blk = get_irn_n(n, -1);
+               blk = get_nodes_block(n);
 
                /* skip a potential Pin */
-               if (is_Pin(mem))
-                       mem = get_Pin_op(mem);
+               mem = skip_Pin(mem);
                turn_into_tuple(n, pn_Mod_max);
                set_Tuple_pred(n, pn_Mod_M,         mem);
                set_Tuple_pred(n, pn_Mod_X_regular, new_r_Jmp(current_ir_graph, blk));
@@ -2917,13 +2915,13 @@ make_tuple:
  * Transform a DivMod node.
  */
 static ir_node *transform_node_DivMod(ir_node *n) {
-       ir_node *dummy;
-       ir_node *a = get_DivMod_left(n);
-       ir_node *b = get_DivMod_right(n);
-       ir_mode *mode = get_DivMod_resmode(n);
-       tarval *ta, *tb;
-       int evaluated = 0;
-       ir_node *va, *vb;
+       const ir_node *dummy;
+       ir_node       *a = get_DivMod_left(n);
+       ir_node       *b = get_DivMod_right(n);
+       ir_mode       *mode = get_DivMod_resmode(n);
+       ir_node       *va, *vb;
+       tarval        *ta, *tb;
+       int           evaluated = 0;
 
        if (is_Const(b) && is_const_Phi(a)) {
                /* check for Div(Phi, Const) */
@@ -2977,7 +2975,7 @@ static ir_node *transform_node_DivMod(ir_node *n) {
                        DBG_OPT_CSTEVAL(n, vb);
                        goto make_tuple;
                } else if (mode_is_signed(mode) && tb == get_mode_minus_one(mode)) {
-                       va = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, get_irn_n(n, -1), a, mode);
+                       va = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, get_nodes_block(n), a, mode);
                        vb = new_Const(mode, get_mode_null(mode));
                        DBG_OPT_CSTEVAL(n, va);
                        DBG_OPT_CSTEVAL(n, vb);
@@ -3012,10 +3010,9 @@ static ir_node *transform_node_DivMod(ir_node *n) {
 make_tuple:
                mem = get_DivMod_mem(n);
                /* skip a potential Pin */
-               if (is_Pin(mem))
-                       mem = get_Pin_op(mem);
+               mem = skip_Pin(mem);
 
-               blk = get_irn_n(n, -1);
+               blk = get_nodes_block(n);
                turn_into_tuple(n, pn_DivMod_max);
                set_Tuple_pred(n, pn_DivMod_M,         mem);
                set_Tuple_pred(n, pn_DivMod_X_regular, new_r_Jmp(current_ir_graph, blk));
@@ -3036,9 +3033,9 @@ static ir_node *transform_node_Quot(ir_node *n) {
 
        if (get_mode_arithmetic(mode) == irma_ieee754) {
                ir_node *b = get_Quot_right(n);
+               tarval *tv = value_of(b);
 
-               if (is_Const(b)) {
-                       tarval *tv = get_Const_tarval(b);
+               if (tv != tarval_bad) {
                        int rem;
 
                        /*
@@ -3055,15 +3052,14 @@ static ir_node *transform_node_Quot(ir_node *n) {
                           using strict rules. */
                        if (tv != tarval_bad &&
                            (tarval_ieee754_get_exact() || (get_irg_fp_model(current_ir_graph) & fp_strict_algebraic) == 0)) {
-                               ir_node *blk = get_irn_n(n, -1);
+                               ir_node *blk = get_nodes_block(n);
                                ir_node *c = new_r_Const(current_ir_graph, blk, mode, tv);
                                ir_node *a = get_Quot_left(n);
                                ir_node *m = new_rd_Mul(get_irn_dbg_info(n), current_ir_graph, blk, a, c, mode);
                                ir_node *mem = get_Quot_mem(n);
 
                                /* skip a potential Pin */
-                               if (is_Pin(mem))
-                                       mem = get_Pin_op(mem);
+                               mem = skip_Pin(mem);
                                turn_into_tuple(n, pn_Quot_max);
                                set_Tuple_pred(n, pn_Quot_M, mem);
                                set_Tuple_pred(n, pn_Quot_X_regular, new_r_Jmp(current_ir_graph, blk));
@@ -3141,10 +3137,10 @@ static ir_node *transform_node_Cmp(ir_node *n) {
 
        if (is_Minus(left) && is_Minus(right) &&
                !mode_overflow_on_unary_Minus(get_irn_mode(left))) {
-               left  = get_Minus_op(left);
-               right = get_Minus_op(right);
+               ir_node *const new_left  = get_Minus_op(right);
+               ir_node *const new_right = get_Minus_op(left);
                n = new_rd_Cmp(get_irn_dbg_info(n), current_ir_graph,
-                       get_nodes_block(n), left, right);
+                       get_nodes_block(n), new_left, new_right);
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_CMP_OP_OP);
        }
        return n;
@@ -3217,7 +3213,7 @@ static ir_node *transform_bitwise_distributive(ir_node *n,
                ir_mode *a_mode = get_irn_mode(a_op);
                ir_mode *b_mode = get_irn_mode(b_op);
                if(a_mode == b_mode && (mode_is_int(a_mode) || a_mode == mode_b)) {
-                       ir_node *blk = get_irn_n(n, -1);
+                       ir_node *blk = get_nodes_block(n);
 
                        n = exact_copy(n);
                        set_binop_left(n, a_op);
@@ -3269,7 +3265,7 @@ static ir_node *transform_bitwise_distributive(ir_node *n,
 
                if (c != NULL) {
                        /* (a sop c) & (b sop c) => (a & b) sop c */
-                       ir_node *blk = get_irn_n(n, -1);
+                       ir_node *blk = get_nodes_block(n);
 
                        ir_node *new_n = exact_copy(n);
                        set_binop_left(new_n, op1);
@@ -3462,7 +3458,7 @@ static ir_node *transform_node_Eor(ir_node *n) {
 
        if (a == b) {
                /* a ^ a = 0 */
-               n = new_rd_Const(get_irn_dbg_info(n), current_ir_graph, get_irn_n(n, -1),
+               n = new_rd_Const(get_irn_dbg_info(n), current_ir_graph, get_nodes_block(n),
                                 mode, get_mode_null(mode));
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_A_A);
        } else if (mode == mode_b &&
@@ -3470,7 +3466,7 @@ static ir_node *transform_node_Eor(ir_node *n) {
                        is_Const(b) && is_Const_one(b) &&
                        is_Cmp(get_Proj_pred(a))) {
                /* The Eor negates a Cmp. The Cmp has the negated result anyways! */
-               n = new_r_Proj(current_ir_graph, get_irn_n(n, -1), get_Proj_pred(a),
+               n = new_r_Proj(current_ir_graph, get_nodes_block(n), get_Proj_pred(a),
                                mode_b, get_negated_pnc(get_Proj_proj(a), mode));
 
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT_BOOL);
@@ -3510,7 +3506,7 @@ static ir_node *transform_node_Not(ir_node *n) {
                        is_Proj(a) &&
                        is_Cmp(get_Proj_pred(a))) {
                /* We negate a Cmp. The Cmp has the negated result anyways! */
-               n = new_r_Proj(current_ir_graph, get_irn_n(n, -1), get_Proj_pred(a),
+               n = new_r_Proj(current_ir_graph, get_nodes_block(n), get_Proj_pred(a),
                                mode_b, get_negated_pnc(get_Proj_proj(a), mode_b));
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_NOT_CMP);
                return n;
@@ -3541,7 +3537,7 @@ static ir_node *transform_node_Not(ir_node *n) {
                        if (is_Const(add_r) && is_Const_all_one(add_r)) {
                                /* ~(x + -1) = -x */
                                ir_node *op = get_Add_left(a);
-                               ir_node *blk = get_irn_n(n, -1);
+                               ir_node *blk = get_nodes_block(n);
                                n = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, blk, op, get_irn_mode(n));
                                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_NOT_MINUS_1);
                        }
@@ -3573,7 +3569,7 @@ static ir_node *transform_node_Minus(ir_node *n) {
                        /* -(~x) = x + 1 */
                        ir_node *op   = get_Not_op(a);
                        tarval *tv    = get_mode_one(mode);
-                       ir_node *blk  = get_irn_n(n, -1);
+                       ir_node *blk  = get_nodes_block(n);
                        ir_node *c    = new_r_Const(current_ir_graph, blk, mode, tv);
                        n = new_rd_Add(get_irn_dbg_info(n), current_ir_graph, blk, op, c, mode);
                        DBG_OPT_ALGSIM2(oldn, a, n, FS_OPT_MINUS_NOT);
@@ -3589,7 +3585,7 @@ static ir_node *transform_node_Minus(ir_node *n) {
                                        /* -(a >>u (size-1)) = a >>s (size-1) */
                                        ir_node *v = get_Shr_left(a);
 
-                                       n = new_rd_Shrs(get_irn_dbg_info(n), current_ir_graph, get_irn_n(n, -1), v, c, mode);
+                                       n = new_rd_Shrs(get_irn_dbg_info(n), current_ir_graph, get_nodes_block(n), v, c, mode);
                                        DBG_OPT_ALGSIM2(oldn, a, n, FS_OPT_PREDICATE);
                                        return n;
                                }
@@ -3605,7 +3601,7 @@ static ir_node *transform_node_Minus(ir_node *n) {
                                        /* -(a >>s (size-1)) = a >>u (size-1) */
                                        ir_node *v = get_Shrs_left(a);
 
-                                       n = new_rd_Shr(get_irn_dbg_info(n), current_ir_graph, get_irn_n(n, -1), v, c, mode);
+                                       n = new_rd_Shr(get_irn_dbg_info(n), current_ir_graph, get_nodes_block(n), v, c, mode);
                                        DBG_OPT_ALGSIM2(oldn, a, n, FS_OPT_PREDICATE);
                                        return n;
                                }
@@ -3616,7 +3612,7 @@ static ir_node *transform_node_Minus(ir_node *n) {
                /* - (a-b) = b - a */
                ir_node *la  = get_Sub_left(a);
                ir_node *ra  = get_Sub_right(a);
-               ir_node *blk = get_irn_n(n, -1);
+               ir_node *blk = get_nodes_block(n);
 
                n = new_rd_Sub(get_irn_dbg_info(n), current_ir_graph, blk, ra, la, mode);
                DBG_OPT_ALGSIM2(oldn, a, n, FS_OPT_MINUS_SUB);
@@ -3626,9 +3622,10 @@ static ir_node *transform_node_Minus(ir_node *n) {
        if (is_Mul(a)) { /* -(a * const) -> a * -const */
                ir_node *mul_l = get_Mul_left(a);
                ir_node *mul_r = get_Mul_right(a);
-               if (is_Const(mul_r)) {
-                       tarval   *tv    = tarval_neg(get_Const_tarval(mul_r));
-                       if(tv != tarval_bad) {
+               tarval  *tv    = value_of(mul_r);
+               if (tv != tarval_bad) {
+                       tv = tarval_neg(tv);
+                       if (tv != tarval_bad) {
                                ir_node  *cnst  = new_Const(mode, tv);
                                dbg_info *dbg   = get_irn_dbg_info(a);
                                ir_graph *irg   = current_ir_graph;
@@ -3673,9 +3670,8 @@ static ir_node *transform_node_Proj_Load(ir_node *proj) {
                        ir_node *load = get_Proj_pred(proj);
 
                        /* get the Load address */
-                       ir_node *addr = get_Load_ptr(load);
-                       ir_node *blk  = get_nodes_block(load);
-                       ir_node *confirm;
+                       const ir_node *addr = get_Load_ptr(load);
+                       const ir_node *confirm;
 
                        if (value_not_null(addr, &confirm)) {
                                if (confirm == NULL) {
@@ -3686,6 +3682,7 @@ static ir_node *transform_node_Proj_Load(ir_node *proj) {
                                        DBG_OPT_EXC_REM(proj);
                                        return get_irg_bad(current_ir_graph);
                                } else {
+                                       ir_node *blk = get_nodes_block(load);
                                        return new_r_Jmp(current_ir_graph, blk);
                                }
                        }
@@ -3703,9 +3700,8 @@ static ir_node *transform_node_Proj_Store(ir_node *proj) {
                        ir_node *store = get_Proj_pred(proj);
 
                        /* get the load/store address */
-                       ir_node *addr = get_Store_ptr(store);
-                       ir_node *blk  = get_nodes_block(store);
-                       ir_node *confirm;
+                       const ir_node *addr = get_Store_ptr(store);
+                       const ir_node *confirm;
 
                        if (value_not_null(addr, &confirm)) {
                                if (confirm == NULL) {
@@ -3715,8 +3711,10 @@ static ir_node *transform_node_Proj_Store(ir_node *proj) {
                                if (get_Proj_proj(proj) == pn_Store_X_except) {
                                        DBG_OPT_EXC_REM(proj);
                                        return get_irg_bad(current_ir_graph);
-                               } else
+                               } else {
+                                       ir_node *blk = get_nodes_block(store);
                                        return new_r_Jmp(current_ir_graph, blk);
+                               }
                        }
                }
        }
@@ -3730,7 +3728,8 @@ static ir_node *transform_node_Proj_Store(ir_node *proj) {
 static ir_node *transform_node_Proj_Div(ir_node *proj) {
        ir_node *div = get_Proj_pred(proj);
        ir_node *b   = get_Div_right(div);
-       ir_node *confirm, *res, *new_mem;
+       ir_node *res, *new_mem;
+       const ir_node *confirm;
        long proj_nr;
 
        if (value_not_zero(b, &confirm)) {
@@ -3738,8 +3737,7 @@ static ir_node *transform_node_Proj_Div(ir_node *proj) {
                if (confirm == NULL) {
                        /* we are sure we have a Const != 0 */
                        new_mem = get_Div_mem(div);
-                       if (is_Pin(new_mem))
-                               new_mem = get_Pin_op(new_mem);
+                       new_mem = skip_Pin(new_mem);
                        set_Div_mem(div, new_mem);
                        set_irn_pinned(div, op_pin_state_floats);
                }
@@ -3778,7 +3776,8 @@ static ir_node *transform_node_Proj_Div(ir_node *proj) {
 static ir_node *transform_node_Proj_Mod(ir_node *proj) {
        ir_node *mod = get_Proj_pred(proj);
        ir_node *b   = get_Mod_right(mod);
-       ir_node *confirm, *res, *new_mem;
+       ir_node *res, *new_mem;
+       const ir_node *confirm;
        long proj_nr;
 
        if (value_not_zero(b, &confirm)) {
@@ -3788,8 +3787,7 @@ static ir_node *transform_node_Proj_Mod(ir_node *proj) {
                if (confirm == NULL) {
                        /* we are sure we have a Const != 0 */
                        new_mem = get_Mod_mem(mod);
-                       if (is_Pin(new_mem))
-                               new_mem = get_Pin_op(new_mem);
+                       new_mem = skip_Pin(new_mem);
                        set_Mod_mem(mod, new_mem);
                        set_irn_pinned(mod, op_pin_state_floats);
                }
@@ -3836,7 +3834,8 @@ static ir_node *transform_node_Proj_Mod(ir_node *proj) {
 static ir_node *transform_node_Proj_DivMod(ir_node *proj) {
        ir_node *divmod = get_Proj_pred(proj);
        ir_node *b      = get_DivMod_right(divmod);
-       ir_node *confirm, *res, *new_mem;
+       ir_node *res, *new_mem;
+       const ir_node *confirm;
        long proj_nr;
 
        if (value_not_zero(b, &confirm)) {
@@ -3846,8 +3845,7 @@ static ir_node *transform_node_Proj_DivMod(ir_node *proj) {
                if (confirm == NULL) {
                        /* we are sure we have a Const != 0 */
                        new_mem = get_DivMod_mem(divmod);
-                       if (is_Pin(new_mem))
-                               new_mem = get_Pin_op(new_mem);
+                       new_mem = skip_Pin(new_mem);
                        set_DivMod_mem(divmod, new_mem);
                        set_irn_pinned(divmod, op_pin_state_floats);
                }
@@ -3910,7 +3908,7 @@ static ir_node *transform_node_Proj_Cond(ir_node *proj) {
                                                return proj;
                                        } else {
                                                /* this case will NEVER be taken, kill it */
-                                               return new_Bad();
+                                               return get_irg_bad(current_ir_graph);
                                        }
                                }
                        }
@@ -4185,9 +4183,9 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
         * later and may help to normalize more compares.
         * Of course this is only possible for integer values.
         */
-       if (is_Const(right)) {
+       tv = value_of(right);
+       if (tv != tarval_bad) {
                mode = get_irn_mode(right);
-               tv = get_Const_tarval(right);
 
                /* TODO extend to arbitrary constants */
                if (is_Conv(left) && tarval_is_null(tv)) {
@@ -4346,7 +4344,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
                                else if (proj_nr == pn_Cmp_Le || proj_nr == pn_Cmp_Lt) {
                                        if (tv != tarval_bad) {
                                                /* c >= 0 : Abs(a) <= c  ==>  (unsigned)(a + c) <= 2*c */
-                                               if (get_irn_op(left) == op_Abs) { // TODO something is missing here
+                                               if (is_Abs(left)) { // TODO something is missing here
                                                }
                                        }
                                }
@@ -4540,7 +4538,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
        }
 
        if (changed) {
-               ir_node *block = get_irn_n(n, -1); /* Beware of get_nodes_Block() */
+               ir_node *block = get_nodes_block(n);
 
                /* create a new compare */
                n = new_rd_Cmp(get_irn_dbg_info(n), current_ir_graph, block, left, right);
@@ -4641,42 +4639,9 @@ static ir_node *transform_node_Proj_Bound(ir_node *proj) {
 static ir_node *transform_node_Proj(ir_node *proj) {
        ir_node *n = get_Proj_pred(proj);
 
-       switch (get_irn_opcode(n)) {
-       case iro_Load:
-               return transform_node_Proj_Load(proj);
-
-       case iro_Store:
-               return transform_node_Proj_Store(proj);
-
-       case iro_Div:
-               return transform_node_Proj_Div(proj);
-
-       case iro_Mod:
-               return transform_node_Proj_Mod(proj);
-
-       case iro_DivMod:
-               return transform_node_Proj_DivMod(proj);
-
-       case iro_Cond:
-               return transform_node_Proj_Cond(proj);
-
-       case iro_Cmp:
-               return transform_node_Proj_Cmp(proj);
-
-       case iro_Tuple:
-               /* should not happen, but if it does will be optimized away */
-               return equivalent_node_Proj(proj);
-
-       case iro_CopyB:
-               return transform_node_Proj_CopyB(proj);
-
-       case iro_Bound:
-               return transform_node_Proj_Bound(proj);
-
-       default:
-               /* do nothing */
-               return proj;
-       }
+       if (n->op->ops.transform_node_Proj)
+               return n->op->ops.transform_node_Proj(proj);
+       return proj;
 }  /* transform_node_Proj */
 
 /**
@@ -5316,10 +5281,15 @@ static ir_node *transform_node_Rotl(ir_node *n) {
  */
 static ir_node *transform_node_Conv(ir_node *n) {
        ir_node *c, *oldn = n;
-       ir_node *a = get_Conv_op(n);
+       ir_mode *mode = get_irn_mode(n);
+       ir_node *a    = get_Conv_op(n);
 
-       if (is_const_Phi(a)) {
-               c = apply_conv_on_phi(a, get_irn_mode(n));
+       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
+                * is instantly reverted, when it tries to insert a Convb.
+                */
+               c = apply_conv_on_phi(a, mode);
                if (c) {
                        DBG_OPT_ALGSIM0(oldn, c, FS_OPT_CONST_PHI);
                        return c;
@@ -5327,10 +5297,34 @@ static ir_node *transform_node_Conv(ir_node *n) {
        }
 
        if (is_Unknown(a)) { /* Conv_A(Unknown_B) -> Unknown_A */
-               ir_mode *mode = get_irn_mode(n);
                return new_r_Unknown(current_ir_graph, mode);
        }
 
+       if (mode_is_reference(mode) &&
+               get_mode_size_bits(mode) == get_mode_size_bits(get_irn_mode(a)) &&
+               is_Add(a)) {
+               ir_node *l = get_Add_left(a);
+               ir_node *r = get_Add_right(a);
+               dbg_info *dbgi = get_irn_dbg_info(a);
+               ir_node *block = get_nodes_block(n);
+               if(is_Conv(l)) {
+                       ir_node *lop = get_Conv_op(l);
+                       if(get_irn_mode(lop) == mode) {
+                               /* ConvP(AddI(ConvI(P), x)) -> AddP(P, x) */
+                               n = new_rd_Add(dbgi, current_ir_graph, block, lop, r, mode);
+                               return n;
+                       }
+               }
+               if(is_Conv(r)) {
+                       ir_node *rop = get_Conv_op(r);
+                       if(get_irn_mode(rop) == mode) {
+                               /* ConvP(AddI(x, ConvI(P))) -> AddP(x, P) */
+                               n = new_rd_Add(dbgi, current_ir_graph, block, l, rop, mode);
+                               return n;
+                       }
+               }
+       }
+
        return n;
 }  /* transform_node_Conv */
 
@@ -5353,10 +5347,11 @@ static ir_node *transform_node_End(ir_node *n) {
                        continue;
                } else if (is_irn_pinned_in_irg(ka) && is_Block_dead(get_nodes_block(ka))) {
                        continue;
+               } else if (is_Bad(ka)) {
+                       /* no need to keep Bad */
+                       continue;
                }
-               /* FIXME: beabi need to keep a Proj(M) */
-               if (is_Phi(ka) || is_irn_keep(ka) || is_Proj(ka))
-                       in[j++] = ka;
+               in[j++] = ka;
        }
        if (j != n_keepalives)
                set_End_keepalives(n, j, in);
@@ -5391,7 +5386,6 @@ static ir_node *transform_node_Mux(ir_node *n) {
        ir_node  *t   = get_Mux_true(n);
        ir_node  *f   = get_Mux_false(n);
        ir_graph *irg = current_ir_graph;
-       ir_node  *conds[1], *vals[2];
 
        /* first normalization step: move a possible zero to the false case */
        if (is_Proj(sel)) {
@@ -5399,16 +5393,16 @@ static ir_node *transform_node_Mux(ir_node *n) {
 
                if (is_Cmp(cmp)) {
                        if (is_Const(t) && is_Const_null(t)) {
-                               /* Psi(x, 0, y) => Psi(x, y, 0) */
+                               ir_node *tmp;
+
+                               /* Mux(x, 0, y) => Mux(x, y, 0) */
                                pn_Cmp pnc = get_Proj_proj(sel);
                                sel = new_r_Proj(irg, get_nodes_block(cmp), cmp, mode_b,
                                        get_negated_pnc(pnc, get_irn_mode(get_Cmp_left(cmp))));
-                               conds[0] = sel;
-                               vals[0]  = f;
-                               vals[1]  = t;
-                               n        = new_rd_Psi(get_irn_dbg_info(n), irg, get_nodes_block(n), 1, conds, vals, mode);
-                               t = vals[0];
-                               f = vals[1];
+                               n        = new_rd_Mux(get_irn_dbg_info(n), irg, get_nodes_block(n), sel, t, f, mode);
+                               tmp = t;
+                               t = f;
+                               f = tmp;
                        }
                }
        }
@@ -5471,12 +5465,9 @@ static ir_node *transform_node_Mux(ir_node *n) {
                        dbg_info *dbg   = get_irn_dbg_info(n);
                        ir_node  *block = get_nodes_block(n);
                        ir_graph *irg   = current_ir_graph;
-
-
-                       conds[0] = sel;
-                       vals[0] = new_Const(mode, tarval_sub(a, min, NULL));
-                       vals[1] = new_Const(mode, tarval_sub(b, min, NULL));
-                       n = new_rd_Psi(dbg, irg, block, 1, conds, vals, mode);
+                       ir_node  *t     = new_Const(mode, tarval_sub(a, min, NULL));
+                       ir_node  *f     = new_Const(mode, tarval_sub(b, min, NULL));
+                       n = new_rd_Mux(dbg, irg, block, sel, f, t, mode);
                        n = new_rd_Add(dbg, irg, block, n, new_Const(mode, min), mode);
                        return n;
                }
@@ -5507,7 +5498,7 @@ static ir_node *transform_node_Mux(ir_node *n) {
                                        if ( (cmp_l == t && (pn == pn_Cmp_Ge || pn == pn_Cmp_Gt))
                                                || (cmp_l == f && (pn == pn_Cmp_Le || pn == pn_Cmp_Lt)))
                                        {
-                                               /* Psi(a >/>= 0, a, -a) = Psi(a </<= 0, -a, a) ==> Abs(a) */
+                                               /* Mux(a >/>= 0, a, -a) = Mux(a </<= 0, -a, a) ==> Abs(a) */
                                                n = new_rd_Abs(get_irn_dbg_info(n), current_ir_graph, block,
                                                                                 cmp_l, mode);
                                                DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_ABS);
@@ -5515,7 +5506,7 @@ static ir_node *transform_node_Mux(ir_node *n) {
                                        } else if ((cmp_l == t && (pn == pn_Cmp_Le || pn == pn_Cmp_Lt))
                                                || (cmp_l == f && (pn == pn_Cmp_Ge || pn == pn_Cmp_Gt)))
                                        {
-                                               /* Psi(a </<= 0, a, -a) = Psi(a >/>= 0, -a, a) ==> -Abs(a) */
+                                               /* Mux(a </<= 0, a, -a) = Mux(a >/>= 0, -a, a) ==> -Abs(a) */
                                                n = new_rd_Abs(get_irn_dbg_info(n), current_ir_graph, block,
                                                                                 cmp_l, mode);
                                                n = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph,
@@ -5528,19 +5519,21 @@ static ir_node *transform_node_Mux(ir_node *n) {
                                if (mode_is_int(mode)) {
                                        /* integer only */
                                        if ((pn == pn_Cmp_Lg || pn == pn_Cmp_Eq) && is_And(cmp_l)) {
-                                               /* Psi((a & b) != 0, c, 0) */
+                                               /* Mux((a & b) != 0, c, 0) */
                                                ir_node *and_r = get_And_right(cmp_l);
                                                ir_node *and_l;
 
                                                if (and_r == t && f == cmp_r) {
                                                        if (is_Const(t) && tarval_is_single_bit(get_Const_tarval(t))) {
                                                                if (pn == pn_Cmp_Lg) {
-                                                                       /* Psi((a & 2^C) != 0, 2^C, 0) */
+                                                                       /* Mux((a & 2^C) != 0, 2^C, 0) */
                                                                        n = cmp_l;
+                                                                       DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_BITOP);
                                                                } else {
-                                                                       /* Psi((a & 2^C) == 0, 2^C, 0) */
+                                                                       /* Mux((a & 2^C) == 0, 2^C, 0) */
                                                                        n = new_rd_Eor(get_irn_dbg_info(n), current_ir_graph,
                                                                                block, cmp_l, t, mode);
+                                                                       DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_BITOP);
                                                                }
                                                                return n;
                                                        }
@@ -5552,10 +5545,12 @@ static ir_node *transform_node_Mux(ir_node *n) {
                                                                        if (pn == pn_Cmp_Lg) {
                                                                                /* (a & (1 << n)) != 0, (1 << n), 0) */
                                                                                n = cmp_l;
+                                                                               DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_BITOP);
                                                                        } else {
                                                                                /* (a & (1 << n)) == 0, (1 << n), 0) */
                                                                                n = new_rd_Eor(get_irn_dbg_info(n), current_ir_graph,
                                                                                        block, cmp_l, t, mode);
+                                                                               DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_BITOP);
                                                                        }
                                                                        return n;
                                                                }
@@ -5569,10 +5564,12 @@ static ir_node *transform_node_Mux(ir_node *n) {
                                                                        if (pn == pn_Cmp_Lg) {
                                                                                /* ((1 << n) & a) != 0, (1 << n), 0) */
                                                                                n = cmp_l;
+                                                                               DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_BITOP);
                                                                        } else {
                                                                                /* ((1 << n) & a) == 0, (1 << n), 0) */
                                                                                n = new_rd_Eor(get_irn_dbg_info(n), current_ir_graph,
                                                                                        block, cmp_l, t, mode);
+                                                                               DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_BITOP);
                                                                        }
                                                                        return n;
                                                                }
@@ -5586,16 +5583,6 @@ static ir_node *transform_node_Mux(ir_node *n) {
        return arch_transform_node_Mux(n);
 }  /* transform_node_Mux */
 
-/**
- * Optimize a Psi into some simpler cases.
- */
-static ir_node *transform_node_Psi(ir_node *n) {
-       if (is_Mux(n))
-               return transform_node_Mux(n);
-
-       return n;
-}  /* transform_node_Psi */
-
 /**
  * optimize Sync nodes that have other syncs as input we simply add the inputs
  * of the other sync to our own inputs
@@ -5673,30 +5660,43 @@ static ir_node *transform_node(ir_node *n) {
  */
 static ir_op_ops *firm_set_default_transform_node(ir_opcode code, ir_op_ops *ops)
 {
-#define CASE(a)                                 \
-       case iro_##a:                                 \
-               ops->transform_node  = transform_node_##a;  \
+#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(Sub);
        CASE(Mul);
-       CASE(Div);
-       CASE(Mod);
-       CASE(DivMod);
+       CASE_PROJ_EX(Div);
+       CASE_PROJ_EX(Mod);
+       CASE_PROJ_EX(DivMod);
        CASE(Quot);
        CASE(Abs);
-       CASE(Cond);
-       CASE(Cmp);
+       CASE_PROJ_EX(Cmp);
+       CASE_PROJ_EX(Cond);
        CASE(And);
-       CASE(Or);
        CASE(Eor);
-       CASE(Minus);
        CASE(Not);
+       CASE(Minus);
        CASE(Cast);
+       CASE_PROJ(Load);
+       CASE_PROJ(Store);
+       CASE_PROJ(Bound);
+       CASE_PROJ(CopyB);
        CASE(Proj);
        CASE(Phi);
+       CASE(Or);
        CASE(Sel);
        CASE(Shr);
        CASE(Shrs);
@@ -5705,13 +5705,14 @@ static ir_op_ops *firm_set_default_transform_node(ir_opcode code, ir_op_ops *ops
        CASE(Conv);
        CASE(End);
        CASE(Mux);
-       CASE(Psi);
        CASE(Sync);
        default:
          /* leave NULL */;
        }
 
        return ops;
+#undef CASE_PROJ_EX
+#undef CASE_PROJ
 #undef CASE
 }  /* firm_set_default_transform_node */
 
@@ -5770,12 +5771,17 @@ static int node_cmp_attr_Call(ir_node *a, ir_node *b) {
 static int node_cmp_attr_Sel(ir_node *a, ir_node *b) {
        const ir_entity *a_ent = get_Sel_entity(a);
        const ir_entity *b_ent = get_Sel_entity(b);
+#if 0
        return
                (a_ent->kind    != b_ent->kind)    ||
                (a_ent->name    != b_ent->name)    ||
                (a_ent->owner   != b_ent->owner)   ||
                (a_ent->ld_name != b_ent->ld_name) ||
                (a_ent->type    != b_ent->type);
+#endif
+       /* Matze: inlining of functions can produce 2 entities with same type,
+        * name, etc. */
+       return a_ent != b_ent;
 }  /* node_cmp_attr_Sel */
 
 /** Compares the attributes of two Phi nodes. */
@@ -6117,7 +6123,6 @@ ir_node *identify_remember(pset *value_table, ir_node *n) {
 
        if (o != n) {
                update_known_irn(o, n);
-               DBG_OPT_CSE(n, o);
        }
 
        return o;
@@ -6355,7 +6360,10 @@ ir_node *optimize_node(ir_node *n) {
 
        /* Now we have a legal, useful node. Enter it in hash table for CSE */
        if (get_opt_cse() && (get_irn_opcode(n) != iro_Block)) {
-               n = identify_remember(current_ir_graph->value_table, n);
+               ir_node *o = n;
+               n = identify_remember(current_ir_graph->value_table, o);
+               if (o != n)
+                       DBG_OPT_CSE(o, n);
        }
 
        return n;
@@ -6420,7 +6428,10 @@ ir_node *optimize_in_place_2(ir_node *n) {
           now all nodes are op_pin_state_pinned to blocks, i.e., the cse only finds common
           subexpressions within a block. */
        if (get_opt_cse()) {
-               n = identify_remember(current_ir_graph->value_table, n);
+               ir_node *o = n;
+               n = identify_remember(current_ir_graph->value_table, o);
+               if (o != n)
+                       DBG_OPT_CSE(o, n);
        }
 
        /* Some more constant expression evaluation. */
@@ -6440,8 +6451,12 @@ ir_node *optimize_in_place_2(ir_node *n) {
        /* Now we have a legal, useful node. Enter it in hash table for cse.
           Blocks should be unique anyways.  (Except the successor of start:
           is cse with the start block!) */
-       if (get_opt_cse() && (get_irn_opcode(n) != iro_Block))
-               n = identify_remember(current_ir_graph->value_table, n);
+       if (get_opt_cse() && (get_irn_opcode(n) != iro_Block)) {
+               ir_node *o = n;
+               n = identify_remember(current_ir_graph->value_table, o);
+               if (o != n)
+                       DBG_OPT_CSE(o, n);
+       }
 
        return n;
 }  /* optimize_in_place_2 */