typo fixed
[libfirm] / ir / ir / iropt.c
index 286b540..3bcf548 100644 (file)
 /* Make types visible to allow most efficient access */
 #include "entity_t.h"
 
+/**
+ * Returns the tarval of a Const node or tarval_bad for all other nodes.
+ */
+static tarval *default_value_of(const ir_node *n) {
+       if (is_Const(n))
+               return get_Const_tarval(n); /* might return tarval_bad */
+       else
+               return tarval_bad;
+}
+
+value_of_func value_of_ptr = default_value_of;
+
+void set_value_of_func(value_of_func func) {
+       if (func != NULL)
+               value_of_ptr = func;
+       else
+               value_of_ptr = default_value_of;
+}
+
 /**
  * Return the value of a Constant.
  */
@@ -100,7 +119,7 @@ static tarval *computed_value_Add(ir_node *n) {
        tarval *ta = value_of(a);
        tarval *tb = value_of(b);
 
-       if ((ta != tarval_bad) && (tb != tarval_bad) && (get_irn_mode(a) == get_irn_mode(b)))
+       if ((ta != tarval_bad) && (tb != tarval_bad))
                return tarval_add(ta, tb);
 
        return tarval_bad;
@@ -111,20 +130,21 @@ static tarval *computed_value_Add(ir_node *n) {
  * Special case: a - a
  */
 static tarval *computed_value_Sub(ir_node *n) {
-       ir_node *a = get_Sub_left(n);
-       ir_node *b = get_Sub_right(n);
-       tarval *ta;
-       tarval *tb;
+       ir_mode *mode = get_irn_mode(n);
+       ir_node *a    = get_Sub_left(n);
+       ir_node *b    = get_Sub_right(n);
+       tarval  *ta;
+       tarval  *tb;
 
        /* a - a */
        if (a == b && !is_Bad(a))
-               return get_mode_null(get_irn_mode(n));
+               return get_mode_null(mode);
 
        ta = value_of(a);
        tb = value_of(b);
 
-       if ((ta != tarval_bad) && (tb != tarval_bad) && (get_irn_mode(a) == get_irn_mode(b)))
-               return tarval_sub(ta, tb);
+       if ((ta != tarval_bad) && (tb != tarval_bad))
+               return tarval_sub(ta, tb, mode);
 
        return tarval_bad;
 }  /* computed_value_Sub */
@@ -214,74 +234,6 @@ static tarval *computed_value_Mul(ir_node *n) {
        return tarval_bad;
 }  /* computed_value_Mul */
 
-/**
- * Return the value of a floating point Quot.
- */
-static tarval *computed_value_Quot(ir_node *n) {
-       ir_node *a = get_Quot_left(n);
-       ir_node *b = get_Quot_right(n);
-
-       tarval *ta = value_of(a);
-       tarval *tb = value_of(b);
-
-       /* This was missing in original implementation. Why? */
-       if ((ta != tarval_bad) && (tb != tarval_bad) && (get_irn_mode(a) == get_irn_mode(b))) {
-               if (tb != get_mode_null(get_tarval_mode(tb)))   /* div by zero: return tarval_bad */
-                       return tarval_quo(ta, tb);
-       }
-       return tarval_bad;
-}  /* computed_value_Quot */
-
-/**
- * Calculate the value of an integer Div of two nodes.
- * Special case: 0 / b
- */
-static tarval *do_computed_value_Div(ir_node *a, ir_node *b) {
-       tarval *ta = value_of(a);
-       tarval *tb = value_of(b);
-
-       /* Compute c1 / c2 or 0 / a, a != 0 */
-       if (ta != tarval_bad) {
-               if ((tb != tarval_bad) && (tb != get_mode_null(get_irn_mode(b))))   /* div by zero: return tarval_bad */
-                       return tarval_div(ta, tb);
-               else if (ta == get_mode_null(get_tarval_mode(ta)))  /* 0 / b == 0 */
-                       return ta;
-       }
-       return tarval_bad;
-}  /* do_computed_value_Div */
-
-/**
- * Return the value of an integer Div.
- */
-static tarval *computed_value_Div(ir_node *n) {
-       return do_computed_value_Div(get_Div_left(n), get_Div_right(n));
-}  /* computed_value_Div */
-
-/**
- * Calculate the value of an integer Mod of two nodes.
- * Special case: a % 1
- */
-static tarval *do_computed_value_Mod(ir_node *a, ir_node *b) {
-       tarval *ta = value_of(a);
-       tarval *tb = value_of(b);
-
-       /* Compute c1 % c2 or a % 1 */
-       if (tb != tarval_bad) {
-               if ((ta != tarval_bad) && (tb != get_mode_null(get_tarval_mode(tb))))   /* div by zero: return tarval_bad */
-                       return tarval_mod(ta, tb);
-               else if (tb == get_mode_one(get_tarval_mode(tb)))    /* x mod 1 == 0 */
-                       return get_mode_null(get_irn_mode(a));
-       }
-       return tarval_bad;
-}  /* do_computed_value_Mod */
-
-/**
- * Return the value of an integer Mod.
- */
-static tarval *computed_value_Mod(ir_node *n) {
-       return do_computed_value_Mod(get_Mod_left(n), get_Mod_right(n));
-}  /* computed_value_Mod */
-
 /**
  * Return the value of an Abs.
  */
@@ -418,20 +370,20 @@ static tarval *computed_value_Shrs(ir_node *n) {
 }  /* computed_value_Shrs */
 
 /**
- * Return the value of a Rot.
+ * Return the value of a Rotl.
  */
-static tarval *computed_value_Rot(ir_node *n) {
-       ir_node *a = get_Rot_left(n);
-       ir_node *b = get_Rot_right(n);
+static tarval *computed_value_Rotl(ir_node *n) {
+       ir_node *a = get_Rotl_left(n);
+       ir_node *b = get_Rotl_right(n);
 
        tarval *ta = value_of(a);
        tarval *tb = value_of(b);
 
        if ((ta != tarval_bad) && (tb != tarval_bad)) {
-               return tarval_rot (ta, tb);
+               return tarval_rotl(ta, tb);
        }
        return tarval_bad;
-}  /* computed_value_Rot */
+}  /* computed_value_Rotl */
 
 /**
  * Return the value of a Conv.
@@ -560,6 +512,54 @@ static tarval *computed_value_Proj_Cmp(ir_node *n) {
        return computed_value_Cmp_Confirm(a, aa, ab, proj_nr);
 }  /* computed_value_Proj_Cmp */
 
+/**
+ * Return the value of a floating point Quot.
+ */
+static tarval *do_computed_value_Quot(ir_node *a, ir_node *b) {
+       tarval  *ta = value_of(a);
+       tarval  *tb = value_of(b);
+
+       /* cannot optimize 0 / b = 0 because of NaN */
+       if (ta != tarval_bad && tb != tarval_bad)
+               return tarval_quo(ta, tb);
+       return tarval_bad;
+}  /* do_computed_value_Quot */
+
+/**
+ * Calculate the value of an integer Div of two nodes.
+ * Special case: 0 / b
+ */
+static tarval *do_computed_value_Div(ir_node *a, ir_node *b) {
+       tarval  *ta = value_of(a);
+       tarval  *tb;
+       ir_node *dummy;
+
+       /* Compute c1 / c2 or 0 / a, a != 0 */
+       if (tarval_is_null(ta) && value_not_zero(b, &dummy))
+               return ta;  /* 0 / b == 0 */
+       tb = value_of(b);
+       if (ta != tarval_bad && tb != tarval_bad)
+               return tarval_div(ta, tb);
+       return tarval_bad;
+}  /* do_computed_value_Div */
+
+/**
+ * Calculate the value of an integer Mod of two nodes.
+ * Special case: a % 1
+ */
+static tarval *do_computed_value_Mod(ir_node *a, ir_node *b) {
+       tarval *ta = value_of(a);
+       tarval *tb = value_of(b);
+
+       /* Compute a % 1 or c1 % c2 */
+       if (tarval_is_one(tb))
+               return get_mode_null(get_irn_mode(a));
+       if (ta != tarval_bad && tb != tarval_bad)
+               return tarval_mod(ta, tb);
+       return tarval_bad;
+}  /* do_computed_value_Mod */
+
+
 /**
  * Return the value of a Proj, handle Proj(Cmp), Proj(Div), Proj(Mod),
  * Proj(DivMod) and Proj(Quot).
@@ -583,12 +583,12 @@ static tarval *computed_value_Proj(ir_node *n) {
 
        case iro_Div:
                if (get_Proj_proj(n) == pn_Div_res)
-                       return computed_value(a);
+                       return do_computed_value_Div(get_Div_left(a), get_Div_right(a));
                break;
 
        case iro_Mod:
                if (get_Proj_proj(n) == pn_Mod_res)
-                       return computed_value(a);
+                       return do_computed_value_Mod(get_Mod_left(a), get_Mod_right(a));
                break;
 
        case iro_Quot:
@@ -637,8 +637,19 @@ static tarval *computed_value_Psi(ir_node *n) {
  * if it has the form Confirm(x, '=', Const).
  */
 static tarval *computed_value_Confirm(ir_node *n) {
-       return get_Confirm_cmp(n) == pn_Cmp_Eq ?
-               value_of(get_Confirm_bound(n)) : tarval_bad;
+       /*
+        * Beware: we might produce Phi(Confirm(x == true), Confirm(x == false)).
+        * Do NOT optimize them away (CondEval wants them), so wait until
+        * remove_confirm is activated.
+        */
+       if (get_opt_remove_confirm()) {
+               if (get_Confirm_cmp(n) == pn_Cmp_Eq) {
+                       tarval *tv = value_of(get_Confirm_bound(n));
+                       if (tv != tarval_bad)
+                               return tv;
+               }
+       }
+       return value_of(get_Confirm_value(n));
 }  /* computed_value_Confirm */
 
 /**
@@ -676,9 +687,6 @@ static ir_op_ops *firm_set_default_computed_value(ir_opcode code, ir_op_ops *ops
        CASE(Sub);
        CASE(Minus);
        CASE(Mul);
-       CASE(Quot);
-       CASE(Div);
-       CASE(Mod);
        CASE(Abs);
        CASE(And);
        CASE(Or);
@@ -687,7 +695,7 @@ static ir_op_ops *firm_set_default_computed_value(ir_opcode code, ir_op_ops *ops
        CASE(Shl);
        CASE(Shr);
        CASE(Shrs);
-       CASE(Rot);
+       CASE(Rotl);
        CASE(Carry);
        CASE(Borrow);
        CASE(Conv);
@@ -868,7 +876,53 @@ static ir_node *equivalent_node_neutral_zero(ir_node *n)
 /**
  * Eor is commutative and has neutral 0.
  */
-#define equivalent_node_Eor  equivalent_node_neutral_zero
+static ir_node *equivalent_node_Eor(ir_node *n)
+{
+       ir_node *oldn = n;
+       ir_node *a;
+       ir_node *b;
+
+       n = equivalent_node_neutral_zero(n);
+       if (n != oldn) return n;
+
+       a = get_Eor_left(n);
+       b = get_Eor_right(n);
+
+       if (is_Eor(a)) {
+               ir_node *aa = get_Eor_left(a);
+               ir_node *ab = get_Eor_right(a);
+
+               if (aa == b) {
+                       /* (a ^ b) ^ a -> b */
+                       n = ab;
+                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_EOR_A_B_A);
+                       return n;
+               } else if (ab == b) {
+                       /* (a ^ b) ^ b -> a */
+                       n = aa;
+                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_EOR_A_B_A);
+                       return n;
+               }
+       }
+       if (is_Eor(b)) {
+               ir_node *ba = get_Eor_left(b);
+               ir_node *bb = get_Eor_right(b);
+
+               if (ba == a) {
+                       /* a ^ (a ^ b) -> b */
+                       n = bb;
+                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_EOR_A_B_A);
+                       return n;
+               } else if (bb == a) {
+                       /* a ^ (b ^ a) -> b */
+                       n = ba;
+                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_EOR_A_B_A);
+                       return n;
+               }
+       }
+
+       return n;
+}
 
 /*
  * Optimize a - 0 and (a - x) + x (for modes with wrap-around).
@@ -884,14 +938,14 @@ static ir_node *equivalent_node_Add(ir_node *n) {
        ir_node *left, *right;
        ir_mode *mode = get_irn_mode(n);
 
-       /* 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))
-               return n;
-
        n = equivalent_node_neutral_zero(n);
        if (n != oldn)
                return n;
 
+       /* 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))
+               return n;
+
        left  = get_Add_left(n);
        right = get_Add_right(n);
 
@@ -927,10 +981,11 @@ static ir_node *equivalent_node_Add(ir_node *n) {
 static ir_node *equivalent_node_left_zero(ir_node *n) {
        ir_node *oldn = n;
 
-       ir_node *a = get_binop_left(n);
-       ir_node *b = get_binop_right(n);
+       ir_node *a  = get_binop_left(n);
+       ir_node *b  = get_binop_right(n);
+       tarval  *tb = value_of(b);
 
-       if (is_Const(b) && is_Const_null(b)) {
+       if (tarval_is_null(tb)) {
                n = a;
 
                DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_NEUTRAL_0);
@@ -941,7 +996,7 @@ static ir_node *equivalent_node_left_zero(ir_node *n) {
 #define equivalent_node_Shl   equivalent_node_left_zero
 #define equivalent_node_Shr   equivalent_node_left_zero
 #define equivalent_node_Shrs  equivalent_node_left_zero
-#define equivalent_node_Rot   equivalent_node_left_zero
+#define equivalent_node_Rotl  equivalent_node_left_zero
 
 /**
  * Optimize a - 0 and (a + x) - x (for modes with wrap-around).
@@ -956,15 +1011,17 @@ static ir_node *equivalent_node_Sub(ir_node *n) {
        ir_node *oldn = n;
        ir_node *b;
        ir_mode *mode = get_irn_mode(n);
+       tarval  *tb;
 
        /* 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))
                return n;
 
-       b = get_Sub_right(n);
+       b  = get_Sub_right(n);
+       tb = value_of(b);
 
        /* Beware: modes might be different */
-       if (is_Const(b) && is_Const_null(b)) {
+       if (tarval_is_null(tb)) {
                ir_node *a = get_Sub_left(n);
                if (mode == get_irn_mode(a)) {
                        n = a;
@@ -1013,85 +1070,27 @@ static ir_node *equivalent_node_Mul(ir_node *n) {
        /* we can handle here only the n * n = n bit cases */
        if (get_irn_mode(n) == get_irn_mode(a)) {
                ir_node *b = get_Mul_right(n);
+               tarval  *tv;
 
-               /* Mul is commutative and has again an other neutral element. */
-               if (is_Const(a) && is_Const_one(a)) {
-                       n = b;
-                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_NEUTRAL_1);
-               } else if (is_Const(b) && is_Const_one(b)) {
+               /*
+                * Mul is commutative and has again an other neutral element.
+                * Constants are place right, so check this case first.
+                */
+               tv = value_of(b);
+               if (tarval_is_one(tv)) {
                        n = a;
                        DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_NEUTRAL_1);
+               } else {
+                       tv = value_of(a);
+                       if (tarval_is_one(tv)) {
+                               n = b;
+                               DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_NEUTRAL_1);
+                       }
                }
        }
        return n;
 }  /* equivalent_node_Mul */
 
-/**
- * Optimize a / 1 = a.
- */
-static ir_node *equivalent_node_Div(ir_node *n) {
-       ir_node *a = get_Div_left(n);
-       ir_node *b = get_Div_right(n);
-
-       /* Div is not commutative. */
-       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);
-               turn_into_tuple(n, pn_Div_max);
-               set_Tuple_pred(n, pn_Div_M,         mem);
-               set_Tuple_pred(n, pn_Div_X_regular, new_r_Jmp(current_ir_graph, blk));
-               set_Tuple_pred(n, pn_Div_X_except,  new_Bad());        /* no exception */
-               set_Tuple_pred(n, pn_Div_res,       a);
-       }
-       return n;
-}  /* equivalent_node_Div */
-
-/**
- * Optimize a / 1.0 = a.
- */
-static ir_node *equivalent_node_Quot(ir_node *n) {
-       ir_node *a = get_Quot_left(n);
-       ir_node *b = get_Quot_right(n);
-
-       /* Div is not commutative. */
-       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);
-               turn_into_tuple(n, pn_Quot_max);
-               set_Tuple_pred(n, pn_Quot_M,         mem);
-               set_Tuple_pred(n, pn_Quot_X_regular, new_r_Jmp(current_ir_graph, blk));
-               set_Tuple_pred(n, pn_Quot_X_except,  new_Bad());        /* no exception */
-               set_Tuple_pred(n, pn_Quot_res,       a);
-       }
-       return n;
-}  /* equivalent_node_Quot */
-
-/**
- * Optimize a / 1 = a.
- */
-static ir_node *equivalent_node_DivMod(ir_node *n) {
-       ir_node *b = get_DivMod_right(n);
-
-       /* Div is not commutative. */
-       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);
-               ir_node *blk = get_irn_n(n, -1);
-               ir_mode *mode = get_DivMod_resmode(n);
-
-               turn_into_tuple(n, pn_DivMod_max);
-               set_Tuple_pred(n, pn_DivMod_M,         mem);
-               set_Tuple_pred(n, pn_DivMod_X_regular, new_r_Jmp(current_ir_graph, blk));
-               set_Tuple_pred(n, pn_DivMod_X_except,  new_Bad());        /* no exception */
-               set_Tuple_pred(n, pn_DivMod_res_div,   a);
-               set_Tuple_pred(n, pn_DivMod_res_mod,   new_Const(mode, get_mode_null(mode)));
-       }
-       return n;
-}  /* equivalent_node_DivMod */
-
 /**
  * Use algebraic simplification a | a = a | 0 = 0 | a = a.
  */
@@ -1169,19 +1168,22 @@ static ir_node *equivalent_node_Conv(ir_node *n) {
        ir_mode *n_mode = get_irn_mode(n);
        ir_mode *a_mode = get_irn_mode(a);
 
+restart:
        if (n_mode == a_mode) { /* No Conv necessary */
                if (get_Conv_strict(n)) {
                        /* special case: the predecessor might be a also a Conv */
                        if (is_Conv(a)) {
                                if (! get_Conv_strict(a)) {
                                        /* first one is not strict, kick it */
-                                       set_Conv_op(n, get_Conv_op(a));
-                                       return n;
+                                       a = get_Conv_op(a);
+                                       a_mode = get_irn_mode(a);
+                                       set_Conv_op(n, a);
+                                       goto restart;
                                }
-                               /* else both are strict conv, second is superflous */
-                       } else if(is_Proj(a)) {
+                               /* else both are strict conv, second is superfluous */
+                       } else if (is_Proj(a)) {
                                ir_node *pred = get_Proj_pred(a);
-                               if(is_Load(pred)) {
+                               if (is_Load(pred)) {
                                        /* loads always return with the exact precision of n_mode */
                                        assert(get_Load_mode(pred) == n_mode);
                                        return a;
@@ -1197,13 +1199,49 @@ static ir_node *equivalent_node_Conv(ir_node *n) {
                ir_node *b      = get_Conv_op(a);
                ir_mode *b_mode = get_irn_mode(b);
 
+               if (get_Conv_strict(n) && get_Conv_strict(a)) {
+                       /* both are strict conv */
+                       if (smaller_mode(a_mode, n_mode)) {
+                               /* both are strict, but the first is smaller, so
+                                  the second cannot remove more precision, remove the
+                                  strict bit */
+                               set_Conv_strict(n, 0);
+                       }
+               }
                if (n_mode == b_mode) {
-                       if (n_mode == mode_b) {
-                               n = b; /* Convb(Conv*(xxxb(...))) == xxxb(...) */
-                               DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_CONV);
-                       } else if (mode_is_int(n_mode)) {
-                               if (get_mode_size_bits(b_mode) <= get_mode_size_bits(a_mode)) {
-                                       n = b;        /* ConvS(ConvL(xxxS(...))) == xxxS(...) */
+                       if (! get_Conv_strict(n) && ! get_Conv_strict(a)) {
+                               if (n_mode == mode_b) {
+                                       n = b; /* Convb(Conv*(xxxb(...))) == xxxb(...) */
+                                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_CONV);
+                               } else if (get_mode_arithmetic(n_mode) == get_mode_arithmetic(a_mode)) {
+                                       if (smaller_mode(b_mode, a_mode)) {
+                                               n = b;        /* ConvS(ConvL(xxxS(...))) == xxxS(...) */
+                                               DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_CONV);
+                                       }
+                               }
+                       }
+                       if (mode_is_int(n_mode) && mode_is_float(a_mode)) {
+                               /* ConvI(ConvF(I)) -> I, iff float mantissa >= int mode */
+                               size_t int_mantissa = get_mode_size_bits(n_mode) - (mode_is_signed(n_mode) ? 1 : 0);
+                               size_t float_mantissa;
+                               /* FIXME There is no way to get the mantissa size of a mode */
+                               switch (get_mode_size_bits(a_mode)) {
+                                       case 32: float_mantissa = 23 + 1; break; // + 1 for implicit 1
+                                       case 64: float_mantissa = 52 + 1; break;
+                                       case 80: float_mantissa = 64 + 1; break;
+                                       default: float_mantissa = 0;      break;
+                               }
+                               if (float_mantissa != 0 && float_mantissa >= int_mantissa) {
+                                       n = b;
+                                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_CONV);
+                                       return n;
+                               }
+                       }
+                       if (is_Conv(b)) {
+                               if (smaller_mode(b_mode, a_mode)) {
+                                       if (get_Conv_strict(n))
+                                               set_Conv_strict(b, 1);
+                                       n = b; /* ConvA(ConvB(ConvA(...))) == ConvA(...) */
                                        DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_CONV);
                                }
                        }
@@ -1261,7 +1299,15 @@ static ir_node *equivalent_node_Phi(ir_node *n) {
        for (i = 0; i < n_preds; ++i) {
                first_val = get_Phi_pred(n, i);
                if (   (first_val != n)                            /* not self pointer */
-#if 1
+#if 0
+                   /* BEWARE: when the if is changed to 1, Phi's will ignore it's Bad
+                    * predecessors. Then, Phi nodes in dead code might be removed, causing
+                    * nodes pointing to themself (Add's for instance).
+                    * This is really bad and causes endless recursions in several
+                    * code pathes, so we do NOT optimize such a code.
+                    * This is not that bad as it sounds, optimize_cf() removes bad control flow
+                    * (and bad Phi predecessors), so live code is optimized later.
+                    */
                    && (! is_Bad(first_val))
 #endif
                   ) {        /* value not dead */
@@ -1280,7 +1326,8 @@ static ir_node *equivalent_node_Phi(ir_node *n) {
                ir_node *scnd_val = get_Phi_pred(n, i);
                if (   (scnd_val != n)
                    && (scnd_val != first_val)
-#if 1
+#if 0
+                   /* see above */
                    && (! is_Bad(scnd_val))
 #endif
                        ) {
@@ -1337,67 +1384,286 @@ static ir_node *equivalent_node_Sync(ir_node *n) {
 }  /* equivalent_node_Sync */
 
 /**
- * Optimize Proj(Tuple) and gigo() for ProjX in Bad block,
- * ProjX(Load) and ProjX(Store).
+ * Optimize Proj(Tuple).
  */
-static ir_node *equivalent_node_Proj(ir_node *proj) {
+static ir_node *equivalent_node_Proj_Tuple(ir_node *proj) {
+       ir_node *oldn  = proj;
+       ir_node *tuple = get_Proj_pred(proj);
+
+       /* Remove the Tuple/Proj combination. */
+       proj = get_Tuple_pred(tuple, get_Proj_proj(proj));
+       DBG_OPT_TUPLE(oldn, tuple, proj);
+
+       return proj;
+}  /* equivalent_node_Proj_Tuple */
+
+/**
+ * Optimize a / 1 = a.
+ */
+static ir_node *equivalent_node_Proj_Div(ir_node *proj) {
        ir_node *oldn = proj;
-       ir_node *a = get_Proj_pred(proj);
+       ir_node *div  = get_Proj_pred(proj);
+       ir_node *b    = get_Div_right(div);
+       tarval  *tb   = value_of(b);
 
-       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));
-                       DBG_OPT_TUPLE(oldn, a, proj);
-               } else {
-                        /* This should not happen! */
-                       assert(! "found a Proj with higher number than Tuple predecessors");
-                       proj = new_Bad();
-               }
-       } else if (get_irn_mode(proj) == mode_X) {
-               if (is_Block_dead(get_nodes_block(skip_Proj(proj)))) {
-                       /* Remove dead control flow -- early gigo(). */
-                       proj = new_Bad();
-               } else if (get_opt_ldst_only_null_ptr_exceptions()) {
-                       if (is_Load(a)) {
-                               /* get the Load address */
-                               ir_node *addr = get_Load_ptr(a);
-                               ir_node *blk  = get_irn_n(a, -1);
-                               ir_node *confirm;
-
-                               if (value_not_null(addr, &confirm)) {
-                                       if (confirm == NULL) {
-                                               /* this node may float if it did not depend on a Confirm */
-                                               set_irn_pinned(a, op_pin_state_floats);
-                                       }
-                                       if (get_Proj_proj(proj) == pn_Load_X_except) {
-                                               DBG_OPT_EXC_REM(proj);
-                                               return new_Bad();
-                                       } else
-                                               return new_r_Jmp(current_ir_graph, blk);
-                               }
-                       } 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);
-                               ir_node *confirm;
-
-                               if (value_not_null(addr, &confirm)) {
-                                       if (confirm == NULL) {
-                                               /* this node may float if it did not depend on a Confirm */
-                                               set_irn_pinned(a, op_pin_state_floats);
-                                       }
-                                       if (get_Proj_proj(proj) == pn_Store_X_except) {
-                                               DBG_OPT_EXC_REM(proj);
-                                               return new_Bad();
-                                       } else
-                                               return new_r_Jmp(current_ir_graph, blk);
+       /* Div is not commutative. */
+       if (tarval_is_one(tb)) { /* div(x, 1) == x */
+               switch (get_Proj_proj(proj)) {
+               case pn_Div_M:
+                       proj = get_Div_mem(div);
+                       DBG_OPT_ALGSIM0(oldn, proj, FS_OPT_NEUTRAL_1);
+                       return proj;
+
+               case pn_Div_res:
+                       proj = get_Div_left(div);
+                       DBG_OPT_ALGSIM0(oldn, proj, FS_OPT_NEUTRAL_1);
+                       return proj;
+
+               default:
+                       /* we cannot replace the exception Proj's here, this is done in
+                          transform_node_Proj_Div() */
+                       return proj;
+               }
+       }
+       return proj;
+}  /* equivalent_node_Proj_Div */
+
+/**
+ * Optimize a / 1.0 = a.
+ */
+static ir_node *equivalent_node_Proj_Quot(ir_node *proj) {
+       ir_node *oldn = proj;
+       ir_node *quot = get_Proj_pred(proj);
+       ir_node *b    = get_Quot_right(quot);
+       tarval  *tb   = value_of(b);
+
+       /* Div is not commutative. */
+       if (tarval_is_one(tb)) { /* Quot(x, 1) == x */
+               switch (get_Proj_proj(proj)) {
+               case pn_Quot_M:
+                       proj = get_Quot_mem(quot);
+                       DBG_OPT_ALGSIM0(oldn, proj, FS_OPT_NEUTRAL_1);
+                       return proj;
+
+               case pn_Quot_res:
+                       proj = get_Quot_left(quot);
+                       DBG_OPT_ALGSIM0(oldn, proj, FS_OPT_NEUTRAL_1);
+                       return proj;
+
+               default:
+                       /* we cannot replace the exception Proj's here, this is done in
+                          transform_node_Proj_Quot() */
+                       return proj;
+               }
+       }
+       return proj;
+}  /* equivalent_node_Proj_Quot */
+
+/**
+ * Optimize a / 1 = a.
+ */
+static ir_node *equivalent_node_Proj_DivMod(ir_node *proj) {
+       ir_node *oldn   = proj;
+       ir_node *divmod = get_Proj_pred(proj);
+       ir_node *b      = get_DivMod_right(divmod);
+       tarval  *tb     = value_of(b);
+
+       /* Div is not commutative. */
+       if (tarval_is_one(tb)) { /* div(x, 1) == x */
+               switch (get_Proj_proj(proj)) {
+               case pn_DivMod_M:
+                       proj = get_DivMod_mem(divmod);
+                       DBG_OPT_ALGSIM0(oldn, proj, FS_OPT_NEUTRAL_1);
+                       return proj;
+
+               case pn_DivMod_res_div:
+                       proj = get_DivMod_left(divmod);
+                       DBG_OPT_ALGSIM0(oldn, proj, FS_OPT_NEUTRAL_1);
+                       return proj;
+
+               default:
+                       /* we cannot replace the exception Proj's here, this is done in
+                          transform_node_Proj_DivMod().
+                          Note further that the pn_DivMod_res_div case is handled in
+                          computed_value_Proj(). */
+                       return proj;
+               }
+       }
+       return proj;
+}  /* equivalent_node_Proj_DivMod */
+
+/**
+ * Optimize CopyB(mem, x, x) into a Nop.
+ */
+static ir_node *equivalent_node_Proj_CopyB(ir_node *proj) {
+       ir_node *oldn  = proj;
+       ir_node *copyb = get_Proj_pred(proj);
+       ir_node *a     = get_CopyB_dst(copyb);
+       ir_node *b     = get_CopyB_src(copyb);
+
+       if (a == b) {
+               /* Turn CopyB into a tuple (mem, jmp, bad, bad) */
+               switch (get_Proj_proj(proj)) {
+               case pn_CopyB_M_regular:
+                       proj = get_CopyB_mem(copyb);
+                       DBG_OPT_ALGSIM0(oldn, proj, FS_OPT_NOP);
+                       break;
+
+               case pn_CopyB_M_except:
+               case pn_CopyB_X_except:
+                       DBG_OPT_EXC_REM(proj);
+                       proj = get_irg_bad(current_ir_graph);
+                       break;
+               }
+       }
+       return proj;
+}  /* equivalent_node_Proj_CopyB */
+
+/**
+ * Optimize Bounds(idx, idx, upper) into idx.
+ */
+static ir_node *equivalent_node_Proj_Bound(ir_node *proj) {
+       ir_node *oldn  = proj;
+       ir_node *bound = get_Proj_pred(proj);
+       ir_node *idx   = get_Bound_index(bound);
+       ir_node *pred  = skip_Proj(idx);
+       int ret_tuple  = 0;
+
+       if (idx == get_Bound_lower(bound))
+               ret_tuple = 1;
+       else if (is_Bound(pred)) {
+               /*
+                * idx was Bounds checked in the same MacroBlock previously,
+                * it is still valid if lower <= pred_lower && pred_upper <= upper.
+                */
+               ir_node *lower = get_Bound_lower(bound);
+               ir_node *upper = get_Bound_upper(bound);
+               if (get_Bound_lower(pred) == lower &&
+                       get_Bound_upper(pred) == upper &&
+                       get_irn_MacroBlock(bound) == get_irn_MacroBlock(pred)) {
+                       /*
+                        * One could expect that we simply return the previous
+                        * Bound here. However, this would be wrong, as we could
+                        * add an exception Proj to a new location then.
+                        * So, we must turn in into a tuple.
+                        */
+                       ret_tuple = 1;
+               }
+       }
+       if (ret_tuple) {
+               /* Turn Bound into a tuple (mem, jmp, bad, idx) */
+               switch (get_Proj_proj(proj)) {
+               case pn_Bound_M:
+                       DBG_OPT_EXC_REM(proj);
+                       proj = get_Bound_mem(bound);
+                       break;
+               case pn_Bound_X_except:
+                       DBG_OPT_EXC_REM(proj);
+                       proj = get_irg_bad(current_ir_graph);
+                       break;
+               case pn_Bound_res:
+                       proj = idx;
+                       DBG_OPT_ALGSIM0(oldn, proj, FS_OPT_NOP);
+                       break;
+               default:
+                       /* cannot optimize pn_Bound_X_regular, handled in transform ... */
+                       ;
+               }
+       }
+       return proj;
+}  /* equivalent_node_Proj_Bound */
+
+/**
+ * Optimize an Exception Proj(Load) with a non-null address.
+ */
+static ir_node *equivalent_node_Proj_Load(ir_node *proj) {
+       if (get_opt_ldst_only_null_ptr_exceptions()) {
+               if (get_irn_mode(proj) == mode_X) {
+                       ir_node *oldn = proj;
+                       ir_node *load = get_Proj_pred(proj);
+
+                       /* get the Load address */
+                       ir_node *addr = get_Load_ptr(load);
+                       ir_node *blk  = get_nodes_block(load);
+                       ir_node *confirm;
+
+                       if (value_not_null(addr, &confirm)) {
+                               if (get_Proj_proj(proj) == pn_Load_X_except) {
+                                       DBG_OPT_EXC_REM(proj);
+                                       return get_irg_bad(current_ir_graph);
                                }
                        }
                }
        }
+       return proj;
+}  /* equivalent_node_Proj_Load */
 
+/**
+ * Optimize an Exception Proj(Store) with a non-null address.
+ */
+static ir_node *equivalent_node_Proj_Store(ir_node *proj) {
+       if (get_opt_ldst_only_null_ptr_exceptions()) {
+               if (get_irn_mode(proj) == mode_X) {
+                       ir_node *oldn  = proj;
+                       ir_node *store = get_Proj_pred(proj);
+
+                       /* get the load/store address */
+                       ir_node *addr = get_Store_ptr(store);
+                       ir_node *blk  = get_nodes_block(store);
+                       ir_node *confirm;
+
+                       if (value_not_null(addr, &confirm)) {
+                               if (get_Proj_proj(proj) == pn_Store_X_except) {
+                                       DBG_OPT_EXC_REM(proj);
+                                       return get_irg_bad(current_ir_graph);
+                               }
+                       }
+               }
+       }
        return proj;
+}  /* equivalent_node_Proj_Store */
+
+/**
+ * Does all optimizations on nodes that must be done on it's Proj's
+ * because of creating new nodes.
+ */
+static ir_node *equivalent_node_Proj(ir_node *proj) {
+       ir_node *n = get_Proj_pred(proj);
+
+       switch (get_irn_opcode(n)) {
+       case iro_Div:
+               return equivalent_node_Proj_Div(proj);
+
+       case iro_DivMod:
+               return equivalent_node_Proj_DivMod(proj);
+
+       case iro_Quot:
+               return equivalent_node_Proj_DivMod(proj);
+
+       case iro_Tuple:
+               return equivalent_node_Proj_Tuple(proj);
+
+       case iro_CopyB:
+               return equivalent_node_Proj_CopyB(proj);
+
+       case iro_Bound:
+               return equivalent_node_Proj_Bound(proj);
+
+       case iro_Load:
+               return equivalent_node_Proj_Load(proj);
+
+       case iro_Store:
+               return equivalent_node_Proj_Store(proj);
+
+       default:
+               if (get_irn_mode(proj) == mode_X) {
+                       if (is_Block_dead(get_nodes_block(n))) {
+                               /* Remove dead control flow -- early gigo(). */
+                               proj = get_irg_bad(current_ir_graph);
+                       }
+               }
+               return proj;
+       }
 }  /* equivalent_node_Proj */
 
 /**
@@ -1408,7 +1674,7 @@ static ir_node *equivalent_node_Id(ir_node *n) {
 
        do {
                n = get_Id_pred(n);
-       } while (get_irn_op(n) == op_Id);
+       } while (is_Id(n));
 
        DBG_OPT_ID(oldn, n);
        return n;
@@ -1477,7 +1743,7 @@ static ir_node *equivalent_node_Mux(ir_node *n)
                         * Note: normalization puts the constant on the right side,
                         * so we check only one case.
                         */
-                       if (cmp_l == t && is_Const(cmp_r) && is_Const_null(cmp_r)) {
+                       if (cmp_l == t && tarval_is_null(value_of(cmp_r))) {
                                /* Mux(t CMP 0, X, t) */
                                if (is_Minus(f) && get_Minus_op(f) == t) {
                                        /* Mux(t CMP 0, -t, t) */
@@ -1508,29 +1774,6 @@ static ir_node *equivalent_node_Psi(ir_node *n) {
        return n;
 }  /* equivalent_node_Psi */
 
-/**
- * Optimize -a CMP -b into b CMP a.
- * This works only for for modes where unary Minus
- * cannot Overflow.
- * Note that two-complement integers can Overflow
- * so it will NOT work.
- *
- * For == and != can be handled in Proj(Cmp)
- */
-static ir_node *equivalent_node_Cmp(ir_node *n) {
-       ir_node *left  = get_Cmp_left(n);
-       ir_node *right = get_Cmp_right(n);
-
-       if (is_Minus(left) && is_Minus(right) &&
-               !mode_overflow_on_unary_Minus(get_irn_mode(left))) {
-               left  = get_Minus_op(left);
-               right = get_Minus_op(right);
-               set_Cmp_left(n, right);
-               set_Cmp_right(n, left);
-       }
-       return n;
-}  /* equivalent_node_Cmp */
-
 /**
  * Remove Confirm nodes if setting is on.
  * Replace Confirms(x, '=', Constlike) by Constlike.
@@ -1539,87 +1782,19 @@ static ir_node *equivalent_node_Confirm(ir_node *n) {
        ir_node *pred = get_Confirm_value(n);
        pn_Cmp  pnc   = get_Confirm_cmp(n);
 
-       if (is_Confirm(pred) && pnc == get_Confirm_cmp(pred)) {
+       while (is_Confirm(pred) && pnc == get_Confirm_cmp(pred)) {
                /*
                 * rare case: two identical Confirms one after another,
                 * replace the second one with the first.
                 */
-               n = pred;
-       }
-       if (pnc == pn_Cmp_Eq) {
-               ir_node *bound = get_Confirm_bound(n);
-
-               /*
-                * Optimize a rare case:
-                * Confirm(x, '=', Constlike) ==> Constlike
-                */
-               if (is_irn_constlike(bound)) {
-                       DBG_OPT_CONFIRM(n, bound);
-                       return bound;
-               }
-       }
-       return get_opt_remove_confirm() ? get_Confirm_value(n) : n;
-}
-
-/**
- * Optimize CopyB(mem, x, x) into a Nop.
- */
-static ir_node *equivalent_node_CopyB(ir_node *n) {
-       ir_node *a = get_CopyB_dst(n);
-       ir_node *b = get_CopyB_src(n);
-
-       if (a == b) {
-               /* Turn CopyB into a tuple (mem, jmp, bad, bad) */
-               ir_node *mem = get_CopyB_mem(n);
-               ir_node *blk = get_nodes_block(n);
-               turn_into_tuple(n, pn_CopyB_max);
-               set_Tuple_pred(n, pn_CopyB_M,         mem);
-               set_Tuple_pred(n, pn_CopyB_X_regular, new_r_Jmp(current_ir_graph, blk));
-               set_Tuple_pred(n, pn_CopyB_X_except,  new_Bad());        /* no exception */
-               set_Tuple_pred(n, pn_CopyB_M_except,  new_Bad());
+               n    = pred;
+               pred = get_Confirm_value(n);
+               pnc  = get_Confirm_cmp(n);
        }
+       if (get_opt_remove_confirm())
+               return get_Confirm_value(n);
        return n;
-}  /* equivalent_node_CopyB */
-
-/**
- * Optimize Bounds(idx, idx, upper) into idx.
- */
-static ir_node *equivalent_node_Bound(ir_node *n) {
-       ir_node *idx  = get_Bound_index(n);
-       ir_node *pred = skip_Proj(idx);
-       int ret_tuple = 0;
-
-       if (is_Bound(pred)) {
-               /*
-                * idx was Bounds checked in the same MacroBlock previously,
-                * it is still valid if lower <= pred_lower && pred_upper <= upper.
-                */
-               ir_node *lower = get_Bound_lower(n);
-               ir_node *upper = get_Bound_upper(n);
-               if (get_Bound_lower(pred) == lower &&
-                       get_Bound_upper(pred) == upper &&
-                       get_irn_MacroBlock(n) == get_irn_MacroBlock(pred)) {
-                       /*
-                        * One could expect that we simply return the previous
-                        * Bound here. However, this would be wrong, as we could
-                        * add an exception Proj to a new location then.
-                        * So, we must turn in into a tuple.
-                        */
-                       ret_tuple = 1;
-               }
-       }
-       if (ret_tuple) {
-               /* Turn Bound into a tuple (mem, jmp, bad, idx) */
-               ir_node *mem = get_Bound_mem(n);
-               ir_node *blk = get_nodes_block(n);
-               turn_into_tuple(n, pn_Bound_max);
-               set_Tuple_pred(n, pn_Bound_M,         mem);
-               set_Tuple_pred(n, pn_Bound_X_regular, new_r_Jmp(current_ir_graph, blk));       /* no exception */
-               set_Tuple_pred(n, pn_Bound_X_except,  new_Bad());       /* no exception */
-               set_Tuple_pred(n, pn_Bound_res,       idx);
-       }
-       return n;
-}  /* equivalent_node_Bound */
+}
 
 /**
  * equivalent_node() returns a node equivalent to input n. It skips all nodes that
@@ -1661,13 +1836,10 @@ static ir_op_ops *firm_set_default_equivalent_node(ir_opcode code, ir_op_ops *op
        CASE(Shl);
        CASE(Shr);
        CASE(Shrs);
-       CASE(Rot);
+       CASE(Rotl);
        CASE(Not);
        CASE(Minus);
        CASE(Mul);
-       CASE(Div);
-       CASE(Quot);
-       CASE(DivMod);
        CASE(And);
        CASE(Conv);
        CASE(Cast);
@@ -1677,10 +1849,7 @@ static ir_op_ops *firm_set_default_equivalent_node(ir_opcode code, ir_op_ops *op
        CASE(Id);
        CASE(Mux);
        CASE(Psi);
-       CASE(Cmp);
        CASE(Confirm);
-       CASE(CopyB);
-       CASE(Bound);
        default:
                /* leave NULL */;
        }
@@ -1704,6 +1873,24 @@ static int is_const_Phi(ir_node *n) {
                return 1;
 }  /* is_const_Phi */
 
+typedef tarval *(*tarval_sub_type)(tarval *a, tarval *b, ir_mode *mode);
+typedef tarval *(*tarval_binop_type)(tarval *a, tarval *b);
+
+/**
+ * Wrapper for the tarval binop evaluation, tarval_sub has one more parameter.
+ */
+static tarval *do_eval(tarval *(*eval)(), tarval *a, tarval *b, ir_mode *mode) {
+       if (eval == tarval_sub) {
+               tarval_sub_type func = (tarval_sub_type)eval;
+
+               return func(a, b, mode);
+       } else {
+               tarval_binop_type func = (tarval_binop_type)eval;
+
+               return func(a, b);
+       }
+}
+
 /**
  * Apply an evaluator on a binop with a constant operators (and one Phi).
  *
@@ -1715,7 +1902,7 @@ static int is_const_Phi(ir_node *n) {
  *
  * @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 *), ir_mode *mode, int left) {
+static ir_node *apply_binop_on_phi(ir_node *phi, tarval *other, tarval *(*eval)(), ir_mode *mode, int left) {
        tarval   *tv;
        void     **res;
        ir_node  *pred;
@@ -1727,7 +1914,7 @@ static ir_node *apply_binop_on_phi(ir_node *phi, tarval *other, tarval *(*eval)(
                for (i = 0; i < n; ++i) {
                        pred = get_irn_n(phi, i);
                        tv   = get_Const_tarval(pred);
-                       tv   = eval(other, tv);
+                       tv   = do_eval(eval, other, tv, mode);
 
                        if (tv == tarval_bad) {
                                /* folding failed, bad */
@@ -1739,7 +1926,7 @@ static ir_node *apply_binop_on_phi(ir_node *phi, tarval *other, tarval *(*eval)(
                for (i = 0; i < n; ++i) {
                        pred = get_irn_n(phi, i);
                        tv   = get_Const_tarval(pred);
-                       tv   = eval(tv, other);
+                       tv   = do_eval(eval, tv, other, mode);
 
                        if (tv == tarval_bad) {
                                /* folding failed, bad */
@@ -1767,7 +1954,7 @@ static ir_node *apply_binop_on_phi(ir_node *phi, tarval *other, tarval *(*eval)(
  *
  * @return a new Phi node if the conversion was successful, NULL else
  */
-static ir_node *apply_binop_on_2_phis(ir_node *a, ir_node *b, tarval *(*eval)(tarval *, tarval *), ir_mode *mode) {
+static ir_node *apply_binop_on_2_phis(ir_node *a, ir_node *b, tarval *(*eval)(), ir_mode *mode) {
        tarval   *tv_l, *tv_r, *tv;
        void     **res;
        ir_node  *pred;
@@ -1785,7 +1972,7 @@ static ir_node *apply_binop_on_2_phis(ir_node *a, ir_node *b, tarval *(*eval)(ta
                tv_l = get_Const_tarval(pred);
                pred = get_irn_n(b, i);
                tv_r = get_Const_tarval(pred);
-               tv   = eval(tv_l, tv_r);
+               tv   = do_eval(eval, tv_l, tv_r, mode);
 
                if (tv == tarval_bad) {
                        /* folding failed, bad */
@@ -1946,6 +2133,7 @@ static ir_node *transform_node_AddSub(ir_node *n) {
                        }
                }
        }
+
        return n;
 }  /* transform_node_AddSub */
 
@@ -1998,6 +2186,17 @@ static ir_node *transform_node_Add(ir_node *n) {
        b = get_Add_right(n);
 
        mode = get_irn_mode(n);
+
+       if (mode_is_reference(mode)) {
+               ir_mode *lmode = get_irn_mode(a);
+
+               if (is_Const(b) && is_Const_null(b) && mode_is_int(lmode)) {
+                       /* an Add(a, NULL) is a hidden Conv */
+                       dbg_info *dbg = get_irn_dbg_info(n);
+                       return new_rd_Conv(dbg, current_ir_graph, get_nodes_block(n), a, mode);
+               }
+       }
+
        HANDLE_BINOP_PHI(tarval_add, a, b, c, mode);
 
        /* for FP these optimizations are only allowed if fp_strict_algebraic is disabled */
@@ -2007,7 +2206,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 (!is_arch_dep_running() && a == b && mode_is_int(mode)) {
-                       ir_node *block = get_irn_n(n, -1);
+                       ir_node *block = get_nodes_block(n);
 
                        n = new_rd_Mul(
                                get_irn_dbg_info(n),
@@ -2112,6 +2311,16 @@ static ir_node *transform_node_Sub(ir_node *n) {
 
        mode = get_irn_mode(n);
 
+       if (mode_is_int(mode)) {
+               ir_mode *lmode = get_irn_mode(a);
+
+               if (is_Const(b) && is_Const_null(b) && mode_is_reference(lmode)) {
+                       /* a Sub(a, NULL) is a hidden Conv */
+                       dbg_info *dbg = get_irn_dbg_info(n);
+                       return new_rd_Conv(dbg, current_ir_graph, get_nodes_block(n), a, mode);
+               }
+       }
+
 restart:
        HANDLE_BINOP_PHI(tarval_sub, a, b, c, mode);
 
@@ -2890,6 +3099,32 @@ static ir_node *transform_node_Abs(ir_node *n) {
        return n;
 }  /* transform_node_Abs */
 
+/**
+ * Optimize -a CMP -b into b CMP a.
+ * This works only for for modes where unary Minus
+ * cannot Overflow.
+ * Note that two-complement integers can Overflow
+ * so it will NOT work.
+ *
+ * For == and != can be handled in Proj(Cmp)
+ */
+static ir_node *transform_node_Cmp(ir_node *n) {
+       ir_node *oldn = n;
+       ir_node *left  = get_Cmp_left(n);
+       ir_node *right = get_Cmp_right(n);
+
+       if (is_Minus(left) && is_Minus(right) &&
+               !mode_overflow_on_unary_Minus(get_irn_mode(left))) {
+               left  = get_Minus_op(left);
+               right = get_Minus_op(right);
+               n = new_rd_Cmp(get_irn_dbg_info(n), current_ir_graph,
+                       get_nodes_block(n), left, right);
+               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_CMP_OP_OP);
+       }
+       return n;
+}  /* transform_node_Cmp */
+
+
 /**
  * Transform a Cond node.
  *
@@ -3403,6 +3638,67 @@ static ir_node *transform_node_Cast(ir_node *n) {
        return n;
 }  /* transform_node_Cast */
 
+/**
+ * Transform a Proj(Load) with a non-null address.
+ */
+static ir_node *transform_node_Proj_Load(ir_node *proj) {
+       if (get_opt_ldst_only_null_ptr_exceptions()) {
+               if (get_irn_mode(proj) == mode_X) {
+                       ir_node *oldn = proj;
+                       ir_node *load = get_Proj_pred(proj);
+
+                       /* get the Load address */
+                       ir_node *addr = get_Load_ptr(load);
+                       ir_node *blk  = get_nodes_block(load);
+                       ir_node *confirm;
+
+                       if (value_not_null(addr, &confirm)) {
+                               if (confirm == NULL) {
+                                       /* this node may float if it did not depend on a Confirm */
+                                       set_irn_pinned(load, op_pin_state_floats);
+                               }
+                               if (get_Proj_proj(proj) == pn_Load_X_except) {
+                                       DBG_OPT_EXC_REM(proj);
+                                       return get_irg_bad(current_ir_graph);
+                               } else {
+                                       return new_r_Jmp(current_ir_graph, blk);
+                               }
+                       }
+               }
+       }
+       return proj;
+}  /* transform_node_Proj_Load */
+
+/**
+ * Transform a Proj(Store) with a non-null address.
+ */
+static ir_node *transform_node_Proj_Store(ir_node *proj) {
+       if (get_opt_ldst_only_null_ptr_exceptions()) {
+               if (get_irn_mode(proj) == mode_X) {
+                       ir_node *oldn  = proj;
+                       ir_node *store = get_Proj_pred(proj);
+
+                       /* get the load/store address */
+                       ir_node *addr = get_Store_ptr(store);
+                       ir_node *blk  = get_nodes_block(store);
+                       ir_node *confirm;
+
+                       if (value_not_null(addr, &confirm)) {
+                               if (confirm == NULL) {
+                                       /* this node may float if it did not depend on a Confirm */
+                                       set_irn_pinned(store, op_pin_state_floats);
+                               }
+                               if (get_Proj_proj(proj) == pn_Store_X_except) {
+                                       DBG_OPT_EXC_REM(proj);
+                                       return get_irg_bad(current_ir_graph);
+                               } else
+                                       return new_r_Jmp(current_ir_graph, blk);
+                       }
+               }
+       }
+       return proj;
+}  /* transform_node_Proj_Store */
+
 /**
  * Transform a Proj(Div) with a non-zero value.
  * Removes the exceptions and routes the memory to the NoMem node.
@@ -3773,11 +4069,11 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
                                                DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP);
                                        }
                                        break;
-                               case iro_Rot:
-                                       if (get_Rot_right(left) == get_Rot_right(right)) {
-                                               /* a ROT X CMP b ROT X ==> a CMP b */
-                                               left  = get_Rot_left(left);
-                                               right = get_Rot_left(right);
+                               case iro_Rotl:
+                                       if (get_Rotl_right(left) == get_Rotl_right(right)) {
+                                               /* a ROTL X CMP b ROTL X ==> a CMP b */
+                                               left  = get_Rotl_left(left);
+                                               right = get_Rotl_left(right);
                                                changed |= 1;
                                                DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP);
                                        }
@@ -3931,7 +4227,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
                                /* c > 0 : a < c  ==>  a <= (c-1)    a >= c  ==>  a > (c-1) */
                                if ((proj_nr == pn_Cmp_Lt || proj_nr == pn_Cmp_Ge) &&
                                        tarval_cmp(tv, get_mode_null(mode)) == pn_Cmp_Gt) {
-                                       tv = tarval_sub(tv, get_mode_one(mode));
+                                       tv = tarval_sub(tv, get_mode_one(mode), NULL);
 
                                        if (tv != tarval_bad) {
                                                proj_nr ^= pn_Cmp_Eq;
@@ -3999,7 +4295,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
                                                        }
 
                                                        if (tv2 != tarval_bad) {
-                                                               tv2 = tarval_sub(tv, tv2);
+                                                               tv2 = tarval_sub(tv, tv2, NULL);
 
                                                                if (tv2 != tarval_bad) {
                                                                        left    = a;
@@ -4011,7 +4307,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
                                                }
                                                /* -a == c ==> a == -c, -a != c ==> a != -c */
                                                else if (is_Minus(left)) {
-                                                       tarval *tv2 = tarval_sub(get_mode_null(mode), tv);
+                                                       tarval *tv2 = tarval_sub(get_mode_null(mode), tv, NULL);
 
                                                        if (tv2 != tarval_bad) {
                                                                left    = get_Minus_op(left);
@@ -4168,7 +4464,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
                                                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_sub(cond, tv1, NULL);
                                                cond = tarval_shrs(tv, cond);
 
                                                if (!tarval_is_all_one(cond) && !tarval_is_null(cond)) {
@@ -4210,7 +4506,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
                                        ir_node *blk  = get_irn_n(op, -1);
                                        ir_mode *mode = get_irn_mode(v);
 
-                                       tv = tarval_sub(tv, get_mode_one(mode));
+                                       tv = tarval_sub(tv, get_mode_one(mode), NULL);
                                        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);
@@ -4230,6 +4526,91 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
        return proj;
 }  /* transform_node_Proj_Cmp */
 
+/**
+ * Optimize CopyB(mem, x, x) into a Nop.
+ */
+static ir_node *transform_node_Proj_CopyB(ir_node *proj) {
+       ir_node *oldn  = proj;
+       ir_node *copyb = get_Proj_pred(proj);
+       ir_node *a     = get_CopyB_dst(copyb);
+       ir_node *b     = get_CopyB_src(copyb);
+
+       if (a == b) {
+               switch (get_Proj_proj(proj)) {
+               case pn_CopyB_X_regular:
+                       /* Turn CopyB into a tuple (mem, jmp, bad, bad) */
+                       DBG_OPT_EXC_REM(proj);
+                       proj = new_r_Jmp(current_ir_graph, get_nodes_block(copyb));
+                       break;
+               case pn_CopyB_M_except:
+               case pn_CopyB_X_except:
+                       DBG_OPT_EXC_REM(proj);
+                       proj = get_irg_bad(current_ir_graph);
+                       break;
+               default:
+                       break;
+               }
+       }
+       return proj;
+}  /* transform_node_Proj_CopyB */
+
+/**
+ * Optimize Bounds(idx, idx, upper) into idx.
+ */
+static ir_node *transform_node_Proj_Bound(ir_node *proj) {
+       ir_node *oldn  = proj;
+       ir_node *bound = get_Proj_pred(proj);
+       ir_node *idx   = get_Bound_index(bound);
+       ir_node *pred  = skip_Proj(idx);
+       int ret_tuple  = 0;
+
+       if (idx == get_Bound_lower(bound))
+               ret_tuple = 1;
+       else if (is_Bound(pred)) {
+               /*
+               * idx was Bounds checked in the same MacroBlock previously,
+               * it is still valid if lower <= pred_lower && pred_upper <= upper.
+               */
+               ir_node *lower = get_Bound_lower(bound);
+               ir_node *upper = get_Bound_upper(bound);
+               if (get_Bound_lower(pred) == lower &&
+                       get_Bound_upper(pred) == upper &&
+                       get_irn_MacroBlock(bound) == get_irn_MacroBlock(pred)) {
+                       /*
+                        * One could expect that we simply return the previous
+                        * Bound here. However, this would be wrong, as we could
+                        * add an exception Proj to a new location then.
+                        * So, we must turn in into a tuple.
+                        */
+                       ret_tuple = 1;
+               }
+       }
+       if (ret_tuple) {
+               /* Turn Bound into a tuple (mem, jmp, bad, idx) */
+               switch (get_Proj_proj(proj)) {
+               case pn_Bound_M:
+                       DBG_OPT_EXC_REM(proj);
+                       proj = get_Bound_mem(bound);
+                       break;
+               case pn_Bound_X_except:
+                       DBG_OPT_EXC_REM(proj);
+                       proj = get_irg_bad(current_ir_graph);
+                       break;
+               case pn_Bound_res:
+                       proj = idx;
+                       DBG_OPT_ALGSIM0(oldn, proj, FS_OPT_NOP);
+                       break;
+               case pn_Bound_X_regular:
+                       DBG_OPT_EXC_REM(proj);
+                       proj = new_r_Jmp(current_ir_graph, get_nodes_block(bound));
+                       break;
+               default:
+                       break;
+               }
+       }
+       return proj;
+}  /* transform_node_Proj_Bound */
+
 /**
  * Does all optimizations on nodes that must be done on it's Proj's
  * because of creating new nodes.
@@ -4238,6 +4619,12 @@ static ir_node *transform_node_Proj(ir_node *proj) {
        ir_node *n = get_Proj_pred(proj);
 
        switch (get_irn_opcode(n)) {
+       case iro_Load:
+               return transform_node_Proj_Load(proj);
+
+       case iro_Store:
+               return transform_node_Proj_Store(proj);
+
        case iro_Div:
                return transform_node_Proj_Div(proj);
 
@@ -4257,6 +4644,12 @@ static ir_node *transform_node_Proj(ir_node *proj) {
                /* should not happen, but if it does will be optimized away */
                return equivalent_node_Proj(proj);
 
+       case iro_CopyB:
+               return transform_node_Proj_CopyB(proj);
+
+       case iro_Bound:
+               return transform_node_Proj_CopyB(proj);
+
        default:
                /* do nothing */
                return proj;
@@ -4425,12 +4818,12 @@ static ir_node *transform_node_Or_bf_store(ir_node *or) {
 }  /* transform_node_Or_bf_store */
 
 /**
- * Optimize an Or(shl(x, c), shr(x, bits - c)) into a Rot
+ * Optimize an Or(shl(x, c), shr(x, bits - c)) into a Rotl
  */
-static ir_node *transform_node_Or_Rot(ir_node *or) {
+static ir_node *transform_node_Or_Rotl(ir_node *or) {
        ir_mode *mode = get_irn_mode(or);
        ir_node *shl, *shr, *block;
-       ir_node *irn, *x, *c1, *c2, *v, *sub, *n;
+       ir_node *irn, *x, *c1, *c2, *v, *sub, *n, *rotval;
        tarval *tv1, *tv2;
 
        if (! mode_is_int(mode))
@@ -4450,86 +4843,67 @@ static ir_node *transform_node_Or_Rot(ir_node *or) {
                return or;
        } else if (!is_Shr(shr)) {
                return or;
-       }
-       x = get_Shl_left(shl);
-       if (x != get_Shr_left(shr))
-               return or;
-
-       c1 = get_Shl_right(shl);
-       c2 = get_Shr_right(shr);
-       if (is_Const(c1) && is_Const(c2)) {
-               tv1 = get_Const_tarval(c1);
-               if (! tarval_is_long(tv1))
-                       return or;
-
-               tv2 = get_Const_tarval(c2);
-               if (! tarval_is_long(tv2))
-                       return or;
-
-               if (get_tarval_long(tv1) + get_tarval_long(tv2)
-                               != (int) get_mode_size_bits(mode))
-                       return or;
-
-               /* yet, condition met */
-               block = get_irn_n(or, -1);
-
-               n = new_r_Rot(current_ir_graph, block, x, c1, mode);
-
-               DBG_OPT_ALGSIM1(or, shl, shr, n, FS_OPT_OR_SHFT_TO_ROT);
-               return n;
-       } else if (is_Sub(c1)) {
-               v   = c2;
-               sub = c1;
-
-               if (get_Sub_right(sub) != v)
-                       return or;
-
-               c1 = get_Sub_left(sub);
-               if (!is_Const(c1))
-                       return or;
+       }
+       x = get_Shl_left(shl);
+       if (x != get_Shr_left(shr))
+               return or;
 
+       c1 = get_Shl_right(shl);
+       c2 = get_Shr_right(shr);
+       if (is_Const(c1) && is_Const(c2)) {
                tv1 = get_Const_tarval(c1);
                if (! tarval_is_long(tv1))
                        return or;
 
-               if (get_tarval_long(tv1) != (int) get_mode_size_bits(mode))
+               tv2 = get_Const_tarval(c2);
+               if (! tarval_is_long(tv2))
+                       return or;
+
+               if (get_tarval_long(tv1) + get_tarval_long(tv2)
+                               != (int) get_mode_size_bits(mode))
                        return or;
 
                /* yet, condition met */
                block = get_nodes_block(or);
 
-               /* a Rot right is not supported, so use a rot left */
-               n =  new_r_Rot(current_ir_graph, block, x, sub, mode);
+               n = new_r_Rotl(current_ir_graph, block, x, c1, mode);
 
-               DBG_OPT_ALGSIM0(or, n, FS_OPT_OR_SHFT_TO_ROT);
+               DBG_OPT_ALGSIM1(or, shl, shr, n, FS_OPT_OR_SHFT_TO_ROTL);
                return n;
-       } else if (is_Sub(c2)) {
-               v   = c1;
-               sub = c2;
+       }
 
-               c1 = get_Sub_left(sub);
-               if (!is_Const(c1))
-                       return or;
+    if (is_Sub(c1)) {
+           v      = c2;
+               sub    = c1;
+        rotval = sub; /* a Rot right is not supported, so use a rot left */
+    } else if (is_Sub(c2)) {
+               v      = c1;
+       sub    = c2;
+        rotval = v;
+    } else return or;
 
-               tv1 = get_Const_tarval(c1);
-               if (! tarval_is_long(tv1))
-                       return or;
+       if (get_Sub_right(sub) != v)
+               return or;
 
-               if (get_tarval_long(tv1) != (int) get_mode_size_bits(mode))
-                       return or;
+       c1 = get_Sub_left(sub);
+       if (!is_Const(c1))
+               return or;
 
-               /* yet, condition met */
-               block = get_irn_n(or, -1);
+       tv1 = get_Const_tarval(c1);
+       if (! tarval_is_long(tv1))
+               return or;
 
-               /* a Rot Left */
-               n = new_r_Rot(current_ir_graph, block, x, v, mode);
+       if (get_tarval_long(tv1) != (int) get_mode_size_bits(mode))
+               return or;
 
-               DBG_OPT_ALGSIM0(or, n, FS_OPT_OR_SHFT_TO_ROT);
-               return n;
-       }
+       /* yet, condition met */
+       block = get_nodes_block(or);
+
+       n = new_r_Rotl(current_ir_graph, block, x, rotval, mode);
 
-       return or;
-}  /* transform_node_Or_Rot */
+       DBG_OPT_ALGSIM0(or, n, FS_OPT_OR_SHFT_TO_ROTL);
+       return n;
+}  /* transform_node_Or_Rotl */
 
 /**
  * Transform an Or.
@@ -4574,7 +4948,7 @@ static ir_node *transform_node_Or(ir_node *n) {
        HANDLE_BINOP_PHI(tarval_or, a, b, c, mode);
 
        n = transform_node_Or_bf_store(n);
-       n = transform_node_Or_Rot(n);
+       n = transform_node_Or_Rotl(n);
        if (n != oldn)
                return n;
 
@@ -4588,15 +4962,15 @@ 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, Rot.
+ * Optimize (a >> c1) >> c2), works for Shr, Shrs, Shl, Rotl.
  *
  * Should be moved to reassociation?
  */
 static ir_node *transform_node_shift(ir_node *n) {
        ir_node *left, *right;
-       tarval *tv1, *tv2, *res;
        ir_mode *mode;
-       int modulo_shf, flag;
+       tarval *tv1, *tv2, *res;
+       ir_node *in[2], *irn, *block;
 
        left = get_binop_left(n);
 
@@ -4613,49 +4987,249 @@ static ir_node *transform_node_shift(ir_node *n) {
        if (tv2 == tarval_bad)
                return n;
 
-       res = tarval_add(tv1, tv2);
+       res  = tarval_add(tv1, tv2);
+       mode = get_irn_mode(n);
 
        /* beware: a simple replacement works only, if res < modulo shift */
+       if (!is_Rotl(n)) {
+               int modulo_shf = get_mode_modulo_shift(mode);
+               assert(modulo_shf >= (int) get_mode_size_bits(mode));
+               if (modulo_shf > 0) {
+                       tarval *modulo = new_tarval_from_long(modulo_shf,
+                                                             get_tarval_mode(res));
+
+                       /* shifting too much */
+                       if (!(tarval_cmp(res, modulo) & pn_Cmp_Lt)) {
+                               if (is_Shrs(n)) {
+                                       ir_graph *irg   = get_irn_irg(n);
+                                       ir_node  *block = get_nodes_block(n);
+                                       dbg_info *dbgi  = get_irn_dbg_info(n);
+                                       ir_node  *cnst  = new_Const(mode_Iu, new_tarval_from_long(get_mode_size_bits(mode)-1, mode_Iu));
+                                       return new_rd_Shrs(dbgi, irg, block, get_binop_left(left),
+                                                          cnst, mode);
+                               }
+
+                               return new_Const(mode, get_mode_null(mode));
+                       }
+               }
+       } else {
+               res = tarval_mod(res, new_tarval_from_long(get_mode_size_bits(mode), get_tarval_mode(res)));
+       }
+
+       /* ok, we can replace it */
+       block = get_nodes_block(n);
+
+       in[0] = get_binop_left(left);
+       in[1] = new_r_Const(current_ir_graph, block, get_tarval_mode(res), res);
+
+       irn = new_ir_node(NULL, current_ir_graph, block, get_irn_op(n), mode, 2, in);
+
+       DBG_OPT_ALGSIM0(n, irn, FS_OPT_REASSOC_SHIFT);
+
+       return transform_node(irn);
+}  /* transform_node_shift */
+
+/**
+ * normalisation: (x & c1) >> c2   to   (x >> c2) & (c1 >> c2)
+ *  (we can use:
+ *    - and, or, xor          instead of &
+ *    - Shl, Shr, Shrs, rotl  instead of >>
+ *    (with a special case for Or/Xor + Shrs)
+ */
+static ir_node *transform_node_bitop_shift(ir_node *n) {
+       ir_node  *left;
+       ir_node  *right = get_binop_right(n);
+       ir_mode  *mode  = get_irn_mode(n);
+       ir_node  *bitop_left;
+       ir_node  *bitop_right;
+       ir_op    *op_left;
+       ir_graph *irg;
+       ir_node  *block;
+       dbg_info *dbgi;
+       ir_node  *new_shift;
+       ir_node  *new_bitop;
+       ir_node  *new_const;
+       tarval   *tv1;
+       tarval   *tv2;
+       tarval   *tv_shift;
+
+       assert(is_Shrs(n) || is_Shr(n) || is_Shl(n) || is_Rotl(n));
+
+       if (!is_Const(right))
+               return n;
+
+       left    = get_binop_left(n);
+       op_left = get_irn_op(left);
+       if (op_left != op_And && op_left != op_Or && op_left != op_Eor)
+               return n;
+
+       /* doing it with Shrs is not legal if the Or/Eor affects the topmost bit */
+       if (is_Shrs(n) && (op_left == op_Or || op_left == op_Eor)) {
+               /* TODO: test if sign bit is affectes */
+               return n;
+       }
+
+       bitop_right = get_binop_right(left);
+       if (!is_Const(bitop_right))
+               return n;
+
+       bitop_left = get_binop_left(left);
+
+       irg   = get_irn_irg(n);
+       block = get_nodes_block(n);
+       dbgi  = get_irn_dbg_info(n);
+       tv1   = get_Const_tarval(bitop_right);
+       tv2   = get_Const_tarval(right);
+
+       assert(get_tarval_mode(tv1) == mode);
+
+       if (is_Shl(n)) {
+               new_shift = new_rd_Shl(dbgi, irg, block, bitop_left, right, mode);
+               tv_shift  = tarval_shl(tv1, tv2);
+       } else if(is_Shr(n)) {
+               new_shift = new_rd_Shr(dbgi, irg, block, bitop_left, right, mode);
+               tv_shift  = tarval_shr(tv1, tv2);
+       } else if(is_Shrs(n)) {
+               new_shift = new_rd_Shrs(dbgi, irg, block, bitop_left, right, mode);
+               tv_shift  = tarval_shrs(tv1, tv2);
+       } else {
+               assert(is_Rotl(n));
+               new_shift = new_rd_Rotl(dbgi, irg, block, bitop_left, right, mode);
+               tv_shift  = tarval_rotl(tv1, tv2);
+       }
+
+       assert(get_tarval_mode(tv_shift) == mode);
+       new_const = new_Const(mode, tv_shift);
+
+       if (op_left == op_And) {
+               new_bitop = new_rd_And(dbgi, irg, block, new_shift, new_const, mode);
+       } else if(op_left == op_Or) {
+               new_bitop = new_rd_Or(dbgi, irg, block, new_shift, new_const, mode);
+       } else {
+               assert(op_left == op_Eor);
+               new_bitop = new_rd_Eor(dbgi, irg, block, new_shift, new_const, mode);
+       }
+
+       return new_bitop;
+}
+
+/**
+ * normalisation:
+ *    (x << c1) >> c2  <=>  x OP (c2-c1) & ((-1 << c1) >> c2)
+ *    also:
+ *    (x >> c1) << c2  <=>  x OP (c2-c1) & ((-1 >> c1) << c2)
+ *      (also with x >>s c1  when c1>=c2)
+ */
+static ir_node *transform_node_shl_shr(ir_node *n) {
+       ir_node  *left;
+       ir_node  *right = get_binop_right(n);
+       ir_node  *x;
+       ir_graph *irg;
+       ir_node  *block;
+       ir_mode  *mode;
+       dbg_info *dbgi;
+       ir_node  *new_const;
+       ir_node  *new_shift;
+       ir_node  *new_and;
+       tarval   *tv_shl;
+       tarval   *tv_shr;
+       tarval   *tv_shift;
+       tarval   *tv_mask;
+       pn_Cmp    pnc;
+       int       need_shrs = 0;
+
+       assert(is_Shl(n) || is_Shr(n) || is_Shrs(n));
+
+       if (!is_Const(right))
+               return n;
+
+       left = get_binop_left(n);
        mode = get_irn_mode(n);
+       if (is_Shl(n) && (is_Shr(left) || is_Shrs(left))) {
+               ir_node *shr_right = get_binop_right(left);
 
-       flag = 0;
+               if (!is_Const(shr_right))
+                       return n;
 
-       modulo_shf = get_mode_modulo_shift(mode);
-       if (modulo_shf > 0) {
-               tarval *modulo = new_tarval_from_long(modulo_shf, get_tarval_mode(res));
+               x      = get_binop_left(left);
+               tv_shr = get_Const_tarval(shr_right);
+               tv_shl = get_Const_tarval(right);
 
-               if (tarval_cmp(res, modulo) & pn_Cmp_Lt)
-                       flag = 1;
-       } else
-               flag = 1;
+               if (is_Shrs(left)) {
+                       /* shrs variant only allowed if c1 >= c2 */
+                       if (! (tarval_cmp(tv_shl, tv_shr) & pn_Cmp_Ge))
+                               return n;
+
+                       tv_mask = tarval_shrs(get_mode_all_one(mode), tv_shr);
+                       need_shrs = 1;
+               } else {
+                       tv_mask = tarval_shr(get_mode_all_one(mode), tv_shr);
+               }
+               tv_mask = tarval_shl(tv_mask, tv_shl);
+       } else if(is_Shr(n) && is_Shl(left)) {
+               ir_node *shl_right = get_Shl_right(left);
 
-       if (flag) {
-               /* ok, we can replace it */
-               ir_node *in[2], *irn, *block = get_irn_n(n, -1);
+               if (!is_Const(shl_right))
+                       return n;
 
-               in[0] = get_binop_left(left);
-               in[1] = new_r_Const(current_ir_graph, block, get_tarval_mode(res), res);
+               x      = get_Shl_left(left);
+               tv_shr = get_Const_tarval(right);
+               tv_shl = get_Const_tarval(shl_right);
 
-               irn = new_ir_node(NULL, current_ir_graph, block, get_irn_op(n), mode, 2, in);
+               tv_mask = tarval_shl(get_mode_all_one(mode), tv_shl);
+               tv_mask = tarval_shr(tv_mask, tv_shr);
+       } else {
+               return n;
+       }
 
-               DBG_OPT_ALGSIM0(n, irn, FS_OPT_REASSOC_SHIFT);
+       assert(get_tarval_mode(tv_shl) == get_tarval_mode(tv_shr));
+       assert(tv_mask != tarval_bad);
+       assert(get_tarval_mode(tv_mask) == mode);
 
-               return transform_node(irn);
+       irg   = get_irn_irg(n);
+       block = get_nodes_block(n);
+       dbgi  = get_irn_dbg_info(n);
+
+       pnc = tarval_cmp(tv_shl, tv_shr);
+       if (pnc == pn_Cmp_Lt || pnc == pn_Cmp_Eq) {
+               tv_shift  = tarval_sub(tv_shr, tv_shl, NULL);
+               new_const = new_Const(get_tarval_mode(tv_shift), tv_shift);
+               if (need_shrs) {
+                       new_shift = new_rd_Shrs(dbgi, irg, block, x, new_const, mode);
+               } else {
+                       new_shift = new_rd_Shr(dbgi, irg, block, x, new_const, mode);
+               }
+       } else {
+               assert(pnc == pn_Cmp_Gt);
+               tv_shift  = tarval_sub(tv_shl, tv_shr, NULL);
+               new_const = new_Const(get_tarval_mode(tv_shift), tv_shift);
+               new_shift = new_rd_Shl(dbgi, irg, block, x, new_const, mode);
        }
-       return n;
-}  /* transform_node_shift */
+
+       new_const = new_Const(mode, tv_mask);
+       new_and   = new_rd_And(dbgi, irg, block, new_shift, new_const, mode);
+
+       return new_and;
+}
 
 /**
  * Transform a Shr.
  */
 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_mode *mode = get_irn_mode(n);
+       ir_node *left  = get_Shr_left(n);
+       ir_node *right = get_Shr_right(n);
+       ir_mode *mode  = get_irn_mode(n);
 
-       HANDLE_BINOP_PHI(tarval_shr, a, b, c, mode);
-       return transform_node_shift(n);
+       HANDLE_BINOP_PHI(tarval_shr, left, right, c, mode);
+       n = transform_node_shift(n);
+
+       if (is_Shr(n))
+               n = transform_node_shl_shr(n);
+       if (is_Shr(n))
+               n = transform_node_bitop_shift(n);
+
+       return n;
 }  /* transform_node_Shr */
 
 /**
@@ -4668,7 +5242,12 @@ static ir_node *transform_node_Shrs(ir_node *n) {
        ir_mode *mode = get_irn_mode(n);
 
        HANDLE_BINOP_PHI(tarval_shrs, a, b, c, mode);
-       return transform_node_shift(n);
+       n = transform_node_shift(n);
+
+       if (is_Shrs(n))
+               n = transform_node_bitop_shift(n);
+
+       return n;
 }  /* transform_node_Shrs */
 
 /**
@@ -4681,21 +5260,33 @@ static ir_node *transform_node_Shl(ir_node *n) {
        ir_mode *mode = get_irn_mode(n);
 
        HANDLE_BINOP_PHI(tarval_shl, a, b, c, mode);
-       return transform_node_shift(n);
+       n = transform_node_shift(n);
+
+       if (is_Shl(n))
+               n = transform_node_shl_shr(n);
+       if (is_Shl(n))
+               n = transform_node_bitop_shift(n);
+
+       return n;
 }  /* transform_node_Shl */
 
 /**
- * Transform a Rot.
+ * Transform a Rotl.
  */
-static ir_node *transform_node_Rot(ir_node *n) {
+static ir_node *transform_node_Rotl(ir_node *n) {
        ir_node *c, *oldn = n;
-       ir_node *a    = get_Rot_left(n);
-       ir_node *b    = get_Rot_right(n);
+       ir_node *a    = get_Rotl_left(n);
+       ir_node *b    = get_Rotl_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 */
+       HANDLE_BINOP_PHI(tarval_rotl, a, b, c, mode);
+       n = transform_node_shift(n);
+
+       if (is_Rotl(n))
+               n = transform_node_bitop_shift(n);
+
+       return n;
+}  /* transform_node_Rotl */
 
 /**
  * Transform a Conv.
@@ -4774,12 +5365,35 @@ static int is_negated_value(ir_node *a, ir_node *b) {
 static ir_node *transform_node_Mux(ir_node *n) {
        ir_node *oldn = n, *sel = get_Mux_sel(n);
        ir_mode *mode = get_irn_mode(n);
+       ir_node  *t   = get_Mux_true(n);
+       ir_node  *f   = get_Mux_false(n);
+       ir_graph *irg = current_ir_graph;
+       ir_node  *conds[1], *vals[2];
+
+       /* first normalization step: move a possible zero to the false case */
+       if (is_Proj(sel)) {
+               ir_node *cmp = get_Proj_pred(sel);
+
+               if (is_Cmp(cmp)) {
+                       if (is_Const(t) && is_Const_null(t)) {
+                               /* Psi(x, 0, y) => Psi(x, y, 0) */
+                               pn_Cmp pnc = get_Proj_proj(sel);
+                               sel = new_r_Proj(irg, get_nodes_block(cmp), cmp, mode_b,
+                                       get_negated_pnc(pnc, get_irn_mode(get_Cmp_left(cmp))));
+                               conds[0] = sel;
+                               vals[0]  = f;
+                               vals[1]  = t;
+                               n        = new_rd_Psi(get_irn_dbg_info(n), irg, get_nodes_block(n), 1, conds, vals, mode);
+                               t = vals[0];
+                               f = vals[1];
+                       }
+               }
+       }
 
+       /* note: after normalization, false can only happen on default */
        if (mode == mode_b) {
-               ir_node  *t     = get_Mux_true(n);
-               ir_node  *f     = get_Mux_false(n);
                dbg_info *dbg   = get_irn_dbg_info(n);
-               ir_node  *block = get_irn_n(n, -1);
+               ir_node  *block = get_nodes_block(n);
                ir_graph *irg   = current_ir_graph;
 
                if (is_Const(t)) {
@@ -4796,20 +5410,6 @@ static ir_node *transform_node_Mux(ir_node *n) {
                                        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_OR_BOOL);
                                        return n;
                                }
-                       } else {
-                               ir_node* not_sel = new_rd_Not(dbg, irg, block, sel, mode_b);
-                               assert(tv_t == tarval_b_false);
-                               if (is_Const(f)) {
-                                       /* Muxb(sel, false, true) = Not(sel) */
-                                       assert(get_Const_tarval(f) == tarval_b_true);
-                                       DBG_OPT_ALGSIM0(oldn, not_sel, FS_OPT_MUX_NOT_BOOL);
-                                       return not_sel;
-                               } else {
-                                       /* Muxb(sel, false, x) = And(Not(sel), x) */
-                                       n = new_rd_And(dbg, irg, block, not_sel, f, mode_b);
-                                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_ANDNOT_BOOL);
-                                       return n;
-                               }
                        }
                } else if (is_Const(f)) {
                        tarval *tv_f = get_Const_tarval(f);
@@ -4829,11 +5429,39 @@ static ir_node *transform_node_Mux(ir_node *n) {
                }
        }
 
-       if (is_Proj(sel) && !mode_honor_signed_zeros(mode)) {
+       /* more normalization: try to normalize Mux(x, C1, C2) into Mux(x, +1/-1, 0) op C2 */
+       if (is_Const(t) && is_Const(f) && mode_is_int(mode)) {
+               tarval *a = get_Const_tarval(t);
+               tarval *b = get_Const_tarval(f);
+               tarval *null = get_tarval_null(mode);
+               tarval *diff, *min;
+
+               if (tarval_cmp(a, b) & pn_Cmp_Gt) {
+                       diff = tarval_sub(a, b, NULL);
+                       min  = b;
+               } else {
+                       diff = tarval_sub(b, a, NULL);
+                       min  = a;
+               }
+
+               if (diff == get_tarval_one(mode) && min != null) {
+                       dbg_info *dbg   = get_irn_dbg_info(n);
+                       ir_node  *block = get_nodes_block(n);
+                       ir_graph *irg   = current_ir_graph;
+
+
+                       conds[0] = sel;
+                       vals[0] = new_Const(mode, tarval_sub(a, min, NULL));
+                       vals[1] = new_Const(mode, tarval_sub(b, min, NULL));
+                       n = new_rd_Psi(dbg, irg, block, 1, conds, vals, mode);
+                       n = new_rd_Add(dbg, irg, block, n, new_Const(mode, min), mode);
+                       return n;
+               }
+       }
+
+       if (is_Proj(sel)) {
                ir_node *cmp = get_Proj_pred(sel);
                long     pn  = get_Proj_proj(sel);
-               ir_node *f   = get_Mux_false(n);
-               ir_node *t   = get_Mux_true(n);
 
                /*
                 * Note: normalization puts the constant on the right side,
@@ -4841,37 +5469,94 @@ static ir_node *transform_node_Mux(ir_node *n) {
                 *
                 * Note further that these optimization work even for floating point
                 * with NaN's because -NaN == NaN.
-                * However, if +0 and -0 is handled differently, we cannot use the first
-                * one.
+                * However, if +0 and -0 is handled differently, we cannot use the Abs/-Abs
+                * transformations.
                 */
                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);
+                               ir_node *block = get_nodes_block(n);
+                               ir_node *cmp_l = get_Cmp_left(cmp);
 
-                               if (is_negated_value(f, t)) {
-                                       ir_node *cmp_left = get_Cmp_left(cmp);
+                               if (!mode_honor_signed_zeros(mode) && is_negated_value(f, t)) {
+                                       /* f = -t */
 
-                                       /* 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)))
+                                       if ( (cmp_l == t && (pn == pn_Cmp_Ge || pn == pn_Cmp_Gt))
+                                               || (cmp_l == f && (pn == pn_Cmp_Le || pn == pn_Cmp_Lt)))
                                        {
+                                               /* Psi(a >/>= 0, a, -a) = Psi(a </<= 0, -a, a) ==> Abs(a) */
                                                n = new_rd_Abs(get_irn_dbg_info(n), current_ir_graph, block,
-                                                                                cmp_left, mode);
+                                                                                cmp_l, 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)))
+                                       } else if ((cmp_l == t && (pn == pn_Cmp_Le || pn == pn_Cmp_Lt))
+                                               || (cmp_l == f && (pn == pn_Cmp_Ge || pn == pn_Cmp_Gt)))
                                        {
+                                               /* Psi(a </<= 0, a, -a) = Psi(a >/>= 0, -a, a) ==> -Abs(a) */
                                                n = new_rd_Abs(get_irn_dbg_info(n), current_ir_graph, block,
-                                                                                cmp_left, mode);
+                                                                                cmp_l, 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)) {
+                                       /* integer only */
+                                       if ((pn == pn_Cmp_Lg || pn == pn_Cmp_Eq) && is_And(cmp_l)) {
+                                               /* Psi((a & b) != 0, c, 0) */
+                                               ir_node *and_r = get_And_right(cmp_l);
+                                               ir_node *and_l;
+
+                                               if (and_r == t && f == cmp_r) {
+                                                       if (is_Const(t) && tarval_is_single_bit(get_Const_tarval(t))) {
+                                                               if (pn == pn_Cmp_Lg) {
+                                                                       /* Psi((a & 2^C) != 0, 2^C, 0) */
+                                                                       n = cmp_l;
+                                                               } else {
+                                                                       /* Psi((a & 2^C) == 0, 2^C, 0) */
+                                                                       n = new_rd_Eor(get_irn_dbg_info(n), current_ir_graph,
+                                                                               block, cmp_l, t, mode);
+                                                               }
+                                                               return n;
+                                                       }
+                                               }
+                                               if (is_Shl(and_r)) {
+                                                       ir_node *shl_l = get_Shl_left(and_r);
+                                                       if (is_Const(shl_l) && is_Const_one(shl_l)) {
+                                                               if (and_r == t && f == cmp_r) {
+                                                                       if (pn == pn_Cmp_Lg) {
+                                                                               /* (a & (1 << n)) != 0, (1 << n), 0) */
+                                                                               n = cmp_l;
+                                                                       } else {
+                                                                               /* (a & (1 << n)) == 0, (1 << n), 0) */
+                                                                               n = new_rd_Eor(get_irn_dbg_info(n), current_ir_graph,
+                                                                                       block, cmp_l, t, mode);
+                                                                       }
+                                                                       return n;
+                                                               }
+                                                       }
+                                               }
+                                               and_l = get_And_left(cmp_l);
+                                               if (is_Shl(and_l)) {
+                                                       ir_node *shl_l = get_Shl_left(and_l);
+                                                       if (is_Const(shl_l) && is_Const_one(shl_l)) {
+                                                               if (and_l == t && f == cmp_r) {
+                                                                       if (pn == pn_Cmp_Lg) {
+                                                                               /* ((1 << n) & a) != 0, (1 << n), 0) */
+                                                                               n = cmp_l;
+                                                                       } else {
+                                                                               /* ((1 << n) & a) == 0, (1 << n), 0) */
+                                                                               n = new_rd_Eor(get_irn_dbg_info(n), current_ir_graph,
+                                                                                       block, cmp_l, t, mode);
+                                                                       }
+                                                                       return n;
+                                                               }
+                                                       }
+                                               }
+                                       }
+                               }
                        }
                }
        }
@@ -4980,6 +5665,7 @@ static ir_op_ops *firm_set_default_transform_node(ir_opcode code, ir_op_ops *ops
        CASE(Quot);
        CASE(Abs);
        CASE(Cond);
+       CASE(Cmp);
        CASE(And);
        CASE(Or);
        CASE(Eor);
@@ -4992,7 +5678,7 @@ 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(Rotl);
        CASE(Conv);
        CASE(End);
        CASE(Mux);
@@ -5300,38 +5986,14 @@ int identities_cmp(const void *elt, const void *key) {
 
 /*
  * Calculate a hash value of a node.
+ *
+ * @param node  The IR-node
  */
-unsigned ir_node_hash(ir_node *node) {
-       unsigned h;
-       int i, irn_arity;
-
-       if (node->op == op_Const) {
-               /* special value for const, as they only differ in their tarval. */
-               h = HASH_PTR(node->attr.con.tv);
-               h = 9*h + HASH_PTR(get_irn_mode(node));
-       } else if (node->op == op_SymConst) {
-               /* special value for const, as they only differ in their symbol. */
-               h = HASH_PTR(node->attr.symc.sym.type_p);
-               h = 9*h + HASH_PTR(get_irn_mode(node));
-       } else {
-
-               /* hash table value = 9*(9*(9*(9*(9*arity+in[0])+in[1])+ ...)+mode)+code */
-               h = irn_arity = get_irn_intra_arity(node);
-
-               /* consider all in nodes... except the block if not a control flow. */
-               for (i = is_cfop(node) ? -1 : 0;  i < irn_arity;  i++) {
-                       h = 9*h + HASH_PTR(get_irn_intra_n(node, i));
-               }
-
-               /* ...mode,... */
-               h = 9*h + HASH_PTR(get_irn_mode(node));
-               /* ...and code */
-               h = 9*h + HASH_PTR(get_irn_op(node));
-       }
-
-       return h;
+unsigned ir_node_hash(const ir_node *node) {
+       return node->op->ops.hash(node);
 }  /* ir_node_hash */
 
+
 pset *new_identities(void) {
        return new_pset(identities_cmp, N_IR_NODES);
 }  /* new_identities */
@@ -5409,52 +6071,6 @@ static void update_known_irn(ir_node *known_irn, const ir_node *new_ir_node) {
        }
 }  /* update_value_table */
 
-/**
- * Return the canonical node computing the same value as n.
- *
- * @param value_table  The value table
- * @param n            The node to lookup
- *
- * Looks up the node in a hash table.
- *
- * For Const nodes this is performed in the constructor, too.  Const
- * nodes are extremely time critical because of their frequent use in
- * constant string arrays.
- */
-static INLINE ir_node *identify(pset *value_table, ir_node *n) {
-       ir_node *o = NULL;
-
-       if (!value_table) return n;
-
-       normalize_node(n);
-
-       o = pset_find(value_table, n, ir_node_hash(n));
-       if (o == NULL)
-               return n;
-
-       update_known_irn(o, n);
-       DBG_OPT_CSE(n, o);
-
-       return o;
-}  /* identify */
-
-/**
- * During construction we set the op_pin_state_pinned flag in the graph right when the
- * optimization is performed.  The flag turning on procedure global cse could
- * be changed between two allocations.  This way we are safe.
- *
- * @param value_table  The value table
- * @param n            The node to lookup
- */
-static INLINE ir_node *identify_cons(pset *value_table, ir_node *n) {
-       ir_node *old = n;
-
-       n = identify(value_table, n);
-       if (n != old && get_irn_MacroBlock(old) != get_irn_MacroBlock(n))
-               set_irg_pinned(current_ir_graph, op_pin_state_floats);
-       return n;
-}  /* identify_cons */
-
 /*
  * Return the canonical node computing the same value as n.
  * Looks up the node in a hash table, enters it in the table
@@ -5484,6 +6100,23 @@ ir_node *identify_remember(pset *value_table, ir_node *n) {
        return o;
 }  /* identify_remember */
 
+/**
+ * During construction we set the op_pin_state_pinned flag in the graph right when the
+ * optimization is performed.  The flag turning on procedure global cse could
+ * be changed between two allocations.  This way we are safe.
+ *
+ * @param value_table  The value table
+ * @param n            The node to lookup
+ */
+static INLINE ir_node *identify_cons(pset *value_table, ir_node *n) {
+       ir_node *old = n;
+
+       n = identify_remember(value_table, n);
+       if (n != old && get_irn_MacroBlock(old) != get_irn_MacroBlock(n))
+               set_irg_pinned(current_ir_graph, op_pin_state_floats);
+       return n;
+}  /* identify_cons */
+
 /* Add a node to the identities value table. */
 void add_identities(pset *value_table, ir_node *node) {
        if (get_opt_cse() && is_no_Block(node))
@@ -5660,7 +6293,7 @@ ir_node *optimize_node(ir_node *n) {
        }
 
        /* remove unnecessary nodes */
-       if (get_opt_constant_folding() ||
+       if (get_opt_algebraic_simplification() ||
            (iro == iro_Phi)  ||   /* always optimize these nodes. */
            (iro == iro_Id)   ||
            (iro == iro_Proj) ||
@@ -5688,14 +6321,14 @@ ir_node *optimize_node(ir_node *n) {
        /* Some more constant expression evaluation that does not allow to
           free the node. */
        iro = get_irn_opcode(n);
-       if (get_opt_constant_folding() ||
+       if (get_opt_algebraic_simplification() ||
            (iro == iro_Cond) ||
            (iro == iro_Proj))     /* Flags tested local. */
                n = transform_node(n);
 
        /* Remove nodes with dead (Bad) input.
           Run always for transformation induced Bads. */
-       n = gigo (n);
+       n = gigo(n);
 
        /* Now we have a legal, useful node. Enter it in hash table for CSE */
        if (get_opt_cse() && (get_irn_opcode(n) != iro_Block)) {
@@ -5764,7 +6397,7 @@ ir_node *optimize_in_place_2(ir_node *n) {
           now all nodes are op_pin_state_pinned to blocks, i.e., the cse only finds common
           subexpressions within a block. */
        if (get_opt_cse()) {
-               n = identify(current_ir_graph->value_table, n);
+               n = identify_remember(current_ir_graph->value_table, n);
        }
 
        /* Some more constant expression evaluation. */
@@ -5808,10 +6441,69 @@ ir_node *optimize_in_place(ir_node *n) {
        return optimize_in_place_2(n);
 }  /* optimize_in_place */
 
+/**
+ * Calculate a hash value of a Const node.
+ */
+static unsigned hash_Const(const ir_node *node) {
+       unsigned h;
+
+       /* special value for const, as they only differ in their tarval. */
+       h = HASH_PTR(node->attr.con.tv);
+       h = 9*h + HASH_PTR(get_irn_mode(node));
+
+       return h;
+}  /* hash_Const */
+
+/**
+ * Calculate a hash value of a SymConst node.
+ */
+static unsigned hash_SymConst(const ir_node *node) {
+       unsigned h;
+
+       /* special value for const, as they only differ in their symbol. */
+       h = HASH_PTR(node->attr.symc.sym.type_p);
+       h = 9*h + HASH_PTR(get_irn_mode(node));
+
+       return h;
+}  /* hash_SymConst */
+
+/**
+ * Set the default hash operation in an ir_op_ops.
+ *
+ * @param code   the opcode for the default operation
+ * @param ops    the operations initialized
+ *
+ * @return
+ *    The operations.
+ */
+static ir_op_ops *firm_set_default_hash(ir_opcode code, ir_op_ops *ops)
+{
+#define CASE(a)                                    \
+       case iro_##a:                                  \
+               ops->hash  = hash_##a; \
+               break
+
+       /* hash function already set */
+       if (ops->hash != NULL)
+               return ops;
+
+       switch (code) {
+       CASE(Const);
+       CASE(SymConst);
+       default:
+               /* use input/mode default hash if no function was given */
+               ops->hash = firm_default_hash;
+       }
+
+       return ops;
+#undef CASE
+}
+
 /*
  * Sets the default operation for an ir_ops.
  */
 ir_op_ops *firm_set_default_operations(ir_opcode code, ir_op_ops *ops) {
+       ops = firm_set_default_hash(code, ops);
        ops = firm_set_default_computed_value(code, ops);
        ops = firm_set_default_equivalent_node(code, ops);
        ops = firm_set_default_transform_node(code, ops);