I was annoyed by the compiler warnings about declaration isn't a prototype
[libfirm] / ir / ir / iropt.c
index 8241810..eb23281 100644 (file)
@@ -23,9 +23,7 @@
  * @author  Christian Schaefer, Goetz Lindenmaier, Michael Beck
  * @version $Id$
  */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <string.h>
 
 #include "irhooks.h"
 #include "irarch.h"
 #include "hashptr.h"
-#include "archop.h"
 #include "opt_confirms.h"
 #include "opt_polymorphy.h"
 #include "irtools.h"
-#include "xmalloc.h"
+#include "irhooks.h"
+#include "array_t.h"
 
 /* Make types visible to allow most efficient access */
 #include "entity_t.h"
@@ -65,6 +63,7 @@ static tarval *default_value_of(const ir_node *n) {
 
 value_of_func value_of_ptr = default_value_of;
 
+/* * Set a new value_of function. */
 void set_value_of_func(value_of_func func) {
        if (func != NULL)
                value_of_ptr = func;
@@ -75,14 +74,14 @@ void set_value_of_func(value_of_func func) {
 /**
  * Return the value of a Constant.
  */
-static tarval *computed_value_Const(ir_node *n) {
+static tarval *computed_value_Const(const ir_node *n) {
        return get_Const_tarval(n);
 }  /* computed_value_Const */
 
 /**
  * Return the value of a 'sizeof', 'alignof' or 'offsetof' SymConst.
  */
-static tarval *computed_value_SymConst(ir_node *n) {
+static tarval *computed_value_SymConst(const ir_node *n) {
        ir_type   *type;
        ir_entity *ent;
 
@@ -112,14 +111,14 @@ static tarval *computed_value_SymConst(ir_node *n) {
 /**
  * Return the value of an Add.
  */
-static tarval *computed_value_Add(ir_node *n) {
+static tarval *computed_value_Add(const ir_node *n) {
        ir_node *a = get_Add_left(n);
        ir_node *b = get_Add_right(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;
@@ -129,21 +128,25 @@ static tarval *computed_value_Add(ir_node *n) {
  * Return the value of a Sub.
  * 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;
+static tarval *computed_value_Sub(const ir_node *n) {
+       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));
+       /* NaN - NaN != 0 */
+       if (! mode_is_float(mode)) {
+               /* a - a = 0 */
+               if (a == b)
+                       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 */
@@ -152,7 +155,7 @@ static tarval *computed_value_Sub(ir_node *n) {
  * Return the value of a Carry.
  * Special : a op 0, 0 op b
  */
-static tarval *computed_value_Carry(ir_node *n) {
+static tarval *computed_value_Carry(const ir_node *n) {
        ir_node *a = get_binop_left(n);
        ir_node *b = get_binop_right(n);
        ir_mode *m = get_irn_mode(n);
@@ -174,7 +177,7 @@ static tarval *computed_value_Carry(ir_node *n) {
  * Return the value of a Borrow.
  * Special : a op 0
  */
-static tarval *computed_value_Borrow(ir_node *n) {
+static tarval *computed_value_Borrow(const ir_node *n) {
        ir_node *a = get_binop_left(n);
        ir_node *b = get_binop_right(n);
        ir_mode *m = get_irn_mode(n);
@@ -193,7 +196,7 @@ static tarval *computed_value_Borrow(ir_node *n) {
 /**
  * Return the value of an unary Minus.
  */
-static tarval *computed_value_Minus(ir_node *n) {
+static tarval *computed_value_Minus(const ir_node *n) {
        ir_node *a = get_Minus_op(n);
        tarval *ta = value_of(a);
 
@@ -206,7 +209,7 @@ static tarval *computed_value_Minus(ir_node *n) {
 /**
  * Return the value of a Mul.
  */
-static tarval *computed_value_Mul(ir_node *n) {
+static tarval *computed_value_Mul(const ir_node *n) {
        ir_node *a = get_Mul_left(n);
        ir_node *b = get_Mul_right(n);
        ir_mode *mode;
@@ -224,87 +227,22 @@ static tarval *computed_value_Mul(ir_node *n) {
        if (ta != tarval_bad && tb != tarval_bad) {
                return tarval_mul(ta, tb);
        } else {
-               /* a*0 = 0 or 0*b = 0 */
-               if (ta == get_mode_null(mode))
-                       return ta;
-               if (tb == get_mode_null(mode))
-                       return tb;
+               /* a * 0 != 0 if a == NaN or a == Inf */
+               if (!mode_is_float(mode)) {
+                       /* a*0 = 0 or 0*b = 0 */
+                       if (ta == get_mode_null(mode))
+                               return ta;
+                       if (tb == get_mode_null(mode))
+                               return tb;
+               }
        }
        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.
  */
-static tarval *computed_value_Abs(ir_node *n) {
+static tarval *computed_value_Abs(const ir_node *n) {
        ir_node *a = get_Abs_op(n);
        tarval *ta = value_of(a);
 
@@ -318,7 +256,7 @@ static tarval *computed_value_Abs(ir_node *n) {
  * Return the value of an And.
  * Special case: a & 0, 0 & b
  */
-static tarval *computed_value_And(ir_node *n) {
+static tarval *computed_value_And(const ir_node *n) {
        ir_node *a = get_And_left(n);
        ir_node *b = get_And_right(n);
 
@@ -338,7 +276,7 @@ static tarval *computed_value_And(ir_node *n) {
  * Return the value of an Or.
  * Special case: a | 1...1, 1...1 | b
  */
-static tarval *computed_value_Or(ir_node *n) {
+static tarval *computed_value_Or(const ir_node *n) {
        ir_node *a = get_Or_left(n);
        ir_node *b = get_Or_right(n);
 
@@ -357,7 +295,7 @@ static tarval *computed_value_Or(ir_node *n) {
 /**
  * Return the value of an Eor.
  */
-static tarval *computed_value_Eor(ir_node *n) {
+static tarval *computed_value_Eor(const ir_node *n) {
        ir_node *a = get_Eor_left(n);
        ir_node *b = get_Eor_right(n);
 
@@ -370,7 +308,7 @@ static tarval *computed_value_Eor(ir_node *n) {
        tb = value_of(b);
 
        if ((ta != tarval_bad) && (tb != tarval_bad)) {
-               return tarval_eor (ta, tb);
+               return tarval_eor(ta, tb);
        }
        return tarval_bad;
 }  /* computed_value_Eor */
@@ -378,7 +316,7 @@ static tarval *computed_value_Eor(ir_node *n) {
 /**
  * Return the value of a Not.
  */
-static tarval *computed_value_Not(ir_node *n) {
+static tarval *computed_value_Not(const ir_node *n) {
        ir_node *a = get_Not_op(n);
        tarval *ta = value_of(a);
 
@@ -391,7 +329,7 @@ static tarval *computed_value_Not(ir_node *n) {
 /**
  * Return the value of a Shl.
  */
-static tarval *computed_value_Shl(ir_node *n) {
+static tarval *computed_value_Shl(const ir_node *n) {
        ir_node *a = get_Shl_left(n);
        ir_node *b = get_Shl_right(n);
 
@@ -399,7 +337,7 @@ static tarval *computed_value_Shl(ir_node *n) {
        tarval *tb = value_of(b);
 
        if ((ta != tarval_bad) && (tb != tarval_bad)) {
-               return tarval_shl (ta, tb);
+               return tarval_shl(ta, tb);
        }
        return tarval_bad;
 }  /* computed_value_Shl */
@@ -407,7 +345,7 @@ static tarval *computed_value_Shl(ir_node *n) {
 /**
  * Return the value of a Shr.
  */
-static tarval *computed_value_Shr(ir_node *n) {
+static tarval *computed_value_Shr(const ir_node *n) {
        ir_node *a = get_Shr_left(n);
        ir_node *b = get_Shr_right(n);
 
@@ -415,7 +353,7 @@ static tarval *computed_value_Shr(ir_node *n) {
        tarval *tb = value_of(b);
 
        if ((ta != tarval_bad) && (tb != tarval_bad)) {
-               return tarval_shr (ta, tb);
+               return tarval_shr(ta, tb);
        }
        return tarval_bad;
 }  /* computed_value_Shr */
@@ -423,7 +361,7 @@ static tarval *computed_value_Shr(ir_node *n) {
 /**
  * Return the value of a Shrs.
  */
-static tarval *computed_value_Shrs(ir_node *n) {
+static tarval *computed_value_Shrs(const ir_node *n) {
        ir_node *a = get_Shrs_left(n);
        ir_node *b = get_Shrs_right(n);
 
@@ -431,7 +369,7 @@ static tarval *computed_value_Shrs(ir_node *n) {
        tarval *tb = value_of(b);
 
        if ((ta != tarval_bad) && (tb != tarval_bad)) {
-               return tarval_shrs (ta, tb);
+               return tarval_shrs(ta, tb);
        }
        return tarval_bad;
 }  /* computed_value_Shrs */
@@ -439,7 +377,7 @@ static tarval *computed_value_Shrs(ir_node *n) {
 /**
  * Return the value of a Rotl.
  */
-static tarval *computed_value_Rotl(ir_node *n) {
+static tarval *computed_value_Rotl(const ir_node *n) {
        ir_node *a = get_Rotl_left(n);
        ir_node *b = get_Rotl_right(n);
 
@@ -455,7 +393,7 @@ static tarval *computed_value_Rotl(ir_node *n) {
 /**
  * Return the value of a Conv.
  */
-static tarval *computed_value_Conv(ir_node *n) {
+static tarval *computed_value_Conv(const ir_node *n) {
        ir_node *a = get_Conv_op(n);
        tarval *ta = value_of(a);
 
@@ -465,6 +403,45 @@ static tarval *computed_value_Conv(ir_node *n) {
        return tarval_bad;
 }  /* computed_value_Conv */
 
+/**
+ * Calculate the value of a Mux: can be evaluated, if the
+ * sel and the right input are known.
+ */
+static tarval *computed_value_Mux(const ir_node *n) {
+       ir_node *sel = get_Mux_sel(n);
+       tarval *ts = value_of(sel);
+
+       if (ts == get_tarval_b_true()) {
+               ir_node *v = get_Mux_true(n);
+               return value_of(v);
+       }
+       else if (ts == get_tarval_b_false()) {
+               ir_node *v = get_Mux_false(n);
+               return value_of(v);
+       }
+       return tarval_bad;
+}  /* computed_value_Mux */
+
+/**
+ * Calculate the value of a Confirm: can be evaluated,
+ * if it has the form Confirm(x, '=', Const).
+ */
+static tarval *computed_value_Confirm(const ir_node *n) {
+       /*
+        * Beware: we might produce Phi(Confirm(x == true), Confirm(x == false)).
+        * Do NOT optimize them away (jump threading 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 */
+
 /**
  * Return the value of a Proj(Cmp).
  *
@@ -474,7 +451,7 @@ static tarval *computed_value_Conv(ir_node *n) {
  * only 1 is used.
  * There are several case where we can evaluate a Cmp node, see later.
  */
-static tarval *computed_value_Proj_Cmp(ir_node *n) {
+static tarval *computed_value_Proj_Cmp(const ir_node *n) {
        ir_node *a   = get_Proj_pred(n);
        ir_node *aa  = get_Cmp_left(a);
        ir_node *ab  = get_Cmp_right(a);
@@ -549,124 +526,147 @@ static tarval *computed_value_Proj_Cmp(ir_node *n) {
                 * the Cmp result.
                 */
                else {
-                       ir_node *aaa = skip_Id(skip_Proj(aa));
-                       ir_node *aba = skip_Id(skip_Proj(ab));
+                       ir_node *aaa = skip_Proj(aa);
+                       ir_node *aba = skip_Proj(ab);
 
                        if (   (   (/* aa is ProjP and aaa is Alloc */
                                       is_Proj(aa)
                                    && mode_is_reference(get_irn_mode(aa))
                                    && is_Alloc(aaa))
                                && (   (/* ab is NULL */
-                                          is_Const(ab)
-                                       && mode_is_reference(get_irn_mode(ab))
-                                       && is_Const_null(ab))
+                                       mode_is_reference(get_irn_mode(ab))
+                                       && tarval_is_null(tab))
                                    || (/* ab is other Alloc */
                                           is_Proj(ab)
                                        && mode_is_reference(get_irn_mode(ab))
                                        && is_Alloc(aba)
                                        && (aaa != aba))))
                            || (/* aa is NULL and aba is Alloc */
-                                  is_Const(aa)
-                               && mode_is_reference(get_irn_mode(aa))
-                               && is_Const_null(aa)
+                               mode_is_reference(get_irn_mode(aa))
+                               && tarval_is_null(taa)
                                && is_Proj(ab)
                                && mode_is_reference(get_irn_mode(ab))
                                && is_Alloc(aba)))
                                /* 3.: */
-                       return new_tarval_from_long(proj_nr & pn_Cmp_Ne, mode_b);
+                       return new_tarval_from_long(proj_nr & pn_Cmp_Lg, mode_b);
                }
        }
        return computed_value_Cmp_Confirm(a, aa, ab, proj_nr);
 }  /* computed_value_Proj_Cmp */
 
 /**
- * Return the value of a Proj, handle Proj(Cmp), Proj(Div), Proj(Mod),
- * Proj(DivMod) and Proj(Quot).
+ * Return the value of a floating point Quot.
  */
-static tarval *computed_value_Proj(ir_node *n) {
-       ir_node *a = get_Proj_pred(n);
-       long proj_nr;
+static tarval *do_computed_value_Quot(const ir_node *a, const ir_node *b) {
+       tarval  *ta = value_of(a);
+       tarval  *tb = value_of(b);
 
-       switch (get_irn_opcode(a)) {
-       case iro_Cmp:
-               return computed_value_Proj_Cmp(n);
-
-       case iro_DivMod:
-               /* compute either the Div or the Mod part */
-               proj_nr = get_Proj_proj(n);
-               if (proj_nr == pn_DivMod_res_div)
-                       return do_computed_value_Div(get_DivMod_left(a), get_DivMod_right(a));
-               else if (proj_nr == pn_DivMod_res_mod)
-                       return do_computed_value_Mod(get_DivMod_left(a), get_DivMod_right(a));
-               break;
+       /* 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 */
 
-       case iro_Div:
-               if (get_Proj_proj(n) == pn_Div_res)
-                       return computed_value(a);
-               break;
+/**
+ * Calculate the value of an integer Div of two nodes.
+ * Special case: 0 / b
+ */
+static tarval *do_computed_value_Div(const ir_node *a, const ir_node *b) {
+       tarval        *ta = value_of(a);
+       tarval        *tb;
+       const ir_node *dummy;
 
-       case iro_Mod:
-               if (get_Proj_proj(n) == pn_Mod_res)
-                       return computed_value(a);
-               break;
+       /* 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 */
 
-       case iro_Quot:
-               if (get_Proj_proj(n) == pn_Quot_res)
-                       return computed_value(a);
-               break;
+/**
+ * Calculate the value of an integer Mod of two nodes.
+ * Special case: a % 1
+ */
+static tarval *do_computed_value_Mod(const ir_node *a, const ir_node *b) {
+       tarval *ta = value_of(a);
+       tarval *tb = value_of(b);
 
-       default:
-               return tarval_bad;
-       }
+       /* 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;
-}  /* computed_value_Proj */
+}  /* do_computed_value_Mod */
 
 /**
- * Calculate the value of a Mux: can be evaluated, if the
- * sel and the right input are known.
+ * Return the value of a Proj(DivMod).
  */
-static tarval *computed_value_Mux(ir_node *n) {
-       ir_node *sel = get_Mux_sel(n);
-       tarval *ts = value_of(sel);
+static tarval *computed_value_Proj_DivMod(const ir_node *n) {
+       long proj_nr = get_Proj_proj(n);
 
-       if (ts == get_tarval_b_true()) {
-               ir_node *v = get_Mux_true(n);
-               return value_of(v);
+       /* compute either the Div or the Mod part */
+       if (proj_nr == pn_DivMod_res_div) {
+               const ir_node *a = get_Proj_pred(n);
+               return do_computed_value_Div(get_DivMod_left(a), get_DivMod_right(a));
+       } else if (proj_nr == pn_DivMod_res_mod) {
+               const ir_node *a = get_Proj_pred(n);
+               return do_computed_value_Mod(get_DivMod_left(a), get_DivMod_right(a));
        }
-       else if (ts == get_tarval_b_false()) {
-               ir_node *v = get_Mux_false(n);
-               return value_of(v);
+       return tarval_bad;
+}  /* computed_value_Proj_DivMod */
+
+/**
+ * Return the value of a Proj(Div).
+ */
+static tarval *computed_value_Proj_Div(const ir_node *n) {
+       long proj_nr = get_Proj_proj(n);
+
+       if (proj_nr == pn_Div_res) {
+               const ir_node *a = get_Proj_pred(n);
+               return do_computed_value_Div(get_Div_left(a), get_Div_right(a));
        }
        return tarval_bad;
-}  /* computed_value_Mux */
+}  /* computed_value_Proj_Div */
 
 /**
- * Calculate the value of a Psi: can be evaluated, if a condition is true
- * and all previous conditions are false. If all conditions are false
- * we evaluate to the default one.
+ * Return the value of a Proj(Mod).
  */
-static tarval *computed_value_Psi(ir_node *n) {
-       if (is_Mux(n))
-               return computed_value_Mux(n);
+static tarval *computed_value_Proj_Mod(const ir_node *n) {
+       long proj_nr = get_Proj_proj(n);
+
+       if (proj_nr == pn_Mod_res) {
+               const ir_node *a = get_Proj_pred(n);
+               return do_computed_value_Mod(get_Mod_left(a), get_Mod_right(a));
+       }
        return tarval_bad;
-}  /* computed_value_Psi */
+}  /* computed_value_Proj_Mod */
 
 /**
- * Calculate the value of a Confirm: can be evaluated,
- * if it has the form Confirm(x, '=', Const).
+ * Return the value of a Proj(Quot).
  */
-static tarval *computed_value_Confirm(ir_node *n) {
-       /*
-        * 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()) {
-               return get_Confirm_cmp(n) == pn_Cmp_Eq ?
-                       value_of(get_Confirm_bound(n)) : tarval_bad;
+static tarval *computed_value_Proj_Quot(const ir_node *n) {
+       long proj_nr = get_Proj_proj(n);
+
+       if (proj_nr == pn_Quot_res) {
+               const ir_node *a = get_Proj_pred(n);
+               return do_computed_value_Quot(get_Quot_left(a), get_Quot_right(a));
        }
        return tarval_bad;
-}  /* computed_value_Confirm */
+}  /* computed_value_Proj_Quot */
+
+/**
+ * Return the value of a Proj.
+ */
+static tarval *computed_value_Proj(const ir_node *proj) {
+       ir_node *n = get_Proj_pred(proj);
+
+       if (n->op->ops.computed_value_Proj != NULL)
+               return n->op->ops.computed_value_Proj(proj);
+       return tarval_bad;
+}  /* computed_value_Proj */
 
 /**
  * If the parameter n can be computed, return its value, else tarval_bad.
@@ -674,7 +674,7 @@ static tarval *computed_value_Confirm(ir_node *n) {
  *
  * @param n  The node this should be evaluated
  */
-tarval *computed_value(ir_node *n) {
+tarval *computed_value(const ir_node *n) {
        if (n->op->ops.computed_value)
                return n->op->ops.computed_value(n);
        return tarval_bad;
@@ -691,9 +691,13 @@ tarval *computed_value(ir_node *n) {
  */
 static ir_op_ops *firm_set_default_computed_value(ir_opcode code, ir_op_ops *ops)
 {
-#define CASE(a)                                    \
-       case iro_##a:                                  \
-               ops->computed_value  = computed_value_##a; \
+#define CASE(a)                                        \
+       case iro_##a:                                      \
+               ops->computed_value      = computed_value_##a; \
+               break
+#define CASE_PROJ(a)                                        \
+       case iro_##a:                                           \
+               ops->computed_value_Proj = computed_value_Proj_##a; \
                break
 
        switch (code) {
@@ -701,11 +705,10 @@ static ir_op_ops *firm_set_default_computed_value(ir_opcode code, ir_op_ops *ops
        CASE(SymConst);
        CASE(Add);
        CASE(Sub);
+       CASE(Carry);
+       CASE(Borrow);
        CASE(Minus);
        CASE(Mul);
-       CASE(Quot);
-       CASE(Div);
-       CASE(Mod);
        CASE(Abs);
        CASE(And);
        CASE(Or);
@@ -715,18 +718,21 @@ static ir_op_ops *firm_set_default_computed_value(ir_opcode code, ir_op_ops *ops
        CASE(Shr);
        CASE(Shrs);
        CASE(Rotl);
-       CASE(Carry);
-       CASE(Borrow);
        CASE(Conv);
-       CASE(Proj);
        CASE(Mux);
-       CASE(Psi);
        CASE(Confirm);
+       CASE_PROJ(Cmp);
+       CASE_PROJ(DivMod);
+       CASE_PROJ(Div);
+       CASE_PROJ(Mod);
+       CASE_PROJ(Quot);
+       CASE(Proj);
        default:
                /* leave NULL */;
        }
 
        return ops;
+#undef CASE_PROJ
 #undef CASE
 }  /* firm_set_default_computed_value */
 
@@ -751,8 +757,8 @@ static ir_node *equivalent_node_Block(ir_node *n)
        ir_node *oldn = n;
        int     n_preds;
 
-       /* don't optimize dead blocks */
-       if (is_Block_dead(n))
+       /* don't optimize dead or labeled blocks */
+       if (is_Block_dead(n) || has_Block_entity(n))
                return n;
 
        n_preds = get_Block_n_cfgpreds(n);
@@ -767,22 +773,26 @@ static ir_node *equivalent_node_Block(ir_node *n)
           This should be true, as the block is matured before optimize is called.
           But what about Phi-cycles with the Phi0/Id that could not be resolved?
           Remaining Phi nodes are just Ids. */
-       if (n_preds == 1 && is_Jmp(get_Block_cfgpred(n, 0))) {
-               ir_node *predblock = get_nodes_block(get_Block_cfgpred(n, 0));
-               if (predblock == oldn) {
-                       /* Jmp jumps into the block it is in -- deal self cycle. */
-                       n = set_Block_dead(n);
-                       DBG_OPT_DEAD_BLOCK(oldn, n);
-               } else if (get_opt_control_flow_straightening()) {
-                       n = predblock;
-                       DBG_OPT_STG(oldn, n);
-               }
-       } else if (n_preds == 1 && is_Cond(skip_Proj(get_Block_cfgpred(n, 0)))) {
-               ir_node *predblock = get_Block_cfgpred_block(n, 0);
-               if (predblock == oldn) {
-                       /* Jmp jumps into the block it is in -- deal self cycle. */
-                       n = set_Block_dead(n);
-                       DBG_OPT_DEAD_BLOCK(oldn, n);
+       if (n_preds == 1) {
+               ir_node *pred = skip_Proj(get_Block_cfgpred(n, 0));
+
+               if (is_Jmp(pred)) {
+                       ir_node *predblock = get_nodes_block(pred);
+                       if (predblock == oldn) {
+                               /* Jmp jumps into the block it is in -- deal self cycle. */
+                               n = set_Block_dead(n);
+                               DBG_OPT_DEAD_BLOCK(oldn, n);
+                       } else if (get_opt_control_flow_straightening()) {
+                               n = predblock;
+                               DBG_OPT_STG(oldn, n);
+                       }
+               } else if (is_Cond(pred)) {
+                       ir_node *predblock = get_nodes_block(pred);
+                       if (predblock == oldn) {
+                               /* Jmp jumps into the block it is in -- deal self cycle. */
+                               n = set_Block_dead(n);
+                               DBG_OPT_DEAD_BLOCK(oldn, n);
+                       }
                }
        } else if ((n_preds == 2) &&
                   (get_opt_control_flow_weak_simplification())) {
@@ -793,15 +803,16 @@ static ir_node *equivalent_node_Block(ir_node *n)
                ir_node *a = get_Block_cfgpred(n, 0);
                ir_node *b = get_Block_cfgpred(n, 1);
 
-               if (is_Proj(a) &&
-                   is_Proj(b) &&
-                   (get_Proj_pred(a) == get_Proj_pred(b)) &&
-                   is_Cond(get_Proj_pred(a)) &&
-                   (get_irn_mode(get_Cond_selector(get_Proj_pred(a))) == mode_b)) {
-                       /* Also a single entry Block following a single exit Block.  Phis have
-                          twice the same operand and will be optimized away. */
-                       n = get_nodes_block(get_Proj_pred(a));
-                       DBG_OPT_IFSIM1(oldn, a, b, n);
+               if (is_Proj(a) && is_Proj(b)) {
+                       ir_node *cond = get_Proj_pred(a);
+
+                   if (cond == get_Proj_pred(b) && is_Cond(cond) &&
+                       get_irn_mode(get_Cond_selector(cond)) == mode_b) {
+                               /* Also a single entry Block following a single exit Block.  Phis have
+                                  twice the same operand and will be optimized away. */
+                               n = get_nodes_block(cond);
+                               DBG_OPT_IFSIM1(oldn, a, b, n);
+                       }
                }
        } else if (get_opt_unreachable_code() &&
                   (n != get_irg_start_block(current_ir_graph)) &&
@@ -839,10 +850,13 @@ static ir_node *equivalent_node_Block(ir_node *n)
  * Of course this only happens if the Block of the Jmp is dead.
  */
 static ir_node *equivalent_node_Jmp(ir_node *n) {
-       /* unreachable code elimination */
-       if (is_Block_dead(get_nodes_block(n)))
-               n = new_Bad();
+       ir_node *oldn = n;
 
+       /* unreachable code elimination */
+       if (is_Block_dead(get_nodes_block(n))) {
+               n = get_irg_bad(current_ir_graph);
+               DBG_OPT_DEAD_BLOCK(oldn, n);
+       }
        return n;
 }  /* equivalent_node_Jmp */
 
@@ -857,8 +871,7 @@ static ir_node *equivalent_node_Jmp(ir_node *n) {
  * Optimize operations that are commutative and have neutral 0,
  * so a op 0 = 0 op a = a.
  */
-static ir_node *equivalent_node_neutral_zero(ir_node *n)
-{
+static ir_node *equivalent_node_neutral_zero(ir_node *n) {
        ir_node *oldn = n;
 
        ir_node *a = get_binop_left(n);
@@ -895,8 +908,7 @@ static ir_node *equivalent_node_neutral_zero(ir_node *n)
 /**
  * Eor is commutative and has neutral 0.
  */
-static ir_node *equivalent_node_Eor(ir_node *n)
-{
+static ir_node *equivalent_node_Eor(ir_node *n) {
        ir_node *oldn = n;
        ir_node *a;
        ir_node *b;
@@ -939,7 +951,6 @@ static ir_node *equivalent_node_Eor(ir_node *n)
                        return n;
                }
        }
-
        return n;
 }
 
@@ -1000,10 +1011,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);
@@ -1029,15 +1041,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;
@@ -1086,85 +1100,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.
  */
@@ -1173,16 +1129,25 @@ static ir_node *equivalent_node_Or(ir_node *n) {
 
        ir_node *a = get_Or_left(n);
        ir_node *b = get_Or_right(n);
+       tarval *tv;
 
        if (a == b) {
                n = a;    /* Or has it's own neutral element */
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_OR);
-       } else if (is_Const(a) && is_Const_null(a)) {
-               n = b;
-               DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_OR);
-       } else if (is_Const(b) && is_Const_null(b)) {
+               return n;
+       }
+       /* constants are cormalized to right, check this site first */
+       tv = value_of(b);
+       if (tarval_is_null(tv)) {
                n = a;
                DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_OR);
+               return n;
+       }
+       tv = value_of(a);
+       if (tarval_is_null(tv)) {
+               n = b;
+               DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_OR);
+               return n;
        }
 
        return n;
@@ -1196,19 +1161,38 @@ static ir_node *equivalent_node_And(ir_node *n) {
 
        ir_node *a = get_And_left(n);
        ir_node *b = get_And_right(n);
+       tarval *tv;
 
        if (a == b) {
                n = a;    /* And has it's own neutral element */
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_AND);
                return n;
        }
-       if (is_Const(a) && is_Const_all_one(a)) {
-               n = b;
+       /* constants are normalized to right, check this site first */
+       tv = value_of(b);
+       if (tarval_is_all_one(tv)) {
+               n = a;
                DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_AND);
                return n;
        }
-       if (is_Const(b) && is_Const_all_one(b)) {
-               n = a;
+       if (tv != get_tarval_bad()) {
+               ir_mode *mode = get_irn_mode(n);
+               if (!mode_is_signed(mode) && is_Conv(a)) {
+                       ir_node *convop     = get_Conv_op(a);
+                       ir_mode *convopmode = get_irn_mode(convop);
+                       if (!mode_is_signed(convopmode)) {
+                               if (tarval_is_all_one(tarval_convert_to(tv, convopmode))) {
+                                       /* Conv(X) & all_one(mode(X)) = Conv(X) */
+                                       n = a;
+                                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_AND);
+                                       return n;
+                               }
+                       }
+               }
+       }
+       tv = value_of(a);
+       if (tarval_is_all_one(tv)) {
+               n = b;
                DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_AND);
                return n;
        }
@@ -1228,7 +1212,6 @@ static ir_node *equivalent_node_And(ir_node *n) {
                        return n;
                }
        }
-
        return n;
 }  /* equivalent_node_And */
 
@@ -1245,8 +1228,56 @@ static ir_node *equivalent_node_Conv(ir_node *n) {
 restart:
        if (n_mode == a_mode) { /* No Conv necessary */
                if (get_Conv_strict(n)) {
-                       /* special case: the predecessor might be a also a Conv */
+                       ir_node *p = a;
+
+                       /* neither Minus nor Abs nor Confirm change the precision,
+                          so we can "look-through" */
+                       for (;;) {
+                               if (is_Minus(p)) {
+                                       p = get_Minus_op(p);
+                               } else if (is_Abs(p)) {
+                                       p = get_Abs_op(p);
+                               } else if (is_Confirm(p)) {
+                                       p = get_Confirm_value(p);
+                               } else {
+                                       /* stop here */
+                                       break;
+                               }
+                       }
+                       if (is_Conv(p) && get_Conv_strict(p)) {
+                               /* we known already, that a_mode == n_mode, and neither
+                                  Abs nor Minus change the mode, so the second Conv
+                                  can be kicked */
+                               assert(get_irn_mode(p) == n_mode);
+                               n = a;
+                               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_CONV);
+                               return n;
+                       }
+                       if (is_Proj(p)) {
+                               ir_node *pred = get_Proj_pred(p);
+                               if (is_Load(pred)) {
+                                       /* Loads always return with the exact precision of n_mode */
+                                       assert(get_Load_mode(pred) == n_mode);
+                                       n = a;
+                                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_CONV);
+                                       return n;
+                               }
+                               if (is_Proj(pred) && get_Proj_proj(pred) == pn_Start_T_args) {
+                                       pred = get_Proj_pred(pred);
+                                       if (is_Start(pred)) {
+                                               /* Arguments always return with the exact precision,
+                                                  as strictConv's are place before Call -- if the
+                                                  caller was compiled with the same setting.
+                                                  Otherwise, the semantics is probably still right. */
+                                               assert(get_irn_mode(p) == n_mode);
+                                               n = a;
+                                               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_CONV);
+                                               return n;
+                                       }
+                               }
+                       }
                        if (is_Conv(a)) {
+                               /* special case: the immediate predecessor is also a Conv */
                                if (! get_Conv_strict(a)) {
                                        /* first one is not strict, kick it */
                                        a = get_Conv_op(a);
@@ -1255,20 +1286,15 @@ restart:
                                        goto restart;
                                }
                                /* else both are strict conv, second is superfluous */
-                       } else if (is_Proj(a)) {
-                               ir_node *pred = get_Proj_pred(a);
-                               if (is_Load(pred)) {
-                                       /* loads always return with the exact precision of n_mode */
-                                       assert(get_Load_mode(pred) == n_mode);
-                                       return a;
-                               }
+                               n = a;
+                               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_CONV);
+                               return n;
                        }
-
-                       /* leave strict floating point Conv's */
+               } else {
+                       n = a;
+                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_CONV);
                        return n;
                }
-               n = a;
-               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_CONV);
        } else if (is_Conv(a)) { /* Conv(Conv(b)) */
                ir_node *b      = get_Conv_op(a);
                ir_mode *b_mode = get_irn_mode(b);
@@ -1287,19 +1313,33 @@ restart:
                                if (n_mode == mode_b) {
                                        n = b; /* Convb(Conv*(xxxb(...))) == xxxb(...) */
                                        DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_CONV);
+                                       return n;
                                } else if (get_mode_arithmetic(n_mode) == get_mode_arithmetic(a_mode)) {
-                                       if (smaller_mode(b_mode, a_mode)) {
+                                       if (values_in_mode(b_mode, a_mode)) {
                                                n = b;        /* ConvS(ConvL(xxxS(...))) == xxxS(...) */
                                                DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_CONV);
+                                               return n;
                                        }
                                }
                        }
+                       if (mode_is_int(n_mode) && get_mode_arithmetic(a_mode) == irma_ieee754) {
+                               /* ConvI(ConvF(I)) -> I, iff float mantissa >= int mode */
+                               unsigned int_mantissa   = get_mode_size_bits(n_mode) - (mode_is_signed(n_mode) ? 1 : 0);
+                               unsigned float_mantissa = tarval_ieee754_get_mantissa_size(a_mode);
+
+                               if (float_mantissa >= int_mantissa) {
+                                       n = b;
+                                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_CONV);
+                                       return n;
+                               }
+                       }
                        if (is_Conv(b)) {
                                if (smaller_mode(b_mode, a_mode)) {
                                        if (get_Conv_strict(n))
                                                set_Conv_strict(b, 1);
                                        n = b; /* ConvA(ConvB(ConvA(...))) == ConvA(...) */
                                        DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_CONV);
+                                       return n;
                                }
                        }
                }
@@ -1323,9 +1363,6 @@ static ir_node *equivalent_node_Cast(ir_node *n) {
 }  /* equivalent_node_Cast */
 
 /**
- * Several optimizations:
- * - no Phi in start block.
- * - remove Id operators that are inputs to Phi
  * - fold Phi-nodes, iff they have only one predecessor except
  *   themselves.
  */
@@ -1341,17 +1378,11 @@ static ir_node *equivalent_node_Phi(ir_node *n) {
        n_preds = get_Phi_n_preds(n);
 
        block = get_nodes_block(n);
-       if ((is_Block_dead(block)) ||                  /* Control dead */
-               (block == get_irg_start_block(current_ir_graph)))  /* There should be no Phi nodes */
-               return new_Bad();                                    /* in the Start Block. */
+       if (is_Block_dead(block))                  /* Control dead */
+               return get_irg_bad(current_ir_graph);
 
        if (n_preds == 0) return n;           /* Phi of dead Region without predecessors. */
 
-       /* If the Block has a Bad pred, we also have one. */
-       for (i = 0;  i < n_preds;  ++i)
-               if (is_Bad(get_Block_cfgpred(block, i)))
-                       set_Phi_pred(n, i, new_Bad());
-
        /* Find first non-self-referencing input */
        for (i = 0; i < n_preds; ++i) {
                first_val = get_Phi_pred(n, i);
@@ -1365,7 +1396,7 @@ static ir_node *equivalent_node_Phi(ir_node *n) {
                     * 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))
+                       && (! is_Bad(get_Block_cfgpred(block, i)))
 #endif
                   ) {        /* value not dead */
                        break;          /* then found first value. */
@@ -1374,7 +1405,7 @@ static ir_node *equivalent_node_Phi(ir_node *n) {
 
        if (i >= n_preds) {
                /* A totally Bad or self-referencing Phi (we didn't break the above loop) */
-               return new_Bad();
+               return get_irg_bad(current_ir_graph);
        }
 
        /* search for rest of inputs, determine if any of these
@@ -1385,7 +1416,7 @@ static ir_node *equivalent_node_Phi(ir_node *n) {
                    && (scnd_val != first_val)
 #if 0
                    /* see above */
-                   && (! is_Bad(scnd_val))
+                   && (! is_Bad(get_Block_cfgpred(block, i)))
 #endif
                        ) {
                        break;
@@ -1402,7 +1433,6 @@ static ir_node *equivalent_node_Phi(ir_node *n) {
 
 /**
  * Several optimizations:
- * - no Sync in start block.
  * - fold Sync-nodes, iff they have only one predecessor except
  *   themselves.
  */
@@ -1435,72 +1465,261 @@ static ir_node *equivalent_node_Sync(ir_node *n) {
                }
        }
 
-       if (arity == 0) return new_Bad();
+       if (arity == 0) return get_irg_bad(current_ir_graph);
        if (arity == 1) return get_Sync_pred(n, 0);
        return 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();
+       /* 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;
                }
-       } 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);
+       }
+       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_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 *load = get_Proj_pred(proj);
+
+                       /* get the Load address */
+                       const ir_node *addr = get_Load_ptr(load);
+                       const ir_node *confirm;
+
+                       if (value_not_null(addr, &confirm)) {
+                               if (get_Proj_proj(proj) == pn_Load_X_except) {
+                                       DBG_OPT_EXC_REM(proj);
+                                       return get_irg_bad(current_ir_graph);
                                }
-                       } 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);
+                       }
+               }
+       }
+       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 *store = get_Proj_pred(proj);
+
+                       /* get the load/store address */
+                       const ir_node *addr = get_Store_ptr(store);
+                       const ir_node *confirm;
+
+                       if (value_not_null(addr, &confirm)) {
+                               if (get_Proj_proj(proj) == pn_Store_X_except) {
+                                       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);
 
+       if (get_irn_mode(proj) == mode_X) {
+               if (is_Block_dead(get_nodes_block(n))) {
+                       /* Remove dead control flow -- early gigo(). */
+                       return get_irg_bad(current_ir_graph);
+               }
+       }
+       if (n->op->ops.equivalent_node_Proj)
+               return n->op->ops.equivalent_node_Proj(proj);
        return proj;
 }  /* equivalent_node_Proj */
 
@@ -1512,7 +1731,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;
@@ -1524,24 +1743,44 @@ static ir_node *equivalent_node_Id(ir_node *n) {
 static ir_node *equivalent_node_Mux(ir_node *n)
 {
        ir_node *oldn = n, *sel = get_Mux_sel(n);
+       ir_node *n_t, *n_f;
        tarval *ts = value_of(sel);
 
        /* Mux(true, f, t) == t */
        if (ts == tarval_b_true) {
                n = get_Mux_true(n);
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_C);
+               return n;
        }
        /* Mux(false, f, t) == f */
-       else if (ts == tarval_b_false) {
+       if (ts == tarval_b_false) {
                n = get_Mux_false(n);
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_C);
+               return n;
+       }
+       n_t = get_Mux_true(n);
+       n_f = get_Mux_false(n);
+
+       /* Mux(v, x, T) == x */
+       if (is_Unknown(n_f)) {
+               n = n_t;
+               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_EQ);
+               return n;
+       }
+       /* Mux(v, T, x) == x */
+       if (is_Unknown(n_t)) {
+               n = n_f;
+               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_EQ);
+               return n;
        }
+
        /* Mux(v, x, x) == x */
-       else if (get_Mux_false(n) == get_Mux_true(n)) {
-               n = get_Mux_true(n);
+       if (n_t == n_f) {
+               n = n_t;
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_EQ);
+               return n;
        }
-       else if (is_Proj(sel) && !mode_honor_signed_zeros(get_irn_mode(n))) {
+       if (is_Proj(sel) && !mode_honor_signed_zeros(get_irn_mode(n))) {
                ir_node *cmp = get_Proj_pred(sel);
                long proj_nr = get_Proj_proj(sel);
                ir_node *f   = get_Mux_false(n);
@@ -1558,8 +1797,8 @@ static ir_node *equivalent_node_Mux(ir_node *n)
 
                        switch (proj_nr) {
                                case pn_Cmp_Eq:
-                                       if ((cmp_l == t && cmp_r == f) || /* Psi(t == f, t, f) -> f */
-                                                       (cmp_l == f && cmp_r == t)) { /* Psi(f == t, t, f) -> f */
+                                       if ((cmp_l == t && cmp_r == f) || /* Mux(t == f, t, f) -> f */
+                                                       (cmp_l == f && cmp_r == t)) { /* Mux(f == t, t, f) -> f */
                                                n = f;
                                                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_TRANSFORM);
                                                return n;
@@ -1568,8 +1807,8 @@ static ir_node *equivalent_node_Mux(ir_node *n)
 
                                case pn_Cmp_Lg:
                                case pn_Cmp_Ne:
-                                       if ((cmp_l == t && cmp_r == f) || /* Psi(t != f, t, f) -> t */
-                                                       (cmp_l == f && cmp_r == t)) { /* Psi(f != t, t, f) -> t */
+                                       if ((cmp_l == t && cmp_r == f) || /* Mux(t != f, t, f) -> t */
+                                                       (cmp_l == f && cmp_r == t)) { /* Mux(f != t, t, f) -> t */
                                                n = t;
                                                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_TRANSFORM);
                                                return n;
@@ -1581,7 +1820,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) */
@@ -1601,40 +1840,6 @@ static ir_node *equivalent_node_Mux(ir_node *n)
        return n;
 }  /* equivalent_node_Mux */
 
-/**
- * Returns a equivalent node of a Psi: if a condition is true
- * and all previous conditions are false we know its value.
- * If all conditions are false its value is the default one.
- */
-static ir_node *equivalent_node_Psi(ir_node *n) {
-       if (is_Mux(n))
-               return equivalent_node_Mux(n);
-       return n;
-}  /* equivalent_node_Psi */
-
-/**
- * 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.
@@ -1643,78 +1848,20 @@ 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;
+               n    = pred;
+               pred = get_Confirm_value(n);
+               pnc  = get_Confirm_cmp(n);
        }
        if (get_opt_remove_confirm())
                return get_Confirm_value(n);
        return 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());
-       }
-       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
  * perform no actual computation, as, e.g., the Id nodes.  It does not create
@@ -1743,44 +1890,50 @@ static ir_op_ops *firm_set_default_equivalent_node(ir_opcode code, ir_op_ops *op
        case iro_##a:                                    \
                ops->equivalent_node  = equivalent_node_##a; \
                break
+#define CASE_PROJ(a)                                          \
+       case iro_##a:                                             \
+               ops->equivalent_node_Proj = equivalent_node_Proj_##a; \
+               break
 
        switch (code) {
        CASE(Block);
        CASE(Jmp);
        CASE(Raise);
-       CASE(Or);
-       CASE(Add);
        CASE(Eor);
-       CASE(Sub);
+       CASE(Add);
        CASE(Shl);
        CASE(Shr);
        CASE(Shrs);
        CASE(Rotl);
+       CASE(Sub);
        CASE(Not);
        CASE(Minus);
        CASE(Mul);
-       CASE(Div);
-       CASE(Quot);
-       CASE(DivMod);
+       CASE(Or);
        CASE(And);
        CASE(Conv);
        CASE(Cast);
        CASE(Phi);
        CASE(Sync);
+       CASE_PROJ(Tuple);
+       CASE_PROJ(Div);
+       CASE_PROJ(Quot);
+       CASE_PROJ(DivMod);
+       CASE_PROJ(CopyB);
+       CASE_PROJ(Bound);
+       CASE_PROJ(Load);
+       CASE_PROJ(Store);
        CASE(Proj);
        CASE(Id);
        CASE(Mux);
-       CASE(Psi);
-       CASE(Cmp);
        CASE(Confirm);
-       CASE(CopyB);
-       CASE(Bound);
        default:
                /* leave NULL */;
        }
 
        return ops;
 #undef CASE
+#undef CASE_PROJ
 }  /* firm_set_default_equivalent_node */
 
 /**
@@ -1792,12 +1945,38 @@ static int is_const_Phi(ir_node *n) {
 
        if (! is_Phi(n) || get_irn_arity(n) == 0)
                return 0;
-       for (i = get_irn_arity(n) - 1; i >= 0; --i)
+       for (i = get_irn_arity(n) - 1; i >= 0; --i) {
                if (! is_Const(get_irn_n(n, i)))
                        return 0;
-               return 1;
+       }
+       return 1;
 }  /* is_const_Phi */
 
+typedef tarval *(*tarval_sub_type)(tarval *a, tarval *b, ir_mode *mode);
+typedef tarval *(*tarval_binop_type)(tarval *a, tarval *b);
+
+/**
+ * in reality eval_func should be tarval (*eval_func)() but incomplete
+ * declarations are bad style and generate noisy warnings
+ */
+typedef void (*eval_func)(void);
+
+/**
+ * Wrapper for the tarval binop evaluation, tarval_sub has one more parameter.
+ */
+static tarval *do_eval(eval_func eval, tarval *a, tarval *b, ir_mode *mode)
+{
+       if (eval == (eval_func) 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).
  *
@@ -1809,7 +1988,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, eval_func eval, ir_mode *mode, int left) {
        tarval   *tv;
        void     **res;
        ir_node  *pred;
@@ -1821,7 +2000,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 */
@@ -1833,7 +2012,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 */
@@ -1845,10 +2024,9 @@ static ir_node *apply_binop_on_phi(ir_node *phi, tarval *other, tarval *(*eval)(
        irg  = current_ir_graph;
        for (i = 0; i < n; ++i) {
                pred = get_irn_n(phi, i);
-               res[i] = new_r_Const_type(irg, get_irg_start_block(irg),
-                       mode, res[i], get_Const_type(pred));
+               res[i] = new_r_Const_type(irg, res[i], get_Const_type(pred));
        }
-       return new_r_Phi(irg, get_nodes_block(phi), n, (ir_node **)res, mode);
+       return new_r_Phi(get_nodes_block(phi), n, (ir_node **)res, mode);
 }  /* apply_binop_on_phi */
 
 /**
@@ -1861,7 +2039,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, eval_func eval, ir_mode *mode) {
        tarval   *tv_l, *tv_r, *tv;
        void     **res;
        ir_node  *pred;
@@ -1879,7 +2057,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 */
@@ -1890,9 +2068,9 @@ static ir_node *apply_binop_on_2_phis(ir_node *a, ir_node *b, tarval *(*eval)(ta
        irg  = current_ir_graph;
        for (i = 0; i < n; ++i) {
                pred = get_irn_n(a, i);
-               res[i] = new_r_Const_type(irg, get_irg_start_block(irg), mode, res[i], get_Const_type(pred));
+               res[i] = new_r_Const_type(irg, res[i], get_Const_type(pred));
        }
-       return new_r_Phi(irg, get_nodes_block(a), n, (ir_node **)res, mode);
+       return new_r_Phi(get_nodes_block(a), n, (ir_node **)res, mode);
 }  /* apply_binop_on_2_phis */
 
 /**
@@ -1927,10 +2105,9 @@ static ir_node *apply_unop_on_phi(ir_node *phi, tarval *(*eval)(tarval *)) {
        irg  = current_ir_graph;
        for (i = 0; i < n; ++i) {
                pred = get_irn_n(phi, i);
-               res[i] = new_r_Const_type(irg, get_irg_start_block(irg),
-                       mode, res[i], get_Const_type(pred));
+               res[i] = new_r_Const_type(irg, res[i], get_Const_type(pred));
        }
-       return new_r_Phi(irg, get_nodes_block(phi), n, (ir_node **)res, mode);
+       return new_r_Phi(get_nodes_block(phi), n, (ir_node **)res, mode);
 }  /* apply_unop_on_phi */
 
 /**
@@ -1962,10 +2139,9 @@ static ir_node *apply_conv_on_phi(ir_node *phi, ir_mode *mode) {
        irg  = current_ir_graph;
        for (i = 0; i < n; ++i) {
                pred = get_irn_n(phi, i);
-               res[i] = new_r_Const_type(irg, get_irg_start_block(irg),
-                       mode, res[i], get_Const_type(pred));
+               res[i] = new_r_Const_type(irg, res[i], get_Const_type(pred));
        }
-       return new_r_Phi(irg, get_nodes_block(phi), n, (ir_node **)res, mode);
+       return new_r_Phi(get_nodes_block(phi), n, (ir_node **)res, mode);
 }  /* apply_conv_on_phi */
 
 /**
@@ -2035,7 +2211,7 @@ static ir_node *transform_node_AddSub(ir_node *n) {
                                /* convert a AddP(P, *s) into AddP(P, *u) */
                                ir_mode *nm = get_reference_mode_unsigned_eq(mode);
 
-                               ir_node *pre = new_r_Conv(current_ir_graph, get_nodes_block(n), right, nm);
+                               ir_node *pre = new_r_Conv(get_nodes_block(n), right, nm);
                                set_binop_right(n, pre);
                        }
                }
@@ -2100,11 +2276,11 @@ static ir_node *transform_node_Add(ir_node *n) {
                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);
+                       return new_rd_Conv(dbg, get_nodes_block(n), a, mode);
                }
        }
 
-       HANDLE_BINOP_PHI(tarval_add, a, b, c, mode);
+       HANDLE_BINOP_PHI((eval_func) tarval_add, a, b, c, mode);
 
        /* for FP these optimizations are only allowed if fp_strict_algebraic is disabled */
        if (mode_is_float(mode) && (get_irg_fp_model(current_ir_graph) & fp_strict_algebraic))
@@ -2112,15 +2288,15 @@ 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)) {
+               if (!is_irg_state(current_ir_graph, IR_GRAPH_STATE_ARCH_DEP)
+                               && a == b && mode_is_int(mode)) {
                        ir_node *block = get_nodes_block(n);
 
                        n = new_rd_Mul(
                                get_irn_dbg_info(n),
-                               current_ir_graph,
                                block,
                                a,
-                               new_r_Const_long(current_ir_graph, block, mode, 2),
+                               new_Const_long(mode, 2),
                                mode);
                        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_A_A);
                        return n;
@@ -2128,8 +2304,7 @@ static ir_node *transform_node_Add(ir_node *n) {
                if (is_Minus(a)) {
                        n = new_rd_Sub(
                                        get_irn_dbg_info(n),
-                                       current_ir_graph,
-                                       get_irn_n(n, -1),
+                                       get_nodes_block(n),
                                        b,
                                        get_Minus_op(a),
                                        mode);
@@ -2139,8 +2314,7 @@ static ir_node *transform_node_Add(ir_node *n) {
                if (is_Minus(b)) {
                        n = new_rd_Sub(
                                        get_irn_dbg_info(n),
-                                       current_ir_graph,
-                                       get_irn_n(n, -1),
+                                       get_nodes_block(n),
                                        a,
                                        get_Minus_op(b),
                                        mode);
@@ -2154,15 +2328,14 @@ static ir_node *transform_node_Add(ir_node *n) {
 
                                if (is_Const(b) && is_Const_one(b)) {
                                        /* ~x + 1 = -x */
-                                       ir_node *blk = get_irn_n(n, -1);
-                                       n = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, blk, op, mode);
+                                       ir_node *blk = get_nodes_block(n);
+                                       n = new_rd_Minus(get_irn_dbg_info(n), blk, op, mode);
                                        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_NOT_PLUS_1);
                                        return n;
                                }
                                if (op == b) {
                                        /* ~x + x = -1 */
-                                       ir_node *blk = get_irn_n(n, -1);
-                                       n = new_r_Const(current_ir_graph, blk, mode, get_mode_minus_one(mode));
+                                       n = new_Const(get_mode_minus_one(mode));
                                        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_X_NOT_X);
                                        return n;
                                }
@@ -2172,8 +2345,7 @@ static ir_node *transform_node_Add(ir_node *n) {
 
                                if (op == a) {
                                        /* x + ~x = -1 */
-                                       ir_node *blk = get_irn_n(n, -1);
-                                       n = new_r_Const(current_ir_graph, blk, mode, get_mode_minus_one(mode));
+                                       n = new_Const(get_mode_minus_one(mode));
                                        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_X_NOT_X);
                                        return n;
                                }
@@ -2190,10 +2362,8 @@ static ir_node *const_negate(ir_node *cnst) {
        tarval   *tv    = tarval_neg(get_Const_tarval(cnst));
        dbg_info *dbgi  = get_irn_dbg_info(cnst);
        ir_graph *irg   = get_irn_irg(cnst);
-       ir_node  *block = get_nodes_block(cnst);
-       ir_mode  *mode  = get_irn_mode(cnst);
        if (tv == tarval_bad) return NULL;
-       return new_rd_Const(dbgi, irg, block, mode, tv);
+       return new_rd_Const(dbgi, irg, tv);
 }
 
 /**
@@ -2224,62 +2394,83 @@ static ir_node *transform_node_Sub(ir_node *n) {
                if (is_Const(b) && is_Const_null(b) && mode_is_reference(lmode)) {
                        /* a Sub(a, NULL) is a hidden Conv */
                        dbg_info *dbg = get_irn_dbg_info(n);
-                       return new_rd_Conv(dbg, current_ir_graph, get_nodes_block(n), a, mode);
+                       n = new_rd_Conv(dbg, get_nodes_block(n), a, mode);
+                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_TO_CONV);
+                       return n;
+               }
+
+               if (mode == lmode                                     &&
+                   get_mode_arithmetic(mode) == irma_twos_complement &&
+                   is_Const(a)                                       &&
+                   get_Const_tarval(a) == get_mode_minus_one(mode)) {
+                       /* -1 - x -> ~x */
+                       dbg_info *dbg = get_irn_dbg_info(n);
+                       n = new_rd_Not(dbg, get_nodes_block(n), b, mode);
+                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_TO_NOT);
+                       return n;
                }
        }
 
 restart:
-       HANDLE_BINOP_PHI(tarval_sub, a, b, c, mode);
+       HANDLE_BINOP_PHI((eval_func) tarval_sub, a, b, c, mode);
 
        /* for FP these optimizations are only allowed if fp_strict_algebraic is disabled */
        if (mode_is_float(mode) && (get_irg_fp_model(current_ir_graph) & fp_strict_algebraic))
                return n;
 
-       if (is_Const(b) && get_irn_mode(b) != mode_P) {
+       if (is_Const(b) && !mode_is_reference(get_irn_mode(b))) {
                /* a - C -> a + (-C) */
                ir_node *cnst = const_negate(b);
                if (cnst != NULL) {
                        ir_node  *block = get_nodes_block(n);
                        dbg_info *dbgi  = get_irn_dbg_info(n);
-                       ir_graph *irg   = get_irn_irg(n);
 
-                       n = new_rd_Add(dbgi, irg, block, a, cnst, mode);
+                       n = new_rd_Add(dbgi, block, a, cnst, mode);
                        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_TO_ADD);
                        return n;
                }
        }
 
        if (is_Minus(a)) { /* (-a) - b -> -(a + b) */
-               ir_graph *irg   = current_ir_graph;
                dbg_info *dbg   = get_irn_dbg_info(n);
                ir_node  *block = get_nodes_block(n);
                ir_node  *left  = get_Minus_op(a);
-               ir_node  *add   = new_rd_Add(dbg, irg, block, left, b, mode);
+               ir_node  *add   = new_rd_Add(dbg, block, left, b, mode);
 
-               n = new_rd_Minus(dbg, irg, block, add, mode);
+               n = new_rd_Minus(dbg, block, add, mode);
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_TO_ADD);
                return n;
        } else if (is_Minus(b)) { /* a - (-b) -> a + b */
-               ir_graph *irg   = current_ir_graph;
                dbg_info *dbg   = get_irn_dbg_info(n);
                ir_node  *block = get_nodes_block(n);
                ir_node  *right = get_Minus_op(b);
 
-               n = new_rd_Add(dbg, irg, block, a, right, mode);
+               n = new_rd_Add(dbg, block, a, right, mode);
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_MINUS);
                return n;
-       } else if (is_Sub(b)) { /* a - (b - c) -> a + (c - b) */
-               ir_graph *irg     = current_ir_graph;
+       } else if (is_Sub(b)) {
+               /* a - (b - c) -> a + (c - b)
+                *             -> (a - b) + c iff (b - c) is a pointer */
                dbg_info *s_dbg   = get_irn_dbg_info(b);
                ir_node  *s_block = get_nodes_block(b);
-               ir_node  *s_left  = get_Sub_right(b);
-               ir_node  *s_right = get_Sub_left(b);
+               ir_node  *s_left  = get_Sub_left(b);
+               ir_node  *s_right = get_Sub_right(b);
                ir_mode  *s_mode  = get_irn_mode(b);
-               ir_node  *sub     = new_rd_Sub(s_dbg, irg, s_block, s_left, s_right, s_mode);
-               dbg_info *a_dbg   = get_irn_dbg_info(n);
-               ir_node  *a_block = get_nodes_block(n);
+               if (mode_is_reference(s_mode)) {
+                       ir_node  *sub     = new_rd_Sub(s_dbg, s_block, a, s_left, mode);
+                       dbg_info *a_dbg   = get_irn_dbg_info(n);
+                       ir_node  *a_block = get_nodes_block(n);
+
+                       if (s_mode != mode)
+                               s_right = new_r_Conv(a_block, s_right, mode);
+                       n = new_rd_Add(a_dbg, a_block, sub, s_right, mode);
+               } else {
+                       ir_node  *sub     = new_rd_Sub(s_dbg, s_block, s_right, s_left, s_mode);
+                       dbg_info *a_dbg   = get_irn_dbg_info(n);
+                       ir_node  *a_block = get_nodes_block(n);
 
-               n = new_rd_Add(a_dbg, irg, a_block, a, sub, mode);
+                       n = new_rd_Add(a_dbg, a_block, a, sub, mode);
+               }
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_TO_ADD);
                return n;
        } else if (is_Mul(b)) { /* a - (b * C) -> a + (b * -C) */
@@ -2287,16 +2478,15 @@ restart:
                if (is_Const(m_right)) {
                        ir_node *cnst2 = const_negate(m_right);
                        if (cnst2 != NULL) {
-                               ir_graph *irg     = current_ir_graph;
                                dbg_info *m_dbg   = get_irn_dbg_info(b);
                                ir_node  *m_block = get_nodes_block(b);
                                ir_node  *m_left  = get_Mul_left(b);
                                ir_mode  *m_mode  = get_irn_mode(b);
-                               ir_node  *mul     = new_rd_Mul(m_dbg, irg, m_block, m_left, cnst2, m_mode);
+                               ir_node  *mul     = new_rd_Mul(m_dbg, m_block, m_left, cnst2, m_mode);
                                dbg_info *a_dbg   = get_irn_dbg_info(n);
                                ir_node  *a_block = get_nodes_block(n);
 
-                               n = new_rd_Add(a_dbg, irg, a_block, a, mul, mode);
+                               n = new_rd_Add(a_dbg, a_block, a, mul, mode);
                                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_TO_ADD);
                                return n;
                        }
@@ -2307,8 +2497,7 @@ restart:
        if (mode_is_num(mode) && mode == get_irn_mode(a) && is_Const(a) && is_Const_null(a)) {
                n = new_rd_Minus(
                                get_irn_dbg_info(n),
-                               current_ir_graph,
-                               get_irn_n(n, -1),
+                               get_nodes_block(n),
                                b,
                                mode);
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_0_A);
@@ -2323,7 +2512,7 @@ restart:
                        if (left == b) {
                                if (mode != get_irn_mode(right)) {
                                        /* This Sub is an effective Cast */
-                                       right = new_r_Conv(get_irn_irg(n), get_irn_n(n, -1), right, mode);
+                                       right = new_r_Conv(get_nodes_block(n), right, mode);
                                }
                                n = right;
                                DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_ADD_SUB);
@@ -2331,7 +2520,7 @@ restart:
                        } else if (right == b) {
                                if (mode != get_irn_mode(left)) {
                                        /* This Sub is an effective Cast */
-                                       left = new_r_Conv(get_irn_irg(n), get_irn_n(n, -1), left, mode);
+                                       left = new_r_Conv(get_nodes_block(n), left, mode);
                                }
                                n = left;
                                DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_ADD_SUB);
@@ -2348,20 +2537,20 @@ restart:
                        if (left == a) {
                                ir_mode *r_mode = get_irn_mode(right);
 
-                               n = new_r_Minus(get_irn_irg(n), get_irn_n(n, -1), right, r_mode);
+                               n = new_r_Minus(get_nodes_block(n), right, r_mode);
                                if (mode != r_mode) {
                                        /* This Sub is an effective Cast */
-                                       n = new_r_Conv(get_irn_irg(n), get_irn_n(n, -1), n, mode);
+                                       n = new_r_Conv(get_nodes_block(n), n, mode);
                                }
                                DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_ADD_SUB);
                                return n;
                        } else if (right == a) {
                                ir_mode *l_mode = get_irn_mode(left);
 
-                               n = new_r_Minus(get_irn_irg(n), get_irn_n(n, -1), left, l_mode);
+                               n = new_r_Minus(get_nodes_block(n), left, l_mode);
                                if (mode != l_mode) {
                                        /* This Sub is an effective Cast */
-                                       n = new_r_Conv(get_irn_irg(n), get_irn_n(n, -1), n, mode);
+                                       n = new_r_Conv(get_nodes_block(n), n, mode);
                                }
                                DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_ADD_SUB);
                                return n;
@@ -2396,31 +2585,31 @@ restart:
                ir_node *mb = get_Mul_right(a);
 
                if (ma == b) {
-                       ir_node *blk = get_irn_n(n, -1);
+                       ir_node *blk = get_nodes_block(n);
                        n = new_rd_Mul(
                                        get_irn_dbg_info(n),
-                                       current_ir_graph, blk,
+                                       blk,
                                        ma,
                                        new_rd_Sub(
                                                get_irn_dbg_info(n),
-                                               current_ir_graph, blk,
+                                               blk,
                                                mb,
-                                               new_r_Const_long(current_ir_graph, blk, mode, 1),
+                                               new_Const_long(mode, 1),
                                                mode),
                                        mode);
                        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_MUL_A_X_A);
                        return n;
                } else if (mb == b) {
-                       ir_node *blk = get_irn_n(n, -1);
+                       ir_node *blk = get_nodes_block(n);
                        n = new_rd_Mul(
                                        get_irn_dbg_info(n),
-                                       current_ir_graph, blk,
+                                       blk,
                                        mb,
                                        new_rd_Sub(
                                                get_irn_dbg_info(n),
-                                               current_ir_graph, blk,
+                                               blk,
                                                ma,
-                                               new_r_Const_long(current_ir_graph, blk, mode, 1),
+                                               new_Const_long(mode, 1),
                                                mode),
                                        mode);
                        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_MUL_A_X_A);
@@ -2428,9 +2617,9 @@ restart:
                }
        }
        if (is_Sub(a)) { /* (x - y) - b -> x - (y + b) */
-               ir_node *x   =      get_Sub_left(a);
+               ir_node *x        = get_Sub_left(a);
                ir_node *y        = get_Sub_right(a);
-               ir_node *blk      = get_irn_n(n, -1);
+               ir_node *blk      = get_nodes_block(n);
                ir_mode *m_b      = get_irn_mode(b);
                ir_mode *m_y      = get_irn_mode(y);
                ir_mode *add_mode;
@@ -2453,9 +2642,9 @@ restart:
                        return n;
                }
 
-               add = new_r_Add(current_ir_graph, blk, y, b, add_mode);
+               add = new_r_Add(blk, y, b, add_mode);
 
-               n = new_rd_Sub(get_irn_dbg_info(n), current_ir_graph, blk, x, add, mode);
+               n = new_rd_Sub(get_irn_dbg_info(n), blk, x, add, mode);
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_SUB_X_Y_Z);
                return n;
        }
@@ -2467,9 +2656,9 @@ restart:
 
                        tv = tarval_add(tv, get_mode_one(mode));
                        if (tv != tarval_bad) {
-                               ir_node *blk = get_irn_n(n, -1);
-                               ir_node *c = new_r_Const(current_ir_graph, blk, mode, tv);
-                               n = new_rd_Add(get_irn_dbg_info(n), current_ir_graph, blk, get_Not_op(b), c, mode);
+                               ir_node *blk = get_nodes_block(n);
+                               ir_node *c = new_Const(tv);
+                               n = new_rd_Add(get_irn_dbg_info(n), blk, get_Not_op(b), c, mode);
                                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_C_NOT_X);
                                return n;
                        }
@@ -2492,31 +2681,31 @@ static ir_node *transform_node_Mul2n(ir_node *n, ir_mode *mode) {
 
        if (ta == get_mode_one(smode)) {
                /* (L)1 * (L)b = (L)b */
-               ir_node *blk = get_irn_n(n, -1);
-               n = new_rd_Conv(get_irn_dbg_info(n), current_ir_graph, blk, b, mode);
+               ir_node *blk = get_nodes_block(n);
+               n = new_rd_Conv(get_irn_dbg_info(n), blk, b, mode);
                DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_NEUTRAL_1);
                return n;
        }
        else if (ta == get_mode_minus_one(smode)) {
                /* (L)-1 * (L)b = (L)b */
-               ir_node *blk = get_irn_n(n, -1);
-               n = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, blk, b, smode);
-               n = new_rd_Conv(get_irn_dbg_info(n), current_ir_graph, blk, n, mode);
+               ir_node *blk = get_nodes_block(n);
+               n = new_rd_Minus(get_irn_dbg_info(n), blk, b, smode);
+               n = new_rd_Conv(get_irn_dbg_info(n), blk, n, mode);
                DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_MUL_MINUS_1);
                return n;
        }
        if (tb == get_mode_one(smode)) {
                /* (L)a * (L)1 = (L)a */
                ir_node *blk = get_irn_n(a, -1);
-               n = new_rd_Conv(get_irn_dbg_info(n), current_ir_graph, blk, a, mode);
+               n = new_rd_Conv(get_irn_dbg_info(n), blk, a, mode);
                DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_NEUTRAL_1);
                return n;
        }
        else if (tb == get_mode_minus_one(smode)) {
                /* (L)a * (L)-1 = (L)-a */
-               ir_node *blk = get_irn_n(n, -1);
-               n = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, blk, a, smode);
-               n = new_rd_Conv(get_irn_dbg_info(n), current_ir_graph, blk, n, mode);
+               ir_node *blk = get_nodes_block(n);
+               n = new_rd_Minus(get_irn_dbg_info(n), blk, a, smode);
+               n = new_rd_Conv(get_irn_dbg_info(n), blk, n, mode);
                DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_MUL_MINUS_1);
                return n;
        }
@@ -2540,7 +2729,7 @@ static ir_node *transform_node_Mul(ir_node *n) {
        if (mode != get_irn_mode(a))
                return transform_node_Mul2n(n, mode);
 
-       HANDLE_BINOP_PHI(tarval_mul, a, b, c, mode);
+       HANDLE_BINOP_PHI((eval_func) tarval_mul, a, b, c, mode);
 
        if (mode_is_signed(mode)) {
                ir_node *r = NULL;
@@ -2550,7 +2739,7 @@ static ir_node *transform_node_Mul(ir_node *n) {
                else if (value_of(b) == get_mode_minus_one(mode))
                        r = a;
                if (r) {
-                       n = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, get_irn_n(n, -1), r, mode);
+                       n = new_rd_Minus(get_irn_dbg_info(n), get_nodes_block(n), r, mode);
                        DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_MUL_MINUS_1);
                        return n;
                }
@@ -2561,24 +2750,23 @@ static ir_node *transform_node_Mul(ir_node *n) {
                        if (cnst != NULL) {
                                dbg_info *dbgi  = get_irn_dbg_info(n);
                                ir_node  *block = get_nodes_block(n);
-                               n = new_rd_Mul(dbgi, current_ir_graph, block, get_Minus_op(a), cnst, mode);
+                               n = new_rd_Mul(dbgi, block, get_Minus_op(a), cnst, mode);
                                DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_MUL_MINUS_1);
                                return n;
                        }
                } else if (is_Minus(b)) { /* (-a) * (-b) -> a * b */
                        dbg_info *dbgi  = get_irn_dbg_info(n);
                        ir_node  *block = get_nodes_block(n);
-                       n = new_rd_Mul(dbgi, current_ir_graph, block, get_Minus_op(a), get_Minus_op(b), mode);
+                       n = new_rd_Mul(dbgi, block, get_Minus_op(a), get_Minus_op(b), mode);
                        DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_MUL_MINUS_MINUS);
                        return n;
                } else if (is_Sub(b)) { /* (-a) * (b - c) -> a * (c - b) */
                        ir_node  *sub_l = get_Sub_left(b);
                        ir_node  *sub_r = get_Sub_right(b);
                        dbg_info *dbgi  = get_irn_dbg_info(n);
-                       ir_graph *irg   = current_ir_graph;
                        ir_node  *block = get_nodes_block(n);
-                       ir_node  *new_b = new_rd_Sub(dbgi, irg, block, sub_r, sub_l, mode);
-                       n = new_rd_Mul(dbgi, irg, block, get_Minus_op(a), new_b, mode);
+                       ir_node  *new_b = new_rd_Sub(dbgi, block, sub_r, sub_l, mode);
+                       n = new_rd_Mul(dbgi, block, get_Minus_op(a), new_b, mode);
                        DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_MUL_MINUS);
                        return n;
                }
@@ -2587,29 +2775,52 @@ static ir_node *transform_node_Mul(ir_node *n) {
                        ir_node  *sub_l = get_Sub_left(a);
                        ir_node  *sub_r = get_Sub_right(a);
                        dbg_info *dbgi  = get_irn_dbg_info(n);
-                       ir_graph *irg   = current_ir_graph;
                        ir_node  *block = get_nodes_block(n);
-                       ir_node  *new_a = new_rd_Sub(dbgi, irg, block, sub_r, sub_l, mode);
-                       n = new_rd_Mul(dbgi, irg, block, new_a, get_Minus_op(b), mode);
+                       ir_node  *new_a = new_rd_Sub(dbgi, block, sub_r, sub_l, mode);
+                       n = new_rd_Mul(dbgi, block, new_a, get_Minus_op(b), mode);
                        DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_MUL_MINUS);
                        return n;
                }
+       } else if (is_Shl(a)) {
+               ir_node *const shl_l = get_Shl_left(a);
+               if (is_Const(shl_l) && is_Const_one(shl_l)) {
+                       /* (1 << x) * b -> b << x */
+                       dbg_info *const dbgi  = get_irn_dbg_info(n);
+                       ir_node  *const block = get_nodes_block(n);
+                       ir_node  *const shl_r = get_Shl_right(a);
+                       n = new_rd_Shl(dbgi, block, b, shl_r, mode);
+                       // TODO add me DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_MUL_SHIFT);
+                       return n;
+               }
+       } else if (is_Shl(b)) {
+               ir_node *const shl_l = get_Shl_left(b);
+               if (is_Const(shl_l) && is_Const_one(shl_l)) {
+                       /* a * (1 << x) -> a << x */
+                       dbg_info *const dbgi  = get_irn_dbg_info(n);
+                       ir_node  *const block = get_nodes_block(n);
+                       ir_node  *const shl_r = get_Shl_right(b);
+                       n = new_rd_Shl(dbgi, block, a, shl_r, mode);
+                       // TODO add me DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_MUL_SHIFT);
+                       return n;
+               }
        }
        if (get_mode_arithmetic(mode) == irma_ieee754) {
                if (is_Const(a)) {
                        tarval *tv = get_Const_tarval(a);
-                       if (tarval_ieee754_get_exponent(tv) == 1 && tarval_ieee754_zero_mantissa(tv)) {
+                       if (tarval_ieee754_get_exponent(tv) == 1 && tarval_ieee754_zero_mantissa(tv)
+                                       && !tarval_is_negative(tv)) {
                                /* 2.0 * b = b + b */
-                               n = new_rd_Add(get_irn_dbg_info(n), current_ir_graph, get_nodes_block(n), b, b, mode);
+                               n = new_rd_Add(get_irn_dbg_info(n), get_nodes_block(n), b, b, mode);
                                DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_ADD_A_A);
                                return n;
                        }
                }
                else if (is_Const(b)) {
                        tarval *tv = get_Const_tarval(b);
-                       if (tarval_ieee754_get_exponent(tv) == 1 && tarval_ieee754_zero_mantissa(tv)) {
+                       if (tarval_ieee754_get_exponent(tv) == 1 && tarval_ieee754_zero_mantissa(tv)
+                                       && !tarval_is_negative(tv)) {
                                /* a * 2.0 = a + a */
-                               n = new_rd_Add(get_irn_dbg_info(n), current_ir_graph, get_nodes_block(n), a, a, mode);
+                               n = new_rd_Add(get_irn_dbg_info(n), get_nodes_block(n), a, a, mode);
                                DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_ADD_A_A);
                                return n;
                        }
@@ -2626,11 +2837,11 @@ static ir_node *transform_node_Div(ir_node *n) {
        ir_node *a = get_Div_left(n);
        ir_node *b = get_Div_right(n);
        ir_node *value;
-       tarval  *tv;
+       const ir_node *dummy;
 
        if (is_Const(b) && is_const_Phi(a)) {
                /* check for Div(Phi, Const) */
-               value = apply_binop_on_phi(a, get_Const_tarval(b), tarval_div, mode, 0);
+               value = apply_binop_on_phi(a, get_Const_tarval(b), (eval_func) tarval_div, mode, 0);
                if (value) {
                        DBG_OPT_ALGSIM0(n, value, FS_OPT_CONST_PHI);
                        goto make_tuple;
@@ -2638,7 +2849,7 @@ static ir_node *transform_node_Div(ir_node *n) {
        }
        else if (is_Const(a) && is_const_Phi(b)) {
                /* check for Div(Const, Phi) */
-               value = apply_binop_on_phi(b, get_Const_tarval(a), tarval_div, mode, 1);
+               value = apply_binop_on_phi(b, get_Const_tarval(a), (eval_func) tarval_div, mode, 1);
                if (value) {
                        DBG_OPT_ALGSIM0(n, value, FS_OPT_CONST_PHI);
                        goto make_tuple;
@@ -2646,7 +2857,7 @@ static ir_node *transform_node_Div(ir_node *n) {
        }
        else if (is_const_Phi(a) && is_const_Phi(b)) {
                /* check for Div(Phi, Phi) */
-               value = apply_binop_on_2_phis(a, b, tarval_div, mode);
+               value = apply_binop_on_2_phis(a, b, (eval_func) tarval_div, mode);
                if (value) {
                        DBG_OPT_ALGSIM0(n, value, FS_OPT_CONST_PHI);
                        goto make_tuple;
@@ -2654,36 +2865,25 @@ static ir_node *transform_node_Div(ir_node *n) {
        }
 
        value = n;
-       tv = value_of(n);
-       if (tv != tarval_bad) {
-               value = new_Const(get_tarval_mode(tv), tv);
 
+       if (a == b && value_not_zero(a, &dummy)) {
+               /* BEWARE: we can optimize a/a to 1 only if this cannot cause a exception */
+               value = new_Const(get_mode_one(mode));
                DBG_OPT_CSTEVAL(n, value);
                goto make_tuple;
        } else {
-               ir_node *a = get_Div_left(n);
-               ir_node *b = get_Div_right(n);
-               ir_node *dummy;
-
-               if (a == b && value_not_zero(a, &dummy)) {
-                       /* BEWARE: we can optimize a/a to 1 only if this cannot cause a exception */
-                       value = new_Const(mode, get_mode_one(mode));
-                       DBG_OPT_CSTEVAL(n, value);
-                       goto make_tuple;
-               } else {
-                       if (mode_is_signed(mode) && is_Const(b)) {
-                               tarval *tv = get_Const_tarval(b);
+               if (mode_is_signed(mode) && is_Const(b)) {
+                       tarval *tv = get_Const_tarval(b);
 
-                               if (tv == get_mode_minus_one(mode)) {
-                                       /* a / -1 */
-                                       value = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, get_irn_n(n, -1), a, mode);
-                                       DBG_OPT_CSTEVAL(n, value);
-                                       goto make_tuple;
-                               }
+                       if (tv == get_mode_minus_one(mode)) {
+                               /* a / -1 */
+                               value = new_rd_Minus(get_irn_dbg_info(n), get_nodes_block(n), a, mode);
+                               DBG_OPT_CSTEVAL(n, value);
+                               goto make_tuple;
                        }
-                       /* Try architecture dependent optimization */
-                       value = arch_dep_replace_div_by_const(n);
                }
+               /* Try architecture dependent optimization */
+               value = arch_dep_replace_div_by_const(n);
        }
 
        if (value != n) {
@@ -2692,14 +2892,13 @@ static ir_node *transform_node_Div(ir_node *n) {
 make_tuple:
                /* Turn Div into a tuple (mem, jmp, bad, value) */
                mem = get_Div_mem(n);
-               blk = get_irn_n(n, -1);
+               blk = get_nodes_block(n);
 
                /* skip a potential Pin */
-               if (is_Pin(mem))
-                       mem = get_Pin_op(mem);
+               mem = skip_Pin(mem);
                turn_into_tuple(n, pn_Div_max);
                set_Tuple_pred(n, pn_Div_M,         mem);
-               set_Tuple_pred(n, pn_Div_X_regular, new_r_Jmp(current_ir_graph, blk));
+               set_Tuple_pred(n, pn_Div_X_regular, new_r_Jmp(blk));
                set_Tuple_pred(n, pn_Div_X_except,  new_Bad());
                set_Tuple_pred(n, pn_Div_res,       value);
        }
@@ -2718,7 +2917,7 @@ static ir_node *transform_node_Mod(ir_node *n) {
 
        if (is_Const(b) && is_const_Phi(a)) {
                /* check for Div(Phi, Const) */
-               value = apply_binop_on_phi(a, get_Const_tarval(b), tarval_mod, mode, 0);
+               value = apply_binop_on_phi(a, get_Const_tarval(b), (eval_func) tarval_mod, mode, 0);
                if (value) {
                        DBG_OPT_ALGSIM0(n, value, FS_OPT_CONST_PHI);
                        goto make_tuple;
@@ -2726,7 +2925,7 @@ static ir_node *transform_node_Mod(ir_node *n) {
        }
        else if (is_Const(a) && is_const_Phi(b)) {
                /* check for Div(Const, Phi) */
-               value = apply_binop_on_phi(b, get_Const_tarval(a), tarval_mod, mode, 1);
+               value = apply_binop_on_phi(b, get_Const_tarval(a), (eval_func) tarval_mod, mode, 1);
                if (value) {
                        DBG_OPT_ALGSIM0(n, value, FS_OPT_CONST_PHI);
                        goto make_tuple;
@@ -2734,7 +2933,7 @@ static ir_node *transform_node_Mod(ir_node *n) {
        }
        else if (is_const_Phi(a) && is_const_Phi(b)) {
                /* check for Div(Phi, Phi) */
-               value = apply_binop_on_2_phis(a, b, tarval_mod, mode);
+               value = apply_binop_on_2_phis(a, b, (eval_func) tarval_mod, mode);
                if (value) {
                        DBG_OPT_ALGSIM0(n, value, FS_OPT_CONST_PHI);
                        goto make_tuple;
@@ -2744,18 +2943,18 @@ static ir_node *transform_node_Mod(ir_node *n) {
        value = n;
        tv = value_of(n);
        if (tv != tarval_bad) {
-               value = new_Const(get_tarval_mode(tv), tv);
+               value = new_Const(tv);
 
                DBG_OPT_CSTEVAL(n, value);
                goto make_tuple;
        } else {
-               ir_node *a = get_Mod_left(n);
-               ir_node *b = get_Mod_right(n);
-               ir_node *dummy;
+               ir_node       *a = get_Mod_left(n);
+               ir_node       *b = get_Mod_right(n);
+               const ir_node *dummy;
 
                if (a == b && value_not_zero(a, &dummy)) {
                        /* BEWARE: we can optimize a%a to 0 only if this cannot cause a exception */
-                       value = new_Const(mode, get_mode_null(mode));
+                       value = new_Const(get_mode_null(mode));
                        DBG_OPT_CSTEVAL(n, value);
                        goto make_tuple;
                } else {
@@ -2764,7 +2963,7 @@ static ir_node *transform_node_Mod(ir_node *n) {
 
                                if (tv == get_mode_minus_one(mode)) {
                                        /* a % -1 = 0 */
-                                       value = new_Const(mode, get_mode_null(mode));
+                                       value = new_Const(get_mode_null(mode));
                                        DBG_OPT_CSTEVAL(n, value);
                                        goto make_tuple;
                                }
@@ -2780,14 +2979,13 @@ static ir_node *transform_node_Mod(ir_node *n) {
 make_tuple:
                /* Turn Mod into a tuple (mem, jmp, bad, value) */
                mem = get_Mod_mem(n);
-               blk = get_irn_n(n, -1);
+               blk = get_nodes_block(n);
 
                /* skip a potential Pin */
-               if (is_Pin(mem))
-                       mem = get_Pin_op(mem);
+               mem = skip_Pin(mem);
                turn_into_tuple(n, pn_Mod_max);
                set_Tuple_pred(n, pn_Mod_M,         mem);
-               set_Tuple_pred(n, pn_Mod_X_regular, new_r_Jmp(current_ir_graph, blk));
+               set_Tuple_pred(n, pn_Mod_X_regular, new_r_Jmp(blk));
                set_Tuple_pred(n, pn_Mod_X_except,  new_Bad());
                set_Tuple_pred(n, pn_Mod_res,       value);
        }
@@ -2798,18 +2996,18 @@ make_tuple:
  * Transform a DivMod node.
  */
 static ir_node *transform_node_DivMod(ir_node *n) {
-       ir_node *dummy;
-       ir_node *a = get_DivMod_left(n);
-       ir_node *b = get_DivMod_right(n);
-       ir_mode *mode = get_DivMod_resmode(n);
-       tarval *ta, *tb;
-       int evaluated = 0;
-       ir_node *va, *vb;
+       const ir_node *dummy;
+       ir_node       *a = get_DivMod_left(n);
+       ir_node       *b = get_DivMod_right(n);
+       ir_mode       *mode = get_DivMod_resmode(n);
+       ir_node       *va, *vb;
+       tarval        *ta, *tb;
+       int           evaluated = 0;
 
        if (is_Const(b) && is_const_Phi(a)) {
                /* check for Div(Phi, Const) */
-               va = apply_binop_on_phi(a, get_Const_tarval(b), tarval_div, mode, 0);
-               vb = apply_binop_on_phi(a, get_Const_tarval(b), tarval_mod, mode, 0);
+               va = apply_binop_on_phi(a, get_Const_tarval(b), (eval_func) tarval_div, mode, 0);
+               vb = apply_binop_on_phi(a, get_Const_tarval(b), (eval_func) tarval_mod, mode, 0);
                if (va && vb) {
                        DBG_OPT_ALGSIM0(n, va, FS_OPT_CONST_PHI);
                        DBG_OPT_ALGSIM0(n, vb, FS_OPT_CONST_PHI);
@@ -2818,8 +3016,8 @@ static ir_node *transform_node_DivMod(ir_node *n) {
        }
        else if (is_Const(a) && is_const_Phi(b)) {
                /* check for Div(Const, Phi) */
-               va = apply_binop_on_phi(b, get_Const_tarval(a), tarval_div, mode, 1);
-               vb = apply_binop_on_phi(b, get_Const_tarval(a), tarval_mod, mode, 1);
+               va = apply_binop_on_phi(b, get_Const_tarval(a), (eval_func) tarval_div, mode, 1);
+               vb = apply_binop_on_phi(b, get_Const_tarval(a), (eval_func) tarval_mod, mode, 1);
                if (va && vb) {
                        DBG_OPT_ALGSIM0(n, va, FS_OPT_CONST_PHI);
                        DBG_OPT_ALGSIM0(n, vb, FS_OPT_CONST_PHI);
@@ -2828,8 +3026,8 @@ static ir_node *transform_node_DivMod(ir_node *n) {
        }
        else if (is_const_Phi(a) && is_const_Phi(b)) {
                /* check for Div(Phi, Phi) */
-               va = apply_binop_on_2_phis(a, b, tarval_div, mode);
-               vb = apply_binop_on_2_phis(a, b, tarval_mod, mode);
+               va = apply_binop_on_2_phis(a, b, (eval_func) tarval_div, mode);
+               vb = apply_binop_on_2_phis(a, b, (eval_func) tarval_mod, mode);
                if (va && vb) {
                        DBG_OPT_ALGSIM0(n, va, FS_OPT_CONST_PHI);
                        DBG_OPT_ALGSIM0(n, vb, FS_OPT_CONST_PHI);
@@ -2842,7 +3040,7 @@ static ir_node *transform_node_DivMod(ir_node *n) {
        if (tb != tarval_bad) {
                if (tb == get_mode_one(get_tarval_mode(tb))) {
                        va = a;
-                       vb = new_Const(mode, get_mode_null(mode));
+                       vb = new_Const(get_mode_null(mode));
                        DBG_OPT_CSTEVAL(n, vb);
                        goto make_tuple;
                } else if (ta != tarval_bad) {
@@ -2852,14 +3050,14 @@ static ir_node *transform_node_DivMod(ir_node *n) {
                                                             Jmp for X result!? */
                        resb = tarval_mod(ta, tb);
                        if (resb == tarval_bad) return n; /* Causes exception! */
-                       va = new_Const(mode, resa);
-                       vb = new_Const(mode, resb);
+                       va = new_Const(resa);
+                       vb = new_Const(resb);
                        DBG_OPT_CSTEVAL(n, va);
                        DBG_OPT_CSTEVAL(n, vb);
                        goto make_tuple;
                } else if (mode_is_signed(mode) && tb == get_mode_minus_one(mode)) {
-                       va = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, get_irn_n(n, -1), a, mode);
-                       vb = new_Const(mode, get_mode_null(mode));
+                       va = new_rd_Minus(get_irn_dbg_info(n), get_nodes_block(n), a, mode);
+                       vb = new_Const(get_mode_null(mode));
                        DBG_OPT_CSTEVAL(n, va);
                        DBG_OPT_CSTEVAL(n, vb);
                        goto make_tuple;
@@ -2872,8 +3070,8 @@ static ir_node *transform_node_DivMod(ir_node *n) {
        } else if (a == b) {
                if (value_not_zero(a, &dummy)) {
                        /* a/a && a != 0 */
-                       va = new_Const(mode, get_mode_one(mode));
-                       vb = new_Const(mode, get_mode_null(mode));
+                       va = new_Const(get_mode_one(mode));
+                       vb = new_Const(get_mode_null(mode));
                        DBG_OPT_CSTEVAL(n, va);
                        DBG_OPT_CSTEVAL(n, vb);
                        goto make_tuple;
@@ -2893,13 +3091,12 @@ static ir_node *transform_node_DivMod(ir_node *n) {
 make_tuple:
                mem = get_DivMod_mem(n);
                /* skip a potential Pin */
-               if (is_Pin(mem))
-                       mem = get_Pin_op(mem);
+               mem = skip_Pin(mem);
 
-               blk = get_irn_n(n, -1);
+               blk = get_nodes_block(n);
                turn_into_tuple(n, pn_DivMod_max);
                set_Tuple_pred(n, pn_DivMod_M,         mem);
-               set_Tuple_pred(n, pn_DivMod_X_regular, new_r_Jmp(current_ir_graph, blk));
+               set_Tuple_pred(n, pn_DivMod_X_regular, new_r_Jmp(blk));
                set_Tuple_pred(n, pn_DivMod_X_except,  new_Bad());  /* no exception */
                set_Tuple_pred(n, pn_DivMod_res_div,   va);
                set_Tuple_pred(n, pn_DivMod_res_mod,   vb);
@@ -2917,10 +3114,10 @@ static ir_node *transform_node_Quot(ir_node *n) {
 
        if (get_mode_arithmetic(mode) == irma_ieee754) {
                ir_node *b = get_Quot_right(n);
+               tarval *tv = value_of(b);
 
-               if (is_Const(b)) {
-                       tarval *tv = get_Const_tarval(b);
-                       int rem;
+               if (tv != tarval_bad) {
+                       int rem = tarval_fp_ops_enabled();
 
                        /*
                         * Floating point constant folding might be disabled here to
@@ -2928,27 +3125,26 @@ static ir_node *transform_node_Quot(ir_node *n) {
                         * However, as we check for exact result, doing it is safe.
                         * Switch it on.
                         */
-                       rem = tarval_enable_fp_ops(1);
+                       tarval_enable_fp_ops(1);
                        tv = tarval_quo(get_mode_one(mode), tv);
-                       (void)tarval_enable_fp_ops(rem);
+                       tarval_enable_fp_ops(rem);
 
                        /* Do the transformation if the result is either exact or we are not
                           using strict rules. */
                        if (tv != tarval_bad &&
                            (tarval_ieee754_get_exact() || (get_irg_fp_model(current_ir_graph) & fp_strict_algebraic) == 0)) {
-                               ir_node *blk = get_irn_n(n, -1);
-                               ir_node *c = new_r_Const(current_ir_graph, blk, mode, tv);
+                               ir_node *blk = get_nodes_block(n);
+                               ir_node *c = new_Const(tv);
                                ir_node *a = get_Quot_left(n);
-                               ir_node *m = new_rd_Mul(get_irn_dbg_info(n), current_ir_graph, blk, a, c, mode);
+                               ir_node *m = new_rd_Mul(get_irn_dbg_info(n), blk, a, c, mode);
                                ir_node *mem = get_Quot_mem(n);
 
                                /* skip a potential Pin */
-                               if (is_Pin(mem))
-                                       mem = get_Pin_op(mem);
+                               mem = skip_Pin(mem);
                                turn_into_tuple(n, pn_Quot_max);
                                set_Tuple_pred(n, pn_Quot_M, mem);
-                               set_Tuple_pred(n, pn_Quot_X_regular, new_r_Jmp(current_ir_graph, blk));
-                               set_Tuple_pred(n, pn_Quot_X_except,  new_r_Bad(current_ir_graph));
+                               set_Tuple_pred(n, pn_Quot_X_regular, new_r_Jmp(blk));
+                               set_Tuple_pred(n, pn_Quot_X_except,  new_Bad());
                                set_Tuple_pred(n, pn_Quot_res, m);
                                DBG_OPT_ALGSIM1(oldn, a, b, m, FS_OPT_FP_INV_MUL);
                        }
@@ -2981,8 +3177,7 @@ static ir_node *transform_node_Abs(ir_node *n) {
                 * Note that -x would create a new node, so we could
                 * not run it in the equivalent_node() context.
                 */
-               n = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph,
-                               get_nodes_block(n), a, mode);
+               n = new_rd_Minus(get_irn_dbg_info(n), get_nodes_block(n), a, mode);
 
                DBG_OPT_CONFIRM(oldn, n);
                return n;
@@ -2998,14 +3193,38 @@ static ir_node *transform_node_Abs(ir_node *n) {
        if (is_Minus(a)) {
                /* Abs(-x) = Abs(x) */
                mode = get_irn_mode(n);
-               n = new_rd_Abs(get_irn_dbg_info(n), current_ir_graph,
-                               get_nodes_block(n), get_Minus_op(a), mode);
+               n = new_rd_Abs(get_irn_dbg_info(n), get_nodes_block(n), get_Minus_op(a), mode);
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ABS_MINUS_X);
                return 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))) {
+               ir_node *const new_left  = get_Minus_op(right);
+               ir_node *const new_right = get_Minus_op(left);
+               n = new_rd_Cmp(get_irn_dbg_info(n), get_nodes_block(n), new_left, new_right);
+               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_CMP_OP_OP);
+       }
+       return n;
+}  /* transform_node_Cmp */
+
+
 /**
  * Transform a Cond node.
  *
@@ -3028,7 +3247,7 @@ static ir_node *transform_node_Cond(ir_node *n) {
                /* It's a boolean Cond, branching on a boolean constant.
                   Replace it by a tuple (Bad, Jmp) or (Jmp, Bad) */
                ir_node *blk = get_nodes_block(n);
-               jmp = new_r_Jmp(current_ir_graph, blk);
+               jmp = new_r_Jmp(blk);
                turn_into_tuple(n, pn_Cond_max);
                if (ta == tarval_b_true) {
                        set_Tuple_pred(n, pn_Cond_false, new_Bad());
@@ -3066,22 +3285,23 @@ static ir_node *transform_bitwise_distributive(ir_node *n,
        if(op != get_irn_op(b))
                return n;
 
+       /* and(conv(a), conv(b)) -> conv(and(a,b)) */
        if (op == op_Conv) {
                ir_node *a_op   = get_Conv_op(a);
                ir_node *b_op   = get_Conv_op(b);
                ir_mode *a_mode = get_irn_mode(a_op);
                ir_mode *b_mode = get_irn_mode(b_op);
                if(a_mode == b_mode && (mode_is_int(a_mode) || a_mode == mode_b)) {
-                       ir_node *blk = get_irn_n(n, -1);
+                       ir_node *blk = get_nodes_block(n);
 
                        n = exact_copy(n);
                        set_binop_left(n, a_op);
                        set_binop_right(n, b_op);
                        set_irn_mode(n, a_mode);
                        n = trans_func(n);
-                       n = new_r_Conv(current_ir_graph, blk, n, get_irn_mode(oldn));
+                       n = new_r_Conv(blk, n, get_irn_mode(oldn));
 
-                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_SHIFT_AND);
+                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_CONV);
                        return n;
                }
        }
@@ -3124,7 +3344,7 @@ static ir_node *transform_bitwise_distributive(ir_node *n,
 
                if (c != NULL) {
                        /* (a sop c) & (b sop c) => (a & b) sop c */
-                       ir_node *blk = get_irn_n(n, -1);
+                       ir_node *blk = get_nodes_block(n);
 
                        ir_node *new_n = exact_copy(n);
                        set_binop_left(new_n, op1);
@@ -3133,11 +3353,10 @@ static ir_node *transform_bitwise_distributive(ir_node *n,
 
                        if(op_root == op_Eor && op == op_Or) {
                                dbg_info  *dbgi = get_irn_dbg_info(n);
-                               ir_graph  *irg  = current_ir_graph;
                                ir_mode   *mode = get_irn_mode(c);
 
-                               c = new_rd_Not(dbgi, irg, blk, c, mode);
-                               n = new_rd_And(dbgi, irg, blk, new_n, c, mode);
+                               c = new_rd_Not(dbgi, blk, c, mode);
+                               n = new_rd_And(dbgi, blk, new_n, c, mode);
                        } else {
                                n = exact_copy(a);
                                set_nodes_block(n, blk);
@@ -3164,7 +3383,7 @@ static ir_node *transform_node_And(ir_node *n) {
        ir_mode *mode;
 
        mode = get_irn_mode(n);
-       HANDLE_BINOP_PHI(tarval_and, a, b, c, mode);
+       HANDLE_BINOP_PHI((eval_func) tarval_and, a, b, c, mode);
 
        /* we can evaluate 2 Projs of the same Cmp */
        if (mode == mode_b && is_Proj(a) && is_Proj(b)) {
@@ -3178,7 +3397,7 @@ static ir_node *transform_node_And(ir_node *n) {
                        /* yes, we can simply calculate with pncs */
                        pn_Cmp new_pnc  = pn_a & pn_b;
 
-                       return new_rd_Proj(dbgi, current_ir_graph, block, pred_a, mode_b, new_pnc);
+                       return new_rd_Proj(dbgi, block, pred_a, mode_b, new_pnc);
                }
        }
        if (is_Or(a)) {
@@ -3193,7 +3412,7 @@ static ir_node *transform_node_And(ir_node *n) {
                                        /* (a|b) & ~(a&b) = a^b */
                                        ir_node *block = get_nodes_block(n);
 
-                                       n = new_rd_Eor(get_irn_dbg_info(n), current_ir_graph, block, ba, bb, mode);
+                                       n = new_rd_Eor(get_irn_dbg_info(n), block, ba, bb, mode);
                                        DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_TO_EOR);
                                        return n;
                                }
@@ -3212,7 +3431,7 @@ static ir_node *transform_node_And(ir_node *n) {
                                        /* (a|b) & ~(a&b) = a^b */
                                        ir_node *block = get_nodes_block(n);
 
-                                       n = new_rd_Eor(get_irn_dbg_info(n), current_ir_graph, block, aa, ab, mode);
+                                       n = new_rd_Eor(get_irn_dbg_info(n), block, aa, ab, mode);
                                        DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_TO_EOR);
                                        return n;
                                }
@@ -3228,8 +3447,8 @@ static ir_node *transform_node_And(ir_node *n) {
                        dbg_info *dbg  = get_irn_dbg_info(n);
                        ir_node *block = get_nodes_block(n);
 
-                       ar = new_rd_Not(dbg, current_ir_graph, block, ar, mode);
-                       n  = new_rd_And(dbg, current_ir_graph, block, ar, b, mode);
+                       ar = new_rd_Not(dbg, block, ar, mode);
+                       n  = new_rd_And(dbg, block, ar, b, mode);
                        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT);
                        return n;
                }
@@ -3238,8 +3457,8 @@ static ir_node *transform_node_And(ir_node *n) {
                        dbg_info *dbg  = get_irn_dbg_info(n);
                        ir_node *block = get_nodes_block(n);
 
-                       al = new_rd_Not(dbg, current_ir_graph, block, al, mode);
-                       n  = new_rd_And(dbg, current_ir_graph, block, al, b, mode);
+                       al = new_rd_Not(dbg, block, al, mode);
+                       n  = new_rd_And(dbg, block, al, b, mode);
                        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT);
                        return n;
                }
@@ -3253,8 +3472,8 @@ static ir_node *transform_node_And(ir_node *n) {
                        dbg_info *dbg  = get_irn_dbg_info(n);
                        ir_node *block = get_nodes_block(n);
 
-                       br = new_rd_Not(dbg, current_ir_graph, block, br, mode);
-                       n  = new_rd_And(dbg, current_ir_graph, block, br, a, mode);
+                       br = new_rd_Not(dbg, block, br, mode);
+                       n  = new_rd_And(dbg, block, br, a, mode);
                        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT);
                        return n;
                }
@@ -3263,8 +3482,8 @@ static ir_node *transform_node_And(ir_node *n) {
                        dbg_info *dbg  = get_irn_dbg_info(n);
                        ir_node *block = get_nodes_block(n);
 
-                       bl = new_rd_Not(dbg, current_ir_graph, block, bl, mode);
-                       n  = new_rd_And(dbg, current_ir_graph, block, bl, a, mode);
+                       bl = new_rd_Not(dbg, block, bl, mode);
+                       n  = new_rd_And(dbg, block, bl, a, mode);
                        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT);
                        return n;
                }
@@ -3276,8 +3495,8 @@ static ir_node *transform_node_And(ir_node *n) {
 
                a = get_Not_op(a);
                b = get_Not_op(b);
-               n = new_rd_Or(get_irn_dbg_info(n), current_ir_graph, block, a, b, mode);
-               n = new_rd_Not(get_irn_dbg_info(n), current_ir_graph, block, n, mode);
+               n = new_rd_Or(get_irn_dbg_info(n), block, a, b, mode);
+               n = new_rd_Not(get_irn_dbg_info(n), block, n, mode);
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_DEMORGAN);
                return n;
        }
@@ -3296,7 +3515,7 @@ static ir_node *transform_node_Eor(ir_node *n) {
        ir_node *b = get_Eor_right(n);
        ir_mode *mode = get_irn_mode(n);
 
-       HANDLE_BINOP_PHI(tarval_eor, a, b, c, mode);
+       HANDLE_BINOP_PHI((eval_func) tarval_eor, a, b, c, mode);
 
        /* we can evaluate 2 Projs of the same Cmp */
        if (mode == mode_b && is_Proj(a) && is_Proj(b)) {
@@ -3310,37 +3529,35 @@ static ir_node *transform_node_Eor(ir_node *n) {
                        /* yes, we can simply calculate with pncs */
                        pn_Cmp new_pnc  = pn_a ^ pn_b;
 
-                       return new_rd_Proj(dbgi, current_ir_graph, block, pred_a, mode_b,
-                                          new_pnc);
+                       return new_rd_Proj(dbgi, block, pred_a, mode_b, new_pnc);
                }
        }
 
        if (a == b) {
                /* a ^ a = 0 */
-               n = new_rd_Const(get_irn_dbg_info(n), current_ir_graph, get_irn_n(n, -1),
-                                mode, get_mode_null(mode));
+               n = new_rd_Const(get_irn_dbg_info(n), current_ir_graph,
+                                get_mode_null(mode));
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_A_A);
        } else if (mode == mode_b &&
                        is_Proj(a) &&
                        is_Const(b) && is_Const_one(b) &&
                        is_Cmp(get_Proj_pred(a))) {
                /* The Eor negates a Cmp. The Cmp has the negated result anyways! */
-               n = new_r_Proj(current_ir_graph, get_irn_n(n, -1), get_Proj_pred(a),
+               n = new_r_Proj(get_nodes_block(n), get_Proj_pred(a),
                                mode_b, get_negated_pnc(get_Proj_proj(a), mode));
 
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT_BOOL);
        } else if (is_Const(b)) {
                if (is_Not(a)) { /* ~x ^ const -> x ^ ~const */
-                       ir_node  *cnst   = new_Const(mode, tarval_not(get_Const_tarval(b)));
+                       ir_node  *cnst   = new_Const(tarval_not(get_Const_tarval(b)));
                        ir_node  *not_op = get_Not_op(a);
                        dbg_info *dbg    = get_irn_dbg_info(n);
-                       ir_graph *irg    = current_ir_graph;
                        ir_node  *block  = get_nodes_block(n);
                        ir_mode  *mode   = get_irn_mode(n);
-                       n = new_rd_Eor(dbg, irg, block, not_op, cnst, mode);
+                       n = new_rd_Eor(dbg, block, not_op, cnst, mode);
                        return n;
                } else if (is_Const_all_one(b)) { /* x ^ 1...1 -> ~1 */
-                       n = new_r_Not(current_ir_graph, get_nodes_block(n), a, mode);
+                       n = new_r_Not(get_nodes_block(n), a, mode);
                        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT);
                }
        } else {
@@ -3361,25 +3578,26 @@ static ir_node *transform_node_Not(ir_node *n) {
        HANDLE_UNOP_PHI(tarval_not,a,c);
 
        /* check for a boolean Not */
-       if (mode == mode_b &&
-                       is_Proj(a) &&
-                       is_Cmp(get_Proj_pred(a))) {
-               /* We negate a Cmp. The Cmp has the negated result anyways! */
-               n = new_r_Proj(current_ir_graph, get_irn_n(n, -1), get_Proj_pred(a),
-                               mode_b, get_negated_pnc(get_Proj_proj(a), mode_b));
-               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_NOT_CMP);
-               return n;
+       if (mode == mode_b && is_Proj(a)) {
+               ir_node *a_pred = get_Proj_pred(a);
+               if (is_Cmp(a_pred)) {
+                       ir_node *cmp_block = get_nodes_block(a_pred);
+                       /* We negate a Cmp. The Cmp has the negated result anyways! */
+                       n = new_r_Proj(cmp_block, get_Proj_pred(a),
+                                      mode_b, get_negated_pnc(get_Proj_proj(a), mode_b));
+                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_NOT_CMP);
+                       return n;
+               }
        }
        if  (is_Eor(a)) {
                ir_node *eor_b = get_Eor_right(a);
                if (is_Const(eor_b)) { /* ~(x ^ const) -> x ^ ~const */
-                       ir_node  *cnst  = new_Const(mode, tarval_not(get_Const_tarval(eor_b)));
+                       ir_node  *cnst  = new_Const(tarval_not(get_Const_tarval(eor_b)));
                        ir_node  *eor_a = get_Eor_left(a);
                        dbg_info *dbg   = get_irn_dbg_info(n);
-                       ir_graph *irg   = current_ir_graph;
                        ir_node  *block = get_nodes_block(n);
                        ir_mode  *mode  = get_irn_mode(n);
-                       n = new_rd_Eor(dbg, irg, block, eor_a, cnst, mode);
+                       n = new_rd_Eor(dbg, block, eor_a, cnst, mode);
                        return n;
                }
        }
@@ -3389,15 +3607,15 @@ static ir_node *transform_node_Not(ir_node *n) {
                        ir_graph *irg   = current_ir_graph;
                        ir_node  *block = get_nodes_block(n);
                        ir_node  *add_l = get_Minus_op(a);
-                       ir_node  *add_r = new_rd_Const(dbg, irg, block, mode, get_mode_minus_one(mode));
-                       n = new_rd_Add(dbg, irg, block, add_l, add_r, mode);
+                       ir_node  *add_r = new_rd_Const(dbg, irg, get_mode_minus_one(mode));
+                       n = new_rd_Add(dbg, block, add_l, add_r, mode);
                } else if (is_Add(a)) {
                        ir_node *add_r = get_Add_right(a);
                        if (is_Const(add_r) && is_Const_all_one(add_r)) {
                                /* ~(x + -1) = -x */
                                ir_node *op = get_Add_left(a);
-                               ir_node *blk = get_irn_n(n, -1);
-                               n = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, blk, op, get_irn_mode(n));
+                               ir_node *blk = get_nodes_block(n);
+                               n = new_rd_Minus(get_irn_dbg_info(n), blk, op, get_irn_mode(n));
                                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_NOT_MINUS_1);
                        }
                }
@@ -3428,9 +3646,9 @@ static ir_node *transform_node_Minus(ir_node *n) {
                        /* -(~x) = x + 1 */
                        ir_node *op   = get_Not_op(a);
                        tarval *tv    = get_mode_one(mode);
-                       ir_node *blk  = get_irn_n(n, -1);
-                       ir_node *c    = new_r_Const(current_ir_graph, blk, mode, tv);
-                       n = new_rd_Add(get_irn_dbg_info(n), current_ir_graph, blk, op, c, mode);
+                       ir_node *blk  = get_nodes_block(n);
+                       ir_node *c    = new_Const(tv);
+                       n = new_rd_Add(get_irn_dbg_info(n), blk, op, c, mode);
                        DBG_OPT_ALGSIM2(oldn, a, n, FS_OPT_MINUS_NOT);
                        return n;
                }
@@ -3444,7 +3662,7 @@ static ir_node *transform_node_Minus(ir_node *n) {
                                        /* -(a >>u (size-1)) = a >>s (size-1) */
                                        ir_node *v = get_Shr_left(a);
 
-                                       n = new_rd_Shrs(get_irn_dbg_info(n), current_ir_graph, get_irn_n(n, -1), v, c, mode);
+                                       n = new_rd_Shrs(get_irn_dbg_info(n), get_nodes_block(n), v, c, mode);
                                        DBG_OPT_ALGSIM2(oldn, a, n, FS_OPT_PREDICATE);
                                        return n;
                                }
@@ -3460,7 +3678,7 @@ static ir_node *transform_node_Minus(ir_node *n) {
                                        /* -(a >>s (size-1)) = a >>u (size-1) */
                                        ir_node *v = get_Shrs_left(a);
 
-                                       n = new_rd_Shr(get_irn_dbg_info(n), current_ir_graph, get_irn_n(n, -1), v, c, mode);
+                                       n = new_rd_Shr(get_irn_dbg_info(n), get_nodes_block(n), v, c, mode);
                                        DBG_OPT_ALGSIM2(oldn, a, n, FS_OPT_PREDICATE);
                                        return n;
                                }
@@ -3471,9 +3689,9 @@ static ir_node *transform_node_Minus(ir_node *n) {
                /* - (a-b) = b - a */
                ir_node *la  = get_Sub_left(a);
                ir_node *ra  = get_Sub_right(a);
-               ir_node *blk = get_irn_n(n, -1);
+               ir_node *blk = get_nodes_block(n);
 
-               n = new_rd_Sub(get_irn_dbg_info(n), current_ir_graph, blk, ra, la, mode);
+               n = new_rd_Sub(get_irn_dbg_info(n), blk, ra, la, mode);
                DBG_OPT_ALGSIM2(oldn, a, n, FS_OPT_MINUS_SUB);
                return n;
        }
@@ -3481,14 +3699,14 @@ static ir_node *transform_node_Minus(ir_node *n) {
        if (is_Mul(a)) { /* -(a * const) -> a * -const */
                ir_node *mul_l = get_Mul_left(a);
                ir_node *mul_r = get_Mul_right(a);
-               if (is_Const(mul_r)) {
-                       tarval   *tv    = tarval_neg(get_Const_tarval(mul_r));
-                       if(tv != tarval_bad) {
-                               ir_node  *cnst  = new_Const(mode, tv);
+               tarval  *tv    = value_of(mul_r);
+               if (tv != tarval_bad) {
+                       tv = tarval_neg(tv);
+                       if (tv != tarval_bad) {
+                               ir_node  *cnst  = new_Const(tv);
                                dbg_info *dbg   = get_irn_dbg_info(a);
-                               ir_graph *irg   = current_ir_graph;
                                ir_node  *block = get_nodes_block(a);
-                               n = new_rd_Mul(dbg, irg, block, mul_l, cnst, mode);
+                               n = new_rd_Mul(dbg, block, mul_l, cnst, mode);
                                DBG_OPT_ALGSIM2(oldn, a, n, FS_OPT_MINUS_MUL_C);
                                return n;
                        }
@@ -3507,11 +3725,10 @@ static ir_node *transform_node_Cast(ir_node *n) {
        ir_type *tp = get_irn_type(n);
 
        if (is_Const(pred) && get_Const_type(pred) != tp) {
-               n = new_rd_Const_type(NULL, current_ir_graph, get_irn_n(pred, -1), get_irn_mode(pred),
-                       get_Const_tarval(pred), tp);
+               n = new_rd_Const_type(NULL, current_ir_graph, get_Const_tarval(pred), tp);
                DBG_OPT_CSTEVAL(oldn, n);
        } else if (is_SymConst(pred) && get_SymConst_value_type(pred) != tp) {
-               n = new_rd_SymConst_type(NULL, current_ir_graph, get_irn_n(pred, -1), get_irn_mode(pred),
+               n = new_rd_SymConst_type(NULL, current_ir_graph, get_irn_mode(pred),
                        get_SymConst_symbol(pred), get_SymConst_kind(pred), tp);
                DBG_OPT_CSTEVAL(oldn, n);
        }
@@ -3519,6 +3736,66 @@ 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 *load = get_Proj_pred(proj);
+
+                       /* get the Load address */
+                       const ir_node *addr = get_Load_ptr(load);
+                       const 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 {
+                                       ir_node *blk = get_nodes_block(load);
+                                       return new_r_Jmp(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 *store = get_Proj_pred(proj);
+
+                       /* get the load/store address */
+                       const ir_node *addr = get_Store_ptr(store);
+                       const 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 {
+                                       ir_node *blk = get_nodes_block(store);
+                                       return new_r_Jmp(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.
@@ -3526,7 +3803,8 @@ static ir_node *transform_node_Cast(ir_node *n) {
 static ir_node *transform_node_Proj_Div(ir_node *proj) {
        ir_node *div = get_Proj_pred(proj);
        ir_node *b   = get_Div_right(div);
-       ir_node *confirm, *res, *new_mem;
+       ir_node *res, *new_mem;
+       const ir_node *confirm;
        long proj_nr;
 
        if (value_not_zero(b, &confirm)) {
@@ -3534,8 +3812,7 @@ static ir_node *transform_node_Proj_Div(ir_node *proj) {
                if (confirm == NULL) {
                        /* we are sure we have a Const != 0 */
                        new_mem = get_Div_mem(div);
-                       if (is_Pin(new_mem))
-                               new_mem = get_Pin_op(new_mem);
+                       new_mem = skip_Pin(new_mem);
                        set_Div_mem(div, new_mem);
                        set_irn_pinned(div, op_pin_state_floats);
                }
@@ -3543,7 +3820,7 @@ static ir_node *transform_node_Proj_Div(ir_node *proj) {
                proj_nr = get_Proj_proj(proj);
                switch (proj_nr) {
                case pn_Div_X_regular:
-                       return new_r_Jmp(current_ir_graph, get_irn_n(div, -1));
+                       return new_r_Jmp(get_nodes_block(div));
 
                case pn_Div_X_except:
                        /* we found an exception handler, remove it */
@@ -3556,7 +3833,7 @@ static ir_node *transform_node_Proj_Div(ir_node *proj) {
 
                        if (confirm) {
                                /* This node can only float up to the Confirm block */
-                               new_mem = new_r_Pin(current_ir_graph, get_nodes_block(confirm), new_mem);
+                               new_mem = new_r_Pin(get_nodes_block(confirm), new_mem);
                        }
                        set_irn_pinned(div, op_pin_state_floats);
                        /* this is a Div without exception, we can remove the memory edge */
@@ -3574,7 +3851,8 @@ static ir_node *transform_node_Proj_Div(ir_node *proj) {
 static ir_node *transform_node_Proj_Mod(ir_node *proj) {
        ir_node *mod = get_Proj_pred(proj);
        ir_node *b   = get_Mod_right(mod);
-       ir_node *confirm, *res, *new_mem;
+       ir_node *res, *new_mem;
+       const ir_node *confirm;
        long proj_nr;
 
        if (value_not_zero(b, &confirm)) {
@@ -3584,8 +3862,7 @@ static ir_node *transform_node_Proj_Mod(ir_node *proj) {
                if (confirm == NULL) {
                        /* we are sure we have a Const != 0 */
                        new_mem = get_Mod_mem(mod);
-                       if (is_Pin(new_mem))
-                               new_mem = get_Pin_op(new_mem);
+                       new_mem = skip_Pin(new_mem);
                        set_Mod_mem(mod, new_mem);
                        set_irn_pinned(mod, op_pin_state_floats);
                }
@@ -3593,7 +3870,7 @@ static ir_node *transform_node_Proj_Mod(ir_node *proj) {
                switch (proj_nr) {
 
                case pn_Mod_X_regular:
-                       return new_r_Jmp(current_ir_graph, get_irn_n(mod, -1));
+                       return new_r_Jmp(get_irn_n(mod, -1));
 
                case pn_Mod_X_except:
                        /* we found an exception handler, remove it */
@@ -3606,7 +3883,7 @@ static ir_node *transform_node_Proj_Mod(ir_node *proj) {
 
                        if (confirm) {
                                /* This node can only float up to the Confirm block */
-                               new_mem = new_r_Pin(current_ir_graph, get_nodes_block(confirm), new_mem);
+                               new_mem = new_r_Pin(get_nodes_block(confirm), new_mem);
                        }
                        /* this is a Mod without exception, we can remove the memory edge */
                        set_Mod_mem(mod, new_mem);
@@ -3615,7 +3892,7 @@ static ir_node *transform_node_Proj_Mod(ir_node *proj) {
                        if (get_Mod_left(mod) == b) {
                                /* a % a = 0 if a != 0 */
                                ir_mode *mode = get_irn_mode(proj);
-                               ir_node *res  = new_Const(mode, get_mode_null(mode));
+                               ir_node *res  = new_Const(get_mode_null(mode));
 
                                DBG_OPT_CSTEVAL(mod, res);
                                return res;
@@ -3632,7 +3909,8 @@ static ir_node *transform_node_Proj_Mod(ir_node *proj) {
 static ir_node *transform_node_Proj_DivMod(ir_node *proj) {
        ir_node *divmod = get_Proj_pred(proj);
        ir_node *b      = get_DivMod_right(divmod);
-       ir_node *confirm, *res, *new_mem;
+       ir_node *res, *new_mem;
+       const ir_node *confirm;
        long proj_nr;
 
        if (value_not_zero(b, &confirm)) {
@@ -3642,8 +3920,7 @@ static ir_node *transform_node_Proj_DivMod(ir_node *proj) {
                if (confirm == NULL) {
                        /* we are sure we have a Const != 0 */
                        new_mem = get_DivMod_mem(divmod);
-                       if (is_Pin(new_mem))
-                               new_mem = get_Pin_op(new_mem);
+                       new_mem = skip_Pin(new_mem);
                        set_DivMod_mem(divmod, new_mem);
                        set_irn_pinned(divmod, op_pin_state_floats);
                }
@@ -3651,7 +3928,7 @@ static ir_node *transform_node_Proj_DivMod(ir_node *proj) {
                switch (proj_nr) {
 
                case pn_DivMod_X_regular:
-                       return new_r_Jmp(current_ir_graph, get_irn_n(divmod, -1));
+                       return new_r_Jmp(get_nodes_block(divmod));
 
                case pn_DivMod_X_except:
                        /* we found an exception handler, remove it */
@@ -3664,7 +3941,7 @@ static ir_node *transform_node_Proj_DivMod(ir_node *proj) {
 
                        if (confirm) {
                                /* This node can only float up to the Confirm block */
-                               new_mem = new_r_Pin(current_ir_graph, get_nodes_block(confirm), new_mem);
+                               new_mem = new_r_Pin(get_nodes_block(confirm), new_mem);
                        }
                        /* this is a DivMod without exception, we can remove the memory edge */
                        set_DivMod_mem(divmod, new_mem);
@@ -3674,7 +3951,7 @@ static ir_node *transform_node_Proj_DivMod(ir_node *proj) {
                        if (get_DivMod_left(divmod) == b) {
                                /* a % a = 0 if a != 0 */
                                ir_mode *mode = get_irn_mode(proj);
-                               ir_node *res  = new_Const(mode, get_mode_null(mode));
+                               ir_node *res  = new_Const(get_mode_null(mode));
 
                                DBG_OPT_CSTEVAL(divmod, res);
                                return res;
@@ -3699,14 +3976,14 @@ static ir_node *transform_node_Proj_Cond(ir_node *proj) {
                                /* we have a constant switch */
                                long num = get_Proj_proj(proj);
 
-                               if (num != get_Cond_defaultProj(n)) { /* we cannot optimize default Proj's yet */
+                               if (num != get_Cond_default_proj(n)) { /* we cannot optimize default Proj's yet */
                                        if (get_tarval_long(tb) == num) {
                                                /* Do NOT create a jump here, or we will have 2 control flow ops
                                                 * in a block. This case is optimized away in optimize_cf(). */
                                                return proj;
                                        } else {
                                                /* this case will NEVER be taken, kill it */
-                                               return new_Bad();
+                                               return get_irg_bad(current_ir_graph);
                                        }
                                }
                        }
@@ -3720,7 +3997,7 @@ static ir_node *transform_node_Proj_Cond(ir_node *proj) {
  */
 static ir_node *create_zero_const(ir_mode *mode) {
        tarval   *tv    = get_mode_null(mode);
-       ir_node  *cnst  = new_Const(mode, tv);
+       ir_node  *cnst  = new_Const(tv);
 
        return cnst;
 }
@@ -3767,12 +4044,12 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
        /* we can evaluate some cases directly */
        switch (proj_nr) {
        case pn_Cmp_False:
-               return new_Const(mode_b, get_tarval_b_false());
+               return new_Const(get_tarval_b_false());
        case pn_Cmp_True:
-               return new_Const(mode_b, get_tarval_b_true());
+               return new_Const(get_tarval_b_true());
        case pn_Cmp_Leg:
                if (!mode_is_float(get_irn_mode(left)))
-                       return new_Const(mode_b, get_tarval_b_true());
+                       return new_Const(get_tarval_b_true());
                break;
        default:
                break;
@@ -3793,7 +4070,6 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
 
                if (smaller_mode(mode_left, mode) && smaller_mode(mode_right, mode)
                                && mode_left != mode_b && mode_right != mode_b) {
-                       ir_graph *irg   = current_ir_graph;
                        ir_node  *block = get_nodes_block(n);
 
                        if (mode_left == mode_right) {
@@ -3802,13 +4078,13 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
                                changed |= 1;
                                DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CONV_CONV);
                        } else if (smaller_mode(mode_left, mode_right)) {
-                               left  = new_r_Conv(irg, block, op_left, mode_right);
+                               left  = new_r_Conv(block, op_left, mode_right);
                                right = op_right;
                                changed |= 1;
                                DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CONV);
                        } else if (smaller_mode(mode_right, mode_left)) {
                                left  = op_left;
-                               right = new_r_Conv(irg, block, op_right, mode_left);
+                               right = new_r_Conv(block, op_right, mode_left);
                                changed |= 1;
                                DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CONV);
                        }
@@ -3936,22 +4212,45 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
                                        DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP);
                                }
                        }
+                       if (is_And(left) && is_Const(right)) {
+                               ir_node *ll = get_binop_left(left);
+                               ir_node *lr = get_binop_right(left);
+                               if (is_Shr(ll) && is_Const(lr)) {
+                                       /* Cmp((x >>u c1) & c2, c3) = Cmp(x & (c2 << c1), c3 << c1) */
+                                       ir_node *block = get_nodes_block(n);
+                                       ir_mode *mode = get_irn_mode(left);
+
+                                       ir_node *llr = get_Shr_right(ll);
+                                       if (is_Const(llr)) {
+                                               dbg_info *dbg = get_irn_dbg_info(left);
+
+                                               tarval *c1    = get_Const_tarval(llr);
+                                               tarval *c2    = get_Const_tarval(lr);
+                                               tarval *c3    = get_Const_tarval(right);
+                                               tarval *mask  = tarval_shl(c2, c1);
+                                               tarval *value = tarval_shl(c3, c1);
+
+                                               left  = new_rd_And(dbg, block, get_Shr_left(ll), new_Const(mask), mode);
+                                               right = new_Const(value);
+                                               changed |= 1;
+                                       }
+                               }
+                       }
                }  /* mode_is_int(...) */
        }  /* proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg */
 
        /* replace mode_b compares with ands/ors */
        if (get_irn_mode(left) == mode_b) {
-               ir_graph *irg   = current_ir_graph;
                ir_node  *block = get_nodes_block(n);
                ir_node  *bres;
 
                switch (proj_nr) {
-                       case pn_Cmp_Le: bres = new_r_Or( irg, block, new_r_Not(irg, block, left, mode_b), right, mode_b); break;
-                       case pn_Cmp_Lt: bres = new_r_And(irg, block, new_r_Not(irg, block, left, mode_b), right, mode_b); break;
-                       case pn_Cmp_Ge: bres = new_r_Or( irg, block, left, new_r_Not(irg, block, right, mode_b), mode_b); break;
-                       case pn_Cmp_Gt: bres = new_r_And(irg, block, left, new_r_Not(irg, block, right, mode_b), mode_b); break;
-                       case pn_Cmp_Lg: bres = new_r_Eor(irg, block, left, right, mode_b); break;
-                       case pn_Cmp_Eq: bres = new_r_Not(irg, block, new_r_Eor(irg, block, left, right, mode_b), mode_b); break;
+                       case pn_Cmp_Le: bres = new_r_Or( block, new_r_Not(block, left, mode_b), right, mode_b); break;
+                       case pn_Cmp_Lt: bres = new_r_And(block, new_r_Not(block, left, mode_b), right, mode_b); break;
+                       case pn_Cmp_Ge: bres = new_r_Or( block, left, new_r_Not(block, right, mode_b), mode_b); break;
+                       case pn_Cmp_Gt: bres = new_r_And(block, left, new_r_Not(block, right, mode_b), mode_b); break;
+                       case pn_Cmp_Lg: bres = new_r_Eor(block, left, right, mode_b); break;
+                       case pn_Cmp_Eq: bres = new_r_Not(block, new_r_Eor(block, left, right, mode_b), mode_b); break;
                        default: bres = NULL;
                }
                if (bres) {
@@ -3981,9 +4280,9 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
         * later and may help to normalize more compares.
         * Of course this is only possible for integer values.
         */
-       if (is_Const(right)) {
+       tv = value_of(right);
+       if (tv != tarval_bad) {
                mode = get_irn_mode(right);
-               tv = get_Const_tarval(right);
 
                /* TODO extend to arbitrary constants */
                if (is_Conv(left) && tarval_is_null(tv)) {
@@ -4047,7 +4346,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;
@@ -4115,7 +4414,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;
@@ -4127,7 +4426,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);
@@ -4142,7 +4441,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
                                else if (proj_nr == pn_Cmp_Le || proj_nr == pn_Cmp_Lt) {
                                        if (tv != tarval_bad) {
                                                /* c >= 0 : Abs(a) <= c  ==>  (unsigned)(a + c) <= 2*c */
-                                               if (get_irn_op(left) == op_Abs) { // TODO something is missing here
+                                               if (is_Abs(left)) { // TODO something is missing here
                                                }
                                        }
                                }
@@ -4163,7 +4462,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
                                                if (mask != tv) {
                                                        /* TODO: move to constant evaluation */
                                                        tv = proj_nr == pn_Cmp_Eq ? get_tarval_b_false() : get_tarval_b_true();
-                                                       c1 = new_Const(mode_b, tv);
+                                                       c1 = new_Const(tv);
                                                        DBG_OPT_CSTEVAL(proj, c1);
                                                        return c1;
                                                }
@@ -4200,7 +4499,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
                                                if (! tarval_is_null(get_Const_tarval(c1))) {
                                                        /* TODO: move to constant evaluation */
                                                        tv = proj_nr == pn_Cmp_Eq ? get_tarval_b_false() : get_tarval_b_true();
-                                                       c1 = new_Const(mode_b, tv);
+                                                       c1 = new_Const(tv);
                                                        DBG_OPT_CSTEVAL(proj, c1);
                                                        return c1;
                                                }
@@ -4225,13 +4524,13 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
                                                if (tarval_and(tv, cmask) != tv) {
                                                        /* condition not met */
                                                        tv = proj_nr == pn_Cmp_Eq ? get_tarval_b_false() : get_tarval_b_true();
-                                                       c1 = new_Const(mode_b, tv);
+                                                       c1 = new_Const(tv);
                                                        DBG_OPT_CSTEVAL(proj, c1);
                                                        return c1;
                                                }
                                                sl   = get_Shl_left(left);
                                                blk  = get_nodes_block(n);
-                                               left = new_rd_And(get_irn_dbg_info(left), current_ir_graph, blk, sl, new_Const(mode, amask), mode);
+                                               left = new_rd_And(get_irn_dbg_info(left), blk, sl, new_Const(amask), mode);
                                                tv   = tarval_shr(tv, tv1);
                                                changed |= 2;
                                                DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_SHF_TO_AND);
@@ -4256,13 +4555,13 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
                                                if (tarval_and(tv, cmask) != tv) {
                                                        /* condition not met */
                                                        tv = proj_nr == pn_Cmp_Eq ? get_tarval_b_false() : get_tarval_b_true();
-                                                       c1 = new_Const(mode_b, tv);
+                                                       c1 = new_Const(tv);
                                                        DBG_OPT_CSTEVAL(proj, c1);
                                                        return c1;
                                                }
                                                sl   = get_Shr_left(left);
                                                blk  = get_nodes_block(n);
-                                               left = new_rd_And(get_irn_dbg_info(left), current_ir_graph, blk, sl, new_Const(mode, amask), mode);
+                                               left = new_rd_And(get_irn_dbg_info(left), blk, sl, new_Const(amask), mode);
                                                tv   = tarval_shl(tv, tv1);
                                                changed |= 2;
                                                DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_SHF_TO_AND);
@@ -4284,19 +4583,19 @@ 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)) {
                                                        /* condition not met */
                                                        tv = proj_nr == pn_Cmp_Eq ? get_tarval_b_false() : get_tarval_b_true();
-                                                       c1 = new_Const(mode_b, tv);
+                                                       c1 = new_Const(tv);
                                                        DBG_OPT_CSTEVAL(proj, c1);
                                                        return c1;
                                                }
                                                sl   = get_Shrs_left(left);
                                                blk  = get_nodes_block(n);
-                                               left = new_rd_And(get_irn_dbg_info(left), current_ir_graph, blk, sl, new_Const(mode, amask), mode);
+                                               left = new_rd_And(get_irn_dbg_info(left), blk, sl, new_Const(amask), mode);
                                                tv   = tarval_shl(tv, tv1);
                                                changed |= 2;
                                                DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_SHF_TO_AND);
@@ -4308,7 +4607,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
        }
 
        if (changed & 2)      /* need a new Const */
-               right = new_Const(mode, tv);
+               right = new_Const(tv);
 
        if ((proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg) && is_Const(right) && is_Const_null(right) && is_Proj(left)) {
                ir_node *op = get_Proj_pred(left);
@@ -4326,8 +4625,8 @@ 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));
-                                       left = new_rd_And(get_irn_dbg_info(op), current_ir_graph, blk, v, new_Const(mode, tv), mode);
+                                       tv = tarval_sub(tv, get_mode_one(mode), NULL);
+                                       left = new_rd_And(get_irn_dbg_info(op), blk, v, new_Const(tv), mode);
                                        changed |= 1;
                                        DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_MOD_TO_AND);
                                }
@@ -4336,16 +4635,99 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
        }
 
        if (changed) {
-               ir_node *block = get_irn_n(n, -1); /* Beware of get_nodes_Block() */
+               ir_node *block = get_nodes_block(n);
 
                /* create a new compare */
-               n = new_rd_Cmp(get_irn_dbg_info(n), current_ir_graph, block, left, right);
-               proj = new_rd_Proj(get_irn_dbg_info(proj), current_ir_graph, block, n, get_irn_mode(proj), proj_nr);
+               n = new_rd_Cmp(get_irn_dbg_info(n), block, left, right);
+               proj = new_rd_Proj(get_irn_dbg_info(proj), block, n, get_irn_mode(proj), proj_nr);
        }
 
        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 *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(get_nodes_block(copyb));
+                       break;
+               case pn_CopyB_X_except:
+                       DBG_OPT_EXC_REM(proj);
+                       proj = get_irg_bad(get_irn_irg(proj));
+                       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(get_irn_irg(proj));
+                       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(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.
@@ -4353,30 +4735,9 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
 static ir_node *transform_node_Proj(ir_node *proj) {
        ir_node *n = get_Proj_pred(proj);
 
-       switch (get_irn_opcode(n)) {
-       case iro_Div:
-               return transform_node_Proj_Div(proj);
-
-       case iro_Mod:
-               return transform_node_Proj_Mod(proj);
-
-       case iro_DivMod:
-               return transform_node_Proj_DivMod(proj);
-
-       case iro_Cond:
-               return transform_node_Proj_Cond(proj);
-
-       case iro_Cmp:
-               return transform_node_Proj_Cmp(proj);
-
-       case iro_Tuple:
-               /* should not happen, but if it does will be optimized away */
-               return equivalent_node_Proj(proj);
-
-       default:
-               /* do nothing */
-               return proj;
-       }
+       if (n->op->ops.transform_node_Proj)
+               return n->op->ops.transform_node_Proj(proj);
+       return proj;
 }  /* transform_node_Proj */
 
 /**
@@ -4415,8 +4776,8 @@ static ir_node *transform_node_Phi(ir_node *phi) {
                        }
                        /* move the Confirm nodes "behind" the Phi */
                        block = get_irn_n(phi, -1);
-                       new_Phi = new_r_Phi(current_ir_graph, block, n, in, get_irn_mode(phi));
-                       return new_r_Confirm(current_ir_graph, block, new_Phi, bound, pnc);
+                       new_Phi = new_r_Phi(block, n, in, get_irn_mode(phi));
+                       return new_r_Confirm(block, new_Phi, bound, pnc);
                }
        }
        return phi;
@@ -4528,10 +4889,9 @@ static ir_node *transform_node_Or_bf_store(ir_node *or) {
                /* ok, all conditions met */
                block = get_irn_n(or, -1);
 
-               new_and = new_r_And(current_ir_graph, block,
-                       value, new_r_Const(current_ir_graph, block, mode, tarval_and(tv4, tv2)), mode);
+               new_and = new_r_And(block, value, new_Const(tarval_and(tv4, tv2)), mode);
 
-               new_const = new_r_Const(current_ir_graph, block, mode, tarval_or(tv3, tv1));
+               new_const = new_Const(tarval_or(tv3, tv1));
 
                set_Or_left(or, new_and);
                set_Or_right(or, new_const);
@@ -4589,7 +4949,7 @@ static ir_node *transform_node_Or_Rotl(ir_node *or) {
                /* yet, condition met */
                block = get_nodes_block(or);
 
-               n = new_r_Rotl(current_ir_graph, block, x, c1, mode);
+               n = new_r_Rotl(block, x, c1, mode);
 
                DBG_OPT_ALGSIM1(or, shl, shr, n, FS_OPT_OR_SHFT_TO_ROTL);
                return n;
@@ -4622,7 +4982,7 @@ static ir_node *transform_node_Or_Rotl(ir_node *or) {
        /* yet, condition met */
        block = get_nodes_block(or);
 
-       n = new_r_Rotl(current_ir_graph, block, x, rotval, mode);
+       n = new_r_Rotl(block, x, rotval, mode);
 
        DBG_OPT_ALGSIM0(or, n, FS_OPT_OR_SHFT_TO_ROTL);
        return n;
@@ -4644,8 +5004,8 @@ static ir_node *transform_node_Or(ir_node *n) {
                mode = get_irn_mode(n);
                a = get_Not_op(a);
                b = get_Not_op(b);
-               n = new_rd_And(get_irn_dbg_info(n), current_ir_graph, block, a, b, mode);
-               n = new_rd_Not(get_irn_dbg_info(n), current_ir_graph, block, n, mode);
+               n = new_rd_And(get_irn_dbg_info(n), block, a, b, mode);
+               n = new_rd_Not(get_irn_dbg_info(n), block, n, mode);
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_DEMORGAN);
                return n;
        }
@@ -4662,13 +5022,12 @@ static ir_node *transform_node_Or(ir_node *n) {
                        /* yes, we can simply calculate with pncs */
                        pn_Cmp new_pnc  = pn_a | pn_b;
 
-                       return new_rd_Proj(dbgi, current_ir_graph, block, pred_a, mode_b,
-                                          new_pnc);
+                       return new_rd_Proj(dbgi, block, pred_a, mode_b, new_pnc);
                }
        }
 
        mode = get_irn_mode(n);
-       HANDLE_BINOP_PHI(tarval_or, a, b, c, mode);
+       HANDLE_BINOP_PHI((eval_func) tarval_or, a, b, c, mode);
 
        n = transform_node_Or_bf_store(n);
        n = transform_node_Or_Rotl(n);
@@ -4716,23 +5075,23 @@ static ir_node *transform_node_shift(ir_node *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));
 
+                       assert(modulo_shf >= (int) get_mode_size_bits(mode));
+
                        /* 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);
+                                       ir_mode  *smode  = get_irn_mode(right);
+                                       ir_node  *cnst  = new_Const_long(smode, get_mode_size_bits(mode) - 1);
+                                       return new_rd_Shrs(dbgi, block, get_binop_left(left), cnst, mode);
                                }
 
-                               return new_Const(mode, get_mode_null(mode));
+                               return new_Const(get_mode_null(mode));
                        }
                }
        } else {
@@ -4743,9 +5102,9 @@ static ir_node *transform_node_shift(ir_node *n) {
        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);
+       in[1] = new_Const(res);
 
-       irn = new_ir_node(NULL, current_ir_graph, block, get_irn_op(n), mode, 2, in);
+       irn = new_ir_node(NULL, get_Block_irg(block), block, get_irn_op(n), mode, 2, in);
 
        DBG_OPT_ALGSIM0(n, irn, FS_OPT_REASSOC_SHIFT);
 
@@ -4766,7 +5125,6 @@ static ir_node *transform_node_bitop_shift(ir_node *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;
@@ -4798,7 +5156,6 @@ static ir_node *transform_node_bitop_shift(ir_node *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);
@@ -4807,30 +5164,30 @@ static ir_node *transform_node_bitop_shift(ir_node *n) {
        assert(get_tarval_mode(tv1) == mode);
 
        if (is_Shl(n)) {
-               new_shift = new_rd_Shl(dbgi, irg, block, bitop_left, right, mode);
+               new_shift = new_rd_Shl(dbgi, 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);
+               new_shift = new_rd_Shr(dbgi, 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);
+               new_shift = new_rd_Shrs(dbgi, 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);
+               new_shift = new_rd_Rotl(dbgi, 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);
+       new_const = new_Const(tv_shift);
 
        if (op_left == op_And) {
-               new_bitop = new_rd_And(dbgi, irg, block, new_shift, new_const, mode);
+               new_bitop = new_rd_And(dbgi, 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);
+               new_bitop = new_rd_Or(dbgi, 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);
+               new_bitop = new_rd_Eor(dbgi, block, new_shift, new_const, mode);
        }
 
        return new_bitop;
@@ -4905,7 +5262,10 @@ static ir_node *transform_node_shl_shr(ir_node *n) {
                return n;
        }
 
-       assert(get_tarval_mode(tv_shl) == get_tarval_mode(tv_shr));
+       if (get_tarval_mode(tv_shl) != get_tarval_mode(tv_shr)) {
+               tv_shl = tarval_convert_to(tv_shl, get_tarval_mode(tv_shr));
+       }
+
        assert(tv_mask != tarval_bad);
        assert(get_tarval_mode(tv_mask) == mode);
 
@@ -4915,22 +5275,22 @@ static ir_node *transform_node_shl_shr(ir_node *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);
-               new_const = new_Const(get_tarval_mode(tv_shift), tv_shift);
+               tv_shift  = tarval_sub(tv_shr, tv_shl, NULL);
+               new_const = new_Const(tv_shift);
                if (need_shrs) {
-                       new_shift = new_rd_Shrs(dbgi, irg, block, x, new_const, mode);
+                       new_shift = new_rd_Shrs(dbgi, block, x, new_const, mode);
                } else {
-                       new_shift = new_rd_Shr(dbgi, irg, block, x, new_const, mode);
+                       new_shift = new_rd_Shr(dbgi, block, x, new_const, mode);
                }
        } else {
                assert(pnc == pn_Cmp_Gt);
-               tv_shift  = tarval_sub(tv_shl, tv_shr);
-               new_const = new_Const(get_tarval_mode(tv_shift), tv_shift);
-               new_shift = new_rd_Shl(dbgi, irg, block, x, new_const, mode);
+               tv_shift  = tarval_sub(tv_shl, tv_shr, NULL);
+               new_const = new_Const(tv_shift);
+               new_shift = new_rd_Shl(dbgi, block, x, new_const, mode);
        }
 
-       new_const = new_Const(mode, tv_mask);
-       new_and   = new_rd_And(dbgi, irg, block, new_shift, new_const, mode);
+       new_const = new_Const(tv_mask);
+       new_and   = new_rd_And(dbgi, block, new_shift, new_const, mode);
 
        return new_and;
 }
@@ -4944,7 +5304,7 @@ static ir_node *transform_node_Shr(ir_node *n) {
        ir_node *right = get_Shr_right(n);
        ir_mode *mode  = get_irn_mode(n);
 
-       HANDLE_BINOP_PHI(tarval_shr, left, right, c, mode);
+       HANDLE_BINOP_PHI((eval_func) tarval_shr, left, right, c, mode);
        n = transform_node_shift(n);
 
        if (is_Shr(n))
@@ -4964,7 +5324,7 @@ static ir_node *transform_node_Shrs(ir_node *n) {
        ir_node *b    = get_Shrs_right(n);
        ir_mode *mode = get_irn_mode(n);
 
-       HANDLE_BINOP_PHI(tarval_shrs, a, b, c, mode);
+       HANDLE_BINOP_PHI((eval_func) tarval_shrs, a, b, c, mode);
        n = transform_node_shift(n);
 
        if (is_Shrs(n))
@@ -4982,7 +5342,7 @@ static ir_node *transform_node_Shl(ir_node *n) {
        ir_node *b    = get_Shl_right(n);
        ir_mode *mode = get_irn_mode(n);
 
-       HANDLE_BINOP_PHI(tarval_shl, a, b, c, mode);
+       HANDLE_BINOP_PHI((eval_func) tarval_shl, a, b, c, mode);
        n = transform_node_shift(n);
 
        if (is_Shl(n))
@@ -5002,7 +5362,7 @@ static ir_node *transform_node_Rotl(ir_node *n) {
        ir_node *b    = get_Rotl_right(n);
        ir_mode *mode = get_irn_mode(n);
 
-       HANDLE_BINOP_PHI(tarval_rotl, a, b, c, mode);
+       HANDLE_BINOP_PHI((eval_func) tarval_rotl, a, b, c, mode);
        n = transform_node_shift(n);
 
        if (is_Rotl(n))
@@ -5016,10 +5376,15 @@ static ir_node *transform_node_Rotl(ir_node *n) {
  */
 static ir_node *transform_node_Conv(ir_node *n) {
        ir_node *c, *oldn = n;
-       ir_node *a = get_Conv_op(n);
+       ir_mode *mode = get_irn_mode(n);
+       ir_node *a    = get_Conv_op(n);
 
-       if (is_const_Phi(a)) {
-               c = apply_conv_on_phi(a, get_irn_mode(n));
+       if (mode != mode_b && is_const_Phi(a)) {
+               /* Do NOT optimize mode_b Conv's, this leads to remaining
+                * Phib nodes later, because the conv_b_lower operation
+                * is instantly reverted, when it tries to insert a Convb.
+                */
+               c = apply_conv_on_phi(a, mode);
                if (c) {
                        DBG_OPT_ALGSIM0(oldn, c, FS_OPT_CONST_PHI);
                        return c;
@@ -5027,10 +5392,34 @@ static ir_node *transform_node_Conv(ir_node *n) {
        }
 
        if (is_Unknown(a)) { /* Conv_A(Unknown_B) -> Unknown_A */
-               ir_mode *mode = get_irn_mode(n);
                return new_r_Unknown(current_ir_graph, mode);
        }
 
+       if (mode_is_reference(mode) &&
+               get_mode_size_bits(mode) == get_mode_size_bits(get_irn_mode(a)) &&
+               is_Add(a)) {
+               ir_node *l = get_Add_left(a);
+               ir_node *r = get_Add_right(a);
+               dbg_info *dbgi = get_irn_dbg_info(a);
+               ir_node *block = get_nodes_block(n);
+               if(is_Conv(l)) {
+                       ir_node *lop = get_Conv_op(l);
+                       if(get_irn_mode(lop) == mode) {
+                               /* ConvP(AddI(ConvI(P), x)) -> AddP(P, x) */
+                               n = new_rd_Add(dbgi, block, lop, r, mode);
+                               return n;
+                       }
+               }
+               if(is_Conv(r)) {
+                       ir_node *rop = get_Conv_op(r);
+                       if(get_irn_mode(rop) == mode) {
+                               /* ConvP(AddI(x, ConvI(P))) -> AddP(x, P) */
+                               n = new_rd_Add(dbgi, block, l, rop, mode);
+                               return n;
+                       }
+               }
+       }
+
        return n;
 }  /* transform_node_Conv */
 
@@ -5053,10 +5442,11 @@ static ir_node *transform_node_End(ir_node *n) {
                        continue;
                } else if (is_irn_pinned_in_irg(ka) && is_Block_dead(get_nodes_block(ka))) {
                        continue;
+               } else if (is_Bad(ka)) {
+                       /* no need to keep Bad */
+                       continue;
                }
-               /* FIXME: beabi need to keep a Proj(M) */
-               if (is_Phi(ka) || is_irn_keep(ka) || is_Proj(ka))
-                       in[j++] = ka;
+               in[j++] = ka;
        }
        if (j != n_keepalives)
                set_End_keepalives(n, j, in);
@@ -5091,7 +5481,63 @@ static ir_node *transform_node_Mux(ir_node *n) {
        ir_node  *t   = get_Mux_true(n);
        ir_node  *f   = get_Mux_false(n);
        ir_graph *irg = current_ir_graph;
-       ir_node  *conds[1], *vals[2];
+
+       if (is_irg_state(irg, IR_GRAPH_STATE_KEEP_MUX))
+               return n;
+
+       if (is_Mux(t)) {
+               ir_node*  block = get_nodes_block(n);
+               ir_node*  c0    = sel;
+               ir_node*  c1    = get_Mux_sel(t);
+               ir_node*  t1    = get_Mux_true(t);
+               ir_node*  f1    = get_Mux_false(t);
+               if (f == f1) {
+                       /* Mux(cond0, Mux(cond1, x, y), y) -> typical if (cond0 && cond1) x else y */
+                       ir_node* and_    = new_r_And(block, c0, c1, mode_b);
+                       ir_node* new_mux = new_r_Mux(block, and_, f1, t1, mode);
+                       n   = new_mux;
+                       sel = and_;
+                       f   = f1;
+                       t   = t1;
+                       DBG_OPT_ALGSIM0(oldn, t, FS_OPT_MUX_COMBINE);
+               } else if (f == t1) {
+                       /* Mux(cond0, Mux(cond1, x, y), x) */
+                       ir_node* not_c1  = new_r_Not(block, c1, mode_b);
+                       ir_node* and_    = new_r_And(block, c0, not_c1, mode_b);
+                       ir_node* new_mux = new_r_Mux(block, and_, t1, f1, mode);
+                       n   = new_mux;
+                       sel = and_;
+                       f   = t1;
+                       t   = f1;
+                       DBG_OPT_ALGSIM0(oldn, t, FS_OPT_MUX_COMBINE);
+               }
+       } else if (is_Mux(f)) {
+               ir_node*  block = get_nodes_block(n);
+               ir_node*  c0    = sel;
+               ir_node*  c1    = get_Mux_sel(f);
+               ir_node*  t1    = get_Mux_true(f);
+               ir_node*  f1    = get_Mux_false(f);
+               if (t == t1) {
+                       /* Mux(cond0, x, Mux(cond1, x, y)) -> typical if (cond0 || cond1) x else y */
+                       ir_node* or_     = new_r_Or(block, c0, c1, mode_b);
+                       ir_node* new_mux = new_r_Mux(block, or_, f1, t1, mode);
+                       n   = new_mux;
+                       sel = or_;
+                       f   = f1;
+                       t   = t1;
+                       DBG_OPT_ALGSIM0(oldn, f, FS_OPT_MUX_COMBINE);
+               } else if (t == f1) {
+                       /* Mux(cond0, x, Mux(cond1, y, x)) */
+                       ir_node* not_c1  = new_r_Not(block, c1, mode_b);
+                       ir_node* or_     = new_r_Or(block, c0, not_c1, mode_b);
+                       ir_node* new_mux = new_r_Mux(block, or_, t1, f1, mode);
+                       n   = new_mux;
+                       sel = or_;
+                       f   = t1;
+                       t   = f1;
+                       DBG_OPT_ALGSIM0(oldn, f, FS_OPT_MUX_COMBINE);
+               }
+       }
 
        /* first normalization step: move a possible zero to the false case */
        if (is_Proj(sel)) {
@@ -5099,16 +5545,16 @@ static ir_node *transform_node_Mux(ir_node *n) {
 
                if (is_Cmp(cmp)) {
                        if (is_Const(t) && is_Const_null(t)) {
-                               /* Psi(x, 0, y) => Psi(x, y, 0) */
+                               ir_node *tmp;
+
+                               /* Mux(x, 0, y) => Mux(x, y, 0) */
                                pn_Cmp pnc = get_Proj_proj(sel);
-                               sel = new_r_Proj(irg, get_nodes_block(cmp), cmp, mode_b,
+                               sel = new_r_Proj(get_nodes_block(cmp), cmp, mode_b,
                                        get_negated_pnc(pnc, get_irn_mode(get_Cmp_left(cmp))));
-                               conds[0] = sel;
-                               vals[0]  = f;
-                               vals[1]  = t;
-                               n        = new_rd_Psi(get_irn_dbg_info(n), irg, get_nodes_block(n), 1, conds, vals, mode);
-                               t = vals[0];
-                               f = vals[1];
+                               n        = new_rd_Mux(get_irn_dbg_info(n), get_nodes_block(n), sel, t, f, mode);
+                               tmp = t;
+                               t = f;
+                               f = tmp;
                        }
                }
        }
@@ -5117,7 +5563,6 @@ static ir_node *transform_node_Mux(ir_node *n) {
        if (mode == mode_b) {
                dbg_info *dbg   = get_irn_dbg_info(n);
                ir_node  *block = get_nodes_block(n);
-               ir_graph *irg   = current_ir_graph;
 
                if (is_Const(t)) {
                        tarval *tv_t = get_Const_tarval(t);
@@ -5129,7 +5574,7 @@ static ir_node *transform_node_Mux(ir_node *n) {
                                        return sel;
                                } else {
                                        /* Muxb(sel, true, x) = Or(sel, x) */
-                                       n = new_rd_Or(dbg, irg, block, sel, f, mode_b);
+                                       n = new_rd_Or(dbg, block, sel, f, mode_b);
                                        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_OR_BOOL);
                                        return n;
                                }
@@ -5138,14 +5583,14 @@ static ir_node *transform_node_Mux(ir_node *n) {
                        tarval *tv_f = get_Const_tarval(f);
                        if (tv_f == tarval_b_true) {
                                /* Muxb(sel, x, true) = Or(Not(sel), x) */
-                               ir_node* not_sel = new_rd_Not(dbg, irg, block, sel, mode_b);
+                               ir_node* not_sel = new_rd_Not(dbg, block, sel, mode_b);
                                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_ORNOT_BOOL);
-                               n = new_rd_Or(dbg, irg, block, not_sel, t, mode_b);
+                               n = new_rd_Or(dbg, block, not_sel, t, mode_b);
                                return n;
                        } else {
                                /* Muxb(sel, x, false) = And(sel, x) */
                                assert(tv_f == tarval_b_false);
-                               n = new_rd_And(dbg, irg, block, sel, t, mode_b);
+                               n = new_rd_And(dbg, block, sel, t, mode_b);
                                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_AND_BOOL);
                                return n;
                        }
@@ -5156,28 +5601,39 @@ static ir_node *transform_node_Mux(ir_node *n) {
        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_is_one(a) && tarval_is_null(b)) {
+                       ir_node *block = get_nodes_block(n);
+                       ir_node *conv  = new_r_Conv(block, sel, mode);
+                       n = conv;
+                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_CONV);
+                       return n;
+               } else if (tarval_is_null(a) && tarval_is_one(b)) {
+                       ir_node *block = get_nodes_block(n);
+                       ir_node *not_  = new_r_Not(block, sel, mode_b);
+                       ir_node *conv  = new_r_Conv(block, not_, mode);
+                       n = conv;
+                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_CONV);
+                       return n;
+               }
+               /* TODO: it's not really clear if that helps in general or should be moved
+                * to backend, especially with the MUX->Conv transformation above */
                if (tarval_cmp(a, b) & pn_Cmp_Gt) {
-                       diff = tarval_sub(a, b);
+                       diff = tarval_sub(a, b, NULL);
                        min  = b;
                } else {
-                       diff = tarval_sub(b, a);
+                       diff = tarval_sub(b, a, NULL);
                        min  = a;
                }
 
-               if (diff == get_tarval_one(mode) && min != null) {
+               if (diff == get_tarval_one(mode)) {
                        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));
-                       vals[1] = new_Const(mode, tarval_sub(b, min));
-                       n = new_rd_Psi(dbg, irg, block, 1, conds, vals, mode);
-                       n = new_rd_Add(dbg, irg, block, n, new_Const(mode, min), mode);
+                       ir_node  *t     = new_Const(tarval_sub(a, min, NULL));
+                       ir_node  *f     = new_Const(tarval_sub(b, min, NULL));
+                       n = new_rd_Mux(dbg, block, sel, f, t, mode);
+                       n = new_rd_Add(dbg, block, n, new_Const(min), mode);
                        return n;
                }
        }
@@ -5207,19 +5663,16 @@ static ir_node *transform_node_Mux(ir_node *n) {
                                        if ( (cmp_l == t && (pn == pn_Cmp_Ge || pn == pn_Cmp_Gt))
                                                || (cmp_l == f && (pn == pn_Cmp_Le || pn == pn_Cmp_Lt)))
                                        {
-                                               /* Psi(a >/>= 0, a, -a) = Psi(a </<= 0, -a, a) ==> Abs(a) */
-                                               n = new_rd_Abs(get_irn_dbg_info(n), current_ir_graph, block,
-                                                                                cmp_l, mode);
+                                               /* Mux(a >/>= 0, a, -a) = Mux(a </<= 0, -a, a) ==> Abs(a) */
+                                               n = new_rd_Abs(get_irn_dbg_info(n), block, cmp_l, mode);
                                                DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_ABS);
                                                return n;
                                        } else if ((cmp_l == t && (pn == pn_Cmp_Le || pn == pn_Cmp_Lt))
                                                || (cmp_l == f && (pn == pn_Cmp_Ge || pn == pn_Cmp_Gt)))
                                        {
-                                               /* Psi(a </<= 0, a, -a) = Psi(a >/>= 0, -a, a) ==> -Abs(a) */
-                                               n = new_rd_Abs(get_irn_dbg_info(n), current_ir_graph, block,
-                                                                                cmp_l, mode);
-                                               n = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph,
-                                                                                                                block, n, mode);
+                                               /* Mux(a </<= 0, a, -a) = Mux(a >/>= 0, -a, a) ==> -Abs(a) */
+                                               n = new_rd_Abs(get_irn_dbg_info(n), block, cmp_l, mode);
+                                               n = new_rd_Minus(get_irn_dbg_info(n), block, n, mode);
                                                DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_ABS);
                                                return n;
                                        }
@@ -5228,19 +5681,21 @@ static ir_node *transform_node_Mux(ir_node *n) {
                                if (mode_is_int(mode)) {
                                        /* integer only */
                                        if ((pn == pn_Cmp_Lg || pn == pn_Cmp_Eq) && is_And(cmp_l)) {
-                                               /* Psi((a & b) != 0, c, 0) */
+                                               /* Mux((a & b) != 0, c, 0) */
                                                ir_node *and_r = get_And_right(cmp_l);
                                                ir_node *and_l;
 
                                                if (and_r == t && f == cmp_r) {
                                                        if (is_Const(t) && tarval_is_single_bit(get_Const_tarval(t))) {
                                                                if (pn == pn_Cmp_Lg) {
-                                                                       /* Psi((a & 2^C) != 0, 2^C, 0) */
+                                                                       /* Mux((a & 2^C) != 0, 2^C, 0) */
                                                                        n = cmp_l;
+                                                                       DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_BITOP);
                                                                } else {
-                                                                       /* Psi((a & 2^C) == 0, 2^C, 0) */
-                                                                       n = new_rd_Eor(get_irn_dbg_info(n), current_ir_graph,
+                                                                       /* Mux((a & 2^C) == 0, 2^C, 0) */
+                                                                       n = new_rd_Eor(get_irn_dbg_info(n),
                                                                                block, cmp_l, t, mode);
+                                                                       DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_BITOP);
                                                                }
                                                                return n;
                                                        }
@@ -5252,10 +5707,12 @@ static ir_node *transform_node_Mux(ir_node *n) {
                                                                        if (pn == pn_Cmp_Lg) {
                                                                                /* (a & (1 << n)) != 0, (1 << n), 0) */
                                                                                n = cmp_l;
+                                                                               DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_BITOP);
                                                                        } else {
                                                                                /* (a & (1 << n)) == 0, (1 << n), 0) */
-                                                                               n = new_rd_Eor(get_irn_dbg_info(n), current_ir_graph,
+                                                                               n = new_rd_Eor(get_irn_dbg_info(n),
                                                                                        block, cmp_l, t, mode);
+                                                                               DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_BITOP);
                                                                        }
                                                                        return n;
                                                                }
@@ -5269,10 +5726,12 @@ static ir_node *transform_node_Mux(ir_node *n) {
                                                                        if (pn == pn_Cmp_Lg) {
                                                                                /* ((1 << n) & a) != 0, (1 << n), 0) */
                                                                                n = cmp_l;
+                                                                               DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_BITOP);
                                                                        } else {
                                                                                /* ((1 << n) & a) == 0, (1 << n), 0) */
-                                                                               n = new_rd_Eor(get_irn_dbg_info(n), current_ir_graph,
+                                                                               n = new_rd_Eor(get_irn_dbg_info(n),
                                                                                        block, cmp_l, t, mode);
+                                                                               DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_BITOP);
                                                                        }
                                                                        return n;
                                                                }
@@ -5283,21 +5742,12 @@ static ir_node *transform_node_Mux(ir_node *n) {
                        }
                }
        }
-       return arch_transform_node_Mux(n);
-}  /* transform_node_Mux */
-
-/**
- * Optimize a Psi into some simpler cases.
- */
-static ir_node *transform_node_Psi(ir_node *n) {
-       if (is_Mux(n))
-               return transform_node_Mux(n);
 
        return n;
-}  /* transform_node_Psi */
+}  /* transform_node_Mux */
 
 /**
- * optimize sync nodes that have other syncs as input we simply add the inputs
+ * optimize Sync nodes that have other syncs as input we simply add the inputs
  * of the other sync to our own inputs
  */
 static ir_node *transform_node_Sync(ir_node *n) {
@@ -5337,7 +5787,80 @@ static ir_node *transform_node_Sync(ir_node *n) {
        add_identities(current_ir_graph->value_table, n);
 
        return n;
-}
+}  /* transform_node_Sync */
+
+/**
+ * optimize a trampoline Call into a direct Call
+ */
+static ir_node *transform_node_Call(ir_node *call) {
+       ir_node  *callee = get_Call_ptr(call);
+       ir_node  *adr, *mem, *res, *bl, **in;
+       ir_type  *ctp, *mtp, *tp;
+       ident    *id;
+       dbg_info *db;
+       int      i, n_res, n_param;
+       ir_variadicity var;
+
+       if (! is_Proj(callee))
+               return call;
+       callee = get_Proj_pred(callee);
+       if (! is_Builtin(callee))
+               return call;
+       if (get_Builtin_kind(callee) != ir_bk_inner_trampoline)
+               return call;
+
+       mem = get_Call_mem(call);
+
+       if (skip_Proj(mem) == callee) {
+               /* memory is routed to the trampoline, skip */
+               mem = get_Builtin_mem(callee);
+       }
+
+       /* build a new call type */
+       mtp = get_Call_type(call);
+       id  = get_type_ident(mtp);
+       id  = id_mangle(new_id_from_chars("T_", 2), id);
+       db  = get_type_dbg_info(mtp);
+
+       n_res   = get_method_n_ress(mtp);
+       n_param = get_method_n_params(mtp);
+       ctp     = new_d_type_method(id, n_param + 1, n_res, db);
+
+       for (i = 0; i < n_res; ++i)
+               set_method_res_type(ctp, i, get_method_res_type(mtp, i));
+
+       NEW_ARR_A(ir_node *, in, n_param + 1);
+
+       /* FIXME: we don't need a new pointer type in every step */
+       tp = get_irg_frame_type(current_ir_graph);
+       id = id_mangle(get_type_ident(tp), new_id_from_chars("_ptr", 4));
+       tp = new_type_pointer(id, tp, mode_P_data);
+       set_method_param_type(ctp, 0, tp);
+
+       in[0] = get_Builtin_param(callee, 2);
+       for (i = 0; i < n_param; ++i) {
+               set_method_param_type(ctp, i + 1, get_method_param_type(mtp, i));
+               in[i + 1] = get_Call_param(call, i);
+       }
+       var = get_method_variadicity(mtp);
+       set_method_variadicity(ctp, var);
+       if (var == variadicity_variadic) {
+               set_method_first_variadic_param_index(ctp, get_method_first_variadic_param_index(mtp) + 1);
+       }
+       /* When we resolve a trampoline, the function must be called by a this-call */
+       set_method_calling_convention(ctp, get_method_calling_convention(mtp) | cc_this_call);
+       set_method_additional_properties(ctp, get_method_additional_properties(mtp));
+
+       adr = get_Builtin_param(callee, 1);
+
+       db  = get_irn_dbg_info(call);
+       bl  = get_nodes_block(call);
+
+       res = new_rd_Call(db, bl, mem, adr, n_param + 1, in, ctp);
+       if (get_irn_pinned(call) == op_pin_state_floats)
+               set_irn_pinned(res, op_pin_state_floats);
+       return res;
+}  /* transform_node_Call */
 
 /**
  * Tries several [inplace] [optimizing] transformations and returns an
@@ -5355,7 +5878,7 @@ static ir_node *transform_node(ir_node *n) {
         */
        do {
                oldn = n;
-               if (n->op->ops.transform_node)
+               if (n->op->ops.transform_node != NULL)
                        n = n->op->ops.transform_node(n);
        } while (oldn != n);
 
@@ -5373,29 +5896,43 @@ static ir_node *transform_node(ir_node *n) {
  */
 static ir_op_ops *firm_set_default_transform_node(ir_opcode code, ir_op_ops *ops)
 {
-#define CASE(a)                                 \
-       case iro_##a:                                 \
-               ops->transform_node  = transform_node_##a;  \
+#define CASE(a)                                         \
+       case iro_##a:                                       \
+               ops->transform_node      = transform_node_##a;  \
+               break
+#define CASE_PROJ(a)                                         \
+       case iro_##a:                                            \
+               ops->transform_node_Proj = transform_node_Proj_##a;  \
+               break
+#define CASE_PROJ_EX(a)                                      \
+       case iro_##a:                                            \
+               ops->transform_node      = transform_node_##a;       \
+               ops->transform_node_Proj = transform_node_Proj_##a;  \
                break
 
        switch (code) {
        CASE(Add);
        CASE(Sub);
        CASE(Mul);
-       CASE(Div);
-       CASE(Mod);
-       CASE(DivMod);
+       CASE_PROJ_EX(Div);
+       CASE_PROJ_EX(Mod);
+       CASE_PROJ_EX(DivMod);
        CASE(Quot);
        CASE(Abs);
-       CASE(Cond);
+       CASE_PROJ_EX(Cmp);
+       CASE_PROJ_EX(Cond);
        CASE(And);
-       CASE(Or);
        CASE(Eor);
-       CASE(Minus);
        CASE(Not);
+       CASE(Minus);
        CASE(Cast);
+       CASE_PROJ(Load);
+       CASE_PROJ(Store);
+       CASE_PROJ(Bound);
+       CASE_PROJ(CopyB);
        CASE(Proj);
        CASE(Phi);
+       CASE(Or);
        CASE(Sel);
        CASE(Shr);
        CASE(Shrs);
@@ -5404,13 +5941,15 @@ static ir_op_ops *firm_set_default_transform_node(ir_opcode code, ir_op_ops *ops
        CASE(Conv);
        CASE(End);
        CASE(Mux);
-       CASE(Psi);
        CASE(Sync);
+       CASE(Call);
        default:
          /* leave NULL */;
        }
 
        return ops;
+#undef CASE_PROJ_EX
+#undef CASE_PROJ
 #undef CASE
 }  /* firm_set_default_transform_node */
 
@@ -5462,19 +6001,27 @@ static int node_cmp_attr_SymConst(ir_node *a, ir_node *b) {
 
 /** Compares the attributes of two Call nodes. */
 static int node_cmp_attr_Call(ir_node *a, ir_node *b) {
-       return get_irn_call_attr(a) != get_irn_call_attr(b);
+       const call_attr *pa = get_irn_call_attr(a);
+       const call_attr *pb = get_irn_call_attr(b);
+       return (pa->type != pb->type)
+               || (pa->tail_call != pb->tail_call);
 }  /* node_cmp_attr_Call */
 
 /** Compares the attributes of two Sel nodes. */
 static int node_cmp_attr_Sel(ir_node *a, ir_node *b) {
        const ir_entity *a_ent = get_Sel_entity(a);
        const ir_entity *b_ent = get_Sel_entity(b);
+#if 0
        return
                (a_ent->kind    != b_ent->kind)    ||
                (a_ent->name    != b_ent->name)    ||
                (a_ent->owner   != b_ent->owner)   ||
                (a_ent->ld_name != b_ent->ld_name) ||
                (a_ent->type    != b_ent->type);
+#endif
+       /* Matze: inlining of functions can produce 2 entities with same type,
+        * name, etc. */
+       return a_ent != b_ent;
 }  /* node_cmp_attr_Sel */
 
 /** Compares the attributes of two Phi nodes. */
@@ -5537,7 +6084,7 @@ static int node_cmp_attr_Div(ir_node *a, ir_node *b) {
        const divmod_attr *ma = get_irn_divmod_attr(a);
        const divmod_attr *mb = get_irn_divmod_attr(b);
        return ma->exc.pin_state != mb->exc.pin_state ||
-                  ma->res_mode      != mb->res_mode ||
+                  ma->resmode       != mb->resmode ||
                   ma->no_remainder  != mb->no_remainder;
 }  /* node_cmp_attr_Div */
 
@@ -5546,7 +6093,7 @@ static int node_cmp_attr_DivMod(ir_node *a, ir_node *b) {
        const divmod_attr *ma = get_irn_divmod_attr(a);
        const divmod_attr *mb = get_irn_divmod_attr(b);
        return ma->exc.pin_state != mb->exc.pin_state ||
-                  ma->res_mode      != mb->res_mode;
+                  ma->resmode       != mb->resmode;
 }  /* node_cmp_attr_DivMod */
 
 /** Compares the attributes of two Mod nodes. */
@@ -5554,7 +6101,7 @@ static int node_cmp_attr_Mod(ir_node *a, ir_node *b) {
        const divmod_attr *ma = get_irn_divmod_attr(a);
        const divmod_attr *mb = get_irn_divmod_attr(b);
        return ma->exc.pin_state != mb->exc.pin_state ||
-                  ma->res_mode      != mb->res_mode;
+                  ma->resmode       != mb->resmode;
 }  /* node_cmp_attr_Mod */
 
 /** Compares the attributes of two Quot nodes. */
@@ -5562,14 +6109,24 @@ static int node_cmp_attr_Quot(ir_node *a, ir_node *b) {
        const divmod_attr *ma = get_irn_divmod_attr(a);
        const divmod_attr *mb = get_irn_divmod_attr(b);
        return ma->exc.pin_state != mb->exc.pin_state ||
-                  ma->res_mode      != mb->res_mode;
+                  ma->resmode       != mb->resmode;
 }  /* node_cmp_attr_Quot */
 
 /** Compares the attributes of two Confirm nodes. */
 static int node_cmp_attr_Confirm(ir_node *a, ir_node *b) {
+       /* no need to compare the bound, as this is a input */
        return (get_Confirm_cmp(a) != get_Confirm_cmp(b));
 }  /* node_cmp_attr_Confirm */
 
+/** Compares the attributes of two Builtin nodes. */
+static int node_cmp_attr_Builtin(ir_node *a, ir_node *b) {
+       const builtin_attr *ma = get_irn_builtin_attr(a);
+       const builtin_attr *mb = get_irn_builtin_attr(b);
+
+       /* no need to compare the type, equal kind means equal type */
+       return ma->kind != mb->kind;
+}  /* node_cmp_attr_Builtin */
+
 /** Compares the attributes of two ASM nodes. */
 static int node_cmp_attr_ASM(ir_node *a, ir_node *b) {
        int i, n;
@@ -5616,6 +6173,14 @@ static int node_cmp_attr_ASM(ir_node *a, ir_node *b) {
        return 0;
 }  /* node_cmp_attr_ASM */
 
+/** Compares the inexistent attributes of two Dummy nodes. */
+static int node_cmp_attr_Dummy(ir_node *a, ir_node *b)
+{
+       (void) a;
+       (void) b;
+       return 1;
+}
+
 /**
  * Set the default node attribute compare operation for an ir_op_ops.
  *
@@ -5653,6 +6218,8 @@ static ir_op_ops *firm_set_default_node_cmp_attr(ir_opcode code, ir_op_ops *ops)
        CASE(Mod);
        CASE(Quot);
        CASE(Bound);
+       CASE(Builtin);
+       CASE(Dummy);
        /* FIXME CopyB */
        default:
          /* leave NULL */;
@@ -5708,38 +6275,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(const 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;
+       return node->op->ops.hash(node);
 }  /* ir_node_hash */
 
+
 pset *new_identities(void) {
        return new_pset(identities_cmp, N_IR_NODES);
 }  /* new_identities */
@@ -5748,13 +6291,9 @@ void del_identities(pset *value_table) {
        del_pset(value_table);
 }  /* del_identities */
 
-/**
- * Normalize a node by putting constants (and operands with larger
- * node index) on the right (operator side).
- *
- * @param n   The node to normalize
- */
-static void normalize_node(ir_node *n) {
+/* Normalize a node by putting constants (and operands with larger
+ * node index) on the right (operator side). */
+void ir_normalize_node(ir_node *n) {
        if (is_op_commutative(get_irn_op(n))) {
                ir_node *l = get_binop_left(n);
                ir_node *r = get_binop_right(n);
@@ -5766,9 +6305,10 @@ static void normalize_node(ir_node *n) {
                if (!operands_are_normalized(l, r)) {
                        set_binop_left(n, r);
                        set_binop_right(n, l);
+                       hook_normalize(n);
                }
        }
-}  /* normalize_node */
+}  /* ir_normalize_node */
 
 /**
  * Update the nodes after a match in the value table. If both nodes have
@@ -5834,13 +6374,12 @@ ir_node *identify_remember(pset *value_table, ir_node *n) {
 
        if (!value_table) return n;
 
-       normalize_node(n);
+       ir_normalize_node(n);
        /* lookup or insert in hash table with given hash key. */
        o = pset_insert(value_table, n, ir_node_hash(n));
 
        if (o != n) {
                update_known_irn(o, n);
-               DBG_OPT_CSE(n, o);
        }
 
        return o;
@@ -5854,7 +6393,7 @@ ir_node *identify_remember(pset *value_table, ir_node *n) {
  * @param value_table  The value table
  * @param n            The node to lookup
  */
-static INLINE ir_node *identify_cons(pset *value_table, ir_node *n) {
+static inline ir_node *identify_cons(pset *value_table, ir_node *n) {
        ir_node *old = n;
 
        n = identify_remember(value_table, n);
@@ -5993,7 +6532,10 @@ ir_node *optimize_node(ir_node *n) {
                /* neither constants nor Tuple values can be evaluated */
                if (iro != iro_Const && (get_irn_mode(n) != mode_T)) {
                        unsigned fp_model = get_irg_fp_model(current_ir_graph);
-                       int old_fp_mode = tarval_enable_fp_ops((fp_model & fp_strict_algebraic) == 0);
+                       int old_fp_mode = tarval_fp_ops_enabled();
+
+                       tarval_enable_fp_ops(! (fp_model & fp_no_float_fold));
+
                        /* try to evaluate */
                        tv = computed_value(n);
                        if (tv != tarval_bad) {
@@ -6026,7 +6568,7 @@ ir_node *optimize_node(ir_node *n) {
 
                                /* evaluation was successful -- replace the node. */
                                irg_kill_node(current_ir_graph, n);
-                               nw = new_Const(get_tarval_mode(tv), tv);
+                               nw = new_Const(tv);
 
                                if (old_tp && get_type_mode(old_tp) == get_tarval_mode(tv))
                                        set_Const_type(nw, old_tp);
@@ -6078,7 +6620,10 @@ ir_node *optimize_node(ir_node *n) {
 
        /* Now we have a legal, useful node. Enter it in hash table for CSE */
        if (get_opt_cse() && (get_irn_opcode(n) != iro_Block)) {
-               n = identify_remember(current_ir_graph->value_table, n);
+               ir_node *o = n;
+               n = identify_remember(current_ir_graph->value_table, o);
+               if (o != n)
+                       DBG_OPT_CSE(o, n);
        }
 
        return n;
@@ -6102,7 +6647,9 @@ ir_node *optimize_in_place_2(ir_node *n) {
                /* neither constants nor Tuple values can be evaluated */
                if (iro != iro_Const && get_irn_mode(n) != mode_T) {
                        unsigned fp_model = get_irg_fp_model(current_ir_graph);
-                       int old_fp_mode = tarval_enable_fp_ops((fp_model & fp_strict_algebraic) == 0);
+                       int old_fp_mode = tarval_fp_ops_enabled();
+
+                       tarval_enable_fp_ops((fp_model & fp_strict_algebraic) == 0);
                        /* try to evaluate */
                        tv = computed_value(n);
                        if (tv != tarval_bad) {
@@ -6116,7 +6663,7 @@ ir_node *optimize_in_place_2(ir_node *n) {
                                for (i = 0; i < arity && !old_tp; ++i)
                                        old_tp = get_irn_type(get_irn_n(n, i));
 
-                               n = new_Const(get_tarval_mode(tv), tv);
+                               n = new_Const(tv);
 
                                if (old_tp && get_type_mode(old_tp) == get_tarval_mode(tv))
                                        set_Const_type(n, old_tp);
@@ -6143,7 +6690,10 @@ ir_node *optimize_in_place_2(ir_node *n) {
           now all nodes are op_pin_state_pinned to blocks, i.e., the cse only finds common
           subexpressions within a block. */
        if (get_opt_cse()) {
-               n = identify_remember(current_ir_graph->value_table, n);
+               ir_node *o = n;
+               n = identify_remember(current_ir_graph->value_table, o);
+               if (o != n)
+                       DBG_OPT_CSE(o, n);
        }
 
        /* Some more constant expression evaluation. */
@@ -6163,8 +6713,12 @@ ir_node *optimize_in_place_2(ir_node *n) {
        /* Now we have a legal, useful node. Enter it in hash table for cse.
           Blocks should be unique anyways.  (Except the successor of start:
           is cse with the start block!) */
-       if (get_opt_cse() && (get_irn_opcode(n) != iro_Block))
-               n = identify_remember(current_ir_graph->value_table, n);
+       if (get_opt_cse() && (get_irn_opcode(n) != iro_Block)) {
+               ir_node *o = n;
+               n = identify_remember(current_ir_graph->value_table, o);
+               if (o != n)
+                       DBG_OPT_CSE(o, n);
+       }
 
        return n;
 }  /* optimize_in_place_2 */
@@ -6187,10 +6741,67 @@ 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);
+
+       return h;
+}  /* hash_Const */
+
+/**
+ * Calculate a hash value of a SymConst node.
+ */
+static unsigned hash_SymConst(const ir_node *node) {
+       unsigned h;
+
+       /* all others are pointers */
+       h = HASH_PTR(node->attr.symc.sym.type_p);
+
+       return h;
+}  /* 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);