we can use a simpler test again with fixed smaller_mode
[libfirm] / ir / ir / iropt.c
index 26299c0..e84ec29 100644 (file)
@@ -145,8 +145,7 @@ static tarval *computed_value_Carry(ir_node *n) {
                tarval_add(ta, tb);
                return tarval_carry() ? get_mode_one(m) : get_mode_null(m);
        } else {
-               if (   (classify_tarval(ta) == TV_CLASSIFY_NULL)
-                       || (classify_tarval(tb) == TV_CLASSIFY_NULL))
+               if (tarval_is_null(ta) || tarval_is_null(tb))
                        return get_mode_null(m);
        }
        return tarval_bad;
@@ -166,7 +165,7 @@ static tarval *computed_value_Borrow(ir_node *n) {
 
        if ((ta != tarval_bad) && (tb != tarval_bad)) {
                return tarval_cmp(ta, tb) == pn_Cmp_Lt ? get_mode_one(m) : get_mode_null(m);
-       } else if (classify_tarval(ta) == TV_CLASSIFY_NULL) {
+       } else if (tarval_is_null(ta)) {
                return get_mode_null(m);
        }
        return tarval_bad;
@@ -310,12 +309,8 @@ static tarval *computed_value_And(ir_node *n) {
        if ((ta != tarval_bad) && (tb != tarval_bad)) {
                return tarval_and (ta, tb);
        } else {
-               tarval *v;
-
-               if (   (classify_tarval ((v = ta)) == TV_CLASSIFY_NULL)
-                       || (classify_tarval ((v = tb)) == TV_CLASSIFY_NULL)) {
-                       return v;
-               }
+               if (tarval_is_null(ta)) return ta;
+               if (tarval_is_null(tb)) return tb;
        }
        return tarval_bad;
 }  /* computed_value_And */
@@ -334,11 +329,8 @@ static tarval *computed_value_Or(ir_node *n) {
        if ((ta != tarval_bad) && (tb != tarval_bad)) {
                return tarval_or (ta, tb);
        } else {
-               tarval *v;
-               if (   (classify_tarval ((v = ta)) == TV_CLASSIFY_ALL_ONE)
-                       || (classify_tarval ((v = tb)) == TV_CLASSIFY_ALL_ONE)) {
-                       return v;
-               }
+               if (tarval_is_all_one(ta)) return ta;
+               if (tarval_is_all_one(tb)) return tb;
        }
        return tarval_bad;
 }  /* computed_value_Or */
@@ -542,25 +534,25 @@ static tarval *computed_value_Proj_Cmp(ir_node *n) {
                        ir_node *aba = skip_Id(skip_Proj(ab));
 
                        if (   (   (/* aa is ProjP and aaa is Alloc */
-                                      (get_irn_op(aa) == op_Proj)
-                                   && (mode_is_reference(get_irn_mode(aa)))
-                                   && (get_irn_op(aaa) == op_Alloc))
+                                      is_Proj(aa)
+                                   && mode_is_reference(get_irn_mode(aa))
+                                   && is_Alloc(aaa))
                                && (   (/* ab is NULL */
-                                          (get_irn_op(ab) == op_Const)
-                                       && (mode_is_reference(get_irn_mode(ab)))
-                                       && (get_Const_tarval(ab) == get_mode_null(get_irn_mode(ab))))
+                                          is_Const(ab)
+                                       && mode_is_reference(get_irn_mode(ab))
+                                       && is_Const_null(ab))
                                    || (/* ab is other Alloc */
-                                          (get_irn_op(ab) == op_Proj)
-                                       && (mode_is_reference(get_irn_mode(ab)))
-                                       && (get_irn_op(aba) == op_Alloc)
+                                          is_Proj(ab)
+                                       && mode_is_reference(get_irn_mode(ab))
+                                       && is_Alloc(aba)
                                        && (aaa != aba))))
                            || (/* aa is NULL and aba is Alloc */
-                                  (get_irn_op(aa) == op_Const)
-                               && (mode_is_reference(get_irn_mode(aa)))
-                               && (get_Const_tarval(aa) == get_mode_null(get_irn_mode(aa)))
-                               && (get_irn_op(ab) == op_Proj)
-                               && (mode_is_reference(get_irn_mode(ab)))
-                               && (get_irn_op(aba) == op_Alloc)))
+                                  is_Const(aa)
+                               && mode_is_reference(get_irn_mode(aa))
+                               && is_Const_null(aa)
+                               && 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);
                }
@@ -742,7 +734,7 @@ static ir_node *equivalent_node_Block(ir_node *n)
           This should be true, as the block is matured before optimize is called.
           But what about Phi-cycles with the Phi0/Id that could not be resolved?
           Remaining Phi nodes are just Ids. */
-       if ((n_preds == 1) && (get_irn_op(get_Block_cfgpred(n, 0)) == op_Jmp)) {
+       if (n_preds == 1 && is_Jmp(get_Block_cfgpred(n, 0))) {
                ir_node *predblock = get_nodes_block(get_Block_cfgpred(n, 0));
                if (predblock == oldn) {
                        /* Jmp jumps into the block it is in -- deal self cycle. */
@@ -752,8 +744,7 @@ static ir_node *equivalent_node_Block(ir_node *n)
                        n = predblock;
                        DBG_OPT_STG(oldn, n);
                }
-       } else if ((n_preds == 1) &&
-                  (get_irn_op(skip_Proj(get_Block_cfgpred(n, 0))) == op_Cond)) {
+       } else if (n_preds == 1 && is_Cond(skip_Proj(get_Block_cfgpred(n, 0)))) {
                ir_node *predblock = get_Block_cfgpred_block(n, 0);
                if (predblock == oldn) {
                        /* Jmp jumps into the block it is in -- deal self cycle. */
@@ -769,10 +760,10 @@ static ir_node *equivalent_node_Block(ir_node *n)
                ir_node *a = get_Block_cfgpred(n, 0);
                ir_node *b = get_Block_cfgpred(n, 1);
 
-               if ((get_irn_op(a) == op_Proj) &&
-                   (get_irn_op(b) == op_Proj) &&
+               if (is_Proj(a) &&
+                   is_Proj(b) &&
                    (get_Proj_pred(a) == get_Proj_pred(b)) &&
-                   (get_irn_op(get_Proj_pred(a)) == op_Cond) &&
+                   is_Cond(get_Proj_pred(a)) &&
                    (get_irn_mode(get_Cond_selector(get_Proj_pred(a))) == mode_b)) {
                        /* Also a single entry Block following a single exit Block.  Phis have
                           twice the same operand and will be optimized away. */
@@ -859,12 +850,10 @@ static ir_node *equivalent_node_neutral_zero(ir_node *n)
         * which happens in this rare construction: NULL + 3.
         * Then, a Conv would be needed which we cannot include here.
         */
-       if (classify_tarval (tv) == TV_CLASSIFY_NULL) {
-               if (get_irn_mode(on) == get_irn_mode(n)) {
-                       n = on;
+       if (tarval_is_null(tv) && get_irn_mode(on) == get_irn_mode(n)) {
+               n = on;
 
-                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_NEUTRAL_0);
-               }
+               DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_NEUTRAL_0);
        }
 
        return n;
@@ -900,7 +889,7 @@ static ir_node *equivalent_node_Add(ir_node *n) {
        left  = get_Add_left(n);
        right = get_Add_right(n);
 
-       if (get_irn_op(left) == op_Sub) {
+       if (is_Sub(left)) {
                if (get_Sub_right(left) == right) {
                        /* (a - x) + x */
 
@@ -911,7 +900,7 @@ static ir_node *equivalent_node_Add(ir_node *n) {
                        }
                }
        }
-       if (get_irn_op(right) == op_Sub) {
+       if (is_Sub(right)) {
                if (get_Sub_right(right) == left) {
                        /* x + (a - x) */
 
@@ -935,7 +924,7 @@ static ir_node *equivalent_node_left_zero(ir_node *n) {
        ir_node *a = get_binop_left(n);
        ir_node *b = get_binop_right(n);
 
-       if (classify_tarval(value_of(b)) == TV_CLASSIFY_NULL) {
+       if (is_Const(b) && is_Const_null(b)) {
                n = a;
 
                DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_NEUTRAL_0);
@@ -969,7 +958,7 @@ static ir_node *equivalent_node_Sub(ir_node *n) {
        b = get_Sub_right(n);
 
        /* Beware: modes might be different */
-       if (classify_tarval(value_of(b)) == TV_CLASSIFY_NULL) {
+       if (is_Const(b) && is_Const_null(b)) {
                ir_node *a = get_Sub_left(n);
                if (mode == get_irn_mode(a)) {
                        n = a;
@@ -1020,10 +1009,10 @@ static ir_node *equivalent_node_Mul(ir_node *n) {
                ir_node *b = get_Mul_right(n);
 
                /* Mul is commutative and has again an other neutral element. */
-               if (classify_tarval(value_of(a)) == TV_CLASSIFY_ONE) {
+               if (is_Const(a) && is_Const_one(a)) {
                        n = b;
                        DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_NEUTRAL_1);
-               } else if (classify_tarval(value_of(b)) == TV_CLASSIFY_ONE) {
+               } else if (is_Const(b) && is_Const_one(b)) {
                        n = a;
                        DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_NEUTRAL_1);
                }
@@ -1039,7 +1028,7 @@ static ir_node *equivalent_node_Div(ir_node *n) {
        ir_node *b = get_Div_right(n);
 
        /* Div is not commutative. */
-       if (classify_tarval(value_of(b)) == TV_CLASSIFY_ONE) { /* div(x, 1) == x */
+       if (is_Const(b) && is_Const_one(b)) { /* div(x, 1) == x */
                /* Turn Div into a tuple (mem, bad, a) */
                ir_node *mem = get_Div_mem(n);
                ir_node *blk = get_irn_n(n, -1);
@@ -1060,7 +1049,7 @@ static ir_node *equivalent_node_Quot(ir_node *n) {
        ir_node *b = get_Quot_right(n);
 
        /* Div is not commutative. */
-       if (classify_tarval(value_of(b)) == TV_CLASSIFY_ONE) { /* Quot(x, 1) == x */
+       if (is_Const(b) && is_Const_one(b)) { /* Quot(x, 1) == x */
                /* Turn Quot into a tuple (mem, jmp, bad, a) */
                ir_node *mem = get_Quot_mem(n);
                ir_node *blk = get_irn_n(n, -1);
@@ -1080,7 +1069,7 @@ static ir_node *equivalent_node_DivMod(ir_node *n) {
        ir_node *b = get_DivMod_right(n);
 
        /* Div is not commutative. */
-       if (classify_tarval(value_of(b)) == TV_CLASSIFY_ONE) { /* div(x, 1) == x */
+       if (is_Const(b) && is_Const_one(b)) { /* div(x, 1) == x */
                /* Turn DivMod into a tuple (mem, jmp, bad, a, 0) */
                ir_node *a = get_DivMod_left(n);
                ir_node *mem = get_Div_mem(n);
@@ -1109,10 +1098,10 @@ static ir_node *equivalent_node_Or(ir_node *n) {
        if (a == b) {
                n = a;    /* Or has it's own neutral element */
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_OR);
-       } else if (classify_tarval(value_of(a)) == TV_CLASSIFY_NULL) {
+       } else if (is_Const(a) && is_Const_null(a)) {
                n = b;
                DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_OR);
-       } else if (classify_tarval(value_of(b)) == TV_CLASSIFY_NULL) {
+       } else if (is_Const(b) && is_Const_null(b)) {
                n = a;
                DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_OR);
        }
@@ -1134,12 +1123,12 @@ static ir_node *equivalent_node_And(ir_node *n) {
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_AND);
                return n;
        }
-       if (classify_tarval(value_of(a)) == TV_CLASSIFY_ALL_ONE) {
+       if (is_Const(a) && is_Const_all_one(a)) {
                n = b;
                DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_AND);
                return n;
        }
-       if (classify_tarval(value_of(b)) == TV_CLASSIFY_ALL_ONE) {
+       if (is_Const(b) && is_Const_all_one(b)) {
                n = a;
                DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_AND);
                return n;
@@ -1185,14 +1174,21 @@ static ir_node *equivalent_node_Conv(ir_node *n) {
                                        return n;
                                }
                                /* else both are strict conv, second is superflous */
-                       } else {
-                               /* leave strict floating point Conv's */
-                               return n;
+                       } 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;
                }
                n = a;
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_CONV);
-       } else if (get_irn_op(a) == op_Conv) { /* Conv(Conv(b)) */
+       } else if (is_Conv(a)) { /* Conv(Conv(b)) */
                ir_mode *b_mode;
 
                b = get_Conv_op(a);
@@ -1204,7 +1200,7 @@ static ir_node *equivalent_node_Conv(ir_node *n) {
                                n = b; /* Convb(Conv*(xxxb(...))) == xxxb(...) */
                                DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_CONV);
                        } else if (mode_is_int(n_mode)) {
-                               if (smaller_mode(b_mode, a_mode)){
+                               if (get_mode_size_bits(b_mode) <= get_mode_size_bits(a_mode)) {
                                        n = b;        /* ConvS(ConvL(xxxS(...))) == xxxS(...) */
                                        DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_CONV);
                                }
@@ -1357,7 +1353,7 @@ static ir_node *equivalent_node_Proj(ir_node *proj) {
        ir_node *oldn = proj;
        ir_node *a = get_Proj_pred(proj);
 
-       if (get_irn_op(a) == op_Tuple) {
+       if (is_Tuple(a)) {
                /* Remove the Tuple/Proj combination. */
                if ( get_Proj_proj(proj) <= get_Tuple_n_preds(a) ) {
                        proj = get_Tuple_pred(a, get_Proj_proj(proj));
@@ -1372,9 +1368,7 @@ static ir_node *equivalent_node_Proj(ir_node *proj) {
                        /* Remove dead control flow -- early gigo(). */
                        proj = new_Bad();
                } else if (get_opt_ldst_only_null_ptr_exceptions()) {
-                       ir_op *op = get_irn_op(a);
-
-                       if (op == op_Load) {
+                       if (is_Load(a)) {
                                /* get the Load address */
                                ir_node *addr = get_Load_ptr(a);
                                ir_node *blk  = get_irn_n(a, -1);
@@ -1391,7 +1385,7 @@ static ir_node *equivalent_node_Proj(ir_node *proj) {
                                        } else
                                                return new_r_Jmp(current_ir_graph, blk);
                                }
-                       } else if (op == op_Store) {
+                       } else if (is_Store(a)) {
                                /* get the load/store address */
                                ir_node *addr = get_Store_ptr(a);
                                ir_node *blk  = get_irn_n(a, -1);
@@ -1452,7 +1446,7 @@ static ir_node *equivalent_node_Mux(ir_node *n)
                n = get_Mux_true(n);
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_EQ);
        }
-       else if (get_irn_op(sel) == op_Proj && !mode_honor_signed_zeros(get_irn_mode(n))) {
+       else if (is_Proj(sel) && !mode_honor_signed_zeros(get_irn_mode(n))) {
                ir_node *cmp = get_Proj_pred(sel);
                long proj_nr = get_Proj_proj(sel);
                ir_node *b   = get_Mux_false(n);
@@ -1466,10 +1460,11 @@ static ir_node *equivalent_node_Mux(ir_node *n)
                 * with NaN's because -NaN == NaN.
                 * However, if +0 and -0 is handled differently, we cannot use the first one.
                 */
-               if (get_irn_op(cmp) == op_Cmp && get_Cmp_left(cmp) == a) {
-                       if (classify_Const(get_Cmp_right(cmp)) == CNST_NULL) {
+               if (is_Cmp(cmp) && get_Cmp_left(cmp) == a) {
+                       ir_node *cmp_r = get_Cmp_right(cmp);
+                       if (is_Const(cmp_r) && is_Const_null(cmp_r)) {
                                /* Mux(a CMP 0, X, a) */
-                               if (get_irn_op(b) == op_Minus && get_Minus_op(b) == a) {
+                               if (is_Minus(b) && get_Minus_op(b) == a) {
                                        /* Mux(a CMP 0, -a, a) */
                                        if (proj_nr == pn_Cmp_Eq) {
                                                /* Mux(a == 0, -a, a)  ==>  -a */
@@ -1480,7 +1475,7 @@ static ir_node *equivalent_node_Mux(ir_node *n)
                                                n = a;
                                                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_TRANSFORM);
                                        }
-                               } else if (classify_Const(b) == CNST_NULL) {
+                               } else if (is_Const(b) && is_Const_null(b)) {
                                        /* Mux(a CMP 0, 0, a) */
                                        if (proj_nr == pn_Cmp_Lg || proj_nr == pn_Cmp_Ne) {
                                                /* Mux(a != 0, 0, a) ==> a */
@@ -1540,7 +1535,7 @@ static ir_node *equivalent_node_Confirm(ir_node *n) {
        ir_node *pred = get_Confirm_value(n);
        pn_Cmp  pnc   = get_Confirm_cmp(n);
 
-       if (get_irn_op(pred) == op_Confirm && pnc == get_Confirm_cmp(pred)) {
+       if (is_Confirm(pred) && pnc == get_Confirm_cmp(pred)) {
                /*
                 * rare case: two identical Confirms one after another,
                 * replace the second one with the first.
@@ -1718,15 +1713,15 @@ static int is_const_Phi(ir_node *n) {
  * @param phi    the Phi node
  * @param other  the other operand
  * @param eval   an evaluator function
+ * @param mode   the mode of the result, may be different from the mode of the Phi!
  * @param left   if non-zero, other is the left operand, else the right
  *
  * @return a new Phi node if the conversion was successful, NULL else
  */
-static ir_node *apply_binop_on_phi(ir_node *phi, tarval *other, tarval *(*eval)(tarval *, tarval *), int left) {
+static ir_node *apply_binop_on_phi(ir_node *phi, tarval *other, tarval *(*eval)(tarval *, tarval *), ir_mode *mode, int left) {
        tarval   *tv;
        void     **res;
        ir_node  *pred;
-       ir_mode  *mode;
        ir_graph *irg;
        int      i, n = get_irn_arity(phi);
 
@@ -1756,7 +1751,6 @@ static ir_node *apply_binop_on_phi(ir_node *phi, tarval *other, tarval *(*eval)(
                        res[i] = tv;
                }
        }
-       mode = get_irn_mode(phi);
        irg  = current_ir_graph;
        for (i = 0; i < n; ++i) {
                pred = get_irn_n(phi, i);
@@ -1804,6 +1798,41 @@ static ir_node *apply_unop_on_phi(ir_node *phi, tarval *(*eval)(tarval *)) {
        return new_r_Phi(irg, get_nodes_block(phi), n, (ir_node **)res, mode);
 }  /* apply_unop_on_phi */
 
+/**
+ * Apply a conversion on a constant operator (a Phi).
+ *
+ * @param phi    the Phi node
+ *
+ * @return a new Phi node if the conversion was successful, NULL else
+ */
+static ir_node *apply_conv_on_phi(ir_node *phi, ir_mode *mode) {
+       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);
+
+               if (tv == tarval_bad) {
+                       /* folding failed, bad */
+                       return 0;
+               }
+               res[i] = tv;
+       }
+       irg  = current_ir_graph;
+       for (i = 0; i < n; ++i) {
+               pred = get_irn_n(phi, i);
+               res[i] = new_r_Const_type(irg, get_irg_start_block(irg),
+                       mode, res[i], get_Const_type(pred));
+       }
+       return new_r_Phi(irg, get_nodes_block(phi), n, (ir_node **)res, mode);
+}  /* apply_conv_on_phi */
+
 /**
  * Transform AddP(P, ConvIs(Iu)), AddP(P, ConvIu(Is)) and
  * SubP(P, ConvIs(Iu)), SubP(P, ConvIu(Is)).
@@ -1817,7 +1846,7 @@ static ir_node *transform_node_AddSub(ir_node *n) {
                ir_node *right = get_binop_right(n);
                int ref_bits   = get_mode_size_bits(mode);
 
-               if (get_irn_op(left) == op_Conv) {
+               if (is_Conv(left)) {
                        ir_mode *mode = get_irn_mode(left);
                        int bits      = get_mode_size_bits(mode);
 
@@ -1840,7 +1869,7 @@ static ir_node *transform_node_AddSub(ir_node *n) {
                        }
                }
 
-               if (get_irn_op(right) == op_Conv) {
+               if (is_Conv(right)) {
                        ir_mode *mode = get_irn_mode(right);
                        int bits      = get_mode_size_bits(mode);
 
@@ -1866,26 +1895,26 @@ static ir_node *transform_node_AddSub(ir_node *n) {
        return n;
 }  /* transform_node_AddSub */
 
-#define HANDLE_BINOP_PHI(op,a,b,c)                          \
-  c = NULL;                                                 \
-  if (is_Const(b) && is_const_Phi(a)) {                     \
-    /* check for Op(Phi, Const) */                          \
-    c = apply_binop_on_phi(a, get_Const_tarval(b), op, 0);  \
-  }                                                         \
-  else if (is_Const(a) && is_const_Phi(b)) {                \
-    /* check for Op(Const, Phi) */                          \
-    c = apply_binop_on_phi(b, get_Const_tarval(a), op, 1);  \
-  }                                                         \
-  if (c) {                                                  \
-    DBG_OPT_ALGSIM0(oldn, c, FS_OPT_CONST_PHI);             \
-    return c;                                               \
+#define HANDLE_BINOP_PHI(eval, a, b, c, mode)                     \
+  c = NULL;                                                       \
+  if (is_Const(b) && is_const_Phi(a)) {                           \
+    /* check for Op(Phi, Const) */                                \
+    c = apply_binop_on_phi(a, get_Const_tarval(b), eval, mode, 0);\
+  }                                                               \
+  else if (is_Const(a) && is_const_Phi(b)) {                      \
+    /* check for Op(Const, Phi) */                                \
+    c = apply_binop_on_phi(b, get_Const_tarval(a), eval, mode, 1);\
+  }                                                               \
+  if (c) {                                                        \
+    DBG_OPT_ALGSIM0(oldn, c, FS_OPT_CONST_PHI);                   \
+    return c;                                                     \
   }
 
-#define HANDLE_UNOP_PHI(op,a,c)                   \
+#define HANDLE_UNOP_PHI(eval, a, c)               \
   c = NULL;                                       \
   if (is_const_Phi(a)) {                          \
     /* check for Op(Phi) */                       \
-    c = apply_unop_on_phi(a, op);                 \
+    c = apply_unop_on_phi(a, eval);               \
     if (c) {                                      \
       DBG_OPT_ALGSIM0(oldn, c, FS_OPT_CONST_PHI); \
       return c;                                   \
@@ -1910,9 +1939,8 @@ static ir_node *transform_node_Add(ir_node *n) {
        a = get_Add_left(n);
        b = get_Add_right(n);
 
-       HANDLE_BINOP_PHI(tarval_add, a,b,c);
-
        mode = get_irn_mode(n);
+       HANDLE_BINOP_PHI(tarval_add, a, b, c, mode);
 
        /* for FP these optimizations are only allowed if fp_strict_algebraic is disabled */
        if (mode_is_float(mode) && (get_irg_fp_model(current_ir_graph) & fp_strict_algebraic))
@@ -1920,7 +1948,7 @@ static ir_node *transform_node_Add(ir_node *n) {
 
        if (mode_is_num(mode)) {
                /* the following code leads to endless recursion when Mul are replaced by a simple instruction chain */
-               if (!get_opt_arch_dep_running() && a == b && mode_is_int(mode)) {
+               if (!is_arch_dep_running() && a == b && mode_is_int(mode)) {
                        ir_node *block = get_irn_n(n, -1);
 
                        n = new_rd_Mul(
@@ -1955,7 +1983,7 @@ static ir_node *transform_node_Add(ir_node *n) {
                        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_A_MINUS_B);
                        return n;
                }
-               if (! get_opt_reassociation()) {
+               if (! is_reassoc_running()) {
                        /* do NOT execute this code if reassociation is enabled, it does the inverse! */
                        if (is_Mul(a)) {
                                ir_node *ma = get_Mul_left(a);
@@ -2028,7 +2056,7 @@ static ir_node *transform_node_Add(ir_node *n) {
                        if (is_Not(a)) {
                                ir_node *op = get_Not_op(a);
 
-                               if (classify_Const(b) == CNST_ONE) {
+                               if (is_Const(b) && is_Const_one(b)) {
                                        /* ~x + 1 = -x */
                                        ir_node *blk = get_irn_n(n, -1);
                                        n = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, blk, op, mode);
@@ -2047,7 +2075,7 @@ static ir_node *transform_node_Add(ir_node *n) {
                                ir_node *op = get_Not_op(b);
 
                                if (op == a) {
-                                       /* ~x + x = -1 */
+                                       /* x + ~x = -1 */
                                        ir_node *blk = get_irn_n(n, -1);
                                        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);
@@ -2059,7 +2087,9 @@ static ir_node *transform_node_Add(ir_node *n) {
        return n;
 }  /* transform_node_Add */
 
-/* returns -cnst */
+/**
+ * returns -cnst or NULL if impossible
+ */
 static ir_node *const_negate(ir_node *cnst) {
        tarval   *tv    = tarval_neg(get_Const_tarval(cnst));
        dbg_info *dbgi  = get_irn_dbg_info(cnst);
@@ -2093,7 +2123,7 @@ static ir_node *transform_node_Sub(ir_node *n) {
        mode = get_irn_mode(n);
 
 restart:
-       HANDLE_BINOP_PHI(tarval_sub, a,b,c);
+       HANDLE_BINOP_PHI(tarval_sub, a, b, c, mode);
 
        /* for FP these optimizations are only allowed if fp_strict_algebraic is disabled */
        if (mode_is_float(mode) && (get_irg_fp_model(current_ir_graph) & fp_strict_algebraic))
@@ -2118,7 +2148,6 @@ restart:
                dbg_info *dbg   = get_irn_dbg_info(n);
                ir_node  *block = get_nodes_block(n);
                ir_node  *left  = get_Minus_op(a);
-               ir_mode  *mode  = get_irn_mode(n);
                ir_node  *add   = new_rd_Add(dbg, irg, block, left, b, mode);
 
                n = new_rd_Minus(dbg, irg, block, add, mode);
@@ -2129,7 +2158,6 @@ restart:
                dbg_info *dbg   = get_irn_dbg_info(n);
                ir_node  *block = get_nodes_block(n);
                ir_node  *right = get_Minus_op(b);
-               ir_mode  *mode  = get_irn_mode(n);
 
                n = new_rd_Add(dbg, irg, block, a, right, mode);
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_MINUS);
@@ -2144,9 +2172,8 @@ restart:
                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);
-               ir_mode  *a_mode  = get_irn_mode(n);
 
-               n = new_rd_Add(a_dbg, irg, a_block, a, sub, a_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) */
@@ -2162,9 +2189,8 @@ restart:
                                ir_node  *mul     = new_rd_Mul(m_dbg, irg, m_block, m_left, cnst2, m_mode);
                                dbg_info *a_dbg   = get_irn_dbg_info(n);
                                ir_node  *a_block = get_nodes_block(n);
-                               ir_mode  *a_mode  = get_irn_mode(n);
 
-                               n = new_rd_Add(a_dbg, irg, a_block, a, mul, a_mode);
+                               n = new_rd_Add(a_dbg, irg, a_block, a, mul, mode);
                                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_TO_ADD);
                                return n;
                        }
@@ -2172,7 +2198,7 @@ restart:
        }
 
        /* Beware of Sub(P, P) which cannot be optimized into a simple Minus ... */
-       if (mode_is_num(mode) && mode == get_irn_mode(a) && (classify_Const(a) == CNST_NULL)) {
+       if (mode_is_num(mode) && mode == get_irn_mode(a) && is_Const(a) && is_Const_null(a)) {
                n = new_rd_Minus(
                                get_irn_dbg_info(n),
                                current_ir_graph,
@@ -2259,7 +2285,7 @@ restart:
                }
        }
        /* do NOT execute this code if reassociation is enabled, it does the inverse! */
-       if (get_opt_reassociation() && get_irn_op(a) == op_Mul) {
+       if (!is_reassoc_running() && is_Mul(a)) {
                ir_node *ma = get_Mul_left(a);
                ir_node *mb = get_Mul_right(a);
 
@@ -2295,21 +2321,22 @@ restart:
                        return n;
                }
        }
-       if (is_Sub(a)) {
-               ir_node *x   = get_Sub_left(a);
-               ir_node *y   = get_Sub_right(a);
-               ir_node *blk = get_irn_n(n, -1);
-               ir_mode *m_b = get_irn_mode(b);
-               ir_mode *m_y = get_irn_mode(y);
+       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_mode *m_b      = get_irn_mode(b);
+               ir_mode *m_y      = get_irn_mode(y);
+               ir_mode *add_mode;
                ir_node *add;
 
                /* Determine the right mode for the Add. */
                if (m_b == m_y)
-                       mode = m_b;
+                       add_mode = m_b;
                else if (mode_is_reference(m_b))
-                       mode = m_b;
+                       add_mode = m_b;
                else if (mode_is_reference(m_y))
-                       mode = m_y;
+                       add_mode = m_y;
                else {
                        /*
                         * Both modes are different but none is reference,
@@ -2320,7 +2347,7 @@ restart:
                        return n;
                }
 
-               add = new_r_Add(current_ir_graph, blk, y, b, mode);
+               add = new_r_Add(current_ir_graph, blk, y, b, add_mode);
 
                n = new_rd_Sub(get_irn_dbg_info(n), current_ir_graph, blk, x, add, mode);
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_SUB_X_Y_Z);
@@ -2403,7 +2430,7 @@ static ir_node *transform_node_Mul(ir_node *n) {
        if (mode != get_irn_mode(a))
                return transform_node_Mul2n(n, mode);
 
-       HANDLE_BINOP_PHI(tarval_mul, a,b,c);
+       HANDLE_BINOP_PHI(tarval_mul, a, b, c, mode);
 
        if (mode_is_signed(mode)) {
                ir_node *r = NULL;
@@ -2720,12 +2747,15 @@ static ir_node *transform_node_Quot(ir_node *n) {
  * Optimize Abs(x) into -x if x is Confirmed <= 0
  */
 static ir_node *transform_node_Abs(ir_node *n) {
-       ir_node        *oldn = n;
-       ir_node        *a = get_Abs_op(n);
-       value_classify_sign sign = classify_value_sign(a);
+       ir_node *c, *oldn = n;
+       ir_node *a = get_Abs_op(n);
+       ir_mode *mode;
 
-       if (sign == value_classified_negative) {
-               ir_mode *mode = get_irn_mode(n);
+       HANDLE_UNOP_PHI(tarval_abs, a, c);
+
+       switch (classify_value_sign(a)) {
+       case value_classified_negative:
+               mode = get_irn_mode(n);
 
                /*
                 * We can replace the Abs by -x here.
@@ -2738,14 +2768,16 @@ static ir_node *transform_node_Abs(ir_node *n) {
                                get_irn_n(n, -1), a, mode);
 
                DBG_OPT_CONFIRM(oldn, n);
-       } else if (sign == value_classified_positive) {
+               return n;
+       case value_classified_positive:
                /* n is positive, Abs is not needed */
                n = a;
 
                DBG_OPT_CONFIRM(oldn, n);
+               return n;
+       default:
+               return n;
        }
-
-       return n;
 }  /* transform_node_Abs */
 
 /**
@@ -2898,9 +2930,8 @@ static ir_node *transform_node_And(ir_node *n) {
        ir_node *b = get_And_right(n);
        ir_mode *mode;
 
-       HANDLE_BINOP_PHI(tarval_and, a,b,c);
-
        mode = get_irn_mode(n);
+       HANDLE_BINOP_PHI(tarval_and, a, b, c, mode);
 
        /* we can evaluate 2 Projs of the same Cmp */
        if (mode == mode_b && is_Proj(a) && is_Proj(b)) {
@@ -2964,7 +2995,7 @@ static ir_node *transform_node_And(ir_node *n) {
                        dbg_info *dbg  = get_irn_dbg_info(n);
                        ir_node *block = get_nodes_block(n);
 
-                       ar = new_rd_Minus(dbg, current_ir_graph, block, ar, mode);
+                       ar = new_rd_Not(dbg, current_ir_graph, block, ar, mode);
                        n  = new_rd_And(dbg, current_ir_graph, block, ar, b, mode);
                        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT);
                        return n;
@@ -2974,7 +3005,7 @@ static ir_node *transform_node_And(ir_node *n) {
                        dbg_info *dbg  = get_irn_dbg_info(n);
                        ir_node *block = get_nodes_block(n);
 
-                       al = new_rd_Minus(dbg, current_ir_graph, block, al, mode);
+                       al = new_rd_Not(dbg, current_ir_graph, block, al, mode);
                        n  = new_rd_And(dbg, current_ir_graph, block, al, b, mode);
                        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT);
                        return n;
@@ -2989,7 +3020,7 @@ static ir_node *transform_node_And(ir_node *n) {
                        dbg_info *dbg  = get_irn_dbg_info(n);
                        ir_node *block = get_nodes_block(n);
 
-                       br = new_rd_Minus(dbg, current_ir_graph, block, br, mode);
+                       br = new_rd_Not(dbg, current_ir_graph, block, br, mode);
                        n  = new_rd_And(dbg, current_ir_graph, block, br, a, mode);
                        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT);
                        return n;
@@ -2999,7 +3030,7 @@ static ir_node *transform_node_And(ir_node *n) {
                        dbg_info *dbg  = get_irn_dbg_info(n);
                        ir_node *block = get_nodes_block(n);
 
-                       bl = new_rd_Minus(dbg, current_ir_graph, block, bl, mode);
+                       bl = new_rd_Not(dbg, current_ir_graph, block, bl, mode);
                        n  = new_rd_And(dbg, current_ir_graph, block, bl, a, mode);
                        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT);
                        return n;
@@ -3032,10 +3063,10 @@ static ir_node *transform_node_Eor(ir_node *n) {
        ir_node *b = get_Eor_right(n);
        ir_mode *mode = get_irn_mode(n);
 
-       HANDLE_BINOP_PHI(tarval_eor, a,b,c);
+       HANDLE_BINOP_PHI(tarval_eor, a, b, c, mode);
 
        /* we can evaluate 2 Projs of the same Cmp */
-       if(get_irn_mode(n) == mode_b && is_Proj(a) && is_Proj(b)) {
+       if (mode == mode_b && is_Proj(a) && is_Proj(b)) {
                ir_node *pred_a = get_Proj_pred(a);
                ir_node *pred_b = get_Proj_pred(b);
                if(pred_a == pred_b) {
@@ -3056,23 +3087,29 @@ static ir_node *transform_node_Eor(ir_node *n) {
                n = new_rd_Const(get_irn_dbg_info(n), current_ir_graph, get_irn_n(n, -1),
                                 mode, get_mode_null(mode));
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_A_A);
-       } else if ((mode == mode_b)
-                  && (get_irn_op(a) == op_Proj)
-                  && (get_irn_mode(a) == mode_b)
-                  && (classify_tarval (value_of(b)) == TV_CLASSIFY_ONE)
-                  && (get_irn_op(get_Proj_pred(a)) == op_Cmp)) {
+       } else if (mode == mode_b &&
+                       is_Proj(a) &&
+                       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),
                                mode_b, get_negated_pnc(get_Proj_proj(a), mode));
 
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT_BOOL);
-       } else if ((mode == mode_b)
-               && (classify_tarval (value_of(b)) == TV_CLASSIFY_ONE)) {
-               /* The Eor is a Not. Replace it by a Not. */
-               /*   ????!!!Extend to bitfield 1111111. */
-               n = new_r_Not(current_ir_graph, get_irn_n(n, -1), a, mode_b);
-
-               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT);
+       } else if (is_Const(b)) {
+               if (is_Not(a)) { /* ~x ^ const -> x ^ ~const */
+                       ir_node  *cnst   = new_Const(mode, tarval_not(get_Const_tarval(b)));
+                       ir_node  *not_op = get_Not_op(a);
+                       dbg_info *dbg    = get_irn_dbg_info(n);
+                       ir_graph *irg    = current_ir_graph;
+                       ir_node  *block  = get_nodes_block(n);
+                       ir_mode  *mode   = get_irn_mode(n);
+                       n = new_rd_Eor(dbg, irg, block, not_op, cnst, mode);
+                       return n;
+               } else if (is_Const_all_one(b)) { /* x ^ 1...1 -> ~1 */
+                       n = new_r_Not(current_ir_graph, get_nodes_block(n), a, mode);
+                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT);
+               }
        } else {
                n = transform_bitwise_distributive(n, transform_node_Eor);
        }
@@ -3085,28 +3122,52 @@ static ir_node *transform_node_Eor(ir_node *n) {
  */
 static ir_node *transform_node_Not(ir_node *n) {
        ir_node *c, *oldn = n;
-       ir_node *a = get_Not_op(n);
-       ir_op *op_a = get_irn_op(a);
+       ir_node *a    = get_Not_op(n);
+       ir_mode *mode = get_irn_mode(n);
 
        HANDLE_UNOP_PHI(tarval_not,a,c);
 
        /* check for a boolean Not */
-       if (   (get_irn_mode(n) == mode_b)
-           && (op_a == op_Proj)
-           && (get_irn_mode(a) == mode_b)
-           && (get_irn_op(get_Proj_pred(a)) == op_Cmp)) {
+       if (mode == mode_b &&
+                       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),
                                mode_b, get_negated_pnc(get_Proj_proj(a), mode_b));
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_NOT_CMP);
-                return n;
+               return n;
        }
-       if (op_a == op_Sub && classify_Const(get_Sub_right(a)) == CNST_ONE) {
-               /* ~(x-1) = -x */
-               ir_node *op = get_Sub_left(a);
-               ir_node *blk = get_irn_n(n, -1);
-               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);
+       if  (is_Eor(a)) {
+               ir_node *eor_b = get_Eor_right(a);
+               if (is_Const(eor_b)) { /* ~(x ^ const) -> x ^ ~const */
+                       ir_node  *cnst  = new_Const(mode, tarval_not(get_Const_tarval(eor_b)));
+                       ir_node  *eor_a = get_Eor_left(a);
+                       dbg_info *dbg   = get_irn_dbg_info(n);
+                       ir_graph *irg   = current_ir_graph;
+                       ir_node  *block = get_nodes_block(n);
+                       ir_mode  *mode  = get_irn_mode(n);
+                       n = new_rd_Eor(dbg, irg, block, eor_a, cnst, mode);
+                       return n;
+               }
+       }
+       if (get_mode_arithmetic(mode) == irma_twos_complement) {
+               if (is_Minus(a)) { /* ~-x -> x + -1 */
+                       dbg_info *dbg   = get_irn_dbg_info(n);
+                       ir_graph *irg   = current_ir_graph;
+                       ir_node  *block = get_nodes_block(n);
+                       ir_node  *add_l = get_Minus_op(a);
+                       ir_node  *add_r = new_rd_Const(dbg, irg, block, mode, get_mode_minus_one(mode));
+                       n = new_rd_Add(dbg, irg, block, add_l, add_r, mode);
+               } else if (is_Add(a)) {
+                       ir_node *add_r = get_Add_right(a);
+                       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);
+                               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);
+                       }
+               }
        }
        return n;
 }  /* transform_node_Not */
@@ -3181,6 +3242,20 @@ static ir_node *transform_node_Minus(ir_node *n) {
                return 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));
+                       ir_node  *cnst  = new_Const(mode, tv);
+                       dbg_info *dbg   = get_irn_dbg_info(a);
+                       ir_graph *irg   = current_ir_graph;
+                       ir_node  *block = get_nodes_block(a);
+                       n = new_rd_Mul(dbg, irg, block, mul_l, cnst, mode);
+                       return n;
+               }
+       }
+
        return n;
 }  /* transform_node_Minus */
 
@@ -3192,11 +3267,11 @@ static ir_node *transform_node_Cast(ir_node *n) {
        ir_node *pred = get_Cast_op(n);
        ir_type *tp = get_irn_type(n);
 
-       if (get_irn_op(pred) == op_Const && get_Const_type(pred) != tp) {
+       if (is_Const(pred) && get_Const_type(pred) != tp) {
                n = new_rd_Const_type(NULL, current_ir_graph, get_irn_n(pred, -1), get_irn_mode(pred),
                        get_Const_tarval(pred), tp);
                DBG_OPT_CSTEVAL(oldn, n);
-       } else if ((get_irn_op(pred) == op_SymConst) && (get_SymConst_value_type(pred) != tp)) {
+       } else if (is_SymConst(pred) && get_SymConst_value_type(pred) != tp) {
                n = new_rd_SymConst_type(NULL, current_ir_graph, get_irn_n(pred, -1), get_SymConst_symbol(pred),
                        get_SymConst_kind(pred), tp);
                DBG_OPT_CSTEVAL(oldn, n);
@@ -3217,6 +3292,15 @@ static ir_node *transform_node_Proj_Div(ir_node *proj) {
 
        if (value_not_zero(b, &confirm)) {
                /* div(x, y) && y != 0 */
+               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);
+                       set_Div_mem(div, new_mem);
+                       set_irn_pinned(div, op_pin_state_floats);
+               }
+
                proj_nr = get_Proj_proj(proj);
                switch (proj_nr) {
                case pn_Div_X_regular:
@@ -3258,6 +3342,15 @@ static ir_node *transform_node_Proj_Mod(ir_node *proj) {
                /* mod(x, y) && y != 0 */
                proj_nr = get_Proj_proj(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);
+                       set_Mod_mem(mod, new_mem);
+                       set_irn_pinned(mod, op_pin_state_floats);
+               }
+
                switch (proj_nr) {
 
                case pn_Mod_X_regular:
@@ -3276,9 +3369,8 @@ static ir_node *transform_node_Proj_Mod(ir_node *proj) {
                                /* This node can only float up to the Confirm block */
                                new_mem = new_r_Pin(current_ir_graph, get_nodes_block(confirm), new_mem);
                        }
-                       set_irn_pinned(mod, op_pin_state_floats);
                        /* this is a Mod without exception, we can remove the memory edge */
-                       set_Mod_mem(mod, get_irg_no_mem(current_ir_graph));
+                       set_Mod_mem(mod, new_mem);
                        return res;
                case pn_Mod_res:
                        if (get_Mod_left(mod) == b) {
@@ -3308,6 +3400,15 @@ static ir_node *transform_node_Proj_DivMod(ir_node *proj) {
                /* DivMod(x, y) && y != 0 */
                proj_nr = get_Proj_proj(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);
+                       set_DivMod_mem(divmod, new_mem);
+                       set_irn_pinned(divmod, op_pin_state_floats);
+               }
+
                switch (proj_nr) {
 
                case pn_DivMod_X_regular:
@@ -3326,9 +3427,8 @@ static ir_node *transform_node_Proj_DivMod(ir_node *proj) {
                                /* This node can only float up to the Confirm block */
                                new_mem = new_r_Pin(current_ir_graph, get_nodes_block(confirm), new_mem);
                        }
-                       set_irn_pinned(divmod, op_pin_state_floats);
                        /* this is a DivMod without exception, we can remove the memory edge */
-                       set_DivMod_mem(divmod, get_irg_no_mem(current_ir_graph));
+                       set_DivMod_mem(divmod, new_mem);
                        return res;
 
                case pn_DivMod_res_mod:
@@ -3390,7 +3490,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
        long proj_nr   = get_Proj_proj(proj);
 
        /* we can evaluate this direct */
-       switch(proj_nr) {
+       switch (proj_nr) {
        case pn_Cmp_False:
                return new_Const(mode_b, get_tarval_b_false());
        case pn_Cmp_True:
@@ -3403,6 +3503,12 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
                break;
        }
 
+       /* remove Casts */
+       if (is_Cast(left))
+               left = get_Cast_op(left);
+       if (is_Cast(right))
+               right = get_Cast_op(right);
+
        /* Remove unnecessary conversions */
        /* TODO handle constants */
        if (is_Conv(left) && is_Conv(right)) {
@@ -3420,42 +3526,21 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
                                left  = op_left;
                                right = op_right;
                                changed |= 1;
+                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CONV_CONV);
                        } else if (smaller_mode(mode_left, mode_right)) {
                                left  = new_r_Conv(irg, block, op_left, mode_right);
                                right = op_right;
                                changed |= 1;
+                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CONV);
                        } else if (smaller_mode(mode_right, mode_left)) {
                                left  = op_left;
                                right = new_r_Conv(irg, block, op_right, mode_left);
                                changed |= 1;
+                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CONV);
                        }
                }
        }
 
-       /* TODO extend to arbitrary constants */
-       if (is_Conv(left) &&
-                       is_Const(right) &&
-                       tarval_is_null(get_Const_tarval(right))) {
-               ir_mode* mode    = get_irn_mode(left);
-               ir_node* op      = get_Conv_op(left);
-               ir_mode* op_mode = get_irn_mode(op);
-
-               if (get_mode_size_bits(mode) > get_mode_size_bits(op_mode) &&
-                               (mode_is_signed(mode) || !mode_is_signed(op_mode))) {
-                       ir_node  *null  = new_Const(op_mode, get_mode_null(op_mode));
-                       dbg_info *dbg   = get_irn_dbg_info(n);
-                       ir_graph *irg   = current_ir_graph;
-                       ir_node  *block = get_nodes_block(n);
-                       return new_rd_Cmp(dbg, irg, block, op, null);
-               }
-       }
-
-       /* remove Casts */
-       if (is_Cast(left))
-               left = get_Cast_op(left);
-       if (is_Cast(right))
-               right = get_Cast_op(right);
-
        /* remove operation of both sides if possible */
        if (proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg) {
                ir_opcode lop = get_irn_opcode(left);
@@ -3471,6 +3556,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
                                left  = get_unop_op(left);
                                right = get_unop_op(right);
                                changed |= 1;
+                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP);
                                break;
                        case iro_Add:
                                ll = get_Add_left(left);
@@ -3483,21 +3569,25 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
                                        left  = lr;
                                        right = rr;
                                        changed |= 1;
+                                       DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP);
                                } else if (ll == rr) {
                                        /* X + a CMP b + X ==> a CMP b */
                                        left  = lr;
                                        right = rl;
                                        changed |= 1;
+                                       DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP);
                                } else if (lr == rl) {
                                        /* a + X CMP X + b ==> a CMP b */
                                        left  = ll;
                                        right = rr;
                                        changed |= 1;
+                                       DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP);
                                } else if (lr == rr) {
                                        /* a + X CMP b + X ==> a CMP b */
                                        left  = ll;
                                        right = rl;
                                        changed |= 1;
+                                       DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP);
                                }
                                break;
                        case iro_Sub:
@@ -3511,11 +3601,13 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
                                        left  = lr;
                                        right = rr;
                                        changed |= 1;
+                                       DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP);
                                } else if (lr == rr) {
                                        /* a - X CMP b - X ==> a CMP b */
                                        left  = ll;
                                        right = rl;
                                        changed |= 1;
+                                       DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP);
                                }
                                break;
                        case iro_Rot:
@@ -3524,6 +3616,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
                                        left  = get_Rot_left(left);
                                        right = get_Rot_left(right);
                                        changed |= 1;
+                                       DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP);
                                }
                                break;
                        default:
@@ -3535,14 +3628,20 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
        if (get_irn_mode(left) == mode_b) {
                ir_graph *irg   = current_ir_graph;
                ir_node  *block = get_nodes_block(n);
+               ir_node  *bres;
 
                switch (proj_nr) {
-                       case pn_Cmp_Le: return new_r_Or( irg, block, new_r_Not(irg, block, left, mode_b), right, mode_b);
-                       case pn_Cmp_Lt: return new_r_And(irg, block, new_r_Not(irg, block, left, mode_b), right, mode_b);
-                       case pn_Cmp_Ge: return new_r_Or( irg, block, left, new_r_Not(irg, block, right, mode_b), mode_b);
-                       case pn_Cmp_Gt: return new_r_And(irg, block, left, new_r_Not(irg, block, right, mode_b), mode_b);
-                       case pn_Cmp_Lg: return new_r_Eor(irg, block, left, right, mode_b);
-                       case pn_Cmp_Eq: return new_r_Not(irg, block, new_r_Eor(irg, block, left, right, mode_b), mode_b);
+                       case pn_Cmp_Le: bres = new_r_Or( irg, block, new_r_Not(irg, block, left, mode_b), right, mode_b); break;
+                       case pn_Cmp_Lt: bres = new_r_And(irg, block, new_r_Not(irg, block, left, mode_b), right, mode_b); break;
+                       case pn_Cmp_Ge: bres = new_r_Or( irg, block, left, new_r_Not(irg, block, right, mode_b), mode_b); break;
+                       case pn_Cmp_Gt: bres = new_r_And(irg, block, left, new_r_Not(irg, block, right, mode_b), mode_b); break;
+                       case pn_Cmp_Lg: bres = new_r_Eor(irg, block, left, right, mode_b); break;
+                       case pn_Cmp_Eq: bres = new_r_Not(irg, block, new_r_Eor(irg, block, left, right, mode_b), mode_b); break;
+                       default: bres = NULL;
+               }
+               if (bres) {
+                       DBG_OPT_ALGSIM0(n, bres, FS_OPT_CMP_TO_BOOL);
+                       return bres;
                }
        }
 
@@ -3558,10 +3657,12 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
         */
        if (is_Const(right)) {
                c = right;
-       } else if (is_Const(left)) {
+       } else if (is_irn_constlike(left)) {
                c     = left;
                left  = right;
                right = c;
+               if(!is_Const(c))
+                       c = NULL;
 
                proj_nr = get_inversed_pnc(proj_nr);
                changed |= 1;
@@ -3585,6 +3686,25 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
                mode = get_irn_mode(c);
                tv = get_Const_tarval(c);
 
+               /* TODO extend to arbitrary constants */
+               if (is_Conv(left) && tarval_is_null(tv)) {
+                       ir_node *op      = get_Conv_op(left);
+                       ir_mode *op_mode = get_irn_mode(op);
+
+                       /*
+                        * UpConv(x) REL 0  ==> x REL 0
+                        */
+                       if (get_mode_size_bits(mode) > get_mode_size_bits(op_mode) &&
+                           ((proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg) ||
+                                mode_is_signed(mode) || !mode_is_signed(op_mode))) {
+                               tv   = get_mode_null(op_mode);
+                               left = op;
+                               mode = op_mode;
+                               changed |= 2;
+                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CONV);
+                       }
+               }
+
                if (tv != tarval_bad) {
                        /* the following optimization is possible on modes without Overflow
                         * on Unary Minus or on == and !=:
@@ -3603,13 +3723,16 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
                                        left = get_Minus_op(left);
                                        proj_nr = get_inversed_pnc(proj_nr);
                                        changed |= 2;
+                                       DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_C);
                                }
                        } else if (is_Not(left) && (proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg)) {
+                               /* Not(a) ==/!= c  ==>  a ==/!= Not(c) */
                                tv = tarval_not(tv);
 
                                if (tv != tarval_bad) {
                                        left = get_Not_op(left);
                                        changed |= 2;
+                                       DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_C);
                                }
                        }
 
@@ -3630,6 +3753,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
                                        if (tv != tarval_bad) {
                                                proj_nr ^= pn_Cmp_Eq;
                                                changed |= 2;
+                                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CNST_MAGN);
                                        }
                                }
                                /* c < 0 : a > c  ==>  a >= (c+1)    a <= c  ==>  a < (c+1) */
@@ -3640,26 +3764,28 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
                                        if (tv != tarval_bad) {
                                                proj_nr ^= pn_Cmp_Eq;
                                                changed |= 2;
+                                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CNST_MAGN);
                                        }
                                }
 
                                /* the following reassociations work only for == and != */
                                if (proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg) {
 
+#if 0 /* Might be not that good in general */
                                        /* a-b == 0  ==>  a == b,  a-b != 0  ==>  a != b */
-                                       if (classify_tarval(tv) == TV_CLASSIFY_NULL && is_Sub(left)) {
-                                               right =get_Sub_right(left);
+                                       if (tarval_is_null(tv) && is_Sub(left)) {
+                                               right = get_Sub_right(left);
                                                left  = get_Sub_left(left);
 
                                                tv = value_of(right);
                                                changed = 1;
+                                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_C);
                                        }
+#endif
 
                                        if (tv != tarval_bad) {
-                                               ir_op *op = get_irn_op(left);
-
                                                /* a-c1 == c2  ==>  a == c2+c1,  a-c1 != c2  ==>  a != c2+c1 */
-                                               if (op == op_Sub) {
+                                               if (is_Sub(left)) {
                                                        ir_node *c1 = get_Sub_right(left);
                                                        tarval *tv2 = value_of(c1);
 
@@ -3670,17 +3796,18 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
                                                                        left    = get_Sub_left(left);
                                                                        tv      = tv2;
                                                                        changed |= 2;
+                                                                       DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_C);
                                                                }
                                                        }
                                                }
                                                /* a+c1 == c2  ==>  a == c2-c1,  a+c1 != c2  ==>  a != c2-c1 */
-                                               else if (op == op_Add) {
+                                               else if (is_Add(left)) {
                                                        ir_node *a_l = get_Add_left(left);
                                                        ir_node *a_r = get_Add_right(left);
                                                        ir_node *a;
                                                        tarval *tv2;
 
-                                                       if (get_irn_op(a_l) == op_Const) {
+                                                       if (is_Const(a_l)) {
                                                                a = a_r;
                                                                tv2 = value_of(a_l);
                                                        } else {
@@ -3695,17 +3822,19 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
                                                                        left    = a;
                                                                        tv      = tv2;
                                                                        changed |= 2;
+                                                                       DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_C);
                                                                }
                                                        }
                                                }
                                                /* -a == c ==> a == -c, -a != c ==> a != -c */
-                                               else if (op == op_Minus) {
+                                               else if (is_Minus(left)) {
                                                        tarval *tv2 = tarval_sub(get_mode_null(mode), tv);
 
                                                        if (tv2 != tarval_bad) {
                                                                left    = get_Minus_op(left);
                                                                tv      = tv2;
                                                                changed |= 2;
+                                                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_C);
                                                        }
                                                }
                                        }
@@ -3713,47 +3842,203 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
                                /* the following reassociations work only for <= */
                                else if (proj_nr == pn_Cmp_Le || proj_nr == pn_Cmp_Lt) {
                                        if (tv != tarval_bad) {
-                                               ir_op *op = get_irn_op(left);
-
                                                /* c >= 0 : Abs(a) <= c  ==>  (unsigned)(a + c) <= 2*c */
-                                               if (op == op_Abs) {
+                                               if (get_irn_op(left) == op_Abs) { // TODO something is missing here
                                                }
                                        }
                                }
                        } /* mode_is_int */
 
-                       /*
-                        * optimization for AND:
-                        * Optimize:
-                        *   And(x, C) == C  ==>  And(x, C) != 0
-                        *   And(x, C) != C  ==>  And(X, C) == 0
-                        *
-                        * if C is a single Bit constant.
-                        */
-                       if ((proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg) && is_And(left)) {
-                               if (tarval_is_single_bit(tv)) {
-                                       /* check for Constant's match. We have check hare the tarvals,
-                                          because our const might be changed */
-                                       ir_node *la = get_And_left(left);
-                                       ir_node *ra = get_And_right(left);
-                                       if ((is_Const(la) && get_Const_tarval(la) == tv) ||
-                                               (is_Const(ra) && get_Const_tarval(ra) == tv)) {
-                                                       /* fine: do the transformation */
-                                                       tv = get_mode_null(get_tarval_mode(tv));
-                                                       proj_nr ^= pn_Cmp_Leg;
-                                                       changed |= 2;
+                       if (proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg) {
+                               switch (get_irn_opcode(left)) {
+                                       ir_node *c1;
+
+                               case iro_And:
+                                       c1 = get_And_right(left);
+                                       if (is_Const(c1)) {
+                                               /*
+                                                * And(x, C1) == C2 ==> FALSE if C2 & C1 != C2
+                                                * And(x, C1) != C2 ==> TRUE if C2 & C1 != C2
+                                                */
+                                               tarval *mask = tarval_and(get_Const_tarval(c1), tv);
+                                               if (mask != tv) {
+                                                       /* TODO: move to constant evaluation */
+                                                       tv = proj_nr == pn_Cmp_Eq ? get_tarval_b_false() : get_tarval_b_true();
+                                                       c1 = new_Const(mode_b, tv);
+                                                       DBG_OPT_CSTEVAL(proj, c1);
+                                                       return c1;
+                                               }
+
+                                               if (tarval_is_single_bit(tv)) {
+                                                       /*
+                                                        * optimization for AND:
+                                                        * Optimize:
+                                                        *   And(x, C) == C  ==>  And(x, C) != 0
+                                                        *   And(x, C) != C  ==>  And(X, C) == 0
+                                                        *
+                                                        * if C is a single Bit constant.
+                                                        */
+
+                                                       /* check for Constant's match. We have check hare the tarvals,
+                                                          because our const might be changed */
+                                                       if (get_Const_tarval(c1) == tv) {
+                                                               /* fine: do the transformation */
+                                                               tv = get_mode_null(get_tarval_mode(tv));
+                                                               proj_nr ^= pn_Cmp_Leg;
+                                                               changed |= 2;
+                                                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CNST_MAGN);
+                                                       }
+                                               }
                                        }
-                               }
+                                       break;
+                               case iro_Or:
+                                       c1 = get_Or_right(left);
+                                       if (is_Const(c1) && tarval_is_null(tv)) {
+                                               /*
+                                                * Or(x, C) == 0  && C != 0 ==> FALSE
+                                                * Or(x, C) != 0  && C != 0 ==> TRUE
+                                                */
+                                               if (! tarval_is_null(get_Const_tarval(c1))) {
+                                                       /* TODO: move to constant evaluation */
+                                                       tv = proj_nr == pn_Cmp_Eq ? get_tarval_b_false() : get_tarval_b_true();
+                                                       c1 = new_Const(mode_b, tv);
+                                                       DBG_OPT_CSTEVAL(proj, c1);
+                                                       return c1;
+                                               }
+                                       }
+                                       break;
+                               case iro_Shl:
+                                       /*
+                                        * optimize x << c1 == c into x & (-1 >>u c1) == c >> c1  if  c & (-1 << c1) == c
+                                        *                             FALSE                       else
+                                        * optimize x << c1 != c into x & (-1 >>u c1) != c >> c1  if  c & (-1 << c1) == c
+                                        *                             TRUE                        else
+                                        */
+                                       c1 = get_Shl_right(left);
+                                       if (is_Const(c1)) {
+                                               tarval  *tv1    = get_Const_tarval(c1);
+                                               ir_mode *mode   = get_irn_mode(left);
+                                               tarval  *minus1 = get_mode_all_one(mode);
+                                               tarval  *amask  = tarval_shr(minus1, tv1);
+                                               tarval  *cmask  = tarval_shl(minus1, tv1);
+                                               ir_node *sl, *blk;
+
+                                               if (tarval_and(tv, cmask) != tv) {
+                                                       /* condition not met */
+                                                       tv = proj_nr == pn_Cmp_Eq ? get_tarval_b_false() : get_tarval_b_true();
+                                                       c1 = new_Const(mode_b, tv);
+                                                       DBG_OPT_CSTEVAL(proj, c1);
+                                                       return c1;
+                                               }
+                                               sl   = get_Shl_left(left);
+                                               blk  = get_nodes_block(n);
+                                               left = new_rd_And(get_irn_dbg_info(left), current_ir_graph, blk, sl, new_Const(mode, amask), mode);
+                                               tv   = tarval_shr(tv, tv1);
+                                               changed |= 2;
+                                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_SHF_TO_AND);
+                                       }
+                                       break;
+                               case iro_Shr:
+                                       /*
+                                        * optimize x >>u c1 == c into x & (-1 << c1) == c << c1  if  c & (-1 >>u c1) == c
+                                        *                             FALSE                       else
+                                        * optimize x >>u c1 != c into x & (-1 << c1) != c << c1  if  c & (-1 >>u c1) == c
+                                        *                             TRUE                        else
+                                        */
+                                       c1 = get_Shr_right(left);
+                                       if (is_Const(c1)) {
+                                               tarval  *tv1    = get_Const_tarval(c1);
+                                               ir_mode *mode   = get_irn_mode(left);
+                                               tarval  *minus1 = get_mode_all_one(mode);
+                                               tarval  *amask  = tarval_shl(minus1, tv1);
+                                               tarval  *cmask  = tarval_shr(minus1, tv1);
+                                               ir_node *sl, *blk;
+
+                                               if (tarval_and(tv, cmask) != tv) {
+                                                       /* condition not met */
+                                                       tv = proj_nr == pn_Cmp_Eq ? get_tarval_b_false() : get_tarval_b_true();
+                                                       c1 = new_Const(mode_b, tv);
+                                                       DBG_OPT_CSTEVAL(proj, c1);
+                                                       return c1;
+                                               }
+                                               sl   = get_Shr_left(left);
+                                               blk  = get_nodes_block(n);
+                                               left = new_rd_And(get_irn_dbg_info(left), current_ir_graph, blk, sl, new_Const(mode, amask), mode);
+                                               tv   = tarval_shl(tv, tv1);
+                                               changed |= 2;
+                                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_SHF_TO_AND);
+                                       }
+                                       break;
+                               case iro_Shrs:
+                                       /*
+                                        * optimize x >>s c1 == c into x & (-1 << c1) == c << c1  if  (c >>s (BITS - c1)) \in {0,-1}
+                                        *                             FALSE                       else
+                                        * optimize x >>s c1 != c into x & (-1 << c1) != c << c1  if  (c >>s (BITS - c1)) \in {0,-1}
+                                        *                             TRUE                        else
+                                        */
+                                       c1 = get_Shrs_right(left);
+                                       if (is_Const(c1)) {
+                                               tarval  *tv1    = get_Const_tarval(c1);
+                                               ir_mode *mode   = get_irn_mode(left);
+                                               tarval  *minus1 = get_mode_all_one(mode);
+                                               tarval  *amask  = tarval_shl(minus1, tv1);
+                                               tarval  *cond   = new_tarval_from_long(get_mode_size_bits(mode), get_tarval_mode(tv1));
+                                               ir_node *sl, *blk;
+
+                                               cond = tarval_sub(cond, tv1);
+                                               cond = tarval_shrs(tv, cond);
+
+                                               if (!tarval_is_all_one(cond) && !tarval_is_null(cond)) {
+                                                       /* condition not met */
+                                                       tv = proj_nr == pn_Cmp_Eq ? get_tarval_b_false() : get_tarval_b_true();
+                                                       c1 = new_Const(mode_b, tv);
+                                                       DBG_OPT_CSTEVAL(proj, c1);
+                                                       return c1;
+                                               }
+                                               sl   = get_Shrs_left(left);
+                                               blk  = get_nodes_block(n);
+                                               left = new_rd_And(get_irn_dbg_info(left), current_ir_graph, blk, sl, new_Const(mode, amask), mode);
+                                               tv   = tarval_shl(tv, tv1);
+                                               changed |= 2;
+                                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_SHF_TO_AND);
+                                       }
+                                       break;
+                               }  /* switch */
                        }
                } /* tarval != bad */
        }
 
+       if (changed & 2)      /* need a new Const */
+               right = new_Const(mode, tv);
+
+       if ((proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg) && is_Const(right) && is_Const_null(right) && is_Proj(left)) {
+               ir_node *op = get_Proj_pred(left);
+
+               if ((is_Mod(op) && get_Proj_proj(left) == pn_Mod_res) ||
+                   (is_DivMod(op) && get_Proj_proj(left) == pn_DivMod_res_mod)) {
+                       ir_node *c = get_binop_right(op);
+
+                       if (is_Const(c)) {
+                               tarval *tv = get_Const_tarval(c);
+
+                               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_mode *mode = get_irn_mode(v);
+
+                                       tv = tarval_sub(tv, get_mode_one(mode));
+                                       left = new_rd_And(get_irn_dbg_info(op), current_ir_graph, blk, v, new_Const(mode, tv), mode);
+                                       changed |= 1;
+                                       DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_MOD_TO_AND);
+                               }
+                       }
+               }
+       }
+
        if (changed) {
                ir_node *block = get_irn_n(n, -1); /* Beware of get_nodes_Block() */
 
-               if (changed & 2)      /* need a new Const */
-                       right = new_Const(mode, tv);
-
                /* create a new compare */
                n = new_rd_Cmp(get_irn_dbg_info(n), current_ir_graph, block, left, right);
 
@@ -3850,7 +4135,7 @@ static void get_comm_Binop_Ops(ir_node *binop, ir_node **a, ir_node **c) {
 
        assert(is_op_commutative(get_irn_op(binop)));
 
-       if (get_irn_op(op_a) == op_Const) {
+       if (is_Const(op_a)) {
                *a = op_b;
                *c = op_a;
        } else {
@@ -3897,8 +4182,8 @@ static ir_node *transform_node_Or_bf_store(ir_node *or) {
                tv2 = get_Const_tarval(c2);
 
                tv = tarval_or(tv1, tv2);
-               if (classify_tarval(tv) == TV_CLASSIFY_ALL_ONE) {
-                       /* the AND does NOT clear a bit with isn't set be the OR */
+               if (tarval_is_all_one(tv)) {
+                       /* the AND does NOT clear a bit with isn't set by the OR */
                        set_Or_left(or, or_l);
                        set_Or_right(or, c1);
 
@@ -3926,7 +4211,7 @@ static ir_node *transform_node_Or_bf_store(ir_node *or) {
                tv4 = get_Const_tarval(c4);
 
                tv = tarval_or(tv4, tv2);
-               if (classify_tarval(tv) != TV_CLASSIFY_ALL_ONE) {
+               if (!tarval_is_all_one(tv)) {
                        /* have at least one 0 at the same bit position */
                        return or;
                }
@@ -3973,16 +4258,16 @@ static ir_node *transform_node_Or_Rot(ir_node *or) {
        shl = get_binop_left(or);
        shr = get_binop_right(or);
 
-       if (get_irn_op(shl) == op_Shr) {
-               if (get_irn_op(shr) != op_Shl)
+       if (is_Shr(shl)) {
+               if (!is_Shl(shr))
                        return or;
 
                irn = shl;
                shl = shr;
                shr = irn;
-       } else if (get_irn_op(shl) != op_Shl) {
+       } else if (!is_Shl(shl)) {
                return or;
-       } else if (get_irn_op(shr) != op_Shr) {
+       } else if (!is_Shr(shr)) {
                return or;
        }
        x = get_Shl_left(shl);
@@ -3991,7 +4276,7 @@ static ir_node *transform_node_Or_Rot(ir_node *or) {
 
        c1 = get_Shl_right(shl);
        c2 = get_Shr_right(shr);
-       if (get_irn_op(c1) == op_Const && get_irn_op(c2) == op_Const) {
+       if (is_Const(c1) && is_Const(c2)) {
                tv1 = get_Const_tarval(c1);
                if (! tarval_is_long(tv1))
                        return or;
@@ -4011,7 +4296,7 @@ static ir_node *transform_node_Or_Rot(ir_node *or) {
 
                DBG_OPT_ALGSIM1(or, shl, shr, n, FS_OPT_OR_SHFT_TO_ROT);
                return n;
-       } else if (get_irn_op(c1) == op_Sub) {
+       } else if (is_Sub(c1)) {
                v   = c2;
                sub = c1;
 
@@ -4019,7 +4304,7 @@ static ir_node *transform_node_Or_Rot(ir_node *or) {
                        return or;
 
                c1 = get_Sub_left(sub);
-               if (get_irn_op(c1) != op_Const)
+               if (!is_Const(c1))
                        return or;
 
                tv1 = get_Const_tarval(c1);
@@ -4037,12 +4322,12 @@ static ir_node *transform_node_Or_Rot(ir_node *or) {
 
                DBG_OPT_ALGSIM0(or, n, FS_OPT_OR_SHFT_TO_ROT);
                return n;
-       } else if (get_irn_op(c2) == op_Sub) {
+       } else if (is_Sub(c2)) {
                v   = c1;
                sub = c2;
 
                c1 = get_Sub_left(sub);
-               if (get_irn_op(c1) != op_Const)
+               if (!is_Const(c1))
                        return or;
 
                tv1 = get_Const_tarval(c1);
@@ -4072,12 +4357,13 @@ static ir_node *transform_node_Or(ir_node *n) {
        ir_node *c, *oldn = n;
        ir_node *a = get_Or_left(n);
        ir_node *b = get_Or_right(n);
+       ir_mode *mode;
 
        if (is_Not(a) && is_Not(b)) {
                /* ~a | ~b = ~(a&b) */
                ir_node *block = get_nodes_block(n);
-               ir_mode *mode = get_irn_mode(n);
 
+               mode = get_irn_mode(n);
                a = get_Not_op(a);
                b = get_Not_op(b);
                n = new_rd_And(get_irn_dbg_info(n), current_ir_graph, block, a, b, mode);
@@ -4103,7 +4389,8 @@ static ir_node *transform_node_Or(ir_node *n) {
                }
        }
 
-       HANDLE_BINOP_PHI(tarval_or, a,b,c);
+       mode = get_irn_mode(n);
+       HANDLE_BINOP_PHI(tarval_or, a, b, c, mode);
 
        n = transform_node_Or_bf_store(n);
        n = transform_node_Or_Rot(n);
@@ -4120,7 +4407,7 @@ static ir_node *transform_node_Or(ir_node *n) {
 static ir_node *transform_node(ir_node *n);
 
 /**
- * Optimize (a >> c1) >> c2), works for Shr, Shrs, Shl.
+ * Optimize (a >> c1) >> c2), works for Shr, Shrs, Shl, Rot.
  *
  * Should be moved to reassociation?
  */
@@ -4182,10 +4469,11 @@ static ir_node *transform_node_shift(ir_node *n) {
  */
 static ir_node *transform_node_Shr(ir_node *n) {
        ir_node *c, *oldn = n;
-       ir_node *a = get_Shr_left(n);
-       ir_node *b = get_Shr_right(n);
+       ir_node *a    = get_Shr_left(n);
+       ir_node *b    = get_Shr_right(n);
+       ir_mode *mode = get_irn_mode(n);
 
-       HANDLE_BINOP_PHI(tarval_shr, a, b, c);
+       HANDLE_BINOP_PHI(tarval_shr, a, b, c, mode);
        return transform_node_shift(n);
 }  /* transform_node_Shr */
 
@@ -4194,10 +4482,11 @@ static ir_node *transform_node_Shr(ir_node *n) {
  */
 static ir_node *transform_node_Shrs(ir_node *n) {
        ir_node *c, *oldn = n;
-       ir_node *a = get_Shrs_left(n);
-       ir_node *b = get_Shrs_right(n);
+       ir_node *a    = get_Shrs_left(n);
+       ir_node *b    = get_Shrs_right(n);
+       ir_mode *mode = get_irn_mode(n);
 
-       HANDLE_BINOP_PHI(tarval_shrs, a, b, c);
+       HANDLE_BINOP_PHI(tarval_shrs, a, b, c, mode);
        return transform_node_shift(n);
 }  /* transform_node_Shrs */
 
@@ -4206,13 +4495,44 @@ static ir_node *transform_node_Shrs(ir_node *n) {
  */
 static ir_node *transform_node_Shl(ir_node *n) {
        ir_node *c, *oldn = n;
-       ir_node *a = get_Shl_left(n);
-       ir_node *b = get_Shl_right(n);
+       ir_node *a    = get_Shl_left(n);
+       ir_node *b    = get_Shl_right(n);
+       ir_mode *mode = get_irn_mode(n);
 
-       HANDLE_BINOP_PHI(tarval_shl, a, b, c);
+       HANDLE_BINOP_PHI(tarval_shl, a, b, c, mode);
        return transform_node_shift(n);
 }  /* transform_node_Shl */
 
+/**
+ * Transform a Rot.
+ */
+static ir_node *transform_node_Rot(ir_node *n) {
+       ir_node *c, *oldn = n;
+       ir_node *a    = get_Rot_left(n);
+       ir_node *b    = get_Rot_right(n);
+       ir_mode *mode = get_irn_mode(n);
+
+       HANDLE_BINOP_PHI(tarval_rot, a, b, c, mode);
+       return transform_node_shift(n);
+}  /* transform_node_Rot */
+
+/**
+ * Transform a Conv.
+ */
+static ir_node *transform_node_Conv(ir_node *n) {
+       ir_node *c, *oldn = n;
+       ir_node *a = get_Conv_op(n);
+
+       if (is_const_Phi(a)) {
+               c = apply_conv_on_phi(a, get_irn_mode(n));
+               if (c) {
+                       DBG_OPT_ALGSIM0(oldn, c, FS_OPT_CONST_PHI);
+                       return c;
+               }
+       }
+       return n;
+}  /* transform_node_Conv */
+
 /**
  * Remove dead blocks and nodes in dead blocks
  * in keep alive list.  We do not generate a new End node.
@@ -4306,7 +4626,7 @@ static ir_node *transform_node_Mux(ir_node *n) {
                }
        }
 
-       if (get_irn_op(sel) == op_Proj && !mode_honor_signed_zeros(mode)) {
+       if (is_Proj(sel) && !mode_honor_signed_zeros(mode)) {
                ir_node *cmp = get_Proj_pred(sel);
                long     pn  = get_Proj_proj(sel);
                ir_node *f   = get_Mux_false(n);
@@ -4321,79 +4641,35 @@ static ir_node *transform_node_Mux(ir_node *n) {
                 * However, if +0 and -0 is handled differently, we cannot use the first
                 * one.
                 */
-               if (get_irn_op(cmp) == op_Cmp
-                               && classify_Const(get_Cmp_right(cmp)) == CNST_NULL) {
-                       ir_node *block    = get_irn_n(n, -1);
-
-                       if(is_negated_value(f, t)) {
-                               ir_node *cmp_left = get_Cmp_left(cmp);
-
-                               /* Psi(a >= 0, a, -a) = Psi(a <= 0, -a, a) ==> Abs(a) */
-                               if ( (cmp_left == t && (pn == pn_Cmp_Ge || pn == pn_Cmp_Gt))
-                                       || (cmp_left == f && (pn == pn_Cmp_Le || pn == pn_Cmp_Lt)))
-                               {
-                                       n = new_rd_Abs(get_irn_dbg_info(n), current_ir_graph, block,
-                                                                  cmp_left, mode);
-                                       DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_ABS);
-                                       return n;
-                               /* Psi(a <= 0, a, -a) = Psi(a >= 0, -a, a) ==> -Abs(a) */
-                               } else if ((cmp_left == t && (pn == pn_Cmp_Le || pn == pn_Cmp_Lt))
-                                       || (cmp_left == f && (pn == pn_Cmp_Ge || pn == pn_Cmp_Gt)))
-                               {
-                                       n = new_rd_Abs(get_irn_dbg_info(n), current_ir_graph, block,
-                                                                  cmp_left, mode);
-                                       n = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph,
-                                                        block, n, mode);
-                                       DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_ABS);
-                                       return n;
-                               }
-                       }
-
-                       if (mode_is_int(mode) && mode_is_signed(mode) &&
-                               get_mode_arithmetic(mode) == irma_twos_complement) {
-                               ir_node *x = get_Cmp_left(cmp);
-
-                               /* the following optimization works only with signed integer two-complement mode */
-
-                               if (mode == get_irn_mode(x)) {
-                                       /*
-                                        * FIXME: this restriction is two rigid, as it would still
-                                        * work if mode(x) = Hs and mode == Is, but at least it removes
-                                        * all wrong cases.
-                                        */
-                                       if ((pn == pn_Cmp_Lt || pn == pn_Cmp_Le) &&
-                                           classify_Const(t) == CNST_ALL_ONE &&
-                                           classify_Const(f) == CNST_NULL) {
-                                               /*
-                                                * Mux(x:T </<= 0, 0, -1) -> Shrs(x, sizeof_bits(T) - 1)
-                                                * Conditions:
-                                                * T must be signed.
-                                                */
-                                               n = new_rd_Shrs(get_irn_dbg_info(n),
-                                                               current_ir_graph, block, x,
-                                                               new_r_Const_long(current_ir_graph, block, mode_Iu,
-                                                               get_mode_size_bits(mode) - 1),
-                                                               mode);
-                                               DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_SHR);
+               if (is_Cmp(cmp)) {
+                       ir_node *cmp_r = get_Cmp_right(cmp);
+                       if (is_Const(cmp_r) && is_Const_null(cmp_r)) {
+                               ir_node *block    = get_irn_n(n, -1);
+
+                               if(is_negated_value(f, t)) {
+                                       ir_node *cmp_left = get_Cmp_left(cmp);
+
+                                       /* Psi(a >= 0, a, -a) = Psi(a <= 0, -a, a) ==> Abs(a) */
+                                       if ( (cmp_left == t && (pn == pn_Cmp_Ge || pn == pn_Cmp_Gt))
+                                               || (cmp_left == f && (pn == pn_Cmp_Le || pn == pn_Cmp_Lt)))
+                                       {
+                                               n = new_rd_Abs(get_irn_dbg_info(n), current_ir_graph, block,
+                                                                                cmp_left, mode);
+                                               DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_ABS);
                                                return n;
-                                       } else if ((pn == pn_Cmp_Gt || pn == pn_Cmp_Ge) &&
-                                                  classify_Const(t) == CNST_ONE &&
-                                                  classify_Const(f) == CNST_NULL) {
-                                               /*
-                                                * Mux(x:T >/>= 0, 0, 1) -> Shr(-x, sizeof_bits(T) - 1)
-                                                * Conditions:
-                                                * T must be signed.
-                                                */
-                                               n = new_rd_Shr(get_irn_dbg_info(n),
-                                                       current_ir_graph, block,
-                                                       new_r_Minus(current_ir_graph, block, x, mode),
-                                                       new_r_Const_long(current_ir_graph, block, mode_Iu,
-                                                       get_mode_size_bits(mode) - 1),
-                                                       mode);
-                                               DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_SHR);
+                                       /* Psi(a <= 0, a, -a) = Psi(a >= 0, -a, a) ==> -Abs(a) */
+                                       } else if ((cmp_left == t && (pn == pn_Cmp_Le || pn == pn_Cmp_Lt))
+                                               || (cmp_left == f && (pn == pn_Cmp_Ge || pn == pn_Cmp_Gt)))
+                                       {
+                                               n = new_rd_Abs(get_irn_dbg_info(n), current_ir_graph, block,
+                                                                                cmp_left, mode);
+                                               n = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph,
+                                                                                                                block, n, mode);
+                                               DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_ABS);
                                                return n;
                                        }
                                }
+
                        }
                }
        }
@@ -4410,6 +4686,42 @@ static ir_node *transform_node_Psi(ir_node *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
+ */
+static ir_node *transform_node_Sync(ir_node *n) {
+       int i, arity;
+
+       arity = get_irn_arity(n);
+       for(i = 0; i < get_irn_arity(n); /*empty*/) {
+               int i2, arity2;
+               ir_node *in = get_irn_n(n, i);
+               if(!is_Sync(in)) {
+                       ++i;
+                       continue;
+               }
+
+               /* set sync input 0 instead of the sync */
+               set_irn_n(n, i, get_irn_n(in, 0));
+               /* so we check this input again for syncs */
+
+               /* append all other inputs of the sync to our sync */
+               arity2 = get_irn_arity(in);
+               for(i2 = 1; i2 < arity2; ++i2) {
+                       ir_node *in_in = get_irn_n(in, i2);
+                       add_irn_n(n, in_in);
+                       /* increase arity so we also check the new inputs for syncs */
+                       arity++;
+               }
+       }
+
+       /* rehash the sync node */
+       add_identities(current_ir_graph->value_table, n);
+
+       return n;
+}
+
 /**
  * Tries several [inplace] [optimizing] transformations and returns an
  * equivalent node.  The difference to equivalent_node() is that these
@@ -4471,9 +4783,12 @@ static ir_op_ops *firm_set_default_transform_node(ir_opcode code, ir_op_ops *ops
        CASE(Shr);
        CASE(Shrs);
        CASE(Shl);
+       CASE(Rot);
+       CASE(Conv);
        CASE(End);
        CASE(Mux);
        CASE(Psi);
+       CASE(Sync);
        default:
          /* leave NULL */;
        }
@@ -5075,7 +5390,7 @@ ir_node *optimize_in_place_2(ir_node *n) {
        ir_node *oldn = n;
        ir_opcode iro = get_irn_opcode(n);
 
-       if (!get_opt_optimize() && (get_irn_op(n) != op_Phi)) return n;
+       if (!get_opt_optimize() && !is_Phi(n)) return n;
 
        /* constant expression evaluation / constant folding */
        if (get_opt_constant_folding()) {