Transform a - (b - c) into (a - b) + c instead of a + (c - b) iff (b - c) is a pointer.
[libfirm] / ir / ir / iropt.c
index e3a6f25..85c5270 100644 (file)
@@ -1,28 +1,33 @@
 /*
- * Project:     libFIRM
- * File name:   ir/ir/iropt.c
- * Purpose:     iropt --- optimizations intertwined with IR construction.
- * Author:      Christian Schaefer
- * Modified by: Goetz Lindenmaier, Michael Beck
- * Created:
- * CVS-ID:      $Id$
- * Copyright:   (c) 1998-2005 Universität Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
  */
 
+/**
+ * @file
+ * @brief   iropt --- optimizations intertwined with IR construction.
+ * @author  Christian Schaefer, Goetz Lindenmaier, Michael Beck
+ * @version $Id$
+ */
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
 
 #include "irnode_t.h"
 #include "irgraph_t.h"
 #include "irarch.h"
 #include "hashptr.h"
 #include "archop.h"
-#include "opt_polymorphy.h"
 #include "opt_confirms.h"
+#include "opt_polymorphy.h"
 #include "irtools.h"
+#include "xmalloc.h"
 
 /* Make types visible to allow most efficient access */
 #include "entity_t.h"
 
+/**
+ * Returns the tarval of a Const node or tarval_bad for all other nodes.
+ */
+static tarval *default_value_of(const ir_node *n) {
+       if (is_Const(n))
+               return get_Const_tarval(n); /* might return tarval_bad */
+       else
+               return tarval_bad;
+}
+
+value_of_func value_of_ptr = default_value_of;
+
+/* * Set a new value_of function. */
+void set_value_of_func(value_of_func func) {
+       if (func != NULL)
+               value_of_ptr = func;
+       else
+               value_of_ptr = default_value_of;
+}
+
 /**
  * Return the value of a Constant.
  */
-static tarval *computed_value_Const(ir_node *n) {
-  return get_Const_tarval(n);
+static tarval *computed_value_Const(const ir_node *n) {
+       return get_Const_tarval(n);
 }  /* computed_value_Const */
 
 /**
- * Return the value of a 'sizeof' or 'alignof' SymConst.
- */
-static tarval *computed_value_SymConst(ir_node *n) {
-  ir_type *type;
-
-  switch (get_SymConst_kind(n)) {
-  case symconst_type_size:
-    type = get_SymConst_type(n);
-    if (get_type_state(type) == layout_fixed)
-      return new_tarval_from_long(get_type_size_bytes(type), get_irn_mode(n));
-    break;
-  case symconst_type_align:
-    type = get_SymConst_type(n);
-    if (get_type_state(type) == layout_fixed)
-      return new_tarval_from_long(get_type_alignment_bytes(type), get_irn_mode(n));
-    break;
-  default:
-    break;
-  }
-  return tarval_bad;
+ * Return the value of a 'sizeof', 'alignof' or 'offsetof' SymConst.
+ */
+static tarval *computed_value_SymConst(const ir_node *n) {
+       ir_type   *type;
+       ir_entity *ent;
+
+       switch (get_SymConst_kind(n)) {
+       case symconst_type_size:
+               type = get_SymConst_type(n);
+               if (get_type_state(type) == layout_fixed)
+                       return new_tarval_from_long(get_type_size_bytes(type), get_irn_mode(n));
+               break;
+       case symconst_type_align:
+               type = get_SymConst_type(n);
+               if (get_type_state(type) == layout_fixed)
+                       return new_tarval_from_long(get_type_alignment_bytes(type), get_irn_mode(n));
+               break;
+       case symconst_ofs_ent:
+               ent  = get_SymConst_entity(n);
+               type = get_entity_owner(ent);
+               if (get_type_state(type) == layout_fixed)
+                       return new_tarval_from_long(get_entity_offset(ent), get_irn_mode(n));
+               break;
+       default:
+               break;
+       }
+       return tarval_bad;
 }  /* computed_value_SymConst */
 
 /**
  * Return the value of an Add.
  */
-static tarval *computed_value_Add(ir_node *n) {
-  ir_node *a = get_Add_left(n);
-  ir_node *b = get_Add_right(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);
+       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)))
-    return tarval_add(ta, tb);
+       if ((ta != tarval_bad) && (tb != tarval_bad))
+               return tarval_add(ta, tb);
 
-  return tarval_bad;
+       return tarval_bad;
 }  /* computed_value_Add */
 
 /**
  * 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));
+       /* a - a */
+       if (a == b && !is_Bad(a))
+               return get_mode_null(mode);
 
-  ta = value_of(a);
-  tb = value_of(b);
+       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;
+       return tarval_bad;
 }  /* computed_value_Sub */
 
 /**
  * Return the value of a Carry.
  * Special : a op 0, 0 op b
  */
-static tarval *computed_value_Carry(ir_node *n) {
-  ir_node *a = get_binop_left(n);
-  ir_node *b = get_binop_right(n);
-  ir_mode *m = get_irn_mode(n);
-
-  tarval *ta = value_of(a);
-  tarval *tb = value_of(b);
-
-  if ((ta != tarval_bad) && (tb != tarval_bad)) {
-    tarval_add(ta, tb);
-    return tarval_carry() ? get_mode_one(m) : get_mode_null(m);
-  } else {
-    if (   (classify_tarval(ta) == TV_CLASSIFY_NULL)
-        || (classify_tarval(tb) == TV_CLASSIFY_NULL))
-      return get_mode_null(m);
-  }
-  return tarval_bad;
+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);
+
+       tarval *ta = value_of(a);
+       tarval *tb = value_of(b);
+
+       if ((ta != tarval_bad) && (tb != tarval_bad)) {
+               tarval_add(ta, tb);
+               return tarval_carry() ? get_mode_one(m) : get_mode_null(m);
+       } else {
+               if (tarval_is_null(ta) || tarval_is_null(tb))
+                       return get_mode_null(m);
+       }
+       return tarval_bad;
 }  /* computed_value_Carry */
 
 /**
  * Return the value of a Borrow.
  * Special : a op 0
  */
-static tarval *computed_value_Borrow(ir_node *n) {
-  ir_node *a = get_binop_left(n);
-  ir_node *b = get_binop_right(n);
-  ir_mode *m = get_irn_mode(n);
-
-  tarval *ta = value_of(a);
-  tarval *tb = value_of(b);
-
-  if ((ta != tarval_bad) && (tb != tarval_bad)) {
-    return tarval_cmp(ta, tb) == pn_Cmp_Lt ? get_mode_one(m) : get_mode_null(m);
-  } else if (classify_tarval(ta) == TV_CLASSIFY_NULL) {
-      return get_mode_null(m);
-  }
-  return tarval_bad;
+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);
+
+       tarval *ta = value_of(a);
+       tarval *tb = value_of(b);
+
+       if ((ta != tarval_bad) && (tb != tarval_bad)) {
+               return tarval_cmp(ta, tb) == pn_Cmp_Lt ? get_mode_one(m) : get_mode_null(m);
+       } else if (tarval_is_null(ta)) {
+               return get_mode_null(m);
+       }
+       return tarval_bad;
 }  /* computed_value_Borrow */
 
 /**
  * Return the value of an unary Minus.
  */
-static tarval *computed_value_Minus(ir_node *n) {
-  ir_node *a = get_Minus_op(n);
-  tarval *ta = value_of(a);
+static tarval *computed_value_Minus(const ir_node *n) {
+       ir_node *a = get_Minus_op(n);
+       tarval *ta = value_of(a);
 
-  if ((ta != tarval_bad) && mode_is_signed(get_irn_mode(a)))
-    return tarval_neg(ta);
+       if (ta != tarval_bad)
+               return tarval_neg(ta);
 
-  return tarval_bad;
+       return tarval_bad;
 }  /* computed_value_Minus */
 
 /**
  * Return the value of a Mul.
  */
-static tarval *computed_value_Mul(ir_node *n) {
-  ir_node *a = get_Mul_left(n);
-  ir_node *b = get_Mul_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))) {
-    return tarval_mul(ta, tb);
-  } else {
-    /* a*0 = 0 or 0*b = 0:
-       calls computed_value recursive and returns the 0 with proper
-       mode. */
-    if ((ta != tarval_bad) && (ta == get_mode_null(get_tarval_mode(ta))))
-      return ta;
-    if ((tb != tarval_bad) && (tb == get_mode_null(get_tarval_mode(tb))))
-      return tb;
-  }
-  return tarval_bad;
+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;
+
+       tarval *ta = value_of(a);
+       tarval *tb = value_of(b);
+
+       mode = get_irn_mode(n);
+       if (mode != get_irn_mode(a)) {
+               /* n * n = 2n bit multiplication */
+               ta = tarval_convert_to(ta, mode);
+               tb = tarval_convert_to(tb, mode);
+       }
+
+       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;
+       }
+       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) {
-  ir_node *a = get_Abs_op(n);
-  tarval *ta = value_of(a);
+static tarval *computed_value_Abs(const ir_node *n) {
+       ir_node *a = get_Abs_op(n);
+       tarval *ta = value_of(a);
 
-  if (ta != tarval_bad)
-    return tarval_abs(ta);
+       if (ta != tarval_bad)
+               return tarval_abs(ta);
 
-  return tarval_bad;
+       return tarval_bad;
 }  /* computed_value_Abs */
 
 /**
  * Return the value of an And.
  * Special case: a & 0, 0 & b
  */
-static tarval *computed_value_And(ir_node *n) {
-  ir_node *a = get_And_left(n);
-  ir_node *b = get_And_right(n);
-
-  tarval *ta = value_of(a);
-  tarval *tb = value_of(b);
-
-  if ((ta != tarval_bad) && (tb != tarval_bad)) {
-    return tarval_and (ta, tb);
-  } else {
-    tarval *v;
-
-    if (   (classify_tarval ((v = ta)) == TV_CLASSIFY_NULL)
-        || (classify_tarval ((v = tb)) == TV_CLASSIFY_NULL)) {
-      return v;
-    }
-  }
-  return tarval_bad;
+static tarval *computed_value_And(const ir_node *n) {
+       ir_node *a = get_And_left(n);
+       ir_node *b = get_And_right(n);
+
+       tarval *ta = value_of(a);
+       tarval *tb = value_of(b);
+
+       if ((ta != tarval_bad) && (tb != tarval_bad)) {
+               return tarval_and (ta, tb);
+       } else {
+               if (tarval_is_null(ta)) return ta;
+               if (tarval_is_null(tb)) return tb;
+       }
+       return tarval_bad;
 }  /* computed_value_And */
 
 /**
  * Return the value of an Or.
  * Special case: a | 1...1, 1...1 | b
  */
-static tarval *computed_value_Or(ir_node *n) {
-  ir_node *a = get_Or_left(n);
-  ir_node *b = get_Or_right(n);
-
-  tarval *ta = value_of(a);
-  tarval *tb = value_of(b);
-
-  if ((ta != tarval_bad) && (tb != tarval_bad)) {
-    return tarval_or (ta, tb);
-  } else {
-    tarval *v;
-    if (   (classify_tarval ((v = ta)) == TV_CLASSIFY_ALL_ONE)
-        || (classify_tarval ((v = tb)) == TV_CLASSIFY_ALL_ONE)) {
-      return v;
-    }
-  }
-  return tarval_bad;
+static tarval *computed_value_Or(const ir_node *n) {
+       ir_node *a = get_Or_left(n);
+       ir_node *b = get_Or_right(n);
+
+       tarval *ta = value_of(a);
+       tarval *tb = value_of(b);
+
+       if ((ta != tarval_bad) && (tb != tarval_bad)) {
+               return tarval_or (ta, tb);
+       } else {
+               if (tarval_is_all_one(ta)) return ta;
+               if (tarval_is_all_one(tb)) return tb;
+       }
+       return tarval_bad;
 }  /* computed_value_Or */
 
 /**
  * Return the value of an Eor.
  */
-static tarval *computed_value_Eor(ir_node *n) {
-  ir_node *a = get_Eor_left(n);
-  ir_node *b = get_Eor_right(n);
+static tarval *computed_value_Eor(const ir_node *n) {
+       ir_node *a = get_Eor_left(n);
+       ir_node *b = get_Eor_right(n);
 
-  tarval *ta, *tb;
+       tarval *ta, *tb;
 
-  if (a == b)
-    return get_mode_null(get_irn_mode(n));
+       if (a == b)
+               return get_mode_null(get_irn_mode(n));
 
-  ta = value_of(a);
-  tb = value_of(b);
+       ta = value_of(a);
+       tb = value_of(b);
 
-  if ((ta != tarval_bad) && (tb != tarval_bad)) {
-    return tarval_eor (ta, tb);
-  }
-  return tarval_bad;
+       if ((ta != tarval_bad) && (tb != tarval_bad)) {
+               return tarval_eor (ta, tb);
+       }
+       return tarval_bad;
 }  /* computed_value_Eor */
 
 /**
  * Return the value of a Not.
  */
-static tarval *computed_value_Not(ir_node *n) {
-  ir_node *a = get_Not_op(n);
-  tarval *ta = value_of(a);
+static tarval *computed_value_Not(const ir_node *n) {
+       ir_node *a = get_Not_op(n);
+       tarval *ta = value_of(a);
 
-  if (ta != tarval_bad)
-    return tarval_not(ta);
+       if (ta != tarval_bad)
+               return tarval_not(ta);
 
-  return tarval_bad;
+       return tarval_bad;
 }  /* computed_value_Not */
 
 /**
  * Return the value of a Shl.
  */
-static tarval *computed_value_Shl(ir_node *n) {
-  ir_node *a = get_Shl_left(n);
-  ir_node *b = get_Shl_right(n);
+static tarval *computed_value_Shl(const ir_node *n) {
+       ir_node *a = get_Shl_left(n);
+       ir_node *b = get_Shl_right(n);
 
-  tarval *ta = value_of(a);
-  tarval *tb = value_of(b);
+       tarval *ta = value_of(a);
+       tarval *tb = value_of(b);
 
-  if ((ta != tarval_bad) && (tb != tarval_bad)) {
-    return tarval_shl (ta, tb);
-  }
-  return tarval_bad;
+       if ((ta != tarval_bad) && (tb != tarval_bad)) {
+               return tarval_shl (ta, tb);
+       }
+       return tarval_bad;
 }  /* computed_value_Shl */
 
 /**
  * Return the value of a Shr.
  */
-static tarval *computed_value_Shr(ir_node *n) {
-  ir_node *a = get_Shr_left(n);
-  ir_node *b = get_Shr_right(n);
+static tarval *computed_value_Shr(const ir_node *n) {
+       ir_node *a = get_Shr_left(n);
+       ir_node *b = get_Shr_right(n);
 
-  tarval *ta = value_of(a);
-  tarval *tb = value_of(b);
+       tarval *ta = value_of(a);
+       tarval *tb = value_of(b);
 
-  if ((ta != tarval_bad) && (tb != tarval_bad)) {
-    return tarval_shr (ta, tb);
-  }
-  return tarval_bad;
+       if ((ta != tarval_bad) && (tb != tarval_bad)) {
+               return tarval_shr (ta, tb);
+       }
+       return tarval_bad;
 }  /* computed_value_Shr */
 
 /**
  * Return the value of a Shrs.
  */
-static tarval *computed_value_Shrs(ir_node *n) {
-  ir_node *a = get_Shrs_left(n);
-  ir_node *b = get_Shrs_right(n);
+static tarval *computed_value_Shrs(const ir_node *n) {
+       ir_node *a = get_Shrs_left(n);
+       ir_node *b = get_Shrs_right(n);
 
-  tarval *ta = value_of(a);
-  tarval *tb = value_of(b);
+       tarval *ta = value_of(a);
+       tarval *tb = value_of(b);
 
-  if ((ta != tarval_bad) && (tb != tarval_bad)) {
-    return tarval_shrs (ta, tb);
-  }
-  return tarval_bad;
+       if ((ta != tarval_bad) && (tb != tarval_bad)) {
+               return tarval_shrs (ta, tb);
+       }
+       return tarval_bad;
 }  /* computed_value_Shrs */
 
 /**
- * Return the value of a Rot.
+ * Return the value of a Rotl.
  */
-static tarval *computed_value_Rot(ir_node *n)
-{
-  ir_node *a = get_Rot_left(n);
-  ir_node *b = get_Rot_right(n);
+static tarval *computed_value_Rotl(const ir_node *n) {
+       ir_node *a = get_Rotl_left(n);
+       ir_node *b = get_Rotl_right(n);
 
-  tarval *ta = value_of(a);
-  tarval *tb = value_of(b);
+       tarval *ta = value_of(a);
+       tarval *tb = value_of(b);
 
-  if ((ta != tarval_bad) && (tb != tarval_bad)) {
-    return tarval_rot (ta, tb);
-  }
-  return tarval_bad;
-}  /* computed_value_Rot */
+       if ((ta != tarval_bad) && (tb != tarval_bad)) {
+               return tarval_rotl(ta, tb);
+       }
+       return tarval_bad;
+}  /* computed_value_Rotl */
 
 /**
  * Return the value of a Conv.
  */
-static tarval *computed_value_Conv(ir_node *n)
-{
-  ir_node *a = get_Conv_op(n);
-  tarval *ta = value_of(a);
+static tarval *computed_value_Conv(const ir_node *n) {
+       ir_node *a = get_Conv_op(n);
+       tarval *ta = value_of(a);
 
-  if (ta != tarval_bad)
-    return tarval_convert_to(ta, get_irn_mode(n));
+       if (ta != tarval_bad)
+               return tarval_convert_to(ta, get_irn_mode(n));
 
-  return tarval_bad;
+       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 (CondEval wants them), so wait until
+        * remove_confirm is activated.
+        */
+       if (get_opt_remove_confirm()) {
+               if (get_Confirm_cmp(n) == pn_Cmp_Eq) {
+                       tarval *tv = value_of(get_Confirm_bound(n));
+                       if (tv != tarval_bad)
+                               return tv;
+               }
+       }
+       return value_of(get_Confirm_value(n));
+}  /* computed_value_Confirm */
+
 /**
  * Return the value of a Proj(Cmp).
  *
@@ -446,186 +447,222 @@ 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)
-{
-  ir_node *a   = get_Proj_pred(n);
-  ir_node *aa  = get_Cmp_left(a);
-  ir_node *ab  = get_Cmp_right(a);
-  long proj_nr = get_Proj_proj(n);
-
-  /*
-   * BEWARE: a == a is NOT always True for floating Point values, as
-   * NaN != NaN is defined, so we must check this here.
-   */
-  if (aa == ab && (
-      !mode_is_float(get_irn_mode(aa)) || proj_nr == pn_Cmp_Lt ||  proj_nr == pn_Cmp_Gt)
-      ) { /* 1.: */
-
-    /* This is a trick with the bits used for encoding the Cmp
-       Proj numbers, the following statement is not the same:
-    return new_tarval_from_long (proj_nr == pn_Cmp_Eq, mode_b) */
-    return new_tarval_from_long (proj_nr & pn_Cmp_Eq, mode_b);
-  }
-  else {
-    tarval *taa = value_of(aa);
-    tarval *tab = value_of(ab);
-    ir_mode *mode = get_irn_mode(aa);
-
-    /*
-     * The predecessors of Cmp are target values.  We can evaluate
-     * the Cmp.
-     */
-    if ((taa != tarval_bad) && (tab != tarval_bad)) {
-      /* strange checks... */
-      pn_Cmp flags = tarval_cmp(taa, tab);
-      if (flags != pn_Cmp_False) {
-        return new_tarval_from_long (proj_nr & flags, mode_b);
-      }
-    }
-    /* for integer values, we can check against MIN/MAX */
-    else if (mode_is_int(mode)) {
-      /* MIN <=/> x.  This results in true/false. */
-      if (taa == get_mode_min(mode)) {
-        /* a compare with the MIN value */
-        if (proj_nr == pn_Cmp_Le)
-          return get_tarval_b_true();
-        else if (proj_nr == pn_Cmp_Gt)
-          return get_tarval_b_false();
-      }
-      /* x >=/< MIN.  This results in true/false. */
-      else
-      if (tab == get_mode_min(mode)) {
-        /* a compare with the MIN value */
-        if (proj_nr == pn_Cmp_Ge)
-          return get_tarval_b_true();
-        else if (proj_nr == pn_Cmp_Lt)
-          return get_tarval_b_false();
-      }
-      /* MAX >=/< x.  This results in true/false. */
-      else if (taa == get_mode_max(mode)) {
-        if (proj_nr == pn_Cmp_Ge)
-          return get_tarval_b_true();
-        else if (proj_nr == pn_Cmp_Lt)
-          return get_tarval_b_false();
-      }
-      /* x <=/> MAX.  This results in true/false. */
-      else if (tab == get_mode_max(mode)) {
-        if (proj_nr == pn_Cmp_Le)
-          return get_tarval_b_true();
-        else if (proj_nr == pn_Cmp_Gt)
-          return get_tarval_b_false();
-      }
-    }
-    /*
-     * The predecessors are Allocs or (void*)(0) constants.  Allocs never
-     * return NULL, they raise an exception.   Therefore we can predict
-     * the Cmp result.
-     */
-    else {
-      ir_node *aaa = skip_Id(skip_Proj(aa));
-      ir_node *aba = skip_Id(skip_Proj(ab));
-
-      if (   (   (/* aa is ProjP and aaa is Alloc */
-                     (get_irn_op(aa) == op_Proj)
-                  && (mode_is_reference(get_irn_mode(aa)))
-                  && (get_irn_op(aaa) == op_Alloc))
-              && (   (/* ab is NULL */
-                         (get_irn_op(ab) == op_Const)
-                      && (mode_is_reference(get_irn_mode(ab)))
-                      && (get_Const_tarval(ab) == get_mode_null(get_irn_mode(ab))))
-                  || (/* ab is other Alloc */
-                         (get_irn_op(ab) == op_Proj)
-                      && (mode_is_reference(get_irn_mode(ab)))
-                      && (get_irn_op(aba) == op_Alloc)
-                      && (aaa != aba))))
-          || (/* aa is NULL and aba is Alloc */
-                 (get_irn_op(aa) == op_Const)
-              && (mode_is_reference(get_irn_mode(aa)))
-              && (get_Const_tarval(aa) == get_mode_null(get_irn_mode(aa)))
-              && (get_irn_op(ab) == op_Proj)
-              && (mode_is_reference(get_irn_mode(ab)))
-              && (get_irn_op(aba) == op_Alloc)))
-        /* 3.: */
-        return new_tarval_from_long(proj_nr & pn_Cmp_Ne, mode_b);
-    }
-  }
-  return computed_value_Cmp_Confirm(a, aa, ab, proj_nr);
+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);
+       long proj_nr = get_Proj_proj(n);
+
+       /*
+        * BEWARE: a == a is NOT always True for floating Point values, as
+        * NaN != NaN is defined, so we must check this here.
+        */
+       if (aa == ab && (
+               !mode_is_float(get_irn_mode(aa)) || proj_nr == pn_Cmp_Lt ||  proj_nr == pn_Cmp_Gt)
+               ) { /* 1.: */
+
+               /* This is a trick with the bits used for encoding the Cmp
+                  Proj numbers, the following statement is not the same:
+               return new_tarval_from_long (proj_nr == pn_Cmp_Eq, mode_b) */
+               return new_tarval_from_long (proj_nr & pn_Cmp_Eq, mode_b);
+       }
+       else {
+               tarval *taa = value_of(aa);
+               tarval *tab = value_of(ab);
+               ir_mode *mode = get_irn_mode(aa);
+
+               /*
+                * The predecessors of Cmp are target values.  We can evaluate
+                * the Cmp.
+                */
+               if ((taa != tarval_bad) && (tab != tarval_bad)) {
+                       /* strange checks... */
+                       pn_Cmp flags = tarval_cmp(taa, tab);
+                       if (flags != pn_Cmp_False) {
+                               return new_tarval_from_long (proj_nr & flags, mode_b);
+                       }
+               }
+               /* for integer values, we can check against MIN/MAX */
+               else if (mode_is_int(mode)) {
+                       /* MIN <=/> x.  This results in true/false. */
+                       if (taa == get_mode_min(mode)) {
+                               /* a compare with the MIN value */
+                               if (proj_nr == pn_Cmp_Le)
+                                       return get_tarval_b_true();
+                               else if (proj_nr == pn_Cmp_Gt)
+                                       return get_tarval_b_false();
+                       }
+                       /* x >=/< MIN.  This results in true/false. */
+                       else
+                               if (tab == get_mode_min(mode)) {
+                                       /* a compare with the MIN value */
+                                       if (proj_nr == pn_Cmp_Ge)
+                                               return get_tarval_b_true();
+                                       else if (proj_nr == pn_Cmp_Lt)
+                                               return get_tarval_b_false();
+                               }
+                               /* MAX >=/< x.  This results in true/false. */
+                               else if (taa == get_mode_max(mode)) {
+                                       if (proj_nr == pn_Cmp_Ge)
+                                               return get_tarval_b_true();
+                                       else if (proj_nr == pn_Cmp_Lt)
+                                               return get_tarval_b_false();
+                               }
+                               /* x <=/> MAX.  This results in true/false. */
+                               else if (tab == get_mode_max(mode)) {
+                                       if (proj_nr == pn_Cmp_Le)
+                                               return get_tarval_b_true();
+                                       else if (proj_nr == pn_Cmp_Gt)
+                                               return get_tarval_b_false();
+                               }
+               }
+               /*
+                * The predecessors are Allocs or (void*)(0) constants.  Allocs never
+                * return NULL, they raise an exception.   Therefore we can predict
+                * the Cmp result.
+                */
+               else {
+                       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 */
+                                       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 */
+                               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_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).
+ * 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);
+       /* 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_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;
+/**
+ * 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;
+
+       /* 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_Div:
-    if (get_Proj_proj(n) == pn_Div_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);
+
+       /* Compute a % 1 or c1 % c2 */
+       if (tarval_is_one(tb))
+               return get_mode_null(get_irn_mode(a));
+       if (ta != tarval_bad && tb != tarval_bad)
+               return tarval_mod(ta, tb);
+       return tarval_bad;
+}  /* do_computed_value_Mod */
 
-  case iro_Mod:
-    if (get_Proj_proj(n) == pn_Mod_res)
-      return computed_value(a);
-    break;
+/**
+ * Return the value of a Proj(DivMod).
+ */
+static tarval *computed_value_Proj_DivMod(const ir_node *n) {
+       long proj_nr = get_Proj_proj(n);
+
+       /* 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));
+       }
+       return tarval_bad;
+}  /* computed_value_Proj_DivMod */
 
-  default:
-    return tarval_bad;
-  }
-  return tarval_bad;
-}  /* computed_value_Proj */
+/**
+ * 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_Proj_Div */
 
 /**
- * Calculate the value of a Mux: can be evaluated, if the
- * sel and the right input are known.
+ * Return the value of a Proj(Mod).
  */
-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_Mod(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);
-  }
-  else if (ts == get_tarval_b_false()) {
-    ir_node *v = get_Mux_false(n);
-    return value_of(v);
-  }
-  return tarval_bad;
-}  /* computed_value_Mux */
+       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_Proj_Mod */
 
 /**
- * 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(Quot).
  */
-static tarval *computed_value_Psi(ir_node *n) {
-  if (is_Mux(n))
-    return computed_value_Mux(n);
-  return tarval_bad;
-}  /* computed_value_Psi */
+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_Proj_Quot */
 
 /**
- * Calculate the value of a Confirm: can be evaluated,
- * if it has the form Confirm(x, '=', Const).
+ * Return the value of a Proj.
  */
-static tarval *computed_value_Confirm(ir_node *n) {
-  return get_Confirm_cmp(n) == pn_Cmp_Eq ?
-    value_of(get_Confirm_bound(n)) : tarval_bad;
-}  /* computed_value_Confirm */
+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.
@@ -633,10 +670,10 @@ static tarval *computed_value_Confirm(ir_node *n) {
  *
  * @param n  The node this should be evaluated
  */
-tarval *computed_value(ir_node *n) {
-  if (n->op->ops.computed_value)
-    return n->op->ops.computed_value(n);
-  return tarval_bad;
+tarval *computed_value(const ir_node *n) {
+       if (n->op->ops.computed_value)
+               return n->op->ops.computed_value(n);
+       return tarval_bad;
 }  /* computed_value */
 
 /**
@@ -648,44 +685,50 @@ tarval *computed_value(ir_node *n) {
  * @return
  *    The operations.
  */
-static ir_op_ops *firm_set_default_computed_value(opcode code, ir_op_ops *ops)
+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; \
-    break
-
-  switch (code) {
-  CASE(Const);
-  CASE(SymConst);
-  CASE(Add);
-  CASE(Sub);
-  CASE(Minus);
-  CASE(Mul);
-  CASE(Quot);
-  CASE(Div);
-  CASE(Mod);
-  CASE(Abs);
-  CASE(And);
-  CASE(Or);
-  CASE(Eor);
-  CASE(Not);
-  CASE(Shl);
-  CASE(Shr);
-  CASE(Shrs);
-  CASE(Rot);
-  CASE(Carry);
-  CASE(Borrow);
-  CASE(Conv);
-  CASE(Proj);
-  CASE(Mux);
-  CASE(Psi);
-  CASE(Confirm);
-  default:
-    /* leave NULL */;
-  }
-
-  return ops;
+#define CASE(a)                                        \
+       case iro_##a:                                      \
+               ops->computed_value      = computed_value_##a; \
+               break
+#define CASE_PROJ(a)                                        \
+       case iro_##a:                                           \
+               ops->computed_value_Proj = computed_value_Proj_##a; \
+               break
+
+       switch (code) {
+       CASE(Const);
+       CASE(SymConst);
+       CASE(Add);
+       CASE(Sub);
+       CASE(Carry);
+       CASE(Borrow);
+       CASE(Minus);
+       CASE(Mul);
+       CASE(Abs);
+       CASE(And);
+       CASE(Or);
+       CASE(Eor);
+       CASE(Not);
+       CASE(Shl);
+       CASE(Shr);
+       CASE(Shrs);
+       CASE(Rotl);
+       CASE(Conv);
+       CASE(Mux);
+       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 */
 
@@ -707,88 +750,95 @@ static ir_op_ops *firm_set_default_computed_value(opcode code, ir_op_ops *ops)
  */
 static ir_node *equivalent_node_Block(ir_node *n)
 {
-  ir_node *oldn = n;
-  int n_preds   = get_Block_n_cfgpreds(n);
-
-  /* The Block constructor does not call optimize, but mature_immBlock
-     calls the optimization. */
-  assert(get_Block_matured(n));
-
-  /* Straightening: a single entry Block following a single exit Block
-     can be merged, if it is not the Start block. */
-  /* !!! Beware, all Phi-nodes of n must have been optimized away.
-     This should be true, as the block is matured before optimize is called.
-     But what about Phi-cycles with the Phi0/Id that could not be resolved?
-     Remaining Phi nodes are just Ids. */
-   if ((n_preds == 1) && (get_irn_op(get_Block_cfgpred(n, 0)) == op_Jmp)) {
-     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) &&
-            (get_irn_op(skip_Proj(get_Block_cfgpred(n, 0))) == op_Cond)) {
-     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);
-     }
-   }
-   else if ((n_preds == 2) &&
-            (get_opt_control_flow_weak_simplification())) {
-    /* Test whether Cond jumps twice to this block
-     * The more general case which more than 2 predecessors is handles
-     * in optimize_cf(), we handle only this special case for speed here.
-     */
-    ir_node *a = get_Block_cfgpred(n, 0);
-    ir_node *b = get_Block_cfgpred(n, 1);
-
-    if ((get_irn_op(a) == op_Proj) &&
-        (get_irn_op(b) == op_Proj) &&
-        (get_Proj_pred(a) == get_Proj_pred(b)) &&
-        (get_irn_op(get_Proj_pred(a)) == op_Cond) &&
-        (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);
-    }
-  }
-  else if (get_opt_unreachable_code() &&
-           (n != get_irg_start_block(current_ir_graph)) &&
-           (n != get_irg_end_block(current_ir_graph))    ) {
-    int i;
-
-    /* If all inputs are dead, this block is dead too, except if it is
-       the start or end block.  This is one step of unreachable code
-       elimination */
-    for (i = get_Block_n_cfgpreds(n) - 1; i >= 0; --i) {
-      ir_node *pred = get_Block_cfgpred(n, i);
-      ir_node *pred_blk;
-
-      if (is_Bad(pred)) continue;
-      pred_blk = get_nodes_block(skip_Proj(pred));
-
-      if (is_Block_dead(pred_blk)) continue;
-
-      if (pred_blk != n) {
-        /* really found a living input */
-        break;
-      }
-    }
-    if (i < 0) {
-      n = set_Block_dead(n);
-      DBG_OPT_DEAD_BLOCK(oldn, n);
-    }
-  }
-
-  return n;
+       ir_node *oldn = n;
+       int     n_preds;
+
+       /* don't optimize dead blocks */
+       if (is_Block_dead(n))
+               return n;
+
+       n_preds = get_Block_n_cfgpreds(n);
+
+       /* The Block constructor does not call optimize, but mature_immBlock()
+          calls the optimization. */
+       assert(get_Block_matured(n));
+
+       /* Straightening: a single entry Block following a single exit Block
+          can be merged, if it is not the Start block. */
+       /* !!! Beware, all Phi-nodes of n must have been optimized away.
+          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) {
+               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())) {
+               /* Test whether Cond jumps twice to this block
+                * The more general case which more than 2 predecessors is handles
+                * in optimize_cf(), we handle only this special case for speed here.
+                */
+               ir_node *a = get_Block_cfgpred(n, 0);
+               ir_node *b = get_Block_cfgpred(n, 1);
+
+               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)) &&
+                  (n != get_irg_end_block(current_ir_graph))    ) {
+               int i;
+
+               /* If all inputs are dead, this block is dead too, except if it is
+                  the start or end block.  This is one step of unreachable code
+                  elimination */
+               for (i = get_Block_n_cfgpreds(n) - 1; i >= 0; --i) {
+                       ir_node *pred = get_Block_cfgpred(n, i);
+                       ir_node *pred_blk;
+
+                       if (is_Bad(pred)) continue;
+                       pred_blk = get_nodes_block(skip_Proj(pred));
+
+                       if (is_Block_dead(pred_blk)) continue;
+
+                       if (pred_blk != n) {
+                               /* really found a living input */
+                               break;
+                       }
+               }
+               if (i < 0) {
+                       n = set_Block_dead(n);
+                       DBG_OPT_DEAD_BLOCK(oldn, n);
+               }
+       }
+
+       return n;
 }  /* equivalent_node_Block */
 
 /**
@@ -796,11 +846,14 @@ 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();
-
-  return n;
+       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 */
 
 /** Raise is handled in the same way as Jmp. */
@@ -814,47 +867,88 @@ 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)
-{
-  ir_node *oldn = n;
-
-  ir_node *a = get_binop_left(n);
-  ir_node *b = get_binop_right(n);
-
-  tarval *tv;
-  ir_node *on;
-
-  /* After running compute_node there is only one constant predecessor.
-     Find this predecessors value and remember the other node: */
-  if ((tv = value_of(a)) != tarval_bad) {
-    on = b;
-  } else if ((tv = value_of(b)) != tarval_bad) {
-    on = a;
-  } else
-    return n;
-
-  /* If this predecessors constant value is zero, the operation is
-   * unnecessary. Remove it.
-   *
-   * Beware: If n is a Add, the mode of on and n might be different
-   * which happens in this rare construction: NULL + 3.
-   * Then, a Conv would be needed which we cannot include here.
-   */
-  if (classify_tarval (tv) == TV_CLASSIFY_NULL) {
-    if (get_irn_mode(on) == get_irn_mode(n)) {
-      n = on;
-
-      DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_NEUTRAL_0);
-    }
-  }
-
-  return n;
+static ir_node *equivalent_node_neutral_zero(ir_node *n) {
+       ir_node *oldn = n;
+
+       ir_node *a = get_binop_left(n);
+       ir_node *b = get_binop_right(n);
+
+       tarval *tv;
+       ir_node *on;
+
+       /* After running compute_node there is only one constant predecessor.
+          Find this predecessors value and remember the other node: */
+       if ((tv = value_of(a)) != tarval_bad) {
+               on = b;
+       } else if ((tv = value_of(b)) != tarval_bad) {
+               on = a;
+       } else
+               return n;
+
+       /* If this predecessors constant value is zero, the operation is
+        * unnecessary. Remove it.
+        *
+        * Beware: If n is a Add, the mode of on and n might be different
+        * which happens in this rare construction: NULL + 3.
+        * Then, a Conv would be needed which we cannot include here.
+        */
+       if (tarval_is_null(tv) && get_irn_mode(on) == get_irn_mode(n)) {
+               n = on;
+
+               DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_NEUTRAL_0);
+       }
+
+       return n;
 }  /* equivalent_node_neutral_zero */
 
 /**
  * Eor is commutative and has neutral 0.
  */
-#define equivalent_node_Eor  equivalent_node_neutral_zero
+static ir_node *equivalent_node_Eor(ir_node *n) {
+       ir_node *oldn = n;
+       ir_node *a;
+       ir_node *b;
+
+       n = equivalent_node_neutral_zero(n);
+       if (n != oldn) return n;
+
+       a = get_Eor_left(n);
+       b = get_Eor_right(n);
+
+       if (is_Eor(a)) {
+               ir_node *aa = get_Eor_left(a);
+               ir_node *ab = get_Eor_right(a);
+
+               if (aa == b) {
+                       /* (a ^ b) ^ a -> b */
+                       n = ab;
+                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_EOR_A_B_A);
+                       return n;
+               } else if (ab == b) {
+                       /* (a ^ b) ^ b -> a */
+                       n = aa;
+                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_EOR_A_B_A);
+                       return n;
+               }
+       }
+       if (is_Eor(b)) {
+               ir_node *ba = get_Eor_left(b);
+               ir_node *bb = get_Eor_right(b);
+
+               if (ba == a) {
+                       /* a ^ (a ^ b) -> b */
+                       n = bb;
+                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_EOR_A_B_A);
+                       return n;
+               } else if (bb == a) {
+                       /* a ^ (b ^ a) -> b */
+                       n = ba;
+                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_EOR_A_B_A);
+                       return n;
+               }
+       }
+       return n;
+}
 
 /*
  * Optimize a - 0 and (a - x) + x (for modes with wrap-around).
@@ -865,46 +959,45 @@ static ir_node *equivalent_node_neutral_zero(ir_node *n)
  * Beware: The Mode of an Add may be different than the mode of its
  * predecessors, so we could not return a predecessors in all cases.
  */
-static ir_node *equivalent_node_Add(ir_node *n)
-{
-  ir_node *oldn = n;
-  ir_node *left, *right;
-  ir_mode *mode = get_irn_mode(n);
-
-  /* for FP these optimizations are only allowed if fp_strict_algebraic is disabled */
-  if (mode_is_float(mode) && (get_irg_fp_model(current_ir_graph) & fp_strict_algebraic))
-    return n;
-
-  n = equivalent_node_neutral_zero(n);
-  if (n != oldn)
-    return n;
-
-  left  = get_Add_left(n);
-  right = get_Add_right(n);
-
-  if (get_irn_op(left) == op_Sub) {
-    if (get_Sub_right(left) == right) {
-      /* (a - x) + x */
-
-      n = get_Sub_left(left);
-      if (mode == get_irn_mode(n)) {
-        DBG_OPT_ALGSIM1(oldn, left, right, n, FS_OPT_ADD_SUB);
-        return n;
-      }
-    }
-  }
-  if (get_irn_op(right) == op_Sub) {
-    if (get_Sub_right(right) == left) {
-      /* x + (a - x) */
-
-      n = get_Sub_left(right);
-      if (mode == get_irn_mode(n)) {
-        DBG_OPT_ALGSIM1(oldn, left, right, n, FS_OPT_ADD_SUB);
-        return n;
-      }
-    }
-  }
-  return n;
+static ir_node *equivalent_node_Add(ir_node *n) {
+       ir_node *oldn = n;
+       ir_node *left, *right;
+       ir_mode *mode = get_irn_mode(n);
+
+       n = equivalent_node_neutral_zero(n);
+       if (n != oldn)
+               return n;
+
+       /* for FP these optimizations are only allowed if fp_strict_algebraic is disabled */
+       if (mode_is_float(mode) && (get_irg_fp_model(current_ir_graph) & fp_strict_algebraic))
+               return n;
+
+       left  = get_Add_left(n);
+       right = get_Add_right(n);
+
+       if (is_Sub(left)) {
+               if (get_Sub_right(left) == right) {
+                       /* (a - x) + x */
+
+                       n = get_Sub_left(left);
+                       if (mode == get_irn_mode(n)) {
+                               DBG_OPT_ALGSIM1(oldn, left, right, n, FS_OPT_ADD_SUB);
+                               return n;
+                       }
+               }
+       }
+       if (is_Sub(right)) {
+               if (get_Sub_right(right) == left) {
+                       /* x + (a - x) */
+
+                       n = get_Sub_left(right);
+                       if (mode == get_irn_mode(n)) {
+                               DBG_OPT_ALGSIM1(oldn, left, right, n, FS_OPT_ADD_SUB);
+                               return n;
+                       }
+               }
+       }
+       return n;
 }  /* equivalent_node_Add */
 
 /**
@@ -912,23 +1005,24 @@ static ir_node *equivalent_node_Add(ir_node *n)
  * so a op 0 = a.
  */
 static ir_node *equivalent_node_left_zero(ir_node *n) {
-  ir_node *oldn = 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 (classify_tarval(value_of(b)) == TV_CLASSIFY_NULL) {
-    n = a;
+       if (tarval_is_null(tb)) {
+               n = a;
 
-    DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_NEUTRAL_0);
-  }
-  return n;
+               DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_NEUTRAL_0);
+       }
+       return n;
 }  /* equivalent_node_left_zero */
 
 #define equivalent_node_Shl   equivalent_node_left_zero
 #define equivalent_node_Shr   equivalent_node_left_zero
 #define equivalent_node_Shrs  equivalent_node_left_zero
-#define equivalent_node_Rot   equivalent_node_left_zero
+#define equivalent_node_Rotl  equivalent_node_left_zero
 
 /**
  * Optimize a - 0 and (a + x) - x (for modes with wrap-around).
@@ -939,241 +1033,261 @@ static ir_node *equivalent_node_left_zero(ir_node *n) {
  * Beware: The Mode of a Sub may be different than the mode of its
  * predecessors, so we could not return a predecessors in all cases.
  */
-static ir_node *equivalent_node_Sub(ir_node *n)
-{
-  ir_node *oldn = n;
-  ir_node *a, *b;
-  ir_mode *mode = get_irn_mode(n);
-
-  /* for FP these optimizations are only allowed if fp_strict_algebraic is disabled */
-  if (mode_is_float(mode) && (get_irg_fp_model(current_ir_graph) & fp_strict_algebraic))
-    return n;
-
-  a = get_Sub_left(n);
-  b = get_Sub_right(n);
-
-  /* Beware: modes might be different */
-  if (classify_tarval(value_of(b)) == TV_CLASSIFY_NULL) {
-    if (mode == get_irn_mode(a)) {
-      n = a;
-
-      DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_NEUTRAL_0);
-    }
-  }
-  else if (get_irn_op(a) == op_Add) {
-    if (mode_wrap_around(mode)) {
-      ir_node *left  = get_Add_left(a);
-      ir_node *right = get_Add_right(a);
-
-      if (left == b) {
-        if (mode == get_irn_mode(right)) {
-          n = right;
-          DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_ADD_SUB);
-        }
-      }
-      else if (right == b) {
-        if (mode == get_irn_mode(left)) {
-          n = left;
-          DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_ADD_SUB);
-        }
-      }
-    }
-  }
-  return n;
+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);
+       tb = value_of(b);
+
+       /* Beware: modes might be different */
+       if (tarval_is_null(tb)) {
+               ir_node *a = get_Sub_left(n);
+               if (mode == get_irn_mode(a)) {
+                       n = a;
+
+                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_NEUTRAL_0);
+               }
+       }
+       return n;
 }  /* equivalent_node_Sub */
 
 
 /**
- * Optimize an "idempotent unary op", ie op(op(n)) = n.
+ * Optimize an "self-inverse unary op", ie op(op(n)) = n.
  *
  * @todo
  *   -(-a) == a, but might overflow two times.
  *   We handle it anyway here but the better way would be a
  *   flag. This would be needed for Pascal for instance.
  */
-static ir_node *equivalent_node_idempotent_unop(ir_node *n)
-{
-  ir_node *oldn = n;
-  ir_node *pred = get_unop_op(n);
-
-  /* optimize symmetric unop */
-  if (get_irn_op(pred) == get_irn_op(n)) {
-    n = get_unop_op(pred);
-    DBG_OPT_ALGSIM2(oldn, pred, n);
-  }
-  return n;
+static ir_node *equivalent_node_idempotent_unop(ir_node *n) {
+       ir_node *oldn = n;
+       ir_node *pred = get_unop_op(n);
+
+       /* optimize symmetric unop */
+       if (get_irn_op(pred) == get_irn_op(n)) {
+               n = get_unop_op(pred);
+               DBG_OPT_ALGSIM2(oldn, pred, n, FS_OPT_IDEM_UNARY);
+       }
+       return n;
 }  /* equivalent_node_idempotent_unop */
 
 /** Optimize Not(Not(x)) == x. */
 #define equivalent_node_Not    equivalent_node_idempotent_unop
 
-/** --x == x       ??? Is this possible or can --x raise an
+/** -(-x) == x       ??? Is this possible or can --x raise an
                        out of bounds exception if min =! max? */
 #define equivalent_node_Minus  equivalent_node_idempotent_unop
 
 /**
  * Optimize a * 1 = 1 * a = a.
  */
-static ir_node *equivalent_node_Mul(ir_node *n)
-{
-  ir_node *oldn = n;
-  ir_node *a = get_Mul_left(n);
-  ir_node *b = get_Mul_right(n);
-
-  /* Mul is commutative and has again an other neutral element. */
-  if (classify_tarval(value_of(a)) == TV_CLASSIFY_ONE) {
-    n = b;
-    DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_NEUTRAL_1);
-  } else if (classify_tarval(value_of(b)) == TV_CLASSIFY_ONE) {
-    n = a;
-    DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_NEUTRAL_1);
-  }
-  return n;
+static ir_node *equivalent_node_Mul(ir_node *n) {
+       ir_node *oldn = n;
+       ir_node *a = get_Mul_left(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.
+                * 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 (classify_tarval(value_of(b)) == TV_CLASSIFY_ONE) { /* div(x, 1) == x */
-    /* Turn Div into a tuple (mem, bad, a) */
-    ir_node *mem = get_Div_mem(n);
-    turn_into_tuple(n, pn_Div_max);
-    set_Tuple_pred(n, pn_Div_M,        mem);
-    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 (classify_tarval(value_of(b)) == TV_CLASSIFY_ONE) { /* Quot(x, 1) == x */
-    /* Turn Quot into a tuple (mem, bad, a) */
-    ir_node *mem = get_Quot_mem(n);
-    turn_into_tuple(n, pn_Quot_max);
-    set_Tuple_pred(n, pn_Quot_M,        mem);
-    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 *a = get_DivMod_left(n);
-  ir_node *b = get_DivMod_right(n);
-
-  /* Div is not commutative. */
-  if (classify_tarval(value_of(b)) == TV_CLASSIFY_ONE) { /* div(x, 1) == x */
-    /* Turn DivMod into a tuple (mem, bad, a, 0) */
-    ir_node *mem = get_Div_mem(n);
-    ir_mode *mode = get_irn_mode(b);
-
-    turn_into_tuple(n, pn_DivMod_max);
-    set_Tuple_pred(n, pn_DivMod_M,        mem);
-    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.
  */
 static ir_node *equivalent_node_Or(ir_node *n) {
-  ir_node *oldn = n;
-
-  ir_node *a = get_Or_left(n);
-  ir_node *b = get_Or_right(n);
-
-  if (a == b) {
-    n = a;    /* Or has it's own neutral element */
-    DBG_OPT_ALGSIM0(oldn, n, FS_OPT_OR);
-  } else if (classify_tarval(value_of(a)) == TV_CLASSIFY_NULL) {
-    n = b;
-    DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_OR);
-  } else if (classify_tarval(value_of(b)) == TV_CLASSIFY_NULL) {
-    n = a;
-    DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_OR);
-  }
-
-  return n;
+       ir_node *oldn = 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);
+               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;
 }  /* equivalent_node_Or */
 
 /**
- * Optimize a & 0b1...1 = 0b1...1 & a =  a & a = a.
+ * Optimize a & 0b1...1 = 0b1...1 & a = a & a = (a|X) & a = a.
  */
 static ir_node *equivalent_node_And(ir_node *n) {
-  ir_node *oldn = n;
-
-  ir_node *a = get_And_left(n);
-  ir_node *b = get_And_right(n);
-
-  if (a == b) {
-    n = a;    /* And has it's own neutral element */
-    DBG_OPT_ALGSIM0(oldn, n, FS_OPT_AND);
-  } else if (classify_tarval(value_of(a)) == TV_CLASSIFY_ALL_ONE) {
-    n = b;
-    DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_AND);
-  } else if (classify_tarval(value_of(b)) == TV_CLASSIFY_ALL_ONE) {
-    n = a;
-    DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_AND);
-  }
-  return n;
+       ir_node *oldn = 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;
+       }
+       /* constants are cormalized 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;
+       }
+       tv = value_of(a);
+       if (tarval_is_all_one(tv)) {
+               n = b;
+               DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_AND);
+               return n;
+       }
+       if (is_Or(a)) {
+               if (b == get_Or_left(a) || b == get_Or_right(a)) {
+                       /* (a|X) & a */
+                       n = b;
+                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_AND);
+                       return n;
+               }
+       }
+       if (is_Or(b)) {
+               if (a == get_Or_left(b) || a == get_Or_right(b)) {
+                       /* a & (a|X) */
+                       n = a;
+                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_AND);
+                       return n;
+               }
+       }
+       return n;
 }  /* equivalent_node_And */
 
 /**
  * Try to remove useless Conv's:
  */
 static ir_node *equivalent_node_Conv(ir_node *n) {
-  ir_node *oldn = n;
-  ir_node *a = get_Conv_op(n);
-  ir_node *b;
-
-  ir_mode *n_mode = get_irn_mode(n);
-  ir_mode *a_mode = get_irn_mode(a);
-
-  if (n_mode == a_mode) { /* No Conv necessary */
-    /* leave strict floating point Conv's */
-    if (get_Conv_strict(n))
-      return n;
-    n = a;
-    DBG_OPT_ALGSIM0(oldn, n, FS_OPT_CONV);
-  } else if (get_irn_op(a) == op_Conv) { /* Conv(Conv(b)) */
-    ir_mode *b_mode;
-
-    b = get_Conv_op(a);
-    n_mode = get_irn_mode(n);
-    b_mode = get_irn_mode(b);
-
-    if (n_mode == b_mode) {
-      if (n_mode == mode_b) {
-        n = b; /* Convb(Conv*(xxxb(...))) == xxxb(...) */
-        DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_CONV);
-      }
-      else if (mode_is_int(n_mode) || mode_is_character(n_mode)) {
-        if (smaller_mode(b_mode, a_mode)){
-          n = b;        /* ConvS(ConvL(xxxS(...))) == xxxS(...) */
-          DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_CONV);
-        }
-      }
-    }
-  }
-  return n;
+       ir_node *oldn = n;
+       ir_node *a = get_Conv_op(n);
+
+       ir_mode *n_mode = get_irn_mode(n);
+       ir_mode *a_mode = get_irn_mode(a);
+
+restart:
+       if (n_mode == a_mode) { /* No Conv necessary */
+               if (get_Conv_strict(n)) {
+                       /* special case: the predecessor might be a also a Conv */
+                       if (is_Conv(a)) {
+                               if (! get_Conv_strict(a)) {
+                                       /* first one is not strict, kick it */
+                                       a = get_Conv_op(a);
+                                       a_mode = get_irn_mode(a);
+                                       set_Conv_op(n, a);
+                                       goto restart;
+                               }
+                               /* else both are strict conv, second is superfluous */
+                       } else if (is_Proj(a)) {
+                               ir_node *pred = get_Proj_pred(a);
+                               if (is_Load(pred)) {
+                                       /* loads always return with the exact precision of n_mode */
+                                       assert(get_Load_mode(pred) == n_mode);
+                                       return a;
+                               }
+                               /* leave strict floating point Conv's */
+                               return n;
+                       } else {
+                               /* leave strict floating point Conv's */
+                               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);
+
+               if (get_Conv_strict(n) && get_Conv_strict(a)) {
+                       /* both are strict conv */
+                       if (smaller_mode(a_mode, n_mode)) {
+                               /* both are strict, but the first is smaller, so
+                                  the second cannot remove more precision, remove the
+                                  strict bit */
+                               set_Conv_strict(n, 0);
+                       }
+               }
+               if (n_mode == b_mode) {
+                       if (! get_Conv_strict(n) && ! get_Conv_strict(a)) {
+                               if (n_mode == mode_b) {
+                                       n = b; /* Convb(Conv*(xxxb(...))) == xxxb(...) */
+                                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_CONV);
+                               } else if (get_mode_arithmetic(n_mode) == get_mode_arithmetic(a_mode)) {
+                                       if (smaller_mode(b_mode, a_mode)) {
+                                               n = b;        /* ConvS(ConvL(xxxS(...))) == xxxS(...) */
+                                               DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_CONV);
+                                       }
+                               }
+                       }
+                       if (mode_is_int(n_mode) && mode_is_float(a_mode)) {
+                               /* ConvI(ConvF(I)) -> I, iff float mantissa >= int mode */
+                               size_t int_mantissa = get_mode_size_bits(n_mode) - (mode_is_signed(n_mode) ? 1 : 0);
+                               size_t float_mantissa;
+                               /* FIXME There is no way to get the mantissa size of a mode */
+                               switch (get_mode_size_bits(a_mode)) {
+                                       case 32: float_mantissa = 23 + 1; break; // + 1 for implicit 1
+                                       case 64: float_mantissa = 52 + 1; break;
+                                       case 80: float_mantissa = 64 + 1; break;
+                                       default: float_mantissa = 0;      break;
+                               }
+                               if (float_mantissa != 0 && float_mantissa >= int_mantissa) {
+                                       n = b;
+                                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_CONV);
+                                       return n;
+                               }
+                       }
+                       if (is_Conv(b)) {
+                               if (smaller_mode(b_mode, a_mode)) {
+                                       if (get_Conv_strict(n))
+                                               set_Conv_strict(b, 1);
+                                       n = b; /* ConvA(ConvB(ConvA(...))) == ConvA(...) */
+                                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_CONV);
+                               }
+                       }
+               }
+       }
+       return n;
 }  /* equivalent_node_Conv */
 
 /**
@@ -1181,198 +1295,390 @@ static ir_node *equivalent_node_Conv(ir_node *n) {
  * is already the type of the Cast.
  */
 static ir_node *equivalent_node_Cast(ir_node *n) {
-  ir_node *oldn = n;
-  ir_node *pred = get_Cast_op(n);
-
-  if (get_irn_type(pred) == get_Cast_type(n)) {
-    n = pred;
-    DBG_OPT_ALGSIM0(oldn, n, FS_OPT_CAST);
-  }
-  return n;
+       ir_node *oldn = n;
+       ir_node *pred = get_Cast_op(n);
+
+       if (get_irn_type(pred) == get_Cast_type(n)) {
+               n = pred;
+               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_CAST);
+       }
+       return 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.
  */
-static ir_node *equivalent_node_Phi(ir_node *n)
-{
-  int i, n_preds;
-
-  ir_node *oldn = n;
-  ir_node *block = NULL;     /* to shutup gcc */
-  ir_node *first_val = NULL; /* to shutup gcc */
+static ir_node *equivalent_node_Phi(ir_node *n) {
+       int i, n_preds;
 
-  if (!get_opt_normalize()) return n;
+       ir_node *oldn = n;
+       ir_node *block;
+       ir_node *first_val = NULL; /* to shutup gcc */
 
-  n_preds = get_Phi_n_preds(n);
+       if (!get_opt_normalize()) return n;
 
-  block = get_nodes_block(n);
-  /* @@@ fliegt 'raus, sollte aber doch immer wahr sein!!!
-     assert(get_irn_arity(block) == n_preds && "phi in wrong block!"); */
-  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. */
+       n_preds = get_Phi_n_preds(n);
 
-  if (n_preds == 0) return n;           /* Phi of dead Region without predecessors. */
+       block = get_nodes_block(n);
+       if (is_Block_dead(block))                  /* Control dead */
+               return get_irg_bad(current_ir_graph);
 
-  /* 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());
+       if (n_preds == 0) return n;           /* Phi of dead Region without predecessors. */
 
-  /* Find first non-self-referencing input */
-  for (i = 0; i < n_preds; ++i) {
-    first_val = get_Phi_pred(n, i);
-    if (   (first_val != n)                            /* not self pointer */
-#if 1
-        && (! is_Bad(first_val))
+       /* Find first non-self-referencing input */
+       for (i = 0; i < n_preds; ++i) {
+               first_val = get_Phi_pred(n, i);
+               if (   (first_val != n)                            /* not self pointer */
+#if 0
+                   /* BEWARE: when the if is changed to 1, Phi's will ignore it's Bad
+                    * predecessors. Then, Phi nodes in dead code might be removed, causing
+                    * nodes pointing to themself (Add's for instance).
+                    * This is really bad and causes endless recursions in several
+                    * code pathes, so we do NOT optimize such a code.
+                    * This is not that bad as it sounds, optimize_cf() removes bad control flow
+                    * (and bad Phi predecessors), so live code is optimized later.
+                    */
+                       && (! is_Bad(get_Block_cfgpred(block, i)))
 #endif
-           ) {        /* value not dead */
-      break;          /* then found first value. */
-    }
-  }
-
-  if (i >= n_preds) {
-    /* A totally Bad or self-referencing Phi (we didn't break the above loop) */
-    return new_Bad();
-  }
-
-  /* search for rest of inputs, determine if any of these
-     are non-self-referencing */
-  while (++i < n_preds) {
-    ir_node *scnd_val = get_Phi_pred(n, i);
-    if (   (scnd_val != n)
-        && (scnd_val != first_val)
-#if 1
-        && (! is_Bad(scnd_val))
+                  ) {        /* value not dead */
+                       break;          /* then found first value. */
+               }
+       }
+
+       if (i >= n_preds) {
+               /* A totally Bad or self-referencing Phi (we didn't break the above loop) */
+               return get_irg_bad(current_ir_graph);
+       }
+
+       /* search for rest of inputs, determine if any of these
+       are non-self-referencing */
+       while (++i < n_preds) {
+               ir_node *scnd_val = get_Phi_pred(n, i);
+               if (   (scnd_val != n)
+                   && (scnd_val != first_val)
+#if 0
+                   /* see above */
+                   && (! is_Bad(get_Block_cfgpred(block, i)))
 #endif
-           ) {
-      break;
-    }
-  }
-
-  if (i >= n_preds) {
-    /* Fold, if no multiple distinct non-self-referencing inputs */
-    n = first_val;
-    DBG_OPT_PHI(oldn, n);
-  }
-  return n;
+                       ) {
+                       break;
+               }
+       }
+
+       if (i >= n_preds) {
+               /* Fold, if no multiple distinct non-self-referencing inputs */
+               n = first_val;
+               DBG_OPT_PHI(oldn, n);
+       }
+       return n;
 }  /* equivalent_node_Phi */
 
 /**
  * Several optimizations:
- * - no Sync in start block.
  * - fold Sync-nodes, iff they have only one predecessor except
  *   themselves.
  */
-static ir_node *equivalent_node_Sync(ir_node *n)
-{
-  int i, n_preds;
+static ir_node *equivalent_node_Sync(ir_node *n) {
+       int arity = get_Sync_n_preds(n);
+       int i;
+
+       for (i = 0; i < arity;) {
+               ir_node *pred = get_Sync_pred(n, i);
+               int      j;
+
+               /* Remove Bad predecessors */
+               if (is_Bad(pred)) {
+                       del_Sync_n(n, i);
+                       --arity;
+                       continue;
+               }
+
+               /* Remove duplicate predecessors */
+               for (j = 0;; ++j) {
+                       if (j >= i) {
+                               ++i;
+                               break;
+                       }
+                       if (get_Sync_pred(n, j) == pred) {
+                               del_Sync_n(n, i);
+                               --arity;
+                               break;
+                       }
+               }
+       }
+
+       if (arity == 0) return get_irg_bad(current_ir_graph);
+       if (arity == 1) return get_Sync_pred(n, 0);
+       return n;
+}  /* equivalent_node_Sync */
 
-  ir_node *oldn = n;
-  ir_node *first_val = NULL; /* to shutup gcc */
+/**
+ * Optimize Proj(Tuple).
+ */
+static ir_node *equivalent_node_Proj_Tuple(ir_node *proj) {
+       ir_node *oldn  = proj;
+       ir_node *tuple = get_Proj_pred(proj);
 
-  if (!get_opt_normalize()) return n;
+       /* Remove the Tuple/Proj combination. */
+       proj = get_Tuple_pred(tuple, get_Proj_proj(proj));
+       DBG_OPT_TUPLE(oldn, tuple, proj);
 
-  n_preds = get_Sync_n_preds(n);
+       return proj;
+}  /* equivalent_node_Proj_Tuple */
 
-  /* Find first non-self-referencing input */
-  for (i = 0; i < n_preds; ++i) {
-    first_val = get_Sync_pred(n, i);
-    if ((first_val != n)  /* not self pointer */ &&
-        (! is_Bad(first_val))
-       ) {            /* value not dead */
-      break;          /* then found first value. */
-    }
-  }
+/**
+ * Optimize a / 1 = a.
+ */
+static ir_node *equivalent_node_Proj_Div(ir_node *proj) {
+       ir_node *oldn = proj;
+       ir_node *div  = get_Proj_pred(proj);
+       ir_node *b    = get_Div_right(div);
+       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_Div_M:
+                       proj = get_Div_mem(div);
+                       DBG_OPT_ALGSIM0(oldn, proj, FS_OPT_NEUTRAL_1);
+                       return proj;
+
+               case pn_Div_res:
+                       proj = get_Div_left(div);
+                       DBG_OPT_ALGSIM0(oldn, proj, FS_OPT_NEUTRAL_1);
+                       return proj;
+
+               default:
+                       /* we cannot replace the exception Proj's here, this is done in
+                          transform_node_Proj_Div() */
+                       return proj;
+               }
+       }
+       return proj;
+}  /* equivalent_node_Proj_Div */
 
-  if (i >= n_preds)
-    /* A totally Bad or self-referencing Sync (we didn't break the above loop) */
-    return new_Bad();
-
-  /* search the rest of inputs, determine if any of these
-     are non-self-referencing */
-  while (++i < n_preds) {
-    ir_node *scnd_val = get_Sync_pred(n, i);
-    if ((scnd_val != n) &&
-        (scnd_val != first_val) &&
-        (! is_Bad(scnd_val))
-       )
-      break;
-  }
+/**
+ * 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 */
 
-  if (i >= n_preds) {
-    /* Fold, if no multiple distinct non-self-referencing inputs */
-    n = first_val;
-    DBG_OPT_SYNC(oldn, n);
-  }
-  return n;
-}  /* equivalent_node_Sync */
+/**
+ * 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 Proj(Tuple) and gigo() for ProjX in Bad block,
- * ProjX(Load) and ProjX(Store).
+ * Optimize CopyB(mem, x, x) into a Nop.
  */
-static ir_node *equivalent_node_Proj(ir_node *n)
-{
-  ir_node *oldn = n;
-
-  ir_node *a = get_Proj_pred(n);
-
-  if ( get_irn_op(a) == op_Tuple) {
-    /* Remove the Tuple/Proj combination. */
-    if ( get_Proj_proj(n) <= get_Tuple_n_preds(a) ) {
-      n = get_Tuple_pred(a, get_Proj_proj(n));
-      DBG_OPT_TUPLE(oldn, a, n);
-    } else {
-      assert(0); /* This should not happen! */
-      n = new_Bad();
-    }
-  }
-  else if (get_irn_mode(n) == mode_X) {
-    if (is_Block_dead(get_nodes_block(skip_Proj(n)))) {
-      /* Remove dead control flow -- early gigo(). */
-      n = new_Bad();
-    }
-    else if (get_opt_ldst_only_null_ptr_exceptions()) {
-      ir_op *op = get_irn_op(a);
-
-      if (op == op_Load || op == op_Store) {
-        /* get the load/store address */
-        ir_node *addr = 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);
-          }
-          DBG_OPT_EXC_REM(n);
-          return new_Bad();
-        }
-      }
-    }
-  }
+static ir_node *equivalent_node_Proj_CopyB(ir_node *proj) {
+       ir_node *oldn  = proj;
+       ir_node *copyb = get_Proj_pred(proj);
+       ir_node *a     = get_CopyB_dst(copyb);
+       ir_node *b     = get_CopyB_src(copyb);
+
+       if (a == b) {
+               /* Turn CopyB into a tuple (mem, jmp, bad, bad) */
+               switch (get_Proj_proj(proj)) {
+               case pn_CopyB_M_regular:
+                       proj = get_CopyB_mem(copyb);
+                       DBG_OPT_ALGSIM0(oldn, proj, FS_OPT_NOP);
+                       break;
+
+               case pn_CopyB_M_except:
+               case pn_CopyB_X_except:
+                       DBG_OPT_EXC_REM(proj);
+                       proj = get_irg_bad(current_ir_graph);
+                       break;
+               }
+       }
+       return proj;
+}  /* equivalent_node_Proj_CopyB */
+
+/**
+ * Optimize Bounds(idx, idx, upper) into idx.
+ */
+static ir_node *equivalent_node_Proj_Bound(ir_node *proj) {
+       ir_node *oldn  = proj;
+       ir_node *bound = get_Proj_pred(proj);
+       ir_node *idx   = get_Bound_index(bound);
+       ir_node *pred  = skip_Proj(idx);
+       int ret_tuple  = 0;
+
+       if (idx == get_Bound_lower(bound))
+               ret_tuple = 1;
+       else if (is_Bound(pred)) {
+               /*
+                * idx was Bounds checked in the same MacroBlock previously,
+                * it is still valid if lower <= pred_lower && pred_upper <= upper.
+                */
+               ir_node *lower = get_Bound_lower(bound);
+               ir_node *upper = get_Bound_upper(bound);
+               if (get_Bound_lower(pred) == lower &&
+                       get_Bound_upper(pred) == upper &&
+                       get_irn_MacroBlock(bound) == get_irn_MacroBlock(pred)) {
+                       /*
+                        * One could expect that we simply return the previous
+                        * Bound here. However, this would be wrong, as we could
+                        * add an exception Proj to a new location then.
+                        * So, we must turn in into a tuple.
+                        */
+                       ret_tuple = 1;
+               }
+       }
+       if (ret_tuple) {
+               /* Turn Bound into a tuple (mem, jmp, bad, idx) */
+               switch (get_Proj_proj(proj)) {
+               case pn_Bound_M:
+                       DBG_OPT_EXC_REM(proj);
+                       proj = get_Bound_mem(bound);
+                       break;
+               case pn_Bound_X_except:
+                       DBG_OPT_EXC_REM(proj);
+                       proj = get_irg_bad(current_ir_graph);
+                       break;
+               case pn_Bound_res:
+                       proj = idx;
+                       DBG_OPT_ALGSIM0(oldn, proj, FS_OPT_NOP);
+                       break;
+               default:
+                       /* cannot optimize pn_Bound_X_regular, handled in transform ... */
+                       ;
+               }
+       }
+       return proj;
+}  /* equivalent_node_Proj_Bound */
+
+/**
+ * Optimize an Exception Proj(Load) with a non-null address.
+ */
+static ir_node *equivalent_node_Proj_Load(ir_node *proj) {
+       if (get_opt_ldst_only_null_ptr_exceptions()) {
+               if (get_irn_mode(proj) == mode_X) {
+                       ir_node *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);
+                               }
+                       }
+               }
+       }
+       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 */
 
-  return n;
+/**
+ * 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 */
 
 /**
  * Remove Id's.
  */
 static ir_node *equivalent_node_Id(ir_node *n) {
-  ir_node *oldn = n;
+       ir_node *oldn = n;
 
-  do {
-    n = get_Id_pred(n);
-  } while (get_irn_op(n) == op_Id);
+       do {
+               n = get_Id_pred(n);
+       } while (is_Id(n));
 
-  DBG_OPT_ID(oldn, n);
-  return n;
+       DBG_OPT_ID(oldn, n);
+       return n;
 }  /* equivalent_node_Id */
 
 /**
@@ -1380,200 +1686,106 @@ 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);
-  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);
-  }
-  /* Mux(false, f, t) == f */
-  else if (ts == tarval_b_false) {
-    n = get_Mux_false(n);
-    DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_C);
-  }
-  /* Mux(v, x, x) == x */
-  else if (get_Mux_false(n) == get_Mux_true(n)) {
-    n = get_Mux_true(n);
-    DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_EQ);
-  }
-  else if (get_irn_op(sel) == op_Proj && !mode_honor_signed_zeros(get_irn_mode(n))) {
-    ir_node *cmp = get_Proj_pred(sel);
-    long proj_nr = get_Proj_proj(sel);
-    ir_node *b   = get_Mux_false(n);
-    ir_node *a   = get_Mux_true(n);
-
-    /*
-     * Note: normalization puts the constant on the right site,
-     * so we check only one case.
-     *
-     * Note further that these optimization work even for floating point
-     * with NaN's because -NaN == NaN.
-     * However, if +0 and -0 is handled differently, we cannot use the first one.
-     */
-    if (get_irn_op(cmp) == op_Cmp && get_Cmp_left(cmp) == a) {
-      if (classify_Const(get_Cmp_right(cmp)) == CNST_NULL) {
-        /* Mux(a CMP 0, X, a) */
-        if (get_irn_op(b) == op_Minus && get_Minus_op(b) == a) {
-          /* Mux(a CMP 0, -a, a) */
-          if (proj_nr == pn_Cmp_Eq) {
-            /* Mux(a == 0, -a, a)  ==>  -a */
-            n = b;
-            DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_TRANSFORM);
-          }
-          else if (proj_nr == pn_Cmp_Lg || proj_nr == pn_Cmp_Ne) {
-            /* Mux(a != 0, -a, a)  ==> a */
-            n = a;
-            DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_TRANSFORM);
-          }
-        }
-        else if (classify_Const(b) == CNST_NULL) {
-          /* Mux(a CMP 0, 0, a) */
-          if (proj_nr == pn_Cmp_Lg || proj_nr == pn_Cmp_Ne) {
-            /* Mux(a != 0, 0, a) ==> a */
-            n = a;
-            DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_TRANSFORM);
-          }
-          else if (proj_nr == pn_Cmp_Eq) {
-            /* Mux(a == 0, 0, a) ==> 0 */
-            n = b;
-            DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_TRANSFORM);
-          }
-        }
-      }
-    }
-  }
-  return n;
+       ir_node *oldn = n, *sel = get_Mux_sel(n);
+       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);
+       }
+       /* Mux(false, f, t) == f */
+       else if (ts == tarval_b_false) {
+               n = get_Mux_false(n);
+               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_C);
+       }
+       /* Mux(v, x, x) == x */
+       else if (get_Mux_false(n) == get_Mux_true(n)) {
+               n = get_Mux_true(n);
+               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_EQ);
+       }
+       else if (is_Proj(sel) && !mode_honor_signed_zeros(get_irn_mode(n))) {
+               ir_node *cmp = get_Proj_pred(sel);
+               long proj_nr = get_Proj_proj(sel);
+               ir_node *f   = get_Mux_false(n);
+               ir_node *t   = get_Mux_true(n);
+
+               /*
+                * Note further that these optimization work even for floating point
+                * with NaN's because -NaN == NaN.
+                * However, if +0 and -0 is handled differently, we cannot use the first one.
+                */
+               if (is_Cmp(cmp)) {
+                       ir_node *const cmp_l = get_Cmp_left(cmp);
+                       ir_node *const cmp_r = get_Cmp_right(cmp);
+
+                       switch (proj_nr) {
+                               case pn_Cmp_Eq:
+                                       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;
+                                       }
+                                       break;
+
+                               case pn_Cmp_Lg:
+                               case pn_Cmp_Ne:
+                                       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;
+                                       }
+                                       break;
+                       }
+
+                       /*
+                        * Note: normalization puts the constant on the right side,
+                        * so we check only one case.
+                        */
+                       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) */
+                                       if (proj_nr == pn_Cmp_Eq) {
+                                               /* Mux(t == 0, -t, t)  ==>  -t */
+                                               n = f;
+                                               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_TRANSFORM);
+                                       } else if (proj_nr == pn_Cmp_Lg || proj_nr == pn_Cmp_Ne) {
+                                               /* Mux(t != 0, -t, t)  ==> t */
+                                               n = t;
+                                               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_TRANSFORM);
+                                       }
+                               }
+                       }
+               }
+       }
+       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.
- */
-static ir_node *equivalent_node_Cmp(ir_node *n)
-{
-  ir_node *left  = get_Cmp_left(n);
-  ir_node *right = get_Cmp_right(n);
-
-  if (get_irn_op(left) == op_Minus && get_irn_op(right) == op_Minus &&
-      !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.
  */
 static ir_node *equivalent_node_Confirm(ir_node *n) {
-  ir_node *pred = get_Confirm_value(n);
-  pn_Cmp  pnc   = get_Confirm_cmp(n);
-
-  if (get_irn_op(pred) == op_Confirm && pnc == get_Confirm_cmp(pred)) {
-    /*
-     * rare case: two identical Confirms one after another,
-     * replace the second one with the first.
-     */
-    n = pred;
-  }
-  if (pnc == pn_Cmp_Eq) {
-    ir_node *bound = get_Confirm_bound(n);
-
-    /*
-     * Optimize a rare case:
-     * Confirm(x, '=', Constlike) ==> Constlike
-     */
-    if (is_irn_constlike(bound)) {
-      DBG_OPT_CONFIRM(n, bound);
-      return bound;
-    }
-  }
-  return get_opt_remove_confirm() ? get_Confirm_value(n) : n;
+       ir_node *pred = get_Confirm_value(n);
+       pn_Cmp  pnc   = get_Confirm_cmp(n);
+
+       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;
+               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, bad, bad) */
-    ir_node *mem = get_CopyB_mem(n);
-    turn_into_tuple(n, pn_CopyB_max);
-    set_Tuple_pred(n, pn_CopyB_M,        mem);
-    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 *lower = get_Bound_lower(n);
-  int ret_tuple = 0;
-
-  /* By definition lower < upper, so if idx == lower -->
-     lower <= idx && idx < upper */
-  if (idx == lower) {
-    /* Turn Bound into a tuple (mem, bad, idx) */
-    ret_tuple = 1;
-  }
-  else {
-    ir_node *pred = skip_Proj(idx);
-
-    if (get_irn_op(pred) == op_Bound) {
-      /*
-       * idx was Bounds_check previously, it is still valid if
-       * lower <= pred_lower && pred_upper <= upper.
-       */
-      ir_node *upper = get_Bound_upper(n);
-      if (get_Bound_lower(pred) == lower &&
-          get_Bound_upper(pred) == upper) {
-        /*
-         * 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 than.
-         * So, we must turn in into a tuple
-         */
-        ret_tuple = 1;
-      }
-    }
-  }
-  if (ret_tuple) {
-    /* Turn Bound into a tuple (mem, bad, idx) */
-    ir_node *mem = get_Bound_mem(n);
-    turn_into_tuple(n, pn_Bound_max);
-    set_Tuple_pred(n, pn_Bound_M,        mem);
-    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
@@ -1582,9 +1794,9 @@ static ir_node *equivalent_node_Bound(ir_node *n) {
  * in array fits, we transform n into a tuple (e.g., Div).
  */
 ir_node *equivalent_node(ir_node *n) {
-  if (n->op->ops.equivalent_node)
-    return n->op->ops.equivalent_node(n);
-  return n;
+       if (n->op->ops.equivalent_node)
+               return n->op->ops.equivalent_node(n);
+       return n;
 }  /* equivalent_node */
 
 /**
@@ -1596,154 +1808,188 @@ ir_node *equivalent_node(ir_node *n) {
  * @return
  *    The operations.
  */
-static ir_op_ops *firm_set_default_equivalent_node(opcode code, ir_op_ops *ops)
+static ir_op_ops *firm_set_default_equivalent_node(ir_opcode code, ir_op_ops *ops)
 {
-#define CASE(a)                                 \
-  case iro_##a:                                 \
-    ops->equivalent_node  = equivalent_node_##a; \
-    break
-
-  switch (code) {
-  CASE(Block);
-  CASE(Jmp);
-  CASE(Raise);
-  CASE(Or);
-  CASE(Add);
-  CASE(Eor);
-  CASE(Sub);
-  CASE(Shl);
-  CASE(Shr);
-  CASE(Shrs);
-  CASE(Rot);
-  CASE(Not);
-  CASE(Minus);
-  CASE(Mul);
-  CASE(Div);
-  CASE(Quot);
-  CASE(DivMod);
-  CASE(And);
-  CASE(Conv);
-  CASE(Cast);
-  CASE(Phi);
-  CASE(Sync);
-  CASE(Proj);
-  CASE(Id);
-  CASE(Mux);
-  CASE(Psi);
-  CASE(Cmp);
-  CASE(Confirm);
-  CASE(CopyB);
-  CASE(Bound);
-  default:
-    /* leave NULL */;
-  }
-
-  return ops;
+#define CASE(a)                                      \
+       case iro_##a:                                    \
+               ops->equivalent_node  = equivalent_node_##a; \
+               break
+#define CASE_PROJ(a)                                          \
+       case iro_##a:                                             \
+               ops->equivalent_node_Proj = equivalent_node_Proj_##a; \
+               break
+
+       switch (code) {
+       CASE(Block);
+       CASE(Jmp);
+       CASE(Raise);
+       CASE(Eor);
+       CASE(Add);
+       CASE(Shl);
+       CASE(Shr);
+       CASE(Shrs);
+       CASE(Rotl);
+       CASE(Sub);
+       CASE(Not);
+       CASE(Minus);
+       CASE(Mul);
+       CASE(Or);
+       CASE(And);
+       CASE(Conv);
+       CASE(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(Confirm);
+       default:
+               /* leave NULL */;
+       }
+
+       return ops;
 #undef CASE
+#undef CASE_PROJ
 }  /* firm_set_default_equivalent_node */
 
-/**
- * Do node specific optimizations of nodes predecessors.
- */
-static void optimize_preds(ir_node *n) {
-  ir_node *a = NULL, *b = NULL;
-
-  /* get the operands we will work on for simple cases. */
-  if (is_binop(n)) {
-    a = get_binop_left(n);
-    b = get_binop_right(n);
-  } else if (is_unop(n)) {
-    a = get_unop_op(n);
-  }
-
-  switch (get_irn_opcode(n)) {
-
-  case iro_Cmp:
-    /* We don't want Cast as input to Cmp. */
-    if (get_irn_op(a) == op_Cast) {
-      a = get_Cast_op(a);
-      set_Cmp_left(n, a);
-    }
-    if (get_irn_op(b) == op_Cast) {
-      b = get_Cast_op(b);
-      set_Cmp_right(n, b);
-    }
-    break;
-
-  default: break;
-  } /* end switch */
-}  /* optimize_preds */
-
 /**
  * Returns non-zero if a node is a Phi node
  * with all predecessors constant.
  */
 static int is_const_Phi(ir_node *n) {
-  int i;
-
-  if (! is_Phi(n))
-    return 0;
-  for (i = get_irn_arity(n) - 1; i >= 0; --i)
-    if (! is_Const(get_irn_n(n, i)))
-      return 0;
-  return 1;
+       int i;
+
+       if (! is_Phi(n) || get_irn_arity(n) == 0)
+               return 0;
+       for (i = get_irn_arity(n) - 1; i >= 0; --i)
+               if (! is_Const(get_irn_n(n, i)))
+                       return 0;
+               return 1;
 }  /* is_const_Phi */
 
+typedef tarval *(*tarval_sub_type)(tarval *a, tarval *b, ir_mode *mode);
+typedef tarval *(*tarval_binop_type)(tarval *a, tarval *b);
+
+/**
+ * Wrapper for the tarval binop evaluation, tarval_sub has one more parameter.
+ */
+static tarval *do_eval(tarval *(*eval)(), tarval *a, tarval *b, ir_mode *mode) {
+       if (eval == tarval_sub) {
+               tarval_sub_type func = (tarval_sub_type)eval;
+
+               return func(a, b, mode);
+       } else {
+               tarval_binop_type func = (tarval_binop_type)eval;
+
+               return func(a, b);
+       }
+}
+
 /**
  * Apply an evaluator on a binop with a constant operators (and one Phi).
  *
  * @param phi    the Phi node
  * @param other  the other operand
  * @param eval   an evaluator function
+ * @param mode   the mode of the result, may be different from the mode of the Phi!
  * @param left   if non-zero, other is the left operand, else the right
  *
  * @return a new Phi node if the conversion was successful, NULL else
  */
-static ir_node *apply_binop_on_phi(ir_node *phi, tarval *other, tarval *(*eval)(tarval *, tarval *), int left) {
-  tarval   *tv;
-  void     **res;
-  ir_node  *pred;
-  ir_mode  *mode;
-  ir_graph *irg;
-  int      i, n = get_irn_arity(phi);
-
-  NEW_ARR_A(void *, res, n);
-  if (left) {
-    for (i = 0; i < n; ++i) {
-      pred = get_irn_n(phi, i);
-      tv   = get_Const_tarval(pred);
-      tv   = eval(other, tv);
-
-      if (tv == tarval_bad) {
-        /* folding failed, bad */
-        return NULL;
-      }
-      res[i] = tv;
-    }
-  }
-  else {
-    for (i = 0; i < n; ++i) {
-      pred = get_irn_n(phi, i);
-      tv   = get_Const_tarval(pred);
-      tv   = eval(tv, other);
-
-      if (tv == tarval_bad) {
-        /* folding failed, bad */
-        return 0;
-      }
-      res[i] = tv;
-    }
-  }
-  mode = get_irn_mode(phi);
-  irg  = current_ir_graph;
-  for (i = 0; i < n; ++i) {
-    pred = get_irn_n(phi, i);
-    res[i] = new_r_Const_type(irg, get_irg_start_block(irg),
-                              mode, res[i], get_Const_type(pred));
-  }
-  return new_r_Phi(irg, get_nodes_block(phi), n, (ir_node **)res, mode);
+static ir_node *apply_binop_on_phi(ir_node *phi, tarval *other, tarval *(*eval)(), ir_mode *mode, int left) {
+       tarval   *tv;
+       void     **res;
+       ir_node  *pred;
+       ir_graph *irg;
+       int      i, n = get_irn_arity(phi);
+
+       NEW_ARR_A(void *, res, n);
+       if (left) {
+               for (i = 0; i < n; ++i) {
+                       pred = get_irn_n(phi, i);
+                       tv   = get_Const_tarval(pred);
+                       tv   = do_eval(eval, other, tv, mode);
+
+                       if (tv == tarval_bad) {
+                               /* folding failed, bad */
+                               return NULL;
+                       }
+                       res[i] = tv;
+               }
+       } else {
+               for (i = 0; i < n; ++i) {
+                       pred = get_irn_n(phi, i);
+                       tv   = get_Const_tarval(pred);
+                       tv   = do_eval(eval, tv, other, mode);
+
+                       if (tv == tarval_bad) {
+                               /* folding failed, bad */
+                               return 0;
+                       }
+                       res[i] = tv;
+               }
+       }
+       irg  = current_ir_graph;
+       for (i = 0; i < n; ++i) {
+               pred = get_irn_n(phi, i);
+               res[i] = new_r_Const_type(irg, get_irg_start_block(irg),
+                       mode, res[i], get_Const_type(pred));
+       }
+       return new_r_Phi(irg, get_nodes_block(phi), n, (ir_node **)res, mode);
 }  /* apply_binop_on_phi */
 
+/**
+ * Apply an evaluator on a binop with two constant Phi.
+ *
+ * @param a      the left Phi node
+ * @param b      the right Phi node
+ * @param eval   an evaluator function
+ * @param mode   the mode of the result, may be different from the mode of the Phi!
+ *
+ * @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)(), ir_mode *mode) {
+       tarval   *tv_l, *tv_r, *tv;
+       void     **res;
+       ir_node  *pred;
+       ir_graph *irg;
+       int      i, n;
+
+       if (get_nodes_block(a) != get_nodes_block(b))
+               return NULL;
+
+       n = get_irn_arity(a);
+       NEW_ARR_A(void *, res, n);
+
+       for (i = 0; i < n; ++i) {
+               pred = get_irn_n(a, i);
+               tv_l = get_Const_tarval(pred);
+               pred = get_irn_n(b, i);
+               tv_r = get_Const_tarval(pred);
+               tv   = do_eval(eval, tv_l, tv_r, mode);
+
+               if (tv == tarval_bad) {
+                       /* folding failed, bad */
+                       return NULL;
+               }
+               res[i] = tv;
+       }
+       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));
+       }
+       return new_r_Phi(irg, get_nodes_block(a), n, (ir_node **)res, mode);
+}  /* apply_binop_on_2_phis */
+
 /**
  * Apply an evaluator on a unop with a constant operator (a Phi).
  *
@@ -1753,125 +1999,176 @@ 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_unop_on_phi(ir_node *phi, tarval *(*eval)(tarval *)) {
-  tarval   *tv;
-  void     **res;
-  ir_node  *pred;
-  ir_mode  *mode;
-  ir_graph *irg;
-  int      i, n = get_irn_arity(phi);
-
-  NEW_ARR_A(void *, res, n);
-  for (i = 0; i < n; ++i) {
-    pred = get_irn_n(phi, i);
-    tv   = get_Const_tarval(pred);
-    tv   = eval(tv);
-
-    if (tv == tarval_bad) {
-      /* folding failed, bad */
-      return 0;
-    }
-    res[i] = tv;
-  }
-  mode = get_irn_mode(phi);
-  irg  = current_ir_graph;
-  for (i = 0; i < n; ++i) {
-    pred = get_irn_n(phi, i);
-    res[i] = new_r_Const_type(irg, get_irg_start_block(irg),
-                              mode, res[i], get_Const_type(pred));
-  }
-  return new_r_Phi(irg, get_nodes_block(phi), n, (ir_node **)res, mode);
+       tarval   *tv;
+       void     **res;
+       ir_node  *pred;
+       ir_mode  *mode;
+       ir_graph *irg;
+       int      i, n = get_irn_arity(phi);
+
+       NEW_ARR_A(void *, res, n);
+       for (i = 0; i < n; ++i) {
+               pred = get_irn_n(phi, i);
+               tv   = get_Const_tarval(pred);
+               tv   = eval(tv);
+
+               if (tv == tarval_bad) {
+                       /* folding failed, bad */
+                       return 0;
+               }
+               res[i] = tv;
+       }
+       mode = get_irn_mode(phi);
+       irg  = current_ir_graph;
+       for (i = 0; i < n; ++i) {
+               pred = get_irn_n(phi, i);
+               res[i] = new_r_Const_type(irg, get_irg_start_block(irg),
+                       mode, res[i], get_Const_type(pred));
+       }
+       return new_r_Phi(irg, get_nodes_block(phi), n, (ir_node **)res, mode);
 }  /* apply_unop_on_phi */
 
+/**
+ * Apply a conversion on a constant operator (a Phi).
+ *
+ * @param phi    the Phi node
+ *
+ * @return a new Phi node if the conversion was successful, NULL else
+ */
+static ir_node *apply_conv_on_phi(ir_node *phi, ir_mode *mode) {
+       tarval   *tv;
+       void     **res;
+       ir_node  *pred;
+       ir_graph *irg;
+       int      i, n = get_irn_arity(phi);
+
+       NEW_ARR_A(void *, res, n);
+       for (i = 0; i < n; ++i) {
+               pred = get_irn_n(phi, i);
+               tv   = get_Const_tarval(pred);
+               tv   = tarval_convert_to(tv, mode);
+
+               if (tv == tarval_bad) {
+                       /* folding failed, bad */
+                       return 0;
+               }
+               res[i] = tv;
+       }
+       irg  = current_ir_graph;
+       for (i = 0; i < n; ++i) {
+               pred = get_irn_n(phi, i);
+               res[i] = new_r_Const_type(irg, get_irg_start_block(irg),
+                       mode, res[i], get_Const_type(pred));
+       }
+       return new_r_Phi(irg, get_nodes_block(phi), n, (ir_node **)res, mode);
+}  /* apply_conv_on_phi */
+
 /**
  * Transform AddP(P, ConvIs(Iu)), AddP(P, ConvIu(Is)) and
  * SubP(P, ConvIs(Iu)), SubP(P, ConvIu(Is)).
  * If possible, remove the Conv's.
  */
-static ir_node *transform_node_AddSub(ir_node *n)
-{
-  ir_mode *mode = get_irn_mode(n);
-
-  if (mode_is_reference(mode)) {
-    ir_node *left  = get_binop_left(n);
-    ir_node *right = get_binop_right(n);
-    int ref_bits   = get_mode_size_bits(mode);
-
-    if (get_irn_op(left) == op_Conv) {
-      ir_mode *mode = get_irn_mode(left);
-      int bits      = get_mode_size_bits(mode);
-
-      if (ref_bits == bits &&
-          mode_is_int(mode) &&
-          get_mode_arithmetic(mode) == irma_twos_complement) {
-        ir_node *pre      = get_Conv_op(left);
-        ir_mode *pre_mode = get_irn_mode(pre);
-
-        if (mode_is_int(pre_mode) &&
-            get_mode_size_bits(pre_mode) == bits &&
-            get_mode_arithmetic(pre_mode) == irma_twos_complement) {
-          /* ok, this conv just changes to sign, moreover the calculation
-           * is done with same number of bits as our address mode, so
-           * we can ignore the conv as address calculation can be viewed
-           * as either signed or unsigned
-           */
-          set_binop_left(n, pre);
-        }
-      }
-    }
-
-    if (get_irn_op(right) == op_Conv) {
-      ir_mode *mode = get_irn_mode(right);
-      int bits      = get_mode_size_bits(mode);
-
-      if (ref_bits == bits &&
-          mode_is_int(mode) &&
-          get_mode_arithmetic(mode) == irma_twos_complement) {
-        ir_node *pre      = get_Conv_op(right);
-        ir_mode *pre_mode = get_irn_mode(pre);
-
-        if (mode_is_int(pre_mode) &&
-            get_mode_size_bits(pre_mode) == bits &&
-            get_mode_arithmetic(pre_mode) == irma_twos_complement) {
-          /* ok, this conv just changes to sign, moreover the calculation
-           * is done with same number of bits as our address mode, so
-           * we can ignore the conv as address calculation can be viewed
-           * as either signed or unsigned
-           */
-          set_binop_right(n, pre);
-        }
-      }
-    }
-  }
-  return n;
+static ir_node *transform_node_AddSub(ir_node *n) {
+       ir_mode *mode = get_irn_mode(n);
+
+       if (mode_is_reference(mode)) {
+               ir_node *left     = get_binop_left(n);
+               ir_node *right    = get_binop_right(n);
+               unsigned ref_bits = get_mode_size_bits(mode);
+
+               if (is_Conv(left)) {
+                       ir_mode *lmode = get_irn_mode(left);
+                       unsigned bits = get_mode_size_bits(lmode);
+
+                       if (ref_bits == bits &&
+                           mode_is_int(lmode) &&
+                           get_mode_arithmetic(lmode) == irma_twos_complement) {
+                               ir_node *pre      = get_Conv_op(left);
+                               ir_mode *pre_mode = get_irn_mode(pre);
+
+                               if (mode_is_int(pre_mode) &&
+                                   get_mode_size_bits(pre_mode) == bits &&
+                                   get_mode_arithmetic(pre_mode) == irma_twos_complement) {
+                                       /* ok, this conv just changes to sign, moreover the calculation
+                                        * is done with same number of bits as our address mode, so
+                                        * we can ignore the conv as address calculation can be viewed
+                                        * as either signed or unsigned
+                                        */
+                                       set_binop_left(n, pre);
+                               }
+                       }
+               }
+
+               if (is_Conv(right)) {
+                       ir_mode *rmode = get_irn_mode(right);
+                       unsigned bits = get_mode_size_bits(rmode);
+
+                       if (ref_bits == bits &&
+                           mode_is_int(rmode) &&
+                           get_mode_arithmetic(rmode) == irma_twos_complement) {
+                               ir_node *pre      = get_Conv_op(right);
+                               ir_mode *pre_mode = get_irn_mode(pre);
+
+                               if (mode_is_int(pre_mode) &&
+                                   get_mode_size_bits(pre_mode) == bits &&
+                                   get_mode_arithmetic(pre_mode) == irma_twos_complement) {
+                                       /* ok, this conv just changes to sign, moreover the calculation
+                                        * is done with same number of bits as our address mode, so
+                                        * we can ignore the conv as address calculation can be viewed
+                                        * as either signed or unsigned
+                                        */
+                                       set_binop_right(n, pre);
+                               }
+                       }
+               }
+
+               /* let address arithmetic use unsigned modes */
+               if (is_Const(right)) {
+                       ir_mode *rmode = get_irn_mode(right);
+
+                       if (mode_is_signed(rmode) && get_mode_arithmetic(rmode) == irma_twos_complement) {
+                               /* 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);
+                               set_binop_right(n, pre);
+                       }
+               }
+       }
+
+       return n;
 }  /* transform_node_AddSub */
 
-#define HANDLE_BINOP_PHI(op,a,b,c)                          \
-  c = NULL;                                                 \
-  if (is_Const(b) && is_const_Phi(a)) {                     \
-    /* check for Op(Phi, Const) */                          \
-    c = apply_binop_on_phi(a, get_Const_tarval(b), op, 0);  \
-  }                                                         \
-  else if (is_Const(a) && is_const_Phi(b)) {                \
-    /* check for Op(Const, Phi) */                          \
-    c = apply_binop_on_phi(b, get_Const_tarval(a), op, 1);  \
-  }                                                         \
-  if (c) {                                                  \
-    DBG_OPT_ALGSIM0(oldn, c, FS_OPT_CONST_PHI);             \
-    return c;                                               \
+#define HANDLE_BINOP_PHI(eval, a, b, c, mode)                     \
+  c = NULL;                                                       \
+  if (is_Const(b) && is_const_Phi(a)) {                           \
+    /* check for Op(Phi, Const) */                                \
+    c = apply_binop_on_phi(a, get_Const_tarval(b), eval, mode, 0);\
+  }                                                               \
+  else if (is_Const(a) && is_const_Phi(b)) {                      \
+    /* check for Op(Const, Phi) */                                \
+    c = apply_binop_on_phi(b, get_Const_tarval(a), eval, mode, 1);\
+  }                                                               \
+  else if (is_const_Phi(a) && is_const_Phi(b)) {                  \
+    /* check for Op(Phi, Phi) */                                  \
+    c = apply_binop_on_2_phis(a, b, eval, mode);                  \
+  }                                                               \
+  if (c) {                                                        \
+    DBG_OPT_ALGSIM0(oldn, c, FS_OPT_CONST_PHI);                   \
+    return c;                                                     \
   }
 
-#define HANDLE_UNOP_PHI(op,a,c)                 \
-  c = NULL;                                     \
-  if (is_const_Phi(a)) {                        \
-    /* check for Op(Phi) */                     \
-    c = apply_unop_on_phi(a, op);               \
-  }                                             \
-  if (c) {                                      \
-    DBG_OPT_ALGSIM0(oldn, c, FS_OPT_CONST_PHI); \
-    return c;                                   \
+#define HANDLE_UNOP_PHI(eval, a, c)               \
+  c = NULL;                                       \
+  if (is_const_Phi(a)) {                          \
+    /* check for Op(Phi) */                       \
+    c = apply_unop_on_phi(a, eval);               \
+    if (c) {                                      \
+      DBG_OPT_ALGSIM0(oldn, c, FS_OPT_CONST_PHI); \
+      return c;                                   \
+    }                                             \
   }
 
-
 /**
  * Do the AddSub optimization, then Transform
  *   Constant folding on Phi
@@ -1881,1037 +2178,2526 @@ static ir_node *transform_node_AddSub(ir_node *n)
  * Transform Add(a,-b) into Sub(a,b).
  * Reassociation might fold this further.
  */
-static ir_node *transform_node_Add(ir_node *n)
-{
-  ir_mode *mode;
-  ir_node *a, *b, *c, *oldn = n;
-
-  n = transform_node_AddSub(n);
-
-  a = get_Add_left(n);
-  b = get_Add_right(n);
-
-  HANDLE_BINOP_PHI(tarval_add, a,b,c);
-
-  mode = get_irn_mode(n);
-
-  /* for FP these optimizations are only allowed if fp_strict_algebraic is disabled */
-  if (mode_is_float(mode) && (get_irg_fp_model(current_ir_graph) & fp_strict_algebraic))
-    return n;
-
-  if (mode_is_num(mode)) {
-    if (a == b) {
-      ir_node *block = get_irn_n(n, -1);
-
-      n = new_rd_Mul(
-            get_irn_dbg_info(n),
-            current_ir_graph,
-            block,
-            a,
-            new_r_Const_long(current_ir_graph, block, mode, 2),
-            mode);
-      DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_A_A);
-    }
-    else if (get_irn_op(a) == op_Minus) {
-      n = new_rd_Sub(
-          get_irn_dbg_info(n),
-          current_ir_graph,
-          get_irn_n(n, -1),
-          b,
-          get_Minus_op(a),
-          mode);
-      DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_A_MINUS_B);
-    }
-    else if (get_irn_op(b) == op_Minus) {
-      n = new_rd_Sub(
-          get_irn_dbg_info(n),
-          current_ir_graph,
-          get_irn_n(n, -1),
-          a,
-          get_Minus_op(b),
-          mode);
-      DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_A_MINUS_B);
-    }
-    /* do NOT execute this code if reassociation is enabled, it does the inverse! */
-    else if (!get_opt_reassociation() && get_irn_op(a) == op_Mul) {
-      ir_node *ma = get_Mul_left(a);
-      ir_node *mb = get_Mul_right(a);
-
-      if (b == ma) {
-        ir_node *blk = get_irn_n(n, -1);
-        n = new_rd_Mul(
-          get_irn_dbg_info(n), current_ir_graph, blk,
-          ma,
-          new_rd_Add(
-            get_irn_dbg_info(n), current_ir_graph, blk,
-            mb,
-            new_r_Const_long(current_ir_graph, blk, mode, 1),
-            mode),
-          mode);
-        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_MUL_A_X_A);
-      }
-      else if (b == mb) {
-        ir_node *blk = get_irn_n(n, -1);
-        n = new_rd_Mul(
-          get_irn_dbg_info(n), current_ir_graph, blk,
-          mb,
-          new_rd_Add(
-            get_irn_dbg_info(n), current_ir_graph, blk,
-            ma,
-            new_r_Const_long(current_ir_graph, blk, mode, 1),
-            mode),
-          mode);
-        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_MUL_A_X_A);
-      }
-    }
-    /* do NOT execute this code if reassociation is enabled, it does the inverse! */
-    else if (!get_opt_reassociation() && get_irn_op(b) == op_Mul) {
-      ir_node *ma = get_Mul_left(b);
-      ir_node *mb = get_Mul_right(b);
-
-      if (a == ma) {
-        ir_node *blk = get_irn_n(n, -1);
-        n = new_rd_Mul(
-          get_irn_dbg_info(n), current_ir_graph, blk,
-          ma,
-          new_rd_Add(
-            get_irn_dbg_info(n), current_ir_graph, blk,
-            mb,
-            new_r_Const_long(current_ir_graph, blk, mode, 1),
-            mode),
-          mode);
-        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_MUL_A_X_A);
-      }
-      else if (a == mb) {
-        ir_node *blk = get_irn_n(n, -1);
-        n = new_rd_Mul(
-          get_irn_dbg_info(n), current_ir_graph, blk,
-          mb,
-          new_rd_Add(
-            get_irn_dbg_info(n), current_ir_graph, blk,
-            ma,
-            new_r_Const_long(current_ir_graph, blk, mode, 1),
-            mode),
-          mode);
-        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_MUL_A_X_A);
-      }
-    }
-  }
-  return n;
+static ir_node *transform_node_Add(ir_node *n) {
+       ir_mode *mode;
+       ir_node *a, *b, *c, *oldn = n;
+
+       n = transform_node_AddSub(n);
+
+       a = get_Add_left(n);
+       b = get_Add_right(n);
+
+       mode = get_irn_mode(n);
+
+       if (mode_is_reference(mode)) {
+               ir_mode *lmode = get_irn_mode(a);
+
+               if (is_Const(b) && is_Const_null(b) && mode_is_int(lmode)) {
+                       /* an Add(a, NULL) is a hidden Conv */
+                       dbg_info *dbg = get_irn_dbg_info(n);
+                       return new_rd_Conv(dbg, current_ir_graph, get_nodes_block(n), a, mode);
+               }
+       }
+
+       HANDLE_BINOP_PHI(tarval_add, a, b, c, mode);
+
+       /* for FP these optimizations are only allowed if fp_strict_algebraic is disabled */
+       if (mode_is_float(mode) && (get_irg_fp_model(current_ir_graph) & fp_strict_algebraic))
+               return n;
+
+       if (mode_is_num(mode)) {
+               /* the following code leads to endless recursion when Mul are replaced by a simple instruction chain */
+               if (!is_arch_dep_running() && a == b && mode_is_int(mode)) {
+                       ir_node *block = get_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),
+                               mode);
+                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_A_A);
+                       return n;
+               }
+               if (is_Minus(a)) {
+                       n = new_rd_Sub(
+                                       get_irn_dbg_info(n),
+                                       current_ir_graph,
+                                       get_irn_n(n, -1),
+                                       b,
+                                       get_Minus_op(a),
+                                       mode);
+                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_A_MINUS_B);
+                       return n;
+               }
+               if (is_Minus(b)) {
+                       n = new_rd_Sub(
+                                       get_irn_dbg_info(n),
+                                       current_ir_graph,
+                                       get_irn_n(n, -1),
+                                       a,
+                                       get_Minus_op(b),
+                                       mode);
+                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_A_MINUS_B);
+                       return n;
+               }
+               if (get_mode_arithmetic(mode) == irma_twos_complement) {
+                       /* Here we rely on constants be on the RIGHT side */
+                       if (is_Not(a)) {
+                               ir_node *op = get_Not_op(a);
+
+                               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);
+                                       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));
+                                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_X_NOT_X);
+                                       return n;
+                               }
+                       }
+                       if (is_Not(b)) {
+                               ir_node *op = get_Not_op(b);
+
+                               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));
+                                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_X_NOT_X);
+                                       return n;
+                               }
+                       }
+               }
+       }
+       return n;
 }  /* transform_node_Add */
 
+/**
+ * returns -cnst or NULL if impossible
+ */
+static ir_node *const_negate(ir_node *cnst) {
+       tarval   *tv    = tarval_neg(get_Const_tarval(cnst));
+       dbg_info *dbgi  = get_irn_dbg_info(cnst);
+       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);
+}
+
 /**
  * Do the AddSub optimization, then Transform
  *   Constant folding on Phi
  *   Sub(0,a)          -> Minus(a)
  *   Sub(Mul(a, x), a) -> Mul(a, x-1)
  *   Sub(Sub(x, y), b) -> Sub(x, Add(y,b))
+ *   Sub(Add(a, x), x) -> a
+ *   Sub(x, Add(x, a)) -> -a
+ *   Sub(x, Const)     -> Add(x, -Const)
  */
-static ir_node *transform_node_Sub(ir_node *n)
-{
-  ir_mode *mode;
-  ir_node *oldn = n;
-  ir_node *a, *b, *c;
-
-  n = transform_node_AddSub(n);
-
-  a = get_Sub_left(n);
-  b = get_Sub_right(n);
-
-  HANDLE_BINOP_PHI(tarval_sub, a,b,c);
-
-  mode = get_irn_mode(n);
-
-  /* for FP these optimizations are only allowed if fp_strict_algebraic is disabled */
-  if (mode_is_float(mode) && (get_irg_fp_model(current_ir_graph) & fp_strict_algebraic))
-    return n;
-
-  if (mode_is_num(mode) && (classify_Const(a) == CNST_NULL)) {
-    n = new_rd_Minus(
-          get_irn_dbg_info(n),
-          current_ir_graph,
-          get_irn_n(n, -1),
-          b,
-          mode);
-    DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_0_A);
-  }
-  /* do NOT execute this code if reassociation is enabled, it does the inverse! */
-  else if (get_opt_reassociation() && get_irn_op(a) == op_Mul) {
-    ir_node *ma = get_Mul_left(a);
-    ir_node *mb = get_Mul_right(a);
-
-    if (ma == b) {
-      ir_node *blk = get_irn_n(n, -1);
-      n = new_rd_Mul(
-        get_irn_dbg_info(n),
-        current_ir_graph, blk,
-        ma,
-        new_rd_Sub(
-          get_irn_dbg_info(n),
-          current_ir_graph, blk,
-          mb,
-          new_r_Const_long(current_ir_graph, blk, mode, 1),
-          mode),
-        mode);
-      DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_MUL_A_X_A);
-    }
-    else if (mb == b) {
-      ir_node *blk = get_irn_n(n, -1);
-      n = new_rd_Mul(
-        get_irn_dbg_info(n),
-        current_ir_graph, blk,
-        mb,
-        new_rd_Sub(
-          get_irn_dbg_info(n),
-          current_ir_graph, blk,
-          ma,
-          new_r_Const_long(current_ir_graph, blk, mode, 1),
-          mode),
-        mode);
-      DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_MUL_A_X_A);
-    }
-  }
-  else if (get_irn_op(a) == op_Sub) {
-    ir_node *x   = get_Sub_left(a);
-    ir_node *y   = get_Sub_right(a);
-    ir_node *blk = get_irn_n(n, -1);
-    ir_mode *m_b = get_irn_mode(b);
-    ir_mode *m_y = get_irn_mode(y);
-    ir_node *add;
-
-    /* Determine the right mode for the Add. */
-    if (m_b == m_y)
-      mode = m_b;
-    else if (mode_is_reference(m_b))
-      mode = m_b;
-    else if (mode_is_reference(m_y))
-      mode = m_y;
-    else {
-      /*
-       * Both modes are different but none is reference,
-       * happens for instance in SubP(SubP(P, Iu), Is).
-       * We have two possibilities here: Cast or ignore.
-       * Currently we ignore this case.
-       */
-      return n;
-    }
-
-    add = new_r_Add(current_ir_graph, blk, y, b, mode);
-
-    set_Sub_left(n, x);
-    set_Sub_right(n, add);
-    DBG_OPT_ALGSIM0(n, n, FS_OPT_SUB_SUB_X_Y_Z);
-  }
-
-  return n;
+static ir_node *transform_node_Sub(ir_node *n) {
+       ir_mode *mode;
+       ir_node *oldn = n;
+       ir_node *a, *b, *c;
+
+       n = transform_node_AddSub(n);
+
+       a = get_Sub_left(n);
+       b = get_Sub_right(n);
+
+       mode = get_irn_mode(n);
+
+       if (mode_is_int(mode)) {
+               ir_mode *lmode = get_irn_mode(a);
+
+               if (is_Const(b) && is_Const_null(b) && mode_is_reference(lmode)) {
+                       /* a Sub(a, NULL) is a hidden Conv */
+                       dbg_info *dbg = get_irn_dbg_info(n);
+                       return new_rd_Conv(dbg, current_ir_graph, get_nodes_block(n), a, mode);
+               }
+       }
+
+restart:
+       HANDLE_BINOP_PHI(tarval_sub, a, b, c, mode);
+
+       /* 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) {
+               /* 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);
+                       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);
+
+               n = new_rd_Minus(dbg, irg, 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);
+               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_MINUS);
+               return n;
+       } else if (is_Sub(b)) {
+               /* a - (b - c) -> a + (c - b)
+                *             -> (a - b) + c iff (b - c) is a pointer */
+               ir_graph *irg     = current_ir_graph;
+               dbg_info *s_dbg   = get_irn_dbg_info(b);
+               ir_node  *s_block = get_nodes_block(b);
+               ir_node  *s_left  = get_Sub_left(b);
+               ir_node  *s_right = get_Sub_right(b);
+               ir_mode  *s_mode  = get_irn_mode(b);
+               if (s_mode == mode_P) {
+                       ir_node  *sub     = new_rd_Sub(s_dbg, irg, s_block, a, s_left, mode);
+                       dbg_info *a_dbg   = get_irn_dbg_info(n);
+                       ir_node  *a_block = get_nodes_block(n);
+
+                       if (s_mode != mode)
+                               s_right = new_r_Conv(irg, a_block, s_right, mode);
+                       n = new_rd_Add(a_dbg, irg, a_block, sub, s_right, mode);
+               } else {
+                       ir_node  *sub     = new_rd_Sub(s_dbg, irg, s_block, s_right, s_left, s_mode);
+                       dbg_info *a_dbg   = get_irn_dbg_info(n);
+                       ir_node  *a_block = get_nodes_block(n);
+
+                       n = new_rd_Add(a_dbg, irg, a_block, a, sub, mode);
+               }
+               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_TO_ADD);
+               return n;
+       } else if (is_Mul(b)) { /* a - (b * C) -> a + (b * -C) */
+               ir_node *m_right = get_Mul_right(b);
+               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);
+                               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);
+                               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_TO_ADD);
+                               return n;
+                       }
+               }
+       }
+
+       /* Beware of Sub(P, P) which cannot be optimized into a simple Minus ... */
+       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),
+                               b,
+                               mode);
+               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_0_A);
+               return n;
+       }
+       if (is_Add(a)) {
+               if (mode_wrap_around(mode)) {
+                       ir_node *left  = get_Add_left(a);
+                       ir_node *right = get_Add_right(a);
+
+                       /* FIXME: Does the Conv's work only for two complement or generally? */
+                       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);
+                               }
+                               n = right;
+                               DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_ADD_SUB);
+                               return n;
+                       } 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);
+                               }
+                               n = left;
+                               DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_ADD_SUB);
+                               return n;
+                       }
+               }
+       }
+       if (is_Add(b)) {
+               if (mode_wrap_around(mode)) {
+                       ir_node *left  = get_Add_left(b);
+                       ir_node *right = get_Add_right(b);
+
+                       /* FIXME: Does the Conv's work only for two complement or generally? */
+                       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);
+                               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);
+                               }
+                               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);
+                               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);
+                               }
+                               DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_ADD_SUB);
+                               return n;
+                       }
+               }
+       }
+       if (mode_is_int(mode) && is_Conv(a) && is_Conv(b)) {
+               ir_mode *mode = get_irn_mode(a);
+
+               if (mode == get_irn_mode(b)) {
+                       ir_mode *ma, *mb;
+                       ir_node *op_a = get_Conv_op(a);
+                       ir_node *op_b = get_Conv_op(b);
+
+                       /* check if it's allowed to skip the conv */
+                       ma = get_irn_mode(op_a);
+                       mb = get_irn_mode(op_b);
+
+                       if (mode_is_reference(ma) && mode_is_reference(mb)) {
+                               /* SubInt(ConvInt(aP), ConvInt(bP)) -> SubInt(aP,bP) */
+                               a = op_a; b = op_b;
+                               set_Sub_left(n, a);
+                               set_Sub_right(n, b);
+
+                               goto restart;
+                       }
+               }
+       }
+       /* do NOT execute this code if reassociation is enabled, it does the inverse! */
+       if (!is_reassoc_running() && is_Mul(a)) {
+               ir_node *ma = get_Mul_left(a);
+               ir_node *mb = get_Mul_right(a);
+
+               if (ma == b) {
+                       ir_node *blk = get_irn_n(n, -1);
+                       n = new_rd_Mul(
+                                       get_irn_dbg_info(n),
+                                       current_ir_graph, blk,
+                                       ma,
+                                       new_rd_Sub(
+                                               get_irn_dbg_info(n),
+                                               current_ir_graph, blk,
+                                               mb,
+                                               new_r_Const_long(current_ir_graph, blk, 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);
+                       n = new_rd_Mul(
+                                       get_irn_dbg_info(n),
+                                       current_ir_graph, blk,
+                                       mb,
+                                       new_rd_Sub(
+                                               get_irn_dbg_info(n),
+                                               current_ir_graph, blk,
+                                               ma,
+                                               new_r_Const_long(current_ir_graph, blk, mode, 1),
+                                               mode),
+                                       mode);
+                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_MUL_A_X_A);
+                       return n;
+               }
+       }
+       if (is_Sub(a)) { /* (x - y) - b -> x - (y + b) */
+               ir_node *x   =      get_Sub_left(a);
+               ir_node *y        = get_Sub_right(a);
+               ir_node *blk      = get_irn_n(n, -1);
+               ir_mode *m_b      = get_irn_mode(b);
+               ir_mode *m_y      = get_irn_mode(y);
+               ir_mode *add_mode;
+               ir_node *add;
+
+               /* Determine the right mode for the Add. */
+               if (m_b == m_y)
+                       add_mode = m_b;
+               else if (mode_is_reference(m_b))
+                       add_mode = m_b;
+               else if (mode_is_reference(m_y))
+                       add_mode = m_y;
+               else {
+                       /*
+                        * Both modes are different but none is reference,
+                        * happens for instance in SubP(SubP(P, Iu), Is).
+                        * We have two possibilities here: Cast or ignore.
+                        * Currently we ignore this case.
+                        */
+                       return n;
+               }
+
+               add = new_r_Add(current_ir_graph, blk, y, b, add_mode);
+
+               n = new_rd_Sub(get_irn_dbg_info(n), current_ir_graph, blk, x, add, mode);
+               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_SUB_X_Y_Z);
+               return n;
+       }
+
+       if (get_mode_arithmetic(mode) == irma_twos_complement) {
+               if (is_Const(a) && is_Not(b)) {
+                       /* c - ~X = X + (c+1) */
+                       tarval *tv = get_Const_tarval(a);
+
+                       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);
+                               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_C_NOT_X);
+                               return n;
+                       }
+               }
+       }
+       return n;
 }  /* transform_node_Sub */
 
+/**
+ * Several transformation done on n*n=2n bits mul.
+ * These transformations must be done here because new nodes may be produced.
+ */
+static ir_node *transform_node_Mul2n(ir_node *n, ir_mode *mode) {
+       ir_node *oldn = n;
+       ir_node *a = get_Mul_left(n);
+       ir_node *b = get_Mul_right(n);
+       tarval *ta = value_of(a);
+       tarval *tb = value_of(b);
+       ir_mode *smode = get_irn_mode(a);
+
+       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);
+               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);
+               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);
+               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);
+               DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_MUL_MINUS_1);
+               return n;
+       }
+       return n;
+}
+
 /**
  * Transform Mul(a,-1) into -a.
  * Do constant evaluation of Phi nodes.
  * Do architecture dependent optimizations on Mul nodes
  */
 static ir_node *transform_node_Mul(ir_node *n) {
-  ir_node *c, *oldn = n;
-  ir_node *a = get_Mul_left(n);
-  ir_node *b = get_Mul_right(n);
-  ir_mode *mode;
-
-  HANDLE_BINOP_PHI(tarval_mul, a,b,c);
-
-  mode = get_irn_mode(n);
-  if (mode_is_signed(mode)) {
-    ir_node *r = NULL;
-
-    if (value_of(a) == get_mode_minus_one(mode))
-      r = b;
-    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);
-      DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_MUL_MINUS_1);
-      return n;
-    }
-  }
-  return arch_dep_replace_mul_with_shifts(n);
+       ir_node *c, *oldn = n;
+       ir_mode *mode = get_irn_mode(n);
+       ir_node *a = get_Mul_left(n);
+       ir_node *b = get_Mul_right(n);
+
+       if (is_Bad(a) || is_Bad(b))
+               return n;
+
+       if (mode != get_irn_mode(a))
+               return transform_node_Mul2n(n, mode);
+
+       HANDLE_BINOP_PHI(tarval_mul, a, b, c, mode);
+
+       if (mode_is_signed(mode)) {
+               ir_node *r = NULL;
+
+               if (value_of(a) == get_mode_minus_one(mode))
+                       r = b;
+               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);
+                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_MUL_MINUS_1);
+                       return n;
+               }
+       }
+       if (is_Minus(a)) {
+               if (is_Const(b)) { /* (-a) * const -> a * -const */
+                       ir_node *cnst = const_negate(b);
+                       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);
+                               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);
+                       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);
+                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_MUL_MINUS);
+                       return n;
+               }
+       } else if (is_Minus(b)) {
+               if (is_Sub(a)) { /* (a - b) * (-c) -> (b - a) * c */
+                       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);
+                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_MUL_MINUS);
+                       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)) {
+                               /* 2.0 * b = b + b */
+                               n = new_rd_Add(get_irn_dbg_info(n), current_ir_graph, get_nodes_block(n), b, b, mode);
+                               DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_ADD_A_A);
+                               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)) {
+                               /* a * 2.0 = a + a */
+                               n = new_rd_Add(get_irn_dbg_info(n), current_ir_graph, get_nodes_block(n), a, a, mode);
+                               DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_ADD_A_A);
+                               return n;
+                       }
+               }
+       }
+       return arch_dep_replace_mul_with_shifts(n);
 }  /* transform_node_Mul */
 
 /**
  * Transform a Div Node.
  */
-static ir_node *transform_node_Div(ir_node *n)
-{
-  tarval *tv = value_of(n);
-  ir_node *value = n;
-
-  /* BEWARE: it is NOT possible to optimize a/a to 1, as this may cause a exception */
-
-  if (tv != tarval_bad) {
-    value = new_Const(get_tarval_mode(tv), tv);
-
-    DBG_OPT_CSTEVAL(n, value);
-  }
-  else /* Try architecture dependent optimization */
-    value = arch_dep_replace_div_by_const(n);
-
-  if (value != n) {
-    /* Turn Div into a tuple (mem, bad, value) */
-    ir_node *mem = get_Div_mem(n);
-
-    turn_into_tuple(n, pn_Div_max);
-    set_Tuple_pred(n, pn_Div_M, mem);
-    set_Tuple_pred(n, pn_Div_X_except, new_Bad());
-    set_Tuple_pred(n, pn_Div_res, value);
-  }
-  return n;
+static ir_node *transform_node_Div(ir_node *n) {
+       ir_mode *mode = get_Div_resmode(n);
+       ir_node *a = get_Div_left(n);
+       ir_node *b = get_Div_right(n);
+       ir_node *value;
+       tarval  *tv;
+
+       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);
+               if (value) {
+                       DBG_OPT_ALGSIM0(n, value, FS_OPT_CONST_PHI);
+                       goto make_tuple;
+               }
+       }
+       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);
+               if (value) {
+                       DBG_OPT_ALGSIM0(n, value, FS_OPT_CONST_PHI);
+                       goto make_tuple;
+               }
+       }
+       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);
+               if (value) {
+                       DBG_OPT_ALGSIM0(n, value, FS_OPT_CONST_PHI);
+                       goto make_tuple;
+               }
+       }
+
+       value = n;
+       tv = value_of(n);
+       if (tv != tarval_bad) {
+               value = new_Const(get_tarval_mode(tv), tv);
+
+               DBG_OPT_CSTEVAL(n, value);
+               goto make_tuple;
+       } else {
+               ir_node       *a = get_Div_left(n);
+               ir_node       *b = get_Div_right(n);
+               const ir_node *dummy;
+
+               if (a == b && value_not_zero(a, &dummy)) {
+                       /* BEWARE: we can optimize a/a to 1 only if this cannot cause a exception */
+                       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 (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;
+                               }
+                       }
+                       /* Try architecture dependent optimization */
+                       value = arch_dep_replace_div_by_const(n);
+               }
+       }
+
+       if (value != n) {
+               ir_node *mem, *blk;
+
+make_tuple:
+               /* Turn Div into a tuple (mem, jmp, bad, value) */
+               mem = get_Div_mem(n);
+               blk = get_irn_n(n, -1);
+
+               /* skip a potential Pin */
+               if (is_Pin(mem))
+                       mem = get_Pin_op(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_except,  new_Bad());
+               set_Tuple_pred(n, pn_Div_res,       value);
+       }
+       return n;
 }  /* transform_node_Div */
 
 /**
  * Transform a Mod node.
  */
-static ir_node *transform_node_Mod(ir_node *n)
-{
-  tarval *tv = value_of(n);
-  ir_node *value = n;
-
-  /* BEWARE: it is NOT possible to optimize a%a to 0, as this may cause a exception */
-
-  if (tv != tarval_bad) {
-    value = new_Const(get_tarval_mode(tv), tv);
-
-    DBG_OPT_CSTEVAL(n, value);
-  }
-  else /* Try architecture dependent optimization */
-    value = arch_dep_replace_mod_by_const(n);
-
-  if (value != n) {
-    /* Turn Mod into a tuple (mem, bad, value) */
-    ir_node *mem = get_Mod_mem(n);
-
-    turn_into_tuple(n, pn_Mod_max);
-    set_Tuple_pred(n, pn_Mod_M, mem);
-    set_Tuple_pred(n, pn_Mod_X_except, new_Bad());
-    set_Tuple_pred(n, pn_Mod_res, value);
-  }
-  return n;
+static ir_node *transform_node_Mod(ir_node *n) {
+       ir_mode *mode = get_Mod_resmode(n);
+       ir_node *a = get_Mod_left(n);
+       ir_node *b = get_Mod_right(n);
+       ir_node *value;
+       tarval  *tv;
+
+       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);
+               if (value) {
+                       DBG_OPT_ALGSIM0(n, value, FS_OPT_CONST_PHI);
+                       goto make_tuple;
+               }
+       }
+       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);
+               if (value) {
+                       DBG_OPT_ALGSIM0(n, value, FS_OPT_CONST_PHI);
+                       goto make_tuple;
+               }
+       }
+       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);
+               if (value) {
+                       DBG_OPT_ALGSIM0(n, value, FS_OPT_CONST_PHI);
+                       goto make_tuple;
+               }
+       }
+
+       value = n;
+       tv = value_of(n);
+       if (tv != tarval_bad) {
+               value = new_Const(get_tarval_mode(tv), tv);
+
+               DBG_OPT_CSTEVAL(n, value);
+               goto make_tuple;
+       } else {
+               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));
+                       DBG_OPT_CSTEVAL(n, value);
+                       goto make_tuple;
+               } else {
+                       if (mode_is_signed(mode) && is_Const(b)) {
+                               tarval *tv = get_Const_tarval(b);
+
+                               if (tv == get_mode_minus_one(mode)) {
+                                       /* a % -1 = 0 */
+                                       value = new_Const(mode, get_mode_null(mode));
+                                       DBG_OPT_CSTEVAL(n, value);
+                                       goto make_tuple;
+                               }
+                       }
+                       /* Try architecture dependent optimization */
+                       value = arch_dep_replace_mod_by_const(n);
+               }
+       }
+
+       if (value != n) {
+               ir_node *mem, *blk;
+
+make_tuple:
+               /* Turn Mod into a tuple (mem, jmp, bad, value) */
+               mem = get_Mod_mem(n);
+               blk = get_irn_n(n, -1);
+
+               /* skip a potential Pin */
+               if (is_Pin(mem))
+                       mem = get_Pin_op(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_except,  new_Bad());
+               set_Tuple_pred(n, pn_Mod_res,       value);
+       }
+       return n;
 }  /* transform_node_Mod */
 
 /**
  * Transform a DivMod node.
  */
-static ir_node *transform_node_DivMod(ir_node *n)
-{
-  int evaluated = 0;
-
-  ir_node *a = get_DivMod_left(n);
-  ir_node *b = get_DivMod_right(n);
-  ir_mode *mode = get_irn_mode(a);
-  tarval *ta = value_of(a);
-  tarval *tb = value_of(b);
-
-  if (!(mode_is_int(mode) && mode_is_int(get_irn_mode(b))))
-    return n;
-
-  /* BEWARE: it is NOT possible to optimize a/a to 1, as this may cause a exception */
-
-  if (tb != tarval_bad) {
-    if (tb == get_mode_one(get_tarval_mode(tb))) {
-      b = new_Const (mode, get_mode_null(mode));
-      evaluated = 1;
-
-      DBG_OPT_CSTEVAL(n, b);
-    }
-    else if (ta != tarval_bad) {
-      tarval *resa, *resb;
-      resa = tarval_div (ta, tb);
-      if (resa == tarval_bad) return n; /* Causes exception!!! Model by replacing through
-                                        Jmp for X result!? */
-      resb = tarval_mod (ta, tb);
-      if (resb == tarval_bad) return n; /* Causes exception! */
-      a = new_Const (mode, resa);
-      b = new_Const (mode, resb);
-      evaluated = 1;
-
-      DBG_OPT_CSTEVAL(n, a);
-      DBG_OPT_CSTEVAL(n, b);
-    }
-    else { /* Try architecture dependent optimization */
-      arch_dep_replace_divmod_by_const(&a, &b, n);
-      evaluated = a != NULL;
-    }
-  } else if (ta == get_mode_null(mode)) {
-    /* 0 / non-Const = 0 */
-    b = a;
-    evaluated = 1;
-  }
-
-  if (evaluated) { /* replace by tuple */
-    ir_node *mem = get_DivMod_mem(n);
-    turn_into_tuple(n, pn_DivMod_max);
-    set_Tuple_pred(n, pn_DivMod_M,        mem);
-    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,  b);
-  }
-
-  return n;
+static ir_node *transform_node_DivMod(ir_node *n) {
+       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);
+               if (va && vb) {
+                       DBG_OPT_ALGSIM0(n, va, FS_OPT_CONST_PHI);
+                       DBG_OPT_ALGSIM0(n, vb, FS_OPT_CONST_PHI);
+                       goto make_tuple;
+               }
+       }
+       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);
+               if (va && vb) {
+                       DBG_OPT_ALGSIM0(n, va, FS_OPT_CONST_PHI);
+                       DBG_OPT_ALGSIM0(n, vb, FS_OPT_CONST_PHI);
+                       goto make_tuple;
+               }
+       }
+       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);
+               if (va && vb) {
+                       DBG_OPT_ALGSIM0(n, va, FS_OPT_CONST_PHI);
+                       DBG_OPT_ALGSIM0(n, vb, FS_OPT_CONST_PHI);
+                       goto make_tuple;
+               }
+       }
+
+       ta = value_of(a);
+       tb = value_of(b);
+       if (tb != tarval_bad) {
+               if (tb == get_mode_one(get_tarval_mode(tb))) {
+                       va = a;
+                       vb = new_Const(mode, get_mode_null(mode));
+                       DBG_OPT_CSTEVAL(n, vb);
+                       goto make_tuple;
+               } else if (ta != tarval_bad) {
+                       tarval *resa, *resb;
+                       resa = tarval_div(ta, tb);
+                       if (resa == tarval_bad) return n; /* Causes exception!!! Model by replacing through
+                                                            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);
+                       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));
+                       DBG_OPT_CSTEVAL(n, va);
+                       DBG_OPT_CSTEVAL(n, vb);
+                       goto make_tuple;
+               } else { /* Try architecture dependent optimization */
+                       va = a;
+                       vb = b;
+                       arch_dep_replace_divmod_by_const(&va, &vb, n);
+                       evaluated = va != NULL;
+               }
+       } 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));
+                       DBG_OPT_CSTEVAL(n, va);
+                       DBG_OPT_CSTEVAL(n, vb);
+                       goto make_tuple;
+               } else {
+                       /* BEWARE: it is NOT possible to optimize a/a to 1, as this may cause a exception */
+                       return n;
+               }
+       } else if (ta == get_mode_null(mode) && value_not_zero(b, &dummy)) {
+               /* 0 / non-Const = 0 */
+               vb = va = a;
+               goto make_tuple;
+       }
+
+       if (evaluated) { /* replace by tuple */
+               ir_node *mem, *blk;
+
+make_tuple:
+               mem = get_DivMod_mem(n);
+               /* skip a potential Pin */
+               if (is_Pin(mem))
+                       mem = get_Pin_op(mem);
+
+               blk = get_irn_n(n, -1);
+               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,   va);
+               set_Tuple_pred(n, pn_DivMod_res_mod,   vb);
+       }
+
+       return n;
 }  /* transform_node_DivMod */
 
+/**
+ * Optimize x / c to x * (1/c)
+ */
+static ir_node *transform_node_Quot(ir_node *n) {
+       ir_mode *mode = get_Quot_resmode(n);
+       ir_node *oldn = n;
+
+       if (get_mode_arithmetic(mode) == irma_ieee754) {
+               ir_node *b = get_Quot_right(n);
+
+               if (is_Const(b)) {
+                       tarval *tv = get_Const_tarval(b);
+                       int rem;
+
+                       /*
+                        * Floating point constant folding might be disabled here to
+                        * prevent rounding.
+                        * However, as we check for exact result, doing it is safe.
+                        * Switch it on.
+                        */
+                       rem = tarval_enable_fp_ops(1);
+                       tv = tarval_quo(get_mode_one(mode), tv);
+                       (void)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 *a = get_Quot_left(n);
+                               ir_node *m = new_rd_Mul(get_irn_dbg_info(n), current_ir_graph, blk, a, c, mode);
+                               ir_node *mem = get_Quot_mem(n);
+
+                               /* skip a potential Pin */
+                               if (is_Pin(mem))
+                                       mem = get_Pin_op(mem);
+                               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_res, m);
+                               DBG_OPT_ALGSIM1(oldn, a, b, m, FS_OPT_FP_INV_MUL);
+                       }
+               }
+       }
+       return n;
+}  /* transform_node_Quot */
+
 /**
  * Optimize Abs(x) into  x if x is Confirmed >= 0
  * Optimize Abs(x) into -x if x is Confirmed <= 0
+ * Optimize Abs(-x) int Abs(x)
  */
-static ir_node *transform_node_Abs(ir_node *n)
-{
-  ir_node        *oldn = n;
-  ir_node        *a = get_Abs_op(n);
-  value_classify_sign sign = classify_value_sign(a);
-
-  if (sign == value_classified_negative) {
-    ir_mode *mode = get_irn_mode(n);
-
-    /*
-     * We can replace the Abs by -x here.
-     * We even could add a new Confirm here.
-     *
-     * 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_irn_n(n, -1), a, mode);
-
-    DBG_OPT_CONFIRM(oldn, n);
-  }
-  else if (sign == value_classified_positive) {
-    /* n is positive, Abs is not needed */
-    n = a;
+static ir_node *transform_node_Abs(ir_node *n) {
+       ir_node *c, *oldn = n;
+       ir_node *a = get_Abs_op(n);
+       ir_mode *mode;
+
+       HANDLE_UNOP_PHI(tarval_abs, a, c);
+
+       switch (classify_value_sign(a)) {
+       case value_classified_negative:
+               mode = get_irn_mode(n);
+
+               /*
+                * We can replace the Abs by -x here.
+                * We even could add a new Confirm here
+                * (if not twos complement)
+                *
+                * 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);
+
+               DBG_OPT_CONFIRM(oldn, n);
+               return n;
+       case value_classified_positive:
+               /* n is positive, Abs is not needed */
+               n = a;
+
+               DBG_OPT_CONFIRM(oldn, n);
+               return n;
+       default:
+               break;
+       }
+       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);
+               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ABS_MINUS_X);
+               return n;
+       }
+       return n;
+}  /* transform_node_Abs */
 
-    DBG_OPT_CONFIRM(oldn, n);
-  }
+/**
+ * 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), current_ir_graph,
+                       get_nodes_block(n), new_left, new_right);
+               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_CMP_OP_OP);
+       }
+       return n;
+}  /* transform_node_Cmp */
 
-  return n;
-}  /* transform_node_Abs */
 
 /**
  * Transform a Cond node.
+ *
+ * Replace the Cond by a Jmp if it branches on a constant
+ * condition.
  */
-static ir_node *transform_node_Cond(ir_node *n)
-{
-  /* Replace the Cond by a Jmp if it branches on a constant
-     condition. */
-  ir_node *jmp;
-  ir_node *a = get_Cond_selector(n);
-  tarval *ta = value_of(a);
-
-  /* we need block info which is not available in floating irgs */
-  if (get_irg_pinned(current_ir_graph) == op_pin_state_floats)
-     return n;
-
-  if ((ta != tarval_bad) &&
-      (get_irn_mode(a) == mode_b) &&
-      (get_opt_unreachable_code())) {
-    /* It's a boolean Cond, branching on a boolean constant.
-               Replace it by a tuple (Bad, Jmp) or (Jmp, Bad) */
-    jmp = new_r_Jmp(current_ir_graph, get_nodes_block(n));
-    turn_into_tuple(n, pn_Cond_max);
-    if (ta == tarval_b_true) {
-      set_Tuple_pred(n, pn_Cond_false, new_Bad());
-      set_Tuple_pred(n, pn_Cond_true, jmp);
-    } else {
-      set_Tuple_pred(n, pn_Cond_false, jmp);
-      set_Tuple_pred(n, pn_Cond_true, new_Bad());
-    }
-    /* We might generate an endless loop, so keep it alive. */
-    add_End_keepalive(get_irg_end(current_ir_graph), get_nodes_block(n));
-  }
-  return n;
+static ir_node *transform_node_Cond(ir_node *n) {
+
+       ir_node *jmp;
+       ir_node *a = get_Cond_selector(n);
+       tarval *ta = value_of(a);
+
+       /* we need block info which is not available in floating irgs */
+       if (get_irg_pinned(current_ir_graph) == op_pin_state_floats)
+               return n;
+
+       if ((ta != tarval_bad) &&
+           (get_irn_mode(a) == mode_b) &&
+           (get_opt_unreachable_code())) {
+               /* 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);
+               turn_into_tuple(n, pn_Cond_max);
+               if (ta == tarval_b_true) {
+                       set_Tuple_pred(n, pn_Cond_false, new_Bad());
+                       set_Tuple_pred(n, pn_Cond_true, jmp);
+               } else {
+                       set_Tuple_pred(n, pn_Cond_false, jmp);
+                       set_Tuple_pred(n, pn_Cond_true, new_Bad());
+               }
+               /* We might generate an endless loop, so keep it alive. */
+               add_End_keepalive(get_irg_end(current_ir_graph), blk);
+       }
+       return n;
 }  /* transform_node_Cond */
 
 /**
- * Transform an And.
+ * Prototype of a recursive transform function
+ * for bitwise distributive transformations.
  */
-static ir_node *transform_node_And(ir_node *n)
+typedef ir_node* (*recursive_transform)(ir_node *n);
+
+/**
+ * makes use of distributive laws for and, or, eor
+ *     and(a OP c, b OP c) -> and(a, b) OP c
+ * note, might return a different op than n
+ */
+static ir_node *transform_bitwise_distributive(ir_node *n,
+                                               recursive_transform trans_func)
 {
-  ir_node *c, *oldn = n;
-  ir_node *a = get_And_left(n);
-  ir_node *b = get_And_right(n);
+       ir_node *oldn    = n;
+       ir_node *a       = get_binop_left(n);
+       ir_node *b       = get_binop_right(n);
+       ir_op   *op      = get_irn_op(a);
+       ir_op   *op_root = get_irn_op(n);
+
+       if(op != get_irn_op(b))
+               return n;
+
+       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);
+
+                       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));
+
+                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_SHIFT_AND);
+                       return n;
+               }
+       }
+
+       if (op == op_Eor) {
+               /* nothing to gain here */
+               return n;
+       }
+
+       if (op == op_Shrs || op == op_Shr || op == op_Shl
+                       || op == op_And || op == op_Or || op == op_Eor) {
+               ir_node *a_left  = get_binop_left(a);
+               ir_node *a_right = get_binop_right(a);
+               ir_node *b_left  = get_binop_left(b);
+               ir_node *b_right = get_binop_right(b);
+               ir_node *c       = NULL;
+               ir_node *op1     = NULL;
+               ir_node *op2     = NULL;
+
+               if (is_op_commutative(op)) {
+                       if (a_left == b_left) {
+                               c   = a_left;
+                               op1 = a_right;
+                               op2 = b_right;
+                       } else if(a_left == b_right) {
+                               c   = a_left;
+                               op1 = a_right;
+                               op2 = b_left;
+                       } else if(a_right == b_left) {
+                               c   = a_right;
+                               op1 = a_left;
+                               op2 = b_right;
+                       }
+               }
+               if(a_right == b_right) {
+                       c   = a_right;
+                       op1 = a_left;
+                       op2 = b_left;
+               }
+
+               if (c != NULL) {
+                       /* (a sop c) & (b sop c) => (a & b) sop c */
+                       ir_node *blk = get_irn_n(n, -1);
+
+                       ir_node *new_n = exact_copy(n);
+                       set_binop_left(new_n, op1);
+                       set_binop_right(new_n, op2);
+                       new_n = trans_func(new_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);
+                       } else {
+                               n = exact_copy(a);
+                               set_nodes_block(n, blk);
+                               set_binop_left(n, new_n);
+                               set_binop_right(n, c);
+                               add_identities(current_ir_graph->value_table, n);
+                       }
+
+                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_SHIFT_AND);
+                       return n;
+               }
+       }
+
+       return n;
+}
 
-  HANDLE_BINOP_PHI(tarval_and, a,b,c);
-  return n;
+/**
+ * Transform an And.
+ */
+static ir_node *transform_node_And(ir_node *n) {
+       ir_node *c, *oldn = n;
+       ir_node *a = get_And_left(n);
+       ir_node *b = get_And_right(n);
+       ir_mode *mode;
+
+       mode = get_irn_mode(n);
+       HANDLE_BINOP_PHI(tarval_and, a, b, c, mode);
+
+       /* we can evaluate 2 Projs of the same Cmp */
+       if (mode == mode_b && is_Proj(a) && is_Proj(b)) {
+               ir_node *pred_a = get_Proj_pred(a);
+               ir_node *pred_b = get_Proj_pred(b);
+               if (pred_a == pred_b) {
+                       dbg_info *dbgi  = get_irn_dbg_info(n);
+                       ir_node  *block = get_nodes_block(pred_a);
+                       pn_Cmp pn_a     = get_Proj_proj(a);
+                       pn_Cmp pn_b     = get_Proj_proj(b);
+                       /* 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);
+               }
+       }
+       if (is_Or(a)) {
+               if (is_Not(b)) {
+                       ir_node *op = get_Not_op(b);
+                       if (is_And(op)) {
+                               ir_node *ba = get_And_left(op);
+                               ir_node *bb = get_And_right(op);
+
+                               /* it's enough to test the following cases due to normalization! */
+                               if (get_Or_left(a) == ba && get_Or_right(a) == bb) {
+                                       /* (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);
+                                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_TO_EOR);
+                                       return n;
+                               }
+                       }
+               }
+       }
+       if (is_Or(b)) {
+               if (is_Not(a)) {
+                       ir_node *op = get_Not_op(a);
+                       if (is_And(op)) {
+                               ir_node *aa = get_And_left(op);
+                               ir_node *ab = get_And_right(op);
+
+                               /* it's enough to test the following cases due to normalization! */
+                               if (get_Or_left(b) == aa && get_Or_right(b) == ab) {
+                                       /* (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);
+                                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_TO_EOR);
+                                       return n;
+                               }
+                       }
+               }
+       }
+       if (is_Eor(a)) {
+               ir_node *al = get_Eor_left(a);
+               ir_node *ar = get_Eor_right(a);
+
+               if (al == b) {
+                       /* (b ^ a) & b -> ~a & b */
+                       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);
+                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT);
+                       return n;
+               }
+               if (ar == b) {
+                       /* (a ^ b) & b -> ~a & b */
+                       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);
+                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT);
+                       return n;
+               }
+       }
+       if (is_Eor(b)) {
+               ir_node *bl = get_Eor_left(b);
+               ir_node *br = get_Eor_right(b);
+
+               if (bl == a) {
+                       /* a & (a ^ b) -> a & ~b */
+                       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);
+                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT);
+                       return n;
+               }
+               if (br == a) {
+                       /* a & (b ^ a) -> a & ~b */
+                       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);
+                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT);
+                       return n;
+               }
+       }
+       if (is_Not(a) && is_Not(b)) {
+               /* ~a & ~b = ~(a|b) */
+               ir_node *block = get_nodes_block(n);
+               ir_mode *mode = get_irn_mode(n);
+
+               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);
+               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_DEMORGAN);
+               return n;
+       }
+
+       n = transform_bitwise_distributive(n, transform_node_And);
+
+       return n;
 }  /* transform_node_And */
 
 /**
  * Transform an Eor.
  */
-static ir_node *transform_node_Eor(ir_node *n)
-{
-  ir_node *c, *oldn = n;
-  ir_node *a = get_Eor_left(n);
-  ir_node *b = get_Eor_right(n);
-  ir_mode *mode = get_irn_mode(n);
-
-  HANDLE_BINOP_PHI(tarval_eor, a,b,c);
-
-  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));
-    DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_A_A);
-  }
-  else if ((mode == mode_b)
-      && (get_irn_op(a) == op_Proj)
-      && (get_irn_mode(a) == mode_b)
-      && (classify_tarval (value_of(b)) == TV_CLASSIFY_ONE)
-      && (get_irn_op(get_Proj_pred(a)) == op_Cmp)) {
-    /* The Eor negates a Cmp. The Cmp has the negated result anyways! */
-    n = new_r_Proj(current_ir_graph, get_irn_n(n, -1), get_Proj_pred(a),
-                   mode_b, get_negated_pnc(get_Proj_proj(a), mode));
-
-    DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT_BOOL);
-  }
-  else if ((mode == mode_b)
-        && (classify_tarval (value_of(b)) == TV_CLASSIFY_ONE)) {
-    /* The Eor is a Not. Replace it by a Not. */
-    /*   ????!!!Extend to bitfield 1111111. */
-    n = new_r_Not(current_ir_graph, get_irn_n(n, -1), a, mode_b);
-
-    DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT);
-  }
-
-  return n;
+static ir_node *transform_node_Eor(ir_node *n) {
+       ir_node *c, *oldn = n;
+       ir_node *a = get_Eor_left(n);
+       ir_node *b = get_Eor_right(n);
+       ir_mode *mode = get_irn_mode(n);
+
+       HANDLE_BINOP_PHI(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)) {
+               ir_node *pred_a = get_Proj_pred(a);
+               ir_node *pred_b = get_Proj_pred(b);
+               if(pred_a == pred_b) {
+                       dbg_info *dbgi  = get_irn_dbg_info(n);
+                       ir_node  *block = get_nodes_block(pred_a);
+                       pn_Cmp pn_a     = get_Proj_proj(a);
+                       pn_Cmp pn_b     = get_Proj_proj(b);
+                       /* 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);
+               }
+       }
+
+       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));
+               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),
+                               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  *not_op = get_Not_op(a);
+                       dbg_info *dbg    = get_irn_dbg_info(n);
+                       ir_graph *irg    = current_ir_graph;
+                       ir_node  *block  = get_nodes_block(n);
+                       ir_mode  *mode   = get_irn_mode(n);
+                       n = new_rd_Eor(dbg, irg, block, not_op, cnst, mode);
+                       return n;
+               } else if (is_Const_all_one(b)) { /* x ^ 1...1 -> ~1 */
+                       n = new_r_Not(current_ir_graph, get_nodes_block(n), a, mode);
+                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT);
+               }
+       } else {
+               n = transform_bitwise_distributive(n, transform_node_Eor);
+       }
+
+       return n;
 }  /* transform_node_Eor */
 
 /**
  * Transform a Not.
  */
-static ir_node *transform_node_Not(ir_node *n)
-{
-  ir_node *c, *oldn = n;
-  ir_node *a = get_Not_op(n);
-
-  HANDLE_UNOP_PHI(tarval_not,a,c);
-
-  /* check for a boolean Not */
-  if (   (get_irn_mode(n) == mode_b)
-      && (get_irn_op(a) == op_Proj)
-      && (get_irn_mode(a) == mode_b)
-      && (get_irn_op(get_Proj_pred(a)) == op_Cmp)) {
-    /* 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;
+static ir_node *transform_node_Not(ir_node *n) {
+       ir_node *c, *oldn = n;
+       ir_node *a    = get_Not_op(n);
+       ir_mode *mode = get_irn_mode(n);
+
+       HANDLE_UNOP_PHI(tarval_not,a,c);
+
+       /* check for a boolean Not */
+       if (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  (is_Eor(a)) {
+               ir_node *eor_b = get_Eor_right(a);
+               if (is_Const(eor_b)) { /* ~(x ^ const) -> x ^ ~const */
+                       ir_node  *cnst  = new_Const(mode, tarval_not(get_Const_tarval(eor_b)));
+                       ir_node  *eor_a = get_Eor_left(a);
+                       dbg_info *dbg   = get_irn_dbg_info(n);
+                       ir_graph *irg   = current_ir_graph;
+                       ir_node  *block = get_nodes_block(n);
+                       ir_mode  *mode  = get_irn_mode(n);
+                       n = new_rd_Eor(dbg, irg, block, eor_a, cnst, mode);
+                       return n;
+               }
+       }
+       if (get_mode_arithmetic(mode) == irma_twos_complement) {
+               if (is_Minus(a)) { /* ~-x -> x + -1 */
+                       dbg_info *dbg   = get_irn_dbg_info(n);
+                       ir_graph *irg   = current_ir_graph;
+                       ir_node  *block = get_nodes_block(n);
+                       ir_node  *add_l = get_Minus_op(a);
+                       ir_node  *add_r = new_rd_Const(dbg, irg, block, mode, get_mode_minus_one(mode));
+                       n = new_rd_Add(dbg, irg, block, add_l, add_r, mode);
+               } else if (is_Add(a)) {
+                       ir_node *add_r = get_Add_right(a);
+                       if (is_Const(add_r) && is_Const_all_one(add_r)) {
+                               /* ~(x + -1) = -x */
+                               ir_node *op = get_Add_left(a);
+                               ir_node *blk = get_irn_n(n, -1);
+                               n = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, blk, op, get_irn_mode(n));
+                               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_NOT_MINUS_1);
+                       }
+               }
+       }
+       return n;
 }  /* transform_node_Not */
 
 /**
  * Transform a Minus.
+ * Optimize:
+ *   -(~x) = x + 1
+ *   -(a-b) = b - a
+ *   -(a >>u (size-1)) = a >>s (size-1)
+ *   -(a >>s (size-1)) = a >>u (size-1)
+ *   -(a * const) -> a * -const
  */
-static ir_node *transform_node_Minus(ir_node *n)
-{
-  ir_node *c, *oldn = n;
-  ir_node *a = get_Minus_op(n);
-
-  HANDLE_UNOP_PHI(tarval_neg,a,c);
-  return n;
+static ir_node *transform_node_Minus(ir_node *n) {
+       ir_node *c, *oldn = n;
+       ir_node *a = get_Minus_op(n);
+       ir_mode *mode;
+
+       HANDLE_UNOP_PHI(tarval_neg,a,c);
+
+       mode = get_irn_mode(a);
+       if (get_mode_arithmetic(mode) == irma_twos_complement) {
+               /* the following rules are only to twos-complement */
+               if (is_Not(a)) {
+                       /* -(~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);
+                       DBG_OPT_ALGSIM2(oldn, a, n, FS_OPT_MINUS_NOT);
+                       return n;
+               }
+               if (is_Shr(a)) {
+                       ir_node *c = get_Shr_right(a);
+
+                       if (is_Const(c)) {
+                               tarval *tv = get_Const_tarval(c);
+
+                               if (tarval_is_long(tv) && get_tarval_long(tv) == (int) get_mode_size_bits(mode) - 1) {
+                                       /* -(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);
+                                       DBG_OPT_ALGSIM2(oldn, a, n, FS_OPT_PREDICATE);
+                                       return n;
+                               }
+                       }
+               }
+               if (is_Shrs(a)) {
+                       ir_node *c = get_Shrs_right(a);
+
+                       if (is_Const(c)) {
+                               tarval *tv = get_Const_tarval(c);
+
+                               if (tarval_is_long(tv) && get_tarval_long(tv) == (int) get_mode_size_bits(mode) - 1) {
+                                       /* -(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);
+                                       DBG_OPT_ALGSIM2(oldn, a, n, FS_OPT_PREDICATE);
+                                       return n;
+                               }
+                       }
+               }
+       }
+       if (is_Sub(a)) {
+               /* - (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);
+
+               n = new_rd_Sub(get_irn_dbg_info(n), current_ir_graph, blk, ra, la, mode);
+               DBG_OPT_ALGSIM2(oldn, a, n, FS_OPT_MINUS_SUB);
+               return n;
+       }
+
+       if (is_Mul(a)) { /* -(a * const) -> a * -const */
+               ir_node *mul_l = get_Mul_left(a);
+               ir_node *mul_r = get_Mul_right(a);
+               if (is_Const(mul_r)) {
+                       tarval   *tv    = tarval_neg(get_Const_tarval(mul_r));
+                       if(tv != tarval_bad) {
+                               ir_node  *cnst  = new_Const(mode, tv);
+                               dbg_info *dbg   = get_irn_dbg_info(a);
+                               ir_graph *irg   = current_ir_graph;
+                               ir_node  *block = get_nodes_block(a);
+                               n = new_rd_Mul(dbg, irg, block, mul_l, cnst, mode);
+                               DBG_OPT_ALGSIM2(oldn, a, n, FS_OPT_MINUS_MUL_C);
+                               return n;
+                       }
+               }
+       }
+
+       return n;
 }  /* transform_node_Minus */
 
 /**
  * Transform a Cast_type(Const) into a new Const_type
  */
 static ir_node *transform_node_Cast(ir_node *n) {
-  ir_node *oldn = n;
-  ir_node *pred = get_Cast_op(n);
-  ir_type *tp = get_irn_type(n);
-
-  if (get_irn_op(pred) == op_Const && get_Const_type(pred) != tp) {
-    n = new_rd_Const_type(NULL, current_ir_graph, get_irn_n(pred, -1), get_irn_mode(pred),
-              get_Const_tarval(pred), tp);
-    DBG_OPT_CSTEVAL(oldn, n);
-  } else if ((get_irn_op(pred) == op_SymConst) && (get_SymConst_value_type(pred) != tp)) {
-    n = new_rd_SymConst_type(NULL, current_ir_graph, get_irn_n(pred, -1), get_SymConst_symbol(pred),
-                 get_SymConst_kind(pred), tp);
-    DBG_OPT_CSTEVAL(oldn, n);
-  }
-
-  return n;
+       ir_node *oldn = n;
+       ir_node *pred = get_Cast_op(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);
+               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),
+                       get_SymConst_symbol(pred), get_SymConst_kind(pred), tp);
+               DBG_OPT_CSTEVAL(oldn, 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(current_ir_graph, blk);
+                               }
+                       }
+               }
+       }
+       return proj;
+}  /* transform_node_Proj_Load */
+
+/**
+ * Transform a Proj(Store) with a non-null address.
+ */
+static ir_node *transform_node_Proj_Store(ir_node *proj) {
+       if (get_opt_ldst_only_null_ptr_exceptions()) {
+               if (get_irn_mode(proj) == mode_X) {
+                       ir_node *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(current_ir_graph, blk);
+                               }
+                       }
+               }
+       }
+       return proj;
+}  /* transform_node_Proj_Store */
+
 /**
  * Transform a Proj(Div) with a non-zero value.
  * Removes the exceptions and routes the memory to the NoMem node.
  */
-static ir_node *transform_node_Proj_Div(ir_node *proj)
-{
-  ir_node *n = get_Proj_pred(proj);
-  ir_node *b = get_Div_right(n);
-  ir_node *confirm;
-  long proj_nr;
-
-  if (value_not_zero(b, &confirm)) {
-    /* div(x, y) && y != 0 */
-    proj_nr = get_Proj_proj(proj);
-    if (proj_nr == pn_Div_X_except) {
-      /* we found an exception handler, remove it */
-      DBG_OPT_EXC_REM(proj);
-      return new_Bad();
-    }
-    else if (proj_nr == pn_Div_M) {
-      ir_node *res = get_Div_mem(n);
-      ir_node *new_mem = get_irg_no_mem(current_ir_graph);
-
-      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);
-      }
-      set_irn_pinned(n, op_pin_state_floats);
-      /* this is a Div without exception, we can remove the memory edge */
-      set_Div_mem(n, new_mem);
-      return res;
-    }
-  }
-  return proj;
+static ir_node *transform_node_Proj_Div(ir_node *proj) {
+       ir_node *div = get_Proj_pred(proj);
+       ir_node *b   = get_Div_right(div);
+       ir_node *res, *new_mem;
+       const ir_node *confirm;
+       long proj_nr;
+
+       if (value_not_zero(b, &confirm)) {
+               /* div(x, y) && y != 0 */
+               if (confirm == NULL) {
+                       /* we are sure we have a Const != 0 */
+                       new_mem = get_Div_mem(div);
+                       if (is_Pin(new_mem))
+                               new_mem = get_Pin_op(new_mem);
+                       set_Div_mem(div, new_mem);
+                       set_irn_pinned(div, op_pin_state_floats);
+               }
+
+               proj_nr = get_Proj_proj(proj);
+               switch (proj_nr) {
+               case pn_Div_X_regular:
+                       return new_r_Jmp(current_ir_graph, get_irn_n(div, -1));
+
+               case pn_Div_X_except:
+                       /* we found an exception handler, remove it */
+                       DBG_OPT_EXC_REM(proj);
+                       return new_Bad();
+
+               case pn_Div_M:
+                       res = get_Div_mem(div);
+                       new_mem = get_irg_no_mem(current_ir_graph);
+
+                       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);
+                       }
+                       set_irn_pinned(div, op_pin_state_floats);
+                       /* this is a Div without exception, we can remove the memory edge */
+                       set_Div_mem(div, new_mem);
+                       return res;
+               }
+       }
+       return proj;
 }  /* transform_node_Proj_Div */
 
 /**
  * Transform a Proj(Mod) with a non-zero value.
  * Removes the exceptions and routes the memory to the NoMem node.
  */
-static ir_node *transform_node_Proj_Mod(ir_node *proj)
-{
-  ir_node *n = get_Proj_pred(proj);
-  ir_node *b = get_Mod_right(n);
-  ir_node *confirm;
-  long proj_nr;
-
-  if (value_not_zero(b, &confirm)) {
-    /* mod(x, y) && y != 0 */
-    proj_nr = get_Proj_proj(proj);
-
-    if (proj_nr == pn_Mod_X_except) {
-      /* we found an exception handler, remove it */
-      DBG_OPT_EXC_REM(proj);
-      return new_Bad();
-    } else if (proj_nr == pn_Mod_M) {
-      ir_node *res = get_Mod_mem(n);
-      ir_node *new_mem = get_irg_no_mem(current_ir_graph);
-
-      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);
-      }
-      set_irn_pinned(n, op_pin_state_floats);
-      /* this is a Mod without exception, we can remove the memory edge */
-      set_Mod_mem(n, get_irg_no_mem(current_ir_graph));
-      return res;
-    }
-    else if (proj_nr == pn_Mod_res && get_Mod_left(n) == b) {
-      /* a % a = 0 if a != 0 */
-      ir_mode *mode = get_irn_mode(proj);
-      ir_node *res  = new_Const(mode, get_mode_null(mode));
-
-      DBG_OPT_CSTEVAL(n, res);
-      return res;
-    }
-  }
-  return 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 *res, *new_mem;
+       const ir_node *confirm;
+       long proj_nr;
+
+       if (value_not_zero(b, &confirm)) {
+               /* mod(x, y) && y != 0 */
+               proj_nr = get_Proj_proj(proj);
+
+               if (confirm == NULL) {
+                       /* we are sure we have a Const != 0 */
+                       new_mem = get_Mod_mem(mod);
+                       if (is_Pin(new_mem))
+                               new_mem = get_Pin_op(new_mem);
+                       set_Mod_mem(mod, new_mem);
+                       set_irn_pinned(mod, op_pin_state_floats);
+               }
+
+               switch (proj_nr) {
+
+               case pn_Mod_X_regular:
+                       return new_r_Jmp(current_ir_graph, get_irn_n(mod, -1));
+
+               case pn_Mod_X_except:
+                       /* we found an exception handler, remove it */
+                       DBG_OPT_EXC_REM(proj);
+                       return new_Bad();
+
+               case pn_Mod_M:
+                       res = get_Mod_mem(mod);
+                       new_mem = get_irg_no_mem(current_ir_graph);
+
+                       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);
+                       }
+                       /* this is a Mod without exception, we can remove the memory edge */
+                       set_Mod_mem(mod, new_mem);
+                       return res;
+               case pn_Mod_res:
+                       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));
+
+                               DBG_OPT_CSTEVAL(mod, res);
+                               return res;
+                       }
+               }
+       }
+       return proj;
 }  /* transform_node_Proj_Mod */
 
 /**
  * Transform a Proj(DivMod) with a non-zero value.
  * Removes the exceptions and routes the memory to the NoMem node.
  */
-static ir_node *transform_node_Proj_DivMod(ir_node *proj)
-{
-  ir_node *n = get_Proj_pred(proj);
-  ir_node *b = get_DivMod_right(n);
-  ir_node *confirm;
-  long proj_nr;
-
-  if (value_not_zero(b, &confirm)) {
-    /* DivMod(x, y) && y != 0 */
-    proj_nr = get_Proj_proj(proj);
-
-    if (proj_nr == pn_DivMod_X_except) {
-      /* we found an exception handler, remove it */
-      DBG_OPT_EXC_REM(proj);
-      return new_Bad();
-    }
-    else if (proj_nr == pn_DivMod_M) {
-      ir_node *res = get_DivMod_mem(n);
-      ir_node *new_mem = get_irg_no_mem(current_ir_graph);
-
-      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);
-      }
-      set_irn_pinned(n, op_pin_state_floats);
-      /* this is a DivMod without exception, we can remove the memory edge */
-      set_DivMod_mem(n, get_irg_no_mem(current_ir_graph));
-      return res;
-    }
-    else if (proj_nr == pn_DivMod_res_mod && get_DivMod_left(n) == b) {
-      /* a % a = 0 if a != 0 */
-      ir_mode *mode = get_irn_mode(proj);
-      ir_node *res  = new_Const(mode, get_mode_null(mode));
-
-      DBG_OPT_CSTEVAL(n, res);
-      return res;
-    }
-  }
-  return 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 *res, *new_mem;
+       const ir_node *confirm;
+       long proj_nr;
+
+       if (value_not_zero(b, &confirm)) {
+               /* DivMod(x, y) && y != 0 */
+               proj_nr = get_Proj_proj(proj);
+
+               if (confirm == NULL) {
+                       /* we are sure we have a Const != 0 */
+                       new_mem = get_DivMod_mem(divmod);
+                       if (is_Pin(new_mem))
+                               new_mem = get_Pin_op(new_mem);
+                       set_DivMod_mem(divmod, new_mem);
+                       set_irn_pinned(divmod, op_pin_state_floats);
+               }
+
+               switch (proj_nr) {
+
+               case pn_DivMod_X_regular:
+                       return new_r_Jmp(current_ir_graph, get_irn_n(divmod, -1));
+
+               case pn_DivMod_X_except:
+                       /* we found an exception handler, remove it */
+                       DBG_OPT_EXC_REM(proj);
+                       return new_Bad();
+
+               case pn_DivMod_M:
+                       res = get_DivMod_mem(divmod);
+                       new_mem = get_irg_no_mem(current_ir_graph);
+
+                       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);
+                       }
+                       /* this is a DivMod without exception, we can remove the memory edge */
+                       set_DivMod_mem(divmod, new_mem);
+                       return res;
+
+               case pn_DivMod_res_mod:
+                       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));
+
+                               DBG_OPT_CSTEVAL(divmod, res);
+                               return res;
+                       }
+               }
+       }
+       return proj;
 }  /* transform_node_Proj_DivMod */
 
 /**
  * Optimizes jump tables (CondIs or CondIu) by removing all impossible cases.
  */
-static ir_node *transform_node_Proj_Cond(ir_node *proj)
-{
-  if (get_opt_unreachable_code()) {
-    ir_node *n = get_Proj_pred(proj);
-    ir_node *b = get_Cond_selector(n);
-
-    if (mode_is_int(get_irn_mode(b))) {
-      tarval *tb = value_of(b);
-
-      if (tb != tarval_bad) {
-        /* 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 (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 proj;
+static ir_node *transform_node_Proj_Cond(ir_node *proj) {
+       if (get_opt_unreachable_code()) {
+               ir_node *n = get_Proj_pred(proj);
+               ir_node *b = get_Cond_selector(n);
+
+               if (mode_is_int(get_irn_mode(b))) {
+                       tarval *tb = value_of(b);
+
+                       if (tb != tarval_bad) {
+                               /* 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 (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 get_irg_bad(current_ir_graph);
+                                       }
+                               }
+                       }
+               }
+       }
+       return proj;
 }  /* transform_node_Proj_Cond */
 
 /**
- * Normalizes and optimizes Cmp nodes.
+ * Create a 0 constant of given mode.
  */
-static ir_node *transform_node_Proj_Cmp(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);
+
+       return cnst;
+}
+
+/* the order of the values is important! */
+typedef enum const_class {
+       const_const = 0,
+       const_like  = 1,
+       const_other = 2
+} const_class;
+
+static const_class classify_const(const ir_node* n)
 {
-  if (get_opt_reassociation()) {
-    ir_node *n     = get_Proj_pred(proj);
-    ir_node *left  = get_Cmp_left(n);
-    ir_node *right = get_Cmp_right(n);
-    ir_node *c     = NULL;
-    tarval *tv     = NULL;
-    int changed    = 0;
-    ir_mode *mode  = NULL;
-    long proj_nr   = get_Proj_proj(proj);
-
-    /*
-     * First step: normalize the compare op
-     * by placing the constant on the right site
-     * or moving the lower address node to the left.
-     * We ignore the case that both are constants
-     * this case should be optimized away.
-     */
-    if (get_irn_op(right) == op_Const)
-      c = right;
-    else if (get_irn_op(left) == op_Const) {
-      c     = left;
-      left  = right;
-      right = c;
-
-      proj_nr = get_inversed_pnc(proj_nr);
-      changed |= 1;
-    }
-    else if (get_irn_idx(left) > get_irn_idx(right)) {
-      ir_node *t = left;
-
-      left  = right;
-      right = t;
-
-      proj_nr = get_inversed_pnc(proj_nr);
-      changed |= 1;
-    }
-
-    /*
-     * Second step: Try to reduce the magnitude
-     * of a constant. This may help to generate better code
-     * later and may help to normalize more compares.
-     * Of course this is only possible for integer values.
-     */
-    if (c) {
-      mode = get_irn_mode(c);
-      tv = get_Const_tarval(c);
-
-      if (tv != tarval_bad) {
-        /* the following optimization is possible on modes without Overflow
-         * on Unary Minus or on == and !=:
-         * -a CMP c  ==>  a swap(CMP) -c
-         *
-         * Beware: for two-complement Overflow may occur, so only == and != can
-         * be optimized, see this:
-         * -MININT < 0 =/=> MININT > 0 !!!
-         */
-        if (get_opt_constant_folding() && get_irn_op(left) == op_Minus &&
-            (!mode_overflow_on_unary_Minus(mode) ||
-             (mode_is_int(mode) && (proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg)))) {
-          left = get_Minus_op(left);
-          tv = tarval_sub(get_mode_null(mode), tv);
-
-          proj_nr = get_inversed_pnc(proj_nr);
-          changed |= 2;
-        }
-
-        /* for integer modes, we have more */
-        if (mode_is_int(mode)) {
-          /* Ne includes Unordered which is not possible on integers.
-           * However, frontends often use this wrong, so fix it here */
-          if (proj_nr & pn_Cmp_Uo) {
-            proj_nr &= ~pn_Cmp_Uo;
-            set_Proj_proj(proj, proj_nr);
-          }
-
-          /* 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));
-
-            proj_nr ^= pn_Cmp_Eq;
-            changed |= 2;
-          }
-          /* c < 0 : a > c  ==>  a >= (c+1)    a <= c  ==>  a < (c+1) */
-          else if ((proj_nr == pn_Cmp_Gt || proj_nr == pn_Cmp_Le) &&
-              tarval_cmp(tv, get_mode_null(mode)) == pn_Cmp_Lt) {
-            tv = tarval_add(tv, get_mode_one(mode));
-
-            proj_nr ^= pn_Cmp_Eq;
-            changed |= 2;
-          }
-
-          /* the following reassociations work only for == and != */
-          if (proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg) {
-
-            /* a-b == 0  ==>  a == b,  a-b != 0  ==>  a != b */
-            if (classify_tarval(tv) == TV_CLASSIFY_NULL && get_irn_op(left) == op_Sub) {
-              right = get_Sub_right(left);
-              left  = get_Sub_left(left);
-
-              tv = value_of(right);
-              changed = 1;
-            }
-
-            if (tv != tarval_bad) {
-              ir_op *op = get_irn_op(left);
-
-              /* a-c1 == c2  ==>  a == c2+c1,  a-c1 != c2  ==>  a != c2+c1 */
-              if (op == op_Sub) {
-                ir_node *c1 = get_Sub_right(left);
-                tarval *tv2 = value_of(c1);
-
-                if (tv2 != tarval_bad) {
-                  tv2 = tarval_add(tv, value_of(c1));
-
-                  if (tv2 != tarval_bad) {
-                    left    = get_Sub_left(left);
-                    tv      = tv2;
-                    changed |= 2;
-                  }
-                }
-              }
-              /* a+c1 == c2  ==>  a == c2-c1,  a+c1 != c2  ==>  a != c2-c1 */
-              else if (op == op_Add) {
-                ir_node *a_l = get_Add_left(left);
-                ir_node *a_r = get_Add_right(left);
-                ir_node *a;
-                tarval *tv2;
-
-                if (get_irn_op(a_l) == op_Const) {
-                  a = a_r;
-                  tv2 = value_of(a_l);
-                }
-                else {
-                  a = a_l;
-                  tv2 = value_of(a_r);
-                }
-
-                if (tv2 != tarval_bad) {
-                  tv2 = tarval_sub(tv, tv2);
-
-                  if (tv2 != tarval_bad) {
-                    left    = a;
-                    tv      = tv2;
-                    changed |= 2;
-                  }
-                }
-              }
-              /* -a == c ==> a == -c, -a != c ==> a != -c */
-              else if (op == op_Minus) {
-                tarval *tv2 = tarval_sub(get_mode_null(mode), tv);
-
-                if (tv2 != tarval_bad) {
-                  left    = get_Minus_op(left);
-                  tv      = tv2;
-                  changed |= 2;
-                }
-              }
-            }
-          } /* == or != */
-          /* the following reassociations work only for <= */
-          else if (proj_nr == pn_Cmp_Le || proj_nr == pn_Cmp_Lt) {
-            if (tv != tarval_bad) {
-              ir_op *op = get_irn_op(left);
-
-              /* c >= 0 : Abs(a) <= c  ==>  (unsigned)(a + c) <= 2*c */
-              if (op == op_Abs) {
-              }
-            }
-          }
-        } /* mode_is_int */
-
-        /*
-         * optimization for AND:
-         * Optimize:
-         *   And(x, C) == C  ==>  And(x, C) != 0
-         *   And(x, C) != C  ==>  And(X, C) == 0
-         *
-         * if C is a single Bit constant.
-         */
-        if ((proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg) &&
-            (get_irn_op(left) == op_And)) {
-          if (is_single_bit_tarval(tv)) {
-            /* check for Constant's match. We have check hare the tarvals,
-               because our const might be changed */
-            ir_node *la = get_And_left(left);
-            ir_node *ra = get_And_right(left);
-            if ((is_Const(la) && get_Const_tarval(la) == tv) ||
-                (is_Const(ra) && get_Const_tarval(ra) == tv)) {
-              /* fine: do the transformation */
-              tv = get_mode_null(get_tarval_mode(tv));
-              proj_nr ^= pn_Cmp_Leg;
-              changed |= 2;
-            }
-          }
-        }
-      } /* tarval != bad */
-    }
-
-    if (changed) {
-      ir_node *block = get_irn_n(n, -1); /* Beware of get_nodes_Block() */
-
-      if (changed & 2)      /* need a new Const */
-        right = new_Const(mode, tv);
-
-      /* create a new compare */
-      n = new_rd_Cmp(get_irn_dbg_info(n), current_ir_graph, block,
-            left, right);
-
-      set_Proj_pred(proj, n);
-      set_Proj_proj(proj, proj_nr);
-    }
-  }
-  return proj;
-}  /* transform_node_Proj_Cmp */
+       if (is_Const(n))         return const_const;
+       if (is_irn_constlike(n)) return const_like;
+       return const_other;
+}
 
 /**
- * Does all optimizations on nodes that must be done on it's Proj's
- * because of creating new nodes.
+ * Determines whether r is more constlike or has a larger index (in that order)
+ * than l.
  */
-static ir_node *transform_node_Proj(ir_node *proj)
+static int operands_are_normalized(const ir_node *l, const ir_node *r)
 {
-  ir_node *n = get_Proj_pred(proj);
-
-  switch (get_irn_opcode(n)) {
-  case iro_Div:
-    return transform_node_Proj_Div(proj);
+       const const_class l_order = classify_const(l);
+       const const_class r_order = classify_const(r);
+       return
+               l_order > r_order ||
+               (l_order == r_order && get_irn_idx(l) <= get_irn_idx(r));
+}
 
-  case iro_Mod:
-    return transform_node_Proj_Mod(proj);
+/**
+ * Normalizes and optimizes Cmp nodes.
+ */
+static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
+       ir_node      *n      = get_Proj_pred(proj);
+       ir_node      *left   = get_Cmp_left(n);
+       ir_node      *right  = get_Cmp_right(n);
+       tarval      *tv      = NULL;
+       int          changed = 0;
+       ir_mode     *mode    = NULL;
+       long         proj_nr = get_Proj_proj(proj);
+
+       /* we can evaluate some cases directly */
+       switch (proj_nr) {
+       case pn_Cmp_False:
+               return new_Const(mode_b, get_tarval_b_false());
+       case pn_Cmp_True:
+               return new_Const(mode_b, 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());
+               break;
+       default:
+               break;
+       }
+
+       /* remove Casts of both sides */
+       left  = skip_Cast(left);
+       right = skip_Cast(right);
+
+       /* Remove unnecessary conversions */
+       /* TODO handle constants */
+       if (is_Conv(left) && is_Conv(right)) {
+               ir_mode *mode        = get_irn_mode(left);
+               ir_node *op_left     = get_Conv_op(left);
+               ir_node *op_right    = get_Conv_op(right);
+               ir_mode *mode_left   = get_irn_mode(op_left);
+               ir_mode *mode_right  = get_irn_mode(op_right);
+
+               if (smaller_mode(mode_left, mode) && smaller_mode(mode_right, mode)
+                               && mode_left != mode_b && mode_right != mode_b) {
+                       ir_graph *irg   = current_ir_graph;
+                       ir_node  *block = get_nodes_block(n);
+
+                       if (mode_left == mode_right) {
+                               left  = op_left;
+                               right = op_right;
+                               changed |= 1;
+                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CONV_CONV);
+                       } else if (smaller_mode(mode_left, mode_right)) {
+                               left  = new_r_Conv(irg, block, op_left, mode_right);
+                               right = op_right;
+                               changed |= 1;
+                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CONV);
+                       } else if (smaller_mode(mode_right, mode_left)) {
+                               left  = op_left;
+                               right = new_r_Conv(irg, block, op_right, mode_left);
+                               changed |= 1;
+                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CONV);
+                       }
+               }
+       }
+
+       /* remove operation on both sides if possible */
+       if (proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg) {
+               /*
+                * The following operations are NOT safe for floating point operations, for instance
+                * 1.0 + inf == 2.0 + inf, =/=> x == y
+                */
+               if (mode_is_int(get_irn_mode(left))) {
+                       unsigned lop = get_irn_opcode(left);
+
+                       if (lop == get_irn_opcode(right)) {
+                               ir_node *ll, *lr, *rl, *rr;
+
+                               /* same operation on both sides, try to remove */
+                               switch (lop) {
+                               case iro_Not:
+                               case iro_Minus:
+                                       /* ~a CMP ~b => a CMP b, -a CMP -b ==> a CMP b */
+                                       left  = get_unop_op(left);
+                                       right = get_unop_op(right);
+                                       changed |= 1;
+                                       DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP);
+                                       break;
+                               case iro_Add:
+                                       ll = get_Add_left(left);
+                                       lr = get_Add_right(left);
+                                       rl = get_Add_left(right);
+                                       rr = get_Add_right(right);
+
+                                       if (ll == rl) {
+                                               /* X + a CMP X + b ==> a CMP b */
+                                               left  = lr;
+                                               right = rr;
+                                               changed |= 1;
+                                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP);
+                                       } else if (ll == rr) {
+                                               /* X + a CMP b + X ==> a CMP b */
+                                               left  = lr;
+                                               right = rl;
+                                               changed |= 1;
+                                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP);
+                                       } else if (lr == rl) {
+                                               /* a + X CMP X + b ==> a CMP b */
+                                               left  = ll;
+                                               right = rr;
+                                               changed |= 1;
+                                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP);
+                                       } else if (lr == rr) {
+                                               /* a + X CMP b + X ==> a CMP b */
+                                               left  = ll;
+                                               right = rl;
+                                               changed |= 1;
+                                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP);
+                                       }
+                                       break;
+                               case iro_Sub:
+                                       ll = get_Sub_left(left);
+                                       lr = get_Sub_right(left);
+                                       rl = get_Sub_left(right);
+                                       rr = get_Sub_right(right);
+
+                                       if (ll == rl) {
+                                               /* X - a CMP X - b ==> a CMP b */
+                                               left  = lr;
+                                               right = rr;
+                                               changed |= 1;
+                                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP);
+                                       } else if (lr == rr) {
+                                               /* a - X CMP b - X ==> a CMP b */
+                                               left  = ll;
+                                               right = rl;
+                                               changed |= 1;
+                                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP);
+                                       }
+                                       break;
+                               case iro_Rotl:
+                                       if (get_Rotl_right(left) == get_Rotl_right(right)) {
+                                               /* a ROTL X CMP b ROTL X ==> a CMP b */
+                                               left  = get_Rotl_left(left);
+                                               right = get_Rotl_left(right);
+                                               changed |= 1;
+                                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP);
+                                       }
+                                       break;
+                               default:
+                                       break;
+                               }
+                       }
+
+                       /* X+A == A, A+X == A, A-X == A -> X == 0 */
+                       if (is_Add(left) || is_Sub(left)) {
+                               ir_node *ll = get_binop_left(left);
+                               ir_node *lr = get_binop_right(left);
+
+                               if (lr == right && is_Add(left)) {
+                                       ir_node *tmp = ll;
+                                       ll = lr;
+                                       lr = tmp;
+                               }
+                               if (ll == right) {
+                                       left     = lr;
+                                       right    = create_zero_const(get_irn_mode(left));
+                                       changed |= 1;
+                                       DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP);
+                               }
+                       }
+                       if (is_Add(right) || is_Sub(right)) {
+                               ir_node *rl = get_binop_left(right);
+                               ir_node *rr = get_binop_right(right);
+
+                               if (rr == left && is_Add(right)) {
+                                       ir_node *tmp = rl;
+                                       rl = rr;
+                                       rr = tmp;
+                               }
+                               if (rl == left) {
+                                       left     = rr;
+                                       right    = create_zero_const(get_irn_mode(left));
+                                       changed |= 1;
+                                       DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP);
+                               }
+                       }
+               }  /* 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;
+                       default: bres = NULL;
+               }
+               if (bres) {
+                       DBG_OPT_ALGSIM0(n, bres, FS_OPT_CMP_TO_BOOL);
+                       return bres;
+               }
+       }
+
+       /*
+        * First step: normalize the compare op
+        * by placing the constant on the right side
+        * or moving the lower address node to the left.
+        */
+       if (!operands_are_normalized(left, right)) {
+               ir_node *t = left;
+
+               left  = right;
+               right = t;
+
+               proj_nr = get_inversed_pnc(proj_nr);
+               changed |= 1;
+       }
+
+       /*
+        * Second step: Try to reduce the magnitude
+        * of a constant. This may help to generate better code
+        * later and may help to normalize more compares.
+        * Of course this is only possible for integer values.
+        */
+       if (is_Const(right)) {
+               mode = get_irn_mode(right);
+               tv = get_Const_tarval(right);
+
+               /* TODO extend to arbitrary constants */
+               if (is_Conv(left) && tarval_is_null(tv)) {
+                       ir_node *op      = get_Conv_op(left);
+                       ir_mode *op_mode = get_irn_mode(op);
+
+                       /*
+                        * UpConv(x) REL 0  ==> x REL 0
+                        */
+                       if (get_mode_size_bits(mode) > get_mode_size_bits(op_mode) &&
+                           ((proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg) ||
+                                mode_is_signed(mode) || !mode_is_signed(op_mode))) {
+                               tv   = get_mode_null(op_mode);
+                               left = op;
+                               mode = op_mode;
+                               changed |= 2;
+                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CONV);
+                       }
+               }
+
+               if (tv != tarval_bad) {
+                       /* the following optimization is possible on modes without Overflow
+                        * on Unary Minus or on == and !=:
+                        * -a CMP c  ==>  a swap(CMP) -c
+                        *
+                        * Beware: for two-complement Overflow may occur, so only == and != can
+                        * be optimized, see this:
+                        * -MININT < 0 =/=> MININT > 0 !!!
+                        */
+                       if (is_Minus(left) &&
+                               (!mode_overflow_on_unary_Minus(mode) ||
+                               (mode_is_int(mode) && (proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg)))) {
+                               tv = tarval_neg(tv);
+
+                               if (tv != tarval_bad) {
+                                       left = get_Minus_op(left);
+                                       proj_nr = get_inversed_pnc(proj_nr);
+                                       changed |= 2;
+                                       DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_C);
+                               }
+                       } else if (is_Not(left) && (proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg)) {
+                               /* Not(a) ==/!= c  ==>  a ==/!= Not(c) */
+                               tv = tarval_not(tv);
+
+                               if (tv != tarval_bad) {
+                                       left = get_Not_op(left);
+                                       changed |= 2;
+                                       DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_C);
+                               }
+                       }
+
+                       /* for integer modes, we have more */
+                       if (mode_is_int(mode)) {
+                               /* Ne includes Unordered which is not possible on integers.
+                                * However, frontends often use this wrong, so fix it here */
+                               if (proj_nr & pn_Cmp_Uo) {
+                                       proj_nr &= ~pn_Cmp_Uo;
+                                       set_Proj_proj(proj, proj_nr);
+                               }
+
+                               /* 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), NULL);
+
+                                       if (tv != tarval_bad) {
+                                               proj_nr ^= pn_Cmp_Eq;
+                                               changed |= 2;
+                                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CNST_MAGN);
+                                       }
+                               }
+                               /* c < 0 : a > c  ==>  a >= (c+1)    a <= c  ==>  a < (c+1) */
+                               else if ((proj_nr == pn_Cmp_Gt || proj_nr == pn_Cmp_Le) &&
+                                       tarval_cmp(tv, get_mode_null(mode)) == pn_Cmp_Lt) {
+                                       tv = tarval_add(tv, get_mode_one(mode));
+
+                                       if (tv != tarval_bad) {
+                                               proj_nr ^= pn_Cmp_Eq;
+                                               changed |= 2;
+                                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CNST_MAGN);
+                                       }
+                               }
+
+                               /* the following reassociations work only for == and != */
+                               if (proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg) {
+
+#if 0 /* Might be not that good in general */
+                                       /* a-b == 0  ==>  a == b,  a-b != 0  ==>  a != b */
+                                       if (tarval_is_null(tv) && is_Sub(left)) {
+                                               right = get_Sub_right(left);
+                                               left  = get_Sub_left(left);
+
+                                               tv = value_of(right);
+                                               changed = 1;
+                                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_C);
+                                       }
+#endif
 
-  case iro_DivMod:
-    return transform_node_Proj_DivMod(proj);
+                                       if (tv != tarval_bad) {
+                                               /* a-c1 == c2  ==>  a == c2+c1,  a-c1 != c2  ==>  a != c2+c1 */
+                                               if (is_Sub(left)) {
+                                                       ir_node *c1 = get_Sub_right(left);
+                                                       tarval *tv2 = value_of(c1);
+
+                                                       if (tv2 != tarval_bad) {
+                                                               tv2 = tarval_add(tv, value_of(c1));
+
+                                                               if (tv2 != tarval_bad) {
+                                                                       left    = get_Sub_left(left);
+                                                                       tv      = tv2;
+                                                                       changed |= 2;
+                                                                       DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_C);
+                                                               }
+                                                       }
+                                               }
+                                               /* a+c1 == c2  ==>  a == c2-c1,  a+c1 != c2  ==>  a != c2-c1 */
+                                               else if (is_Add(left)) {
+                                                       ir_node *a_l = get_Add_left(left);
+                                                       ir_node *a_r = get_Add_right(left);
+                                                       ir_node *a;
+                                                       tarval *tv2;
+
+                                                       if (is_Const(a_l)) {
+                                                               a = a_r;
+                                                               tv2 = value_of(a_l);
+                                                       } else {
+                                                               a = a_l;
+                                                               tv2 = value_of(a_r);
+                                                       }
+
+                                                       if (tv2 != tarval_bad) {
+                                                               tv2 = tarval_sub(tv, tv2, NULL);
+
+                                                               if (tv2 != tarval_bad) {
+                                                                       left    = a;
+                                                                       tv      = tv2;
+                                                                       changed |= 2;
+                                                                       DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_C);
+                                                               }
+                                                       }
+                                               }
+                                               /* -a == c ==> a == -c, -a != c ==> a != -c */
+                                               else if (is_Minus(left)) {
+                                                       tarval *tv2 = tarval_sub(get_mode_null(mode), tv, NULL);
+
+                                                       if (tv2 != tarval_bad) {
+                                                               left    = get_Minus_op(left);
+                                                               tv      = tv2;
+                                                               changed |= 2;
+                                                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_C);
+                                                       }
+                                               }
+                                       }
+                               } /* == or != */
+                               /* the following reassociations work only for <= */
+                               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
+                                               }
+                                       }
+                               }
+                       } /* mode_is_int */
+
+                       if (proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg) {
+                               switch (get_irn_opcode(left)) {
+                                       ir_node *c1;
+
+                               case iro_And:
+                                       c1 = get_And_right(left);
+                                       if (is_Const(c1)) {
+                                               /*
+                                                * And(x, C1) == C2 ==> FALSE if C2 & C1 != C2
+                                                * And(x, C1) != C2 ==> TRUE if C2 & C1 != C2
+                                                */
+                                               tarval *mask = tarval_and(get_Const_tarval(c1), tv);
+                                               if (mask != tv) {
+                                                       /* TODO: move to constant evaluation */
+                                                       tv = proj_nr == pn_Cmp_Eq ? get_tarval_b_false() : get_tarval_b_true();
+                                                       c1 = new_Const(mode_b, tv);
+                                                       DBG_OPT_CSTEVAL(proj, c1);
+                                                       return c1;
+                                               }
+
+                                               if (tarval_is_single_bit(tv)) {
+                                                       /*
+                                                        * optimization for AND:
+                                                        * Optimize:
+                                                        *   And(x, C) == C  ==>  And(x, C) != 0
+                                                        *   And(x, C) != C  ==>  And(X, C) == 0
+                                                        *
+                                                        * if C is a single Bit constant.
+                                                        */
+
+                                                       /* check for Constant's match. We have check hare the tarvals,
+                                                          because our const might be changed */
+                                                       if (get_Const_tarval(c1) == tv) {
+                                                               /* fine: do the transformation */
+                                                               tv = get_mode_null(get_tarval_mode(tv));
+                                                               proj_nr ^= pn_Cmp_Leg;
+                                                               changed |= 2;
+                                                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CNST_MAGN);
+                                                       }
+                                               }
+                                       }
+                                       break;
+                               case iro_Or:
+                                       c1 = get_Or_right(left);
+                                       if (is_Const(c1) && tarval_is_null(tv)) {
+                                               /*
+                                                * Or(x, C) == 0  && C != 0 ==> FALSE
+                                                * Or(x, C) != 0  && C != 0 ==> TRUE
+                                                */
+                                               if (! tarval_is_null(get_Const_tarval(c1))) {
+                                                       /* TODO: move to constant evaluation */
+                                                       tv = proj_nr == pn_Cmp_Eq ? get_tarval_b_false() : get_tarval_b_true();
+                                                       c1 = new_Const(mode_b, tv);
+                                                       DBG_OPT_CSTEVAL(proj, c1);
+                                                       return c1;
+                                               }
+                                       }
+                                       break;
+                               case iro_Shl:
+                                       /*
+                                        * optimize x << c1 == c into x & (-1 >>u c1) == c >> c1  if  c & (-1 << c1) == c
+                                        *                             FALSE                       else
+                                        * optimize x << c1 != c into x & (-1 >>u c1) != c >> c1  if  c & (-1 << c1) == c
+                                        *                             TRUE                        else
+                                        */
+                                       c1 = get_Shl_right(left);
+                                       if (is_Const(c1)) {
+                                               tarval  *tv1    = get_Const_tarval(c1);
+                                               ir_mode *mode   = get_irn_mode(left);
+                                               tarval  *minus1 = get_mode_all_one(mode);
+                                               tarval  *amask  = tarval_shr(minus1, tv1);
+                                               tarval  *cmask  = tarval_shl(minus1, tv1);
+                                               ir_node *sl, *blk;
+
+                                               if (tarval_and(tv, cmask) != tv) {
+                                                       /* condition not met */
+                                                       tv = proj_nr == pn_Cmp_Eq ? get_tarval_b_false() : get_tarval_b_true();
+                                                       c1 = new_Const(mode_b, tv);
+                                                       DBG_OPT_CSTEVAL(proj, c1);
+                                                       return c1;
+                                               }
+                                               sl   = get_Shl_left(left);
+                                               blk  = get_nodes_block(n);
+                                               left = new_rd_And(get_irn_dbg_info(left), current_ir_graph, blk, sl, new_Const(mode, amask), mode);
+                                               tv   = tarval_shr(tv, tv1);
+                                               changed |= 2;
+                                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_SHF_TO_AND);
+                                       }
+                                       break;
+                               case iro_Shr:
+                                       /*
+                                        * optimize x >>u c1 == c into x & (-1 << c1) == c << c1  if  c & (-1 >>u c1) == c
+                                        *                             FALSE                       else
+                                        * optimize x >>u c1 != c into x & (-1 << c1) != c << c1  if  c & (-1 >>u c1) == c
+                                        *                             TRUE                        else
+                                        */
+                                       c1 = get_Shr_right(left);
+                                       if (is_Const(c1)) {
+                                               tarval  *tv1    = get_Const_tarval(c1);
+                                               ir_mode *mode   = get_irn_mode(left);
+                                               tarval  *minus1 = get_mode_all_one(mode);
+                                               tarval  *amask  = tarval_shl(minus1, tv1);
+                                               tarval  *cmask  = tarval_shr(minus1, tv1);
+                                               ir_node *sl, *blk;
+
+                                               if (tarval_and(tv, cmask) != tv) {
+                                                       /* condition not met */
+                                                       tv = proj_nr == pn_Cmp_Eq ? get_tarval_b_false() : get_tarval_b_true();
+                                                       c1 = new_Const(mode_b, tv);
+                                                       DBG_OPT_CSTEVAL(proj, c1);
+                                                       return c1;
+                                               }
+                                               sl   = get_Shr_left(left);
+                                               blk  = get_nodes_block(n);
+                                               left = new_rd_And(get_irn_dbg_info(left), current_ir_graph, blk, sl, new_Const(mode, amask), mode);
+                                               tv   = tarval_shl(tv, tv1);
+                                               changed |= 2;
+                                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_SHF_TO_AND);
+                                       }
+                                       break;
+                               case iro_Shrs:
+                                       /*
+                                        * optimize x >>s c1 == c into x & (-1 << c1) == c << c1  if  (c >>s (BITS - c1)) \in {0,-1}
+                                        *                             FALSE                       else
+                                        * optimize x >>s c1 != c into x & (-1 << c1) != c << c1  if  (c >>s (BITS - c1)) \in {0,-1}
+                                        *                             TRUE                        else
+                                        */
+                                       c1 = get_Shrs_right(left);
+                                       if (is_Const(c1)) {
+                                               tarval  *tv1    = get_Const_tarval(c1);
+                                               ir_mode *mode   = get_irn_mode(left);
+                                               tarval  *minus1 = get_mode_all_one(mode);
+                                               tarval  *amask  = tarval_shl(minus1, tv1);
+                                               tarval  *cond   = new_tarval_from_long(get_mode_size_bits(mode), get_tarval_mode(tv1));
+                                               ir_node *sl, *blk;
+
+                                               cond = tarval_sub(cond, tv1, 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);
+                                                       DBG_OPT_CSTEVAL(proj, c1);
+                                                       return c1;
+                                               }
+                                               sl   = get_Shrs_left(left);
+                                               blk  = get_nodes_block(n);
+                                               left = new_rd_And(get_irn_dbg_info(left), current_ir_graph, blk, sl, new_Const(mode, amask), mode);
+                                               tv   = tarval_shl(tv, tv1);
+                                               changed |= 2;
+                                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_SHF_TO_AND);
+                                       }
+                                       break;
+                               }  /* switch */
+                       }
+               } /* tarval != bad */
+       }
+
+       if (changed & 2)      /* need a new Const */
+               right = new_Const(mode, tv);
+
+       if ((proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg) && is_Const(right) && is_Const_null(right) && is_Proj(left)) {
+               ir_node *op = get_Proj_pred(left);
+
+               if ((is_Mod(op) && get_Proj_proj(left) == pn_Mod_res) ||
+                   (is_DivMod(op) && get_Proj_proj(left) == pn_DivMod_res_mod)) {
+                       ir_node *c = get_binop_right(op);
+
+                       if (is_Const(c)) {
+                               tarval *tv = get_Const_tarval(c);
+
+                               if (tarval_is_single_bit(tv)) {
+                                       /* special case: (x % 2^n) CMP 0 ==> x & (2^n-1) CMP 0 */
+                                       ir_node *v    = get_binop_left(op);
+                                       ir_node *blk  = get_irn_n(op, -1);
+                                       ir_mode *mode = get_irn_mode(v);
+
+                                       tv = tarval_sub(tv, get_mode_one(mode), NULL);
+                                       left = new_rd_And(get_irn_dbg_info(op), current_ir_graph, blk, v, new_Const(mode, tv), mode);
+                                       changed |= 1;
+                                       DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_MOD_TO_AND);
+                               }
+                       }
+               }
+       }
+
+       if (changed) {
+               ir_node *block = get_irn_n(n, -1); /* Beware of get_nodes_Block() */
+
+               /* 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);
+       }
+
+       return proj;
+}  /* transform_node_Proj_Cmp */
 
-  case iro_Cond:
-    return transform_node_Proj_Cond(proj);
+/**
+ * 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(current_ir_graph, get_nodes_block(copyb));
+                       break;
+               case pn_CopyB_M_except:
+               case pn_CopyB_X_except:
+                       DBG_OPT_EXC_REM(proj);
+                       proj = get_irg_bad(current_ir_graph);
+                       break;
+               default:
+                       break;
+               }
+       }
+       return proj;
+}  /* transform_node_Proj_CopyB */
 
-  case iro_Cmp:
-    return transform_node_Proj_Cmp(proj);
+/**
+ * Optimize Bounds(idx, idx, upper) into idx.
+ */
+static ir_node *transform_node_Proj_Bound(ir_node *proj) {
+       ir_node *oldn  = proj;
+       ir_node *bound = get_Proj_pred(proj);
+       ir_node *idx   = get_Bound_index(bound);
+       ir_node *pred  = skip_Proj(idx);
+       int ret_tuple  = 0;
+
+       if (idx == get_Bound_lower(bound))
+               ret_tuple = 1;
+       else if (is_Bound(pred)) {
+               /*
+               * idx was Bounds checked in the same MacroBlock previously,
+               * it is still valid if lower <= pred_lower && pred_upper <= upper.
+               */
+               ir_node *lower = get_Bound_lower(bound);
+               ir_node *upper = get_Bound_upper(bound);
+               if (get_Bound_lower(pred) == lower &&
+                       get_Bound_upper(pred) == upper &&
+                       get_irn_MacroBlock(bound) == get_irn_MacroBlock(pred)) {
+                       /*
+                        * One could expect that we simply return the previous
+                        * Bound here. However, this would be wrong, as we could
+                        * add an exception Proj to a new location then.
+                        * So, we must turn in into a tuple.
+                        */
+                       ret_tuple = 1;
+               }
+       }
+       if (ret_tuple) {
+               /* Turn Bound into a tuple (mem, jmp, bad, idx) */
+               switch (get_Proj_proj(proj)) {
+               case pn_Bound_M:
+                       DBG_OPT_EXC_REM(proj);
+                       proj = get_Bound_mem(bound);
+                       break;
+               case pn_Bound_X_except:
+                       DBG_OPT_EXC_REM(proj);
+                       proj = get_irg_bad(current_ir_graph);
+                       break;
+               case pn_Bound_res:
+                       proj = idx;
+                       DBG_OPT_ALGSIM0(oldn, proj, FS_OPT_NOP);
+                       break;
+               case pn_Bound_X_regular:
+                       DBG_OPT_EXC_REM(proj);
+                       proj = new_r_Jmp(current_ir_graph, get_nodes_block(bound));
+                       break;
+               default:
+                       break;
+               }
+       }
+       return proj;
+}  /* transform_node_Proj_Bound */
 
-  case iro_Tuple:
-    /* should not happen, but if it does will be optimized away */
-    return equivalent_node_Proj(proj);
+/**
+ * Does all optimizations on nodes that must be done on it's Proj's
+ * because of creating new nodes.
+ */
+static ir_node *transform_node_Proj(ir_node *proj) {
+       ir_node *n = get_Proj_pred(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 */
 
 /**
  * Move Confirms down through Phi nodes.
  */
 static ir_node *transform_node_Phi(ir_node *phi) {
-  int i, n;
-  ir_mode *mode = get_irn_mode(phi);
-
-  if (mode_is_reference(mode)) {
-    n = get_irn_arity(phi);
-
-    /* Beware of Phi0 */
-    if (n > 0) {
-      ir_node *pred = get_irn_n(phi, 0);
-      ir_node *bound, *new_Phi, *block, **in;
-      pn_Cmp  pnc;
-
-      if (! is_Confirm(pred))
-        return phi;
-
-      bound = get_Confirm_bound(pred);
-      pnc   = get_Confirm_cmp(pred);
-
-      NEW_ARR_A(ir_node *, in, n);
-      in[0] = get_Confirm_value(pred);
-
-      for (i = 1; i < n; ++i) {
-        pred = get_irn_n(phi, i);
-
-        if (! is_Confirm(pred) ||
-            get_Confirm_bound(pred) != bound ||
-            get_Confirm_cmp(pred) != pnc)
-          return phi;
-        in[i] = get_Confirm_value(pred);
-      }
-      /* 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);
-    }
-  }
-  return phi;
+       int i, n;
+       ir_mode *mode = get_irn_mode(phi);
+
+       if (mode_is_reference(mode)) {
+               n = get_irn_arity(phi);
+
+               /* Beware of Phi0 */
+               if (n > 0) {
+                       ir_node *pred = get_irn_n(phi, 0);
+                       ir_node *bound, *new_Phi, *block, **in;
+                       pn_Cmp  pnc;
+
+                       if (! is_Confirm(pred))
+                               return phi;
+
+                       bound = get_Confirm_bound(pred);
+                       pnc   = get_Confirm_cmp(pred);
+
+                       NEW_ARR_A(ir_node *, in, n);
+                       in[0] = get_Confirm_value(pred);
+
+                       for (i = 1; i < n; ++i) {
+                               pred = get_irn_n(phi, i);
+
+                               if (! is_Confirm(pred) ||
+                                       get_Confirm_bound(pred) != bound ||
+                                       get_Confirm_cmp(pred) != pnc)
+                                       return phi;
+                               in[i] = get_Confirm_value(pred);
+                       }
+                       /* 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);
+               }
+       }
+       return phi;
 }  /* transform_node_Phi */
 
 /**
  * Returns the operands of a commutative bin-op, if one operand is
  * a const, it is returned as the second one.
  */
-static void get_comm_Binop_Ops(ir_node *binop, ir_node **a, ir_node **c)
-{
-  ir_node *op_a = get_binop_left(binop);
-  ir_node *op_b = get_binop_right(binop);
-
-  assert(is_op_commutative(get_irn_op(binop)));
-
-  if (get_irn_op(op_a) == op_Const) {
-    *a = op_b;
-    *c = op_a;
-  }
-  else {
-    *a = op_a;
-    *c = op_b;
-  }
+static void get_comm_Binop_Ops(ir_node *binop, ir_node **a, ir_node **c) {
+       ir_node *op_a = get_binop_left(binop);
+       ir_node *op_b = get_binop_right(binop);
+
+       assert(is_op_commutative(get_irn_op(binop)));
+
+       if (is_Const(op_a)) {
+               *a = op_b;
+               *c = op_a;
+       } else {
+               *a = op_a;
+               *c = op_b;
+       }
 }  /* get_comm_Binop_Ops */
 
 /**
@@ -2923,203 +4709,234 @@ static void get_comm_Binop_Ops(ir_node *binop, ir_node **a, ir_node **c)
  *        OR     c2      ===>               OR
  *           AND    c1
  *               OR
+ *
+ *
+ * value  c2                 value  c1
+ *     AND   c1    ===>           OR     if (c1 | c2) == 0x111..11
+ *        OR
  */
-static ir_node *transform_node_Or_bf_store(ir_node *or)
-{
-  ir_node *and, *c1;
-  ir_node *or_l, *c2;
-  ir_node *and_l, *c3;
-  ir_node *value, *c4;
-  ir_node *new_and, *new_const, *block;
-  ir_mode *mode = get_irn_mode(or);
-
-  tarval *tv1, *tv2, *tv3, *tv4, *tv, *n_tv4, *n_tv2;
-
-  get_comm_Binop_Ops(or, &and, &c1);
-  if ((get_irn_op(c1) != op_Const) || (get_irn_op(and) != op_And))
-    return or;
-
-  get_comm_Binop_Ops(and, &or_l, &c2);
-  if ((get_irn_op(c2) != op_Const) || (get_irn_op(or_l) != op_Or))
-    return or;
-
-  get_comm_Binop_Ops(or_l, &and_l, &c3);
-  if ((get_irn_op(c3) != op_Const) || (get_irn_op(and_l) != op_And))
-    return or;
-
-  get_comm_Binop_Ops(and_l, &value, &c4);
-  if (get_irn_op(c4) != op_Const)
-    return or;
-
-  /* ok, found the pattern, check for conditions */
-  assert(mode == get_irn_mode(and));
-  assert(mode == get_irn_mode(or_l));
-  assert(mode == get_irn_mode(and_l));
-
-  tv1 = get_Const_tarval(c1);
-  tv2 = get_Const_tarval(c2);
-  tv3 = get_Const_tarval(c3);
-  tv4 = get_Const_tarval(c4);
-
-  tv = tarval_or(tv4, tv2);
-  if (classify_tarval(tv) != TV_CLASSIFY_ALL_ONE) {
-    /* have at least one 0 at the same bit position */
-    return or;
-  }
-
-  n_tv4 = tarval_not(tv4);
-  if (tv3 != tarval_and(tv3, n_tv4)) {
-    /* bit in the or_mask is outside the and_mask */
-    return or;
-  }
-
-  n_tv2 = tarval_not(tv2);
-  if (tv1 != tarval_and(tv1, n_tv2)) {
-    /* bit in the or_mask is outside the and_mask */
-    return 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_const = new_r_Const(current_ir_graph, block, mode, tarval_or(tv3, tv1));
-
-  set_Or_left(or, new_and);
-  set_Or_right(or, new_const);
-
-  /* check for more */
-  return transform_node_Or_bf_store(or);
+static ir_node *transform_node_Or_bf_store(ir_node *or) {
+       ir_node *and, *c1;
+       ir_node *or_l, *c2;
+       ir_node *and_l, *c3;
+       ir_node *value, *c4;
+       ir_node *new_and, *new_const, *block;
+       ir_mode *mode = get_irn_mode(or);
+
+       tarval *tv1, *tv2, *tv3, *tv4, *tv, *n_tv4, *n_tv2;
+
+       while (1) {
+               get_comm_Binop_Ops(or, &and, &c1);
+               if (!is_Const(c1) || !is_And(and))
+                       return or;
+
+               get_comm_Binop_Ops(and, &or_l, &c2);
+               if (!is_Const(c2))
+                       return or;
+
+               tv1 = get_Const_tarval(c1);
+               tv2 = get_Const_tarval(c2);
+
+               tv = tarval_or(tv1, tv2);
+               if (tarval_is_all_one(tv)) {
+                       /* the AND does NOT clear a bit with isn't set by the OR */
+                       set_Or_left(or, or_l);
+                       set_Or_right(or, c1);
+
+                       /* check for more */
+                       continue;
+               }
+
+               if (!is_Or(or_l))
+                       return or;
+
+               get_comm_Binop_Ops(or_l, &and_l, &c3);
+               if (!is_Const(c3) || !is_And(and_l))
+                       return or;
+
+               get_comm_Binop_Ops(and_l, &value, &c4);
+               if (!is_Const(c4))
+                       return or;
+
+               /* ok, found the pattern, check for conditions */
+               assert(mode == get_irn_mode(and));
+               assert(mode == get_irn_mode(or_l));
+               assert(mode == get_irn_mode(and_l));
+
+               tv3 = get_Const_tarval(c3);
+               tv4 = get_Const_tarval(c4);
+
+               tv = tarval_or(tv4, tv2);
+               if (!tarval_is_all_one(tv)) {
+                       /* have at least one 0 at the same bit position */
+                       return or;
+               }
+
+               n_tv4 = tarval_not(tv4);
+               if (tv3 != tarval_and(tv3, n_tv4)) {
+                       /* bit in the or_mask is outside the and_mask */
+                       return or;
+               }
+
+               n_tv2 = tarval_not(tv2);
+               if (tv1 != tarval_and(tv1, n_tv2)) {
+                       /* bit in the or_mask is outside the and_mask */
+                       return 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_const = new_r_Const(current_ir_graph, block, mode, tarval_or(tv3, tv1));
+
+               set_Or_left(or, new_and);
+               set_Or_right(or, new_const);
+
+               /* check for more */
+       }
 }  /* transform_node_Or_bf_store */
 
 /**
- * Optimize an Or(shl(x, c), shr(x, bits - c)) into a Rot
+ * Optimize an Or(shl(x, c), shr(x, bits - c)) into a Rotl
  */
-static ir_node *transform_node_Or_Rot(ir_node *or)
-{
-  ir_mode *mode = get_irn_mode(or);
-  ir_node *shl, *shr, *block;
-  ir_node *irn, *x, *c1, *c2, *v, *sub, *n;
-  tarval *tv1, *tv2;
-
-  if (! mode_is_int(mode))
-    return or;
-
-  shl = get_binop_left(or);
-  shr = get_binop_right(or);
-
-  if (get_irn_op(shl) == op_Shr) {
-    if (get_irn_op(shr) != op_Shl)
-      return or;
-
-    irn = shl;
-    shl = shr;
-    shr = irn;
-  }
-  else if (get_irn_op(shl) != op_Shl)
-    return or;
-  else if (get_irn_op(shr) != op_Shr)
-    return or;
-
-  x = get_Shl_left(shl);
-  if (x != get_Shr_left(shr))
-    return or;
-
-  c1 = get_Shl_right(shl);
-  c2 = get_Shr_right(shr);
-  if (get_irn_op(c1) == op_Const && get_irn_op(c2) == op_Const) {
-    tv1 = get_Const_tarval(c1);
-    if (! tarval_is_long(tv1))
-      return or;
-
-    tv2 = get_Const_tarval(c2);
-    if (! tarval_is_long(tv2))
-      return or;
-
-    if (get_tarval_long(tv1) + get_tarval_long(tv2)
-        != get_mode_size_bits(mode))
-      return or;
-
-    /* yet, condition met */
-    block = get_irn_n(or, -1);
-
-    n = new_r_Rot(current_ir_graph, block, x, c1, mode);
-
-    DBG_OPT_ALGSIM1(or, shl, shr, n, FS_OPT_OR_SHFT_TO_ROT);
-    return n;
-  }
-  else if (get_irn_op(c1) == op_Sub) {
-    v   = c2;
-    sub = c1;
-
-    if (get_Sub_right(sub) != v)
-      return or;
-
-    c1 = get_Sub_left(sub);
-    if (get_irn_op(c1) != op_Const)
-      return or;
-
-    tv1 = get_Const_tarval(c1);
-    if (! tarval_is_long(tv1))
-      return or;
-
-    if (get_tarval_long(tv1) != get_mode_size_bits(mode))
-      return or;
-
-    /* yet, condition met */
-    block = get_nodes_block(or);
-
-    /* a Rot right is not supported, so use a rot left */
-    n =  new_r_Rot(current_ir_graph, block, x, sub, mode);
-
-    DBG_OPT_ALGSIM0(or, n, FS_OPT_OR_SHFT_TO_ROT);
-    return n;
-  }
-  else if (get_irn_op(c2) == op_Sub) {
-    v   = c1;
-    sub = c2;
-
-    c1 = get_Sub_left(sub);
-    if (get_irn_op(c1) != op_Const)
-      return or;
-
-    tv1 = get_Const_tarval(c1);
-    if (! tarval_is_long(tv1))
-      return or;
-
-    if (get_tarval_long(tv1) != get_mode_size_bits(mode))
-      return or;
-
-    /* yet, condition met */
-    block = get_irn_n(or, -1);
-
-    /* a Rot Left */
-    n = new_r_Rot(current_ir_graph, block, x, v, mode);
-
-    DBG_OPT_ALGSIM0(or, n, FS_OPT_OR_SHFT_TO_ROT);
-    return n;
-  }
-
-  return or;
-}  /* transform_node_Or_Rot */
+static ir_node *transform_node_Or_Rotl(ir_node *or) {
+       ir_mode *mode = get_irn_mode(or);
+       ir_node *shl, *shr, *block;
+       ir_node *irn, *x, *c1, *c2, *v, *sub, *n, *rotval;
+       tarval *tv1, *tv2;
+
+       if (! mode_is_int(mode))
+               return or;
+
+       shl = get_binop_left(or);
+       shr = get_binop_right(or);
+
+       if (is_Shr(shl)) {
+               if (!is_Shl(shr))
+                       return or;
+
+               irn = shl;
+               shl = shr;
+               shr = irn;
+       } else if (!is_Shl(shl)) {
+               return or;
+       } else if (!is_Shr(shr)) {
+               return or;
+       }
+       x = get_Shl_left(shl);
+       if (x != get_Shr_left(shr))
+               return or;
+
+       c1 = get_Shl_right(shl);
+       c2 = get_Shr_right(shr);
+       if (is_Const(c1) && is_Const(c2)) {
+               tv1 = get_Const_tarval(c1);
+               if (! tarval_is_long(tv1))
+                       return or;
+
+               tv2 = get_Const_tarval(c2);
+               if (! tarval_is_long(tv2))
+                       return or;
+
+               if (get_tarval_long(tv1) + get_tarval_long(tv2)
+                               != (int) get_mode_size_bits(mode))
+                       return or;
+
+               /* yet, condition met */
+               block = get_nodes_block(or);
+
+               n = new_r_Rotl(current_ir_graph, block, x, c1, mode);
+
+               DBG_OPT_ALGSIM1(or, shl, shr, n, FS_OPT_OR_SHFT_TO_ROTL);
+               return n;
+       }
+
+    if (is_Sub(c1)) {
+           v      = c2;
+               sub    = c1;
+        rotval = sub; /* a Rot right is not supported, so use a rot left */
+    } else if (is_Sub(c2)) {
+               v      = c1;
+       sub    = c2;
+        rotval = v;
+    } else return or;
+
+       if (get_Sub_right(sub) != v)
+               return or;
+
+       c1 = get_Sub_left(sub);
+       if (!is_Const(c1))
+               return or;
+
+       tv1 = get_Const_tarval(c1);
+       if (! tarval_is_long(tv1))
+               return or;
+
+       if (get_tarval_long(tv1) != (int) get_mode_size_bits(mode))
+               return or;
+
+       /* yet, condition met */
+       block = get_nodes_block(or);
+
+       n = new_r_Rotl(current_ir_graph, block, x, rotval, mode);
+
+       DBG_OPT_ALGSIM0(or, n, FS_OPT_OR_SHFT_TO_ROTL);
+       return n;
+}  /* transform_node_Or_Rotl */
 
 /**
  * Transform an Or.
  */
-static ir_node *transform_node_Or(ir_node *n)
-{
-  ir_node *c, *oldn = n;
-  ir_node *a = get_Or_left(n);
-  ir_node *b = get_Or_right(n);
-
-  HANDLE_BINOP_PHI(tarval_or, a,b,c);
-
-  n = transform_node_Or_bf_store(n);
-  n = transform_node_Or_Rot(n);
-
-  return n;
+static ir_node *transform_node_Or(ir_node *n) {
+       ir_node *c, *oldn = n;
+       ir_node *a = get_Or_left(n);
+       ir_node *b = get_Or_right(n);
+       ir_mode *mode;
+
+       if (is_Not(a) && is_Not(b)) {
+               /* ~a | ~b = ~(a&b) */
+               ir_node *block = get_nodes_block(n);
+
+               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);
+               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_DEMORGAN);
+               return n;
+       }
+
+       /* we can evaluate 2 Projs of the same Cmp */
+       if (get_irn_mode(n) == mode_b && is_Proj(a) && is_Proj(b)) {
+               ir_node *pred_a = get_Proj_pred(a);
+               ir_node *pred_b = get_Proj_pred(b);
+               if (pred_a == pred_b) {
+                       dbg_info *dbgi  = get_irn_dbg_info(n);
+                       ir_node  *block = get_nodes_block(pred_a);
+                       pn_Cmp pn_a     = get_Proj_proj(a);
+                       pn_Cmp pn_b     = get_Proj_proj(b);
+                       /* 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);
+               }
+       }
+
+       mode = get_irn_mode(n);
+       HANDLE_BINOP_PHI(tarval_or, a, b, c, mode);
+
+       n = transform_node_Or_bf_store(n);
+       n = transform_node_Or_Rotl(n);
+       if (n != oldn)
+               return n;
+
+       n = transform_bitwise_distributive(n, transform_node_Or);
+
+       return n;
 }  /* transform_node_Or */
 
 
@@ -3127,267 +4944,645 @@ static ir_node *transform_node_Or(ir_node *n)
 static ir_node *transform_node(ir_node *n);
 
 /**
- * Optimize (a >> c1) >> c2), works for Shr, Shrs, Shl.
+ * Optimize (a >> c1) >> c2), works for Shr, Shrs, Shl, Rotl.
  *
  * Should be moved to reassociation?
  */
-static ir_node *transform_node_shift(ir_node *n)
-{
-  ir_node *left, *right;
-  tarval *tv1, *tv2, *res;
-  ir_mode *mode;
-  int modulo_shf, flag;
+static ir_node *transform_node_shift(ir_node *n) {
+       ir_node *left, *right;
+       ir_mode *mode;
+       tarval *tv1, *tv2, *res;
+       ir_node *in[2], *irn, *block;
+
+       left = get_binop_left(n);
+
+       /* different operations */
+       if (get_irn_op(left) != get_irn_op(n))
+               return n;
+
+       right = get_binop_right(n);
+       tv1 = value_of(right);
+       if (tv1 == tarval_bad)
+               return n;
+
+       tv2 = value_of(get_binop_right(left));
+       if (tv2 == tarval_bad)
+               return n;
+
+       res  = tarval_add(tv1, tv2);
+       mode = get_irn_mode(n);
+
+       /* beware: a simple replacement works only, if res < modulo shift */
+       if (!is_Rotl(n)) {
+               int modulo_shf = get_mode_modulo_shift(mode);
+               assert(modulo_shf >= (int) get_mode_size_bits(mode));
+               if (modulo_shf > 0) {
+                       tarval *modulo = new_tarval_from_long(modulo_shf,
+                                                             get_tarval_mode(res));
+
+                       /* shifting too much */
+                       if (!(tarval_cmp(res, modulo) & pn_Cmp_Lt)) {
+                               if (is_Shrs(n)) {
+                                       ir_graph *irg   = get_irn_irg(n);
+                                       ir_node  *block = get_nodes_block(n);
+                                       dbg_info *dbgi  = get_irn_dbg_info(n);
+                                       ir_node  *cnst  = new_Const(mode_Iu, new_tarval_from_long(get_mode_size_bits(mode)-1, mode_Iu));
+                                       return new_rd_Shrs(dbgi, irg, block, get_binop_left(left),
+                                                          cnst, mode);
+                               }
+
+                               return new_Const(mode, get_mode_null(mode));
+                       }
+               }
+       } else {
+               res = tarval_mod(res, new_tarval_from_long(get_mode_size_bits(mode), get_tarval_mode(res)));
+       }
+
+       /* ok, we can replace it */
+       block = get_nodes_block(n);
+
+       in[0] = get_binop_left(left);
+       in[1] = new_r_Const(current_ir_graph, block, get_tarval_mode(res), res);
+
+       irn = new_ir_node(NULL, current_ir_graph, block, get_irn_op(n), mode, 2, in);
+
+       DBG_OPT_ALGSIM0(n, irn, FS_OPT_REASSOC_SHIFT);
+
+       return transform_node(irn);
+}  /* transform_node_shift */
 
-  left = get_binop_left(n);
+/**
+ * normalisation: (x & c1) >> c2   to   (x >> c2) & (c1 >> c2)
+ *  (we can use:
+ *    - and, or, xor          instead of &
+ *    - Shl, Shr, Shrs, rotl  instead of >>
+ *    (with a special case for Or/Xor + Shrs)
+ */
+static ir_node *transform_node_bitop_shift(ir_node *n) {
+       ir_node  *left;
+       ir_node  *right = get_binop_right(n);
+       ir_mode  *mode  = get_irn_mode(n);
+       ir_node  *bitop_left;
+       ir_node  *bitop_right;
+       ir_op    *op_left;
+       ir_graph *irg;
+       ir_node  *block;
+       dbg_info *dbgi;
+       ir_node  *new_shift;
+       ir_node  *new_bitop;
+       ir_node  *new_const;
+       tarval   *tv1;
+       tarval   *tv2;
+       tarval   *tv_shift;
+
+       assert(is_Shrs(n) || is_Shr(n) || is_Shl(n) || is_Rotl(n));
+
+       if (!is_Const(right))
+               return n;
+
+       left    = get_binop_left(n);
+       op_left = get_irn_op(left);
+       if (op_left != op_And && op_left != op_Or && op_left != op_Eor)
+               return n;
+
+       /* doing it with Shrs is not legal if the Or/Eor affects the topmost bit */
+       if (is_Shrs(n) && (op_left == op_Or || op_left == op_Eor)) {
+               /* TODO: test if sign bit is affectes */
+               return n;
+       }
+
+       bitop_right = get_binop_right(left);
+       if (!is_Const(bitop_right))
+               return n;
+
+       bitop_left = get_binop_left(left);
+
+       irg   = get_irn_irg(n);
+       block = get_nodes_block(n);
+       dbgi  = get_irn_dbg_info(n);
+       tv1   = get_Const_tarval(bitop_right);
+       tv2   = get_Const_tarval(right);
+
+       assert(get_tarval_mode(tv1) == mode);
+
+       if (is_Shl(n)) {
+               new_shift = new_rd_Shl(dbgi, irg, block, bitop_left, right, mode);
+               tv_shift  = tarval_shl(tv1, tv2);
+       } else if(is_Shr(n)) {
+               new_shift = new_rd_Shr(dbgi, irg, block, bitop_left, right, mode);
+               tv_shift  = tarval_shr(tv1, tv2);
+       } else if(is_Shrs(n)) {
+               new_shift = new_rd_Shrs(dbgi, irg, block, bitop_left, right, mode);
+               tv_shift  = tarval_shrs(tv1, tv2);
+       } else {
+               assert(is_Rotl(n));
+               new_shift = new_rd_Rotl(dbgi, irg, block, bitop_left, right, mode);
+               tv_shift  = tarval_rotl(tv1, tv2);
+       }
+
+       assert(get_tarval_mode(tv_shift) == mode);
+       new_const = new_Const(mode, tv_shift);
+
+       if (op_left == op_And) {
+               new_bitop = new_rd_And(dbgi, irg, block, new_shift, new_const, mode);
+       } else if(op_left == op_Or) {
+               new_bitop = new_rd_Or(dbgi, irg, block, new_shift, new_const, mode);
+       } else {
+               assert(op_left == op_Eor);
+               new_bitop = new_rd_Eor(dbgi, irg, block, new_shift, new_const, mode);
+       }
+
+       return new_bitop;
+}
 
-  /* different operations */
-  if (get_irn_op(left) != get_irn_op(n))
-    return n;
+/**
+ * normalisation:
+ *    (x << c1) >> c2  <=>  x OP (c2-c1) & ((-1 << c1) >> c2)
+ *    also:
+ *    (x >> c1) << c2  <=>  x OP (c2-c1) & ((-1 >> c1) << c2)
+ *      (also with x >>s c1  when c1>=c2)
+ */
+static ir_node *transform_node_shl_shr(ir_node *n) {
+       ir_node  *left;
+       ir_node  *right = get_binop_right(n);
+       ir_node  *x;
+       ir_graph *irg;
+       ir_node  *block;
+       ir_mode  *mode;
+       dbg_info *dbgi;
+       ir_node  *new_const;
+       ir_node  *new_shift;
+       ir_node  *new_and;
+       tarval   *tv_shl;
+       tarval   *tv_shr;
+       tarval   *tv_shift;
+       tarval   *tv_mask;
+       pn_Cmp    pnc;
+       int       need_shrs = 0;
+
+       assert(is_Shl(n) || is_Shr(n) || is_Shrs(n));
+
+       if (!is_Const(right))
+               return n;
+
+       left = get_binop_left(n);
+       mode = get_irn_mode(n);
+       if (is_Shl(n) && (is_Shr(left) || is_Shrs(left))) {
+               ir_node *shr_right = get_binop_right(left);
+
+               if (!is_Const(shr_right))
+                       return n;
+
+               x      = get_binop_left(left);
+               tv_shr = get_Const_tarval(shr_right);
+               tv_shl = get_Const_tarval(right);
+
+               if (is_Shrs(left)) {
+                       /* shrs variant only allowed if c1 >= c2 */
+                       if (! (tarval_cmp(tv_shl, tv_shr) & pn_Cmp_Ge))
+                               return n;
+
+                       tv_mask = tarval_shrs(get_mode_all_one(mode), tv_shr);
+                       need_shrs = 1;
+               } else {
+                       tv_mask = tarval_shr(get_mode_all_one(mode), tv_shr);
+               }
+               tv_mask = tarval_shl(tv_mask, tv_shl);
+       } else if(is_Shr(n) && is_Shl(left)) {
+               ir_node *shl_right = get_Shl_right(left);
+
+               if (!is_Const(shl_right))
+                       return n;
+
+               x      = get_Shl_left(left);
+               tv_shr = get_Const_tarval(right);
+               tv_shl = get_Const_tarval(shl_right);
+
+               tv_mask = tarval_shl(get_mode_all_one(mode), tv_shl);
+               tv_mask = tarval_shr(tv_mask, tv_shr);
+       } else {
+               return n;
+       }
+
+       assert(get_tarval_mode(tv_shl) == get_tarval_mode(tv_shr));
+       assert(tv_mask != tarval_bad);
+       assert(get_tarval_mode(tv_mask) == mode);
+
+       irg   = get_irn_irg(n);
+       block = get_nodes_block(n);
+       dbgi  = get_irn_dbg_info(n);
+
+       pnc = tarval_cmp(tv_shl, tv_shr);
+       if (pnc == pn_Cmp_Lt || pnc == pn_Cmp_Eq) {
+               tv_shift  = tarval_sub(tv_shr, tv_shl, NULL);
+               new_const = new_Const(get_tarval_mode(tv_shift), tv_shift);
+               if (need_shrs) {
+                       new_shift = new_rd_Shrs(dbgi, irg, block, x, new_const, mode);
+               } else {
+                       new_shift = new_rd_Shr(dbgi, irg, block, x, new_const, mode);
+               }
+       } else {
+               assert(pnc == pn_Cmp_Gt);
+               tv_shift  = tarval_sub(tv_shl, tv_shr, NULL);
+               new_const = new_Const(get_tarval_mode(tv_shift), tv_shift);
+               new_shift = new_rd_Shl(dbgi, irg, block, x, new_const, mode);
+       }
+
+       new_const = new_Const(mode, tv_mask);
+       new_and   = new_rd_And(dbgi, irg, block, new_shift, new_const, mode);
+
+       return new_and;
+}
 
-  right = get_binop_right(n);
-  tv1 = value_of(right);
-  if (tv1 == tarval_bad)
-    return n;
+/**
+ * Transform a Shr.
+ */
+static ir_node *transform_node_Shr(ir_node *n) {
+       ir_node *c, *oldn = n;
+       ir_node *left  = get_Shr_left(n);
+       ir_node *right = get_Shr_right(n);
+       ir_mode *mode  = get_irn_mode(n);
 
-  tv2 = value_of(get_binop_right(left));
-  if (tv2 == tarval_bad)
-    return n;
+       HANDLE_BINOP_PHI(tarval_shr, left, right, c, mode);
+       n = transform_node_shift(n);
 
-  res = tarval_add(tv1, tv2);
+       if (is_Shr(n))
+               n = transform_node_shl_shr(n);
+       if (is_Shr(n))
+               n = transform_node_bitop_shift(n);
 
-  /* beware: a simple replacement works only, if res < modulo shift */
-  mode = get_irn_mode(n);
+       return n;
+}  /* transform_node_Shr */
 
-  flag = 0;
+/**
+ * Transform a Shrs.
+ */
+static ir_node *transform_node_Shrs(ir_node *n) {
+       ir_node *c, *oldn = n;
+       ir_node *a    = get_Shrs_left(n);
+       ir_node *b    = get_Shrs_right(n);
+       ir_mode *mode = get_irn_mode(n);
 
-  modulo_shf = get_mode_modulo_shift(mode);
-  if (modulo_shf > 0) {
-    tarval *modulo = new_tarval_from_long(modulo_shf, get_tarval_mode(res));
+       HANDLE_BINOP_PHI(tarval_shrs, a, b, c, mode);
+       n = transform_node_shift(n);
 
-    if (tarval_cmp(res, modulo) & pn_Cmp_Lt)
-      flag = 1;
-  }
-  else
-    flag = 1;
+       if (is_Shrs(n))
+               n = transform_node_bitop_shift(n);
 
-  if (flag) {
-    /* ok, we can replace it */
-    ir_node *in[2], *irn, *block = get_irn_n(n, -1);
+       return n;
+}  /* transform_node_Shrs */
 
-    in[0] = get_binop_left(left);
-    in[1] = new_r_Const(current_ir_graph, block, get_tarval_mode(res), res);
+/**
+ * Transform a Shl.
+ */
+static ir_node *transform_node_Shl(ir_node *n) {
+       ir_node *c, *oldn = n;
+       ir_node *a    = get_Shl_left(n);
+       ir_node *b    = get_Shl_right(n);
+       ir_mode *mode = get_irn_mode(n);
 
-    irn = new_ir_node(NULL, current_ir_graph, block, get_irn_op(n), mode, 2, in);
+       HANDLE_BINOP_PHI(tarval_shl, a, b, c, mode);
+       n = transform_node_shift(n);
 
-    DBG_OPT_ALGSIM0(n, irn, FS_OPT_REASSOC_SHIFT);
+       if (is_Shl(n))
+               n = transform_node_shl_shr(n);
+       if (is_Shl(n))
+               n = transform_node_bitop_shift(n);
 
-    return transform_node(irn);
-  }
-  return n;
-}  /* transform_node_shift */
+       return n;
+}  /* transform_node_Shl */
 
 /**
- * Transform a Shr.
+ * Transform a Rotl.
  */
-static ir_node *transform_node_Shr(ir_node *n)
-{
-  ir_node *c, *oldn = n;
-  ir_node *a = get_Shr_left(n);
-  ir_node *b = get_Shr_right(n);
+static ir_node *transform_node_Rotl(ir_node *n) {
+       ir_node *c, *oldn = n;
+       ir_node *a    = get_Rotl_left(n);
+       ir_node *b    = get_Rotl_right(n);
+       ir_mode *mode = get_irn_mode(n);
 
-  HANDLE_BINOP_PHI(tarval_shr, a, b, c);
-  return transform_node_shift(n);
-}  /* transform_node_Shr */
+       HANDLE_BINOP_PHI(tarval_rotl, a, b, c, mode);
+       n = transform_node_shift(n);
 
-/**
- * Transform a Shrs.
- */
-static ir_node *transform_node_Shrs(ir_node *n)
-{
-  ir_node *c, *oldn = n;
-  ir_node *a = get_Shrs_left(n);
-  ir_node *b = get_Shrs_right(n);
+       if (is_Rotl(n))
+               n = transform_node_bitop_shift(n);
 
-  HANDLE_BINOP_PHI(tarval_shrs, a, b, c);
-  return transform_node_shift(n);
-}  /* transform_node_Shrs */
+       return n;
+}  /* transform_node_Rotl */
 
 /**
- * Transform a Shl.
+ * Transform a Conv.
  */
-static ir_node *transform_node_Shl(ir_node *n)
-{
-  ir_node *c, *oldn = n;
-  ir_node *a = get_Shl_left(n);
-  ir_node *b = get_Shl_right(n);
-
-  HANDLE_BINOP_PHI(tarval_shl, a, b, c);
-  return transform_node_shift(n);
-}  /* transform_node_Shl */
+static ir_node *transform_node_Conv(ir_node *n) {
+       ir_node *c, *oldn = n;
+       ir_node *a = get_Conv_op(n);
+
+       if (is_const_Phi(a)) {
+               c = apply_conv_on_phi(a, get_irn_mode(n));
+               if (c) {
+                       DBG_OPT_ALGSIM0(oldn, c, FS_OPT_CONST_PHI);
+                       return c;
+               }
+       }
+
+       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);
+       }
+
+       return n;
+}  /* transform_node_Conv */
 
 /**
  * Remove dead blocks and nodes in dead blocks
  * in keep alive list.  We do not generate a new End node.
  */
 static ir_node *transform_node_End(ir_node *n) {
-  int i, n_keepalives = get_End_n_keepalives(n);
-
-  for (i = 0; i < n_keepalives; ++i) {
-    ir_node *ka = get_End_keepalive(n, i);
-    if (is_Block(ka)) {
-      if (is_Block_dead(ka)) {
-        set_End_keepalive(n, i, new_Bad());
-      }
-    }
-    else if (is_irn_pinned_in_irg(ka) && is_Block_dead(get_nodes_block(ka)))
-      set_End_keepalive(n, i, new_Bad());
-  }
-  return n;
+       int i, j, n_keepalives = get_End_n_keepalives(n);
+       ir_node **in;
+
+       NEW_ARR_A(ir_node *, in, n_keepalives);
+
+       for (i = j = 0; i < n_keepalives; ++i) {
+               ir_node *ka = get_End_keepalive(n, i);
+               if (is_Block(ka)) {
+                       if (! is_Block_dead(ka)) {
+                               in[j++] = ka;
+                       }
+                       continue;
+               } else if (is_irn_pinned_in_irg(ka) && is_Block_dead(get_nodes_block(ka))) {
+                       continue;
+               }
+               /* FIXME: beabi need to keep a Proj(M) */
+               if (is_Phi(ka) || is_irn_keep(ka) || is_Proj(ka))
+                       in[j++] = ka;
+       }
+       if (j != n_keepalives)
+               set_End_keepalives(n, j, in);
+       return n;
 }  /* transform_node_End */
 
+/** returns 1 if a == -b */
+static int is_negated_value(ir_node *a, ir_node *b) {
+       if (is_Minus(a) && get_Minus_op(a) == b)
+               return 1;
+       if (is_Minus(b) && get_Minus_op(b) == a)
+               return 1;
+       if (is_Sub(a) && is_Sub(b)) {
+               ir_node *a_left  = get_Sub_left(a);
+               ir_node *a_right = get_Sub_right(a);
+               ir_node *b_left  = get_Sub_left(b);
+               ir_node *b_right = get_Sub_right(b);
+
+               if (a_left == b_right && a_right == b_left)
+                       return 1;
+       }
+
+       return 0;
+}
+
 /**
  * Optimize a Mux into some simpler cases.
  */
-static ir_node *transform_node_Mux(ir_node *n)
-{
-  ir_node *oldn = n, *sel = get_Mux_sel(n);
-  ir_mode *mode = get_irn_mode(n);
-
-  if (get_irn_op(sel) == op_Proj && !mode_honor_signed_zeros(mode)) {
-    ir_node *cmp = get_Proj_pred(sel);
-    long proj_nr = get_Proj_proj(sel);
-    ir_node *f   =  get_Mux_false(n);
-    ir_node *t   = get_Mux_true(n);
-
-    if (get_irn_op(cmp) == op_Cmp && classify_Const(get_Cmp_right(cmp)) == CNST_NULL) {
-      ir_node *block = get_irn_n(n, -1);
-
-      /*
-       * Note: normalization puts the constant on the right site,
-       * so we check only one case.
-       *
-       * Note further that these optimization work even for floating point
-       * with NaN's because -NaN == NaN.
-       * However, if +0 and -0 is handled differently, we cannot use the first one.
-       */
-      if (get_irn_op(f) == op_Minus &&
-          get_Minus_op(f)   == t &&
-          get_Cmp_left(cmp) == t) {
-
-        if (proj_nr == pn_Cmp_Ge || proj_nr == pn_Cmp_Gt) {
-          /* Mux(a >=/> 0, -a, a)  ==>  Abs(a) */
-          n = new_rd_Abs(get_irn_dbg_info(n),
-                current_ir_graph,
-                block,
-                t, mode);
-          DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_ABS);
-          return n;
-        }
-        else if (proj_nr == pn_Cmp_Le || proj_nr == pn_Cmp_Lt) {
-          /* Mux(a <=/< 0, -a, a)  ==>  Minus(Abs(a)) */
-          n = new_rd_Abs(get_irn_dbg_info(n),
-                current_ir_graph,
-                block,
-                t, mode);
-          n = new_rd_Minus(get_irn_dbg_info(n),
-                current_ir_graph,
-                block,
-                n, mode);
-
-          DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_ABS);
-          return n;
-        }
-      }
-      else if (get_irn_op(t) == op_Minus &&
-          get_Minus_op(t)   == f &&
-          get_Cmp_left(cmp) == f) {
-
-        if (proj_nr == pn_Cmp_Le || proj_nr == pn_Cmp_Lt) {
-          /* Mux(a <=/< 0, a, -a)  ==>  Abs(a) */
-          n = new_rd_Abs(get_irn_dbg_info(n),
-                current_ir_graph,
-                block,
-                f, mode);
-          DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_ABS);
-          return n;
-        }
-        else if (proj_nr == pn_Cmp_Ge || proj_nr == pn_Cmp_Gt) {
-          /* Mux(a >=/> 0, a, -a)  ==>  Minus(Abs(a)) */
-          n = new_rd_Abs(get_irn_dbg_info(n),
-                current_ir_graph,
-                block,
-                f, mode);
-          n = new_rd_Minus(get_irn_dbg_info(n),
-                current_ir_graph,
-                block,
-                n, mode);
-
-          DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_ABS);
-          return n;
-        }
-      }
-
-      if (mode_is_int(mode) && mode_is_signed(mode) &&
-          get_mode_arithmetic(mode) == irma_twos_complement) {
-        ir_node *x = get_Cmp_left(cmp);
-
-        /* the following optimization works only with signed integer two-complement mode */
-
-        if (mode == get_irn_mode(x)) {
-          /*
-           * FIXME: this restriction is two rigid, as it would still
-           * work if mode(x) = Hs and mode == Is, but at least it removes
-           * all wrong cases.
-           */
-          if ((proj_nr == pn_Cmp_Lt || proj_nr == pn_Cmp_Le) &&
-              classify_Const(t) == CNST_ALL_ONE &&
-              classify_Const(f) == CNST_NULL) {
-            /*
-             * Mux(x:T </<= 0, 0, -1) -> Shrs(x, sizeof_bits(T) - 1)
-             * Conditions:
-             * T must be signed.
-             */
-            n = new_rd_Shrs(get_irn_dbg_info(n),
-                  current_ir_graph, block, x,
-                  new_r_Const_long(current_ir_graph, block, mode_Iu,
-                    get_mode_size_bits(mode) - 1),
-                  mode);
-            DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_SHR);
-            return n;
-          }
-          else if ((proj_nr == pn_Cmp_Gt || proj_nr == pn_Cmp_Ge) &&
-                   classify_Const(t) == CNST_ONE &&
-                   classify_Const(f) == CNST_NULL) {
-            /*
-             * Mux(x:T >/>= 0, 0, 1) -> Shr(-x, sizeof_bits(T) - 1)
-             * Conditions:
-             * T must be signed.
-             */
-            n = new_rd_Shr(get_irn_dbg_info(n),
-                  current_ir_graph, block,
-                  new_r_Minus(current_ir_graph, block, x, mode),
-                  new_r_Const_long(current_ir_graph, block, mode_Iu,
-                    get_mode_size_bits(mode) - 1),
-                  mode);
-            DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_SHR);
-            return n;
-          }
-        }
-      }
-    }
-  }
-  return arch_transform_node_Mux(n);
+static ir_node *transform_node_Mux(ir_node *n) {
+       ir_node *oldn = n, *sel = get_Mux_sel(n);
+       ir_mode *mode = get_irn_mode(n);
+       ir_node  *t   = get_Mux_true(n);
+       ir_node  *f   = get_Mux_false(n);
+       ir_graph *irg = current_ir_graph;
+
+       /* first normalization step: move a possible zero to the false case */
+       if (is_Proj(sel)) {
+               ir_node *cmp = get_Proj_pred(sel);
+
+               if (is_Cmp(cmp)) {
+                       if (is_Const(t) && is_Const_null(t)) {
+                               ir_node *tmp;
+
+                               /* Mux(x, 0, y) => Mux(x, y, 0) */
+                               pn_Cmp pnc = get_Proj_proj(sel);
+                               sel = new_r_Proj(irg, get_nodes_block(cmp), cmp, mode_b,
+                                       get_negated_pnc(pnc, get_irn_mode(get_Cmp_left(cmp))));
+                               n        = new_rd_Mux(get_irn_dbg_info(n), irg, get_nodes_block(n), sel, t, f, mode);
+                               tmp = t;
+                               t = f;
+                               f = tmp;
+                       }
+               }
+       }
+
+       /* note: after normalization, false can only happen on default */
+       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);
+                       if (tv_t == tarval_b_true) {
+                               if (is_Const(f)) {
+                                       /* Muxb(sel, true, false) = sel */
+                                       assert(get_Const_tarval(f) == tarval_b_false);
+                                       DBG_OPT_ALGSIM0(oldn, sel, FS_OPT_MUX_BOOL);
+                                       return sel;
+                               } else {
+                                       /* Muxb(sel, true, x) = Or(sel, x) */
+                                       n = new_rd_Or(dbg, irg, block, sel, f, mode_b);
+                                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_OR_BOOL);
+                                       return n;
+                               }
+                       }
+               } else if (is_Const(f)) {
+                       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);
+                               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_ORNOT_BOOL);
+                               n = new_rd_Or(dbg, irg, 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);
+                               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_AND_BOOL);
+                               return n;
+                       }
+               }
+       }
+
+       /* more normalization: try to normalize Mux(x, C1, C2) into Mux(x, +1/-1, 0) op C2 */
+       if (is_Const(t) && is_Const(f) && mode_is_int(mode)) {
+               tarval *a = get_Const_tarval(t);
+               tarval *b = get_Const_tarval(f);
+               tarval *null = get_tarval_null(mode);
+               tarval *diff, *min;
+
+               if (tarval_cmp(a, b) & pn_Cmp_Gt) {
+                       diff = tarval_sub(a, b, NULL);
+                       min  = b;
+               } else {
+                       diff = tarval_sub(b, a, NULL);
+                       min  = a;
+               }
+
+               if (diff == get_tarval_one(mode) && min != null) {
+                       dbg_info *dbg   = get_irn_dbg_info(n);
+                       ir_node  *block = get_nodes_block(n);
+                       ir_graph *irg   = current_ir_graph;
+                       ir_node  *t     = new_Const(mode, tarval_sub(a, min, NULL));
+                       ir_node  *f     = new_Const(mode, tarval_sub(b, min, NULL));
+                       n = new_rd_Mux(dbg, irg, block, sel, f, t, mode);
+                       n = new_rd_Add(dbg, irg, block, n, new_Const(mode, min), mode);
+                       return n;
+               }
+       }
+
+       if (is_Proj(sel)) {
+               ir_node *cmp = get_Proj_pred(sel);
+               long     pn  = get_Proj_proj(sel);
+
+               /*
+                * Note: normalization puts the constant on the right side,
+                * so we check only one case.
+                *
+                * Note further that these optimization work even for floating point
+                * with NaN's because -NaN == NaN.
+                * However, if +0 and -0 is handled differently, we cannot use the Abs/-Abs
+                * transformations.
+                */
+               if (is_Cmp(cmp)) {
+                       ir_node *cmp_r = get_Cmp_right(cmp);
+                       if (is_Const(cmp_r) && is_Const_null(cmp_r)) {
+                               ir_node *block = get_nodes_block(n);
+                               ir_node *cmp_l = get_Cmp_left(cmp);
+
+                               if (!mode_honor_signed_zeros(mode) && is_negated_value(f, t)) {
+                                       /* f = -t */
+
+                                       if ( (cmp_l == t && (pn == pn_Cmp_Ge || pn == pn_Cmp_Gt))
+                                               || (cmp_l == f && (pn == pn_Cmp_Le || pn == pn_Cmp_Lt)))
+                                       {
+                                               /* Mux(a >/>= 0, a, -a) = Mux(a </<= 0, -a, a) ==> Abs(a) */
+                                               n = new_rd_Abs(get_irn_dbg_info(n), current_ir_graph, block,
+                                                                                cmp_l, mode);
+                                               DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_ABS);
+                                               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)))
+                                       {
+                                               /* Mux(a </<= 0, a, -a) = Mux(a >/>= 0, -a, a) ==> -Abs(a) */
+                                               n = new_rd_Abs(get_irn_dbg_info(n), current_ir_graph, block,
+                                                                                cmp_l, mode);
+                                               n = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph,
+                                                                                                                block, n, mode);
+                                               DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_ABS);
+                                               return n;
+                                       }
+                               }
+
+                               if (mode_is_int(mode)) {
+                                       /* integer only */
+                                       if ((pn == pn_Cmp_Lg || pn == pn_Cmp_Eq) && is_And(cmp_l)) {
+                                               /* 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) {
+                                                                       /* Mux((a & 2^C) != 0, 2^C, 0) */
+                                                                       n = cmp_l;
+                                                               } else {
+                                                                       /* Mux((a & 2^C) == 0, 2^C, 0) */
+                                                                       n = new_rd_Eor(get_irn_dbg_info(n), current_ir_graph,
+                                                                               block, cmp_l, t, mode);
+                                                               }
+                                                               return n;
+                                                       }
+                                               }
+                                               if (is_Shl(and_r)) {
+                                                       ir_node *shl_l = get_Shl_left(and_r);
+                                                       if (is_Const(shl_l) && is_Const_one(shl_l)) {
+                                                               if (and_r == t && f == cmp_r) {
+                                                                       if (pn == pn_Cmp_Lg) {
+                                                                               /* (a & (1 << n)) != 0, (1 << n), 0) */
+                                                                               n = cmp_l;
+                                                                       } else {
+                                                                               /* (a & (1 << n)) == 0, (1 << n), 0) */
+                                                                               n = new_rd_Eor(get_irn_dbg_info(n), current_ir_graph,
+                                                                                       block, cmp_l, t, mode);
+                                                                       }
+                                                                       return n;
+                                                               }
+                                                       }
+                                               }
+                                               and_l = get_And_left(cmp_l);
+                                               if (is_Shl(and_l)) {
+                                                       ir_node *shl_l = get_Shl_left(and_l);
+                                                       if (is_Const(shl_l) && is_Const_one(shl_l)) {
+                                                               if (and_l == t && f == cmp_r) {
+                                                                       if (pn == pn_Cmp_Lg) {
+                                                                               /* ((1 << n) & a) != 0, (1 << n), 0) */
+                                                                               n = cmp_l;
+                                                                       } else {
+                                                                               /* ((1 << n) & a) == 0, (1 << n), 0) */
+                                                                               n = new_rd_Eor(get_irn_dbg_info(n), current_ir_graph,
+                                                                                       block, cmp_l, t, mode);
+                                                                       }
+                                                                       return n;
+                                                               }
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
+               }
+       }
+       return arch_transform_node_Mux(n);
 }  /* transform_node_Mux */
 
 /**
- * Optimize a Psi into some simpler cases.
+ * 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_Psi(ir_node *n) {
-  if (is_Mux(n))
-    return transform_node_Mux(n);
-
-  return n;
-}  /* transform_node_Psi */
+static ir_node *transform_node_Sync(ir_node *n) {
+       int arity = get_Sync_n_preds(n);
+       int i;
+
+       for (i = 0; i < arity;) {
+               ir_node *pred = get_Sync_pred(n, i);
+               int      pred_arity;
+               int      j;
+
+               if (!is_Sync(pred)) {
+                       ++i;
+                       continue;
+               }
+
+               del_Sync_n(n, i);
+               --arity;
+
+               pred_arity = get_Sync_n_preds(pred);
+               for (j = 0; j < pred_arity; ++j) {
+                       ir_node *pred_pred = get_Sync_pred(pred, j);
+                       int      k;
+
+                       for (k = 0;; ++k) {
+                               if (k >= arity) {
+                                       add_irn_n(n, pred_pred);
+                                       ++arity;
+                                       break;
+                               }
+                               if (get_Sync_pred(n, k) == pred_pred) break;
+                       }
+               }
+       }
+
+       /* rehash the sync node */
+       add_identities(current_ir_graph->value_table, n);
+
+       return n;
+}
 
 /**
  * Tries several [inplace] [optimizing] transformations and returns an
@@ -3395,15 +5590,25 @@ static ir_node *transform_node_Psi(ir_node *n) {
  * transformations _do_ generate new nodes, and thus the old node must
  * not be freed even if the equivalent node isn't the old one.
  */
-static ir_node *transform_node(ir_node *n)
-{
-  if (n->op->ops.transform_node)
-    n = n->op->ops.transform_node(n);
-  return n;
+static ir_node *transform_node(ir_node *n) {
+       ir_node *oldn;
+
+       /*
+        * Transform_node is the only "optimizing transformation" that might
+        * return a node with a different opcode. We iterate HERE until fixpoint
+        * to get the final result.
+        */
+       do {
+               oldn = n;
+               if (n->op->ops.transform_node)
+                       n = n->op->ops.transform_node(n);
+       } while (oldn != n);
+
+       return n;
 }  /* transform_node */
 
 /**
- * sSets the default transform node operation for an ir_op_ops.
+ * Sets the default transform node operation for an ir_op_ops.
  *
  * @param code   the opcode for the default operation
  * @param ops    the operations initialized
@@ -3411,42 +5616,61 @@ static ir_node *transform_node(ir_node *n)
  * @return
  *    The operations.
  */
-static ir_op_ops *firm_set_default_transform_node(opcode code, ir_op_ops *ops)
+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;   \
-    break
-
-  switch (code) {
-  CASE(Add);
-  CASE(Sub);
-  CASE(Mul);
-  CASE(Div);
-  CASE(Mod);
-  CASE(DivMod);
-  CASE(Abs);
-  CASE(Cond);
-  CASE(And);
-  CASE(Or);
-  CASE(Eor);
-  CASE(Minus);
-  CASE(Not);
-  CASE(Cast);
-  CASE(Proj);
-  CASE(Phi);
-  CASE(Sel);
-  CASE(Shr);
-  CASE(Shrs);
-  CASE(Shl);
-  CASE(End);
-  CASE(Mux);
-  CASE(Psi);
-  default:
-    /* leave NULL */;
-  }
-
-  return ops;
+#define CASE(a)                                         \
+       case iro_##a:                                       \
+               ops->transform_node      = transform_node_##a;  \
+               break
+#define CASE_PROJ(a)                                         \
+       case iro_##a:                                            \
+               ops->transform_node_Proj = transform_node_Proj_##a;  \
+               break
+#define CASE_PROJ_EX(a)                                      \
+       case iro_##a:                                            \
+               ops->transform_node      = transform_node_##a;       \
+               ops->transform_node_Proj = transform_node_Proj_##a;  \
+               break
+
+       switch (code) {
+       CASE(Add);
+       CASE(Sub);
+       CASE(Mul);
+       CASE_PROJ_EX(Div);
+       CASE_PROJ_EX(Mod);
+       CASE_PROJ_EX(DivMod);
+       CASE(Quot);
+       CASE(Abs);
+       CASE_PROJ_EX(Cmp);
+       CASE_PROJ_EX(Cond);
+       CASE(And);
+       CASE(Eor);
+       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);
+       CASE(Shl);
+       CASE(Rotl);
+       CASE(Conv);
+       CASE(End);
+       CASE(Mux);
+       CASE(Sync);
+       default:
+         /* leave NULL */;
+       }
+
+       return ops;
+#undef CASE_PROJ_EX
+#undef CASE_PROJ
 #undef CASE
 }  /* firm_set_default_transform_node */
 
@@ -3459,90 +5683,199 @@ static ir_op_ops *firm_set_default_transform_node(opcode code, ir_op_ops *ops)
 
 /** Compares the attributes of two Const nodes. */
 static int node_cmp_attr_Const(ir_node *a, ir_node *b) {
-  return (get_Const_tarval(a) != get_Const_tarval(b))
-      || (get_Const_type(a) != get_Const_type(b));
+       return (get_Const_tarval(a) != get_Const_tarval(b))
+           || (get_Const_type(a) != get_Const_type(b));
 }  /* node_cmp_attr_Const */
 
 /** Compares the attributes of two Proj nodes. */
 static int node_cmp_attr_Proj(ir_node *a, ir_node *b) {
-  return get_irn_proj_attr (a) != get_irn_proj_attr (b);
+       return get_irn_proj_attr(a) != get_irn_proj_attr(b);
 }  /* node_cmp_attr_Proj */
 
 /** Compares the attributes of two Filter nodes. */
 static int node_cmp_attr_Filter(ir_node *a, ir_node *b) {
-  return get_Filter_proj(a) != get_Filter_proj(b);
+       return get_Filter_proj(a) != get_Filter_proj(b);
 }  /* node_cmp_attr_Filter */
 
 /** Compares the attributes of two Alloc nodes. */
 static int node_cmp_attr_Alloc(ir_node *a, ir_node *b) {
-  return (get_irn_alloc_attr(a).where != get_irn_alloc_attr(b).where)
-      || (get_irn_alloc_attr(a).type != get_irn_alloc_attr(b).type);
+       const alloc_attr *pa = get_irn_alloc_attr(a);
+       const alloc_attr *pb = get_irn_alloc_attr(b);
+       return (pa->where != pb->where) || (pa->type != pb->type);
 }  /* node_cmp_attr_Alloc */
 
 /** Compares the attributes of two Free nodes. */
 static int node_cmp_attr_Free(ir_node *a, ir_node *b) {
-  return (get_irn_free_attr(a).where != get_irn_free_attr(b).where)
-      || (get_irn_free_attr(a).type != get_irn_free_attr(b).type);
+       const free_attr *pa = get_irn_free_attr(a);
+       const free_attr *pb = get_irn_free_attr(b);
+       return (pa->where != pb->where) || (pa->type != pb->type);
 }  /* node_cmp_attr_Free */
 
 /** Compares the attributes of two SymConst nodes. */
 static int node_cmp_attr_SymConst(ir_node *a, ir_node *b) {
-  return (get_irn_symconst_attr(a).num != get_irn_symconst_attr(b).num)
-      || (get_irn_symconst_attr(a).sym.type_p != get_irn_symconst_attr(b).sym.type_p)
-      || (get_irn_symconst_attr(a).tp != get_irn_symconst_attr(b).tp);
+       const symconst_attr *pa = get_irn_symconst_attr(a);
+       const symconst_attr *pb = get_irn_symconst_attr(b);
+       return (pa->kind       != pb->kind)
+           || (pa->sym.type_p != pb->sym.type_p)
+           || (pa->tp         != pb->tp);
 }  /* node_cmp_attr_SymConst */
 
 /** 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));
+       return get_irn_call_attr(a) != get_irn_call_attr(b);
 }  /* node_cmp_attr_Call */
 
 /** Compares the attributes of two Sel nodes. */
 static int node_cmp_attr_Sel(ir_node *a, ir_node *b) {
-  return (get_irn_sel_attr(a).ent->kind  != get_irn_sel_attr(b).ent->kind)
-      || (get_irn_sel_attr(a).ent->name    != get_irn_sel_attr(b).ent->name)
-      || (get_irn_sel_attr(a).ent->owner   != get_irn_sel_attr(b).ent->owner)
-      || (get_irn_sel_attr(a).ent->ld_name != get_irn_sel_attr(b).ent->ld_name)
-      || (get_irn_sel_attr(a).ent->type    != get_irn_sel_attr(b).ent->type);
+       const ir_entity *a_ent = get_Sel_entity(a);
+       const ir_entity *b_ent = get_Sel_entity(b);
+       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);
 }  /* node_cmp_attr_Sel */
 
 /** Compares the attributes of two Phi nodes. */
 static int node_cmp_attr_Phi(ir_node *a, ir_node *b) {
-  return get_irn_phi_attr (a) != get_irn_phi_attr (b);
+       /* we can only enter this function if both nodes have the same number of inputs,
+          hence it is enough to check if one of them is a Phi0 */
+       if (is_Phi0(a)) {
+               /* check the Phi0 pos attribute */
+               return get_irn_phi_attr(a)->u.pos != get_irn_phi_attr(b)->u.pos;
+       }
+       return 0;
 }  /* node_cmp_attr_Phi */
 
 /** Compares the attributes of two Conv nodes. */
 static int node_cmp_attr_Conv(ir_node *a, ir_node *b) {
-  return get_Conv_strict(a) != get_Conv_strict(b);
+       return get_Conv_strict(a) != get_Conv_strict(b);
 }  /* node_cmp_attr_Conv */
 
 /** Compares the attributes of two Cast nodes. */
 static int node_cmp_attr_Cast(ir_node *a, ir_node *b) {
-  return get_Cast_type(a) != get_Cast_type(b);
+       return get_Cast_type(a) != get_Cast_type(b);
 }  /* node_cmp_attr_Cast */
 
 /** Compares the attributes of two Load nodes. */
 static int node_cmp_attr_Load(ir_node *a, ir_node *b) {
-  if (get_Load_volatility(a) == volatility_is_volatile ||
-      get_Load_volatility(b) == volatility_is_volatile)
-    /* NEVER do CSE on volatile Loads */
-    return 1;
-
-  return get_Load_mode(a) != get_Load_mode(b);
+       if (get_Load_volatility(a) == volatility_is_volatile ||
+           get_Load_volatility(b) == volatility_is_volatile)
+               /* NEVER do CSE on volatile Loads */
+               return 1;
+       /* do not CSE Loads with different alignment. Be conservative. */
+       if (get_Load_align(a) != get_Load_align(b))
+               return 1;
+
+       return get_Load_mode(a) != get_Load_mode(b);
 }  /* node_cmp_attr_Load */
 
 /** Compares the attributes of two Store nodes. */
 static int node_cmp_attr_Store(ir_node *a, ir_node *b) {
-  /* NEVER do CSE on volatile Stores */
-  return (get_Store_volatility(a) == volatility_is_volatile ||
-          get_Store_volatility(b) == volatility_is_volatile);
+       /* do not CSE Stores with different alignment. Be conservative. */
+       if (get_Store_align(a) != get_Store_align(b))
+               return 1;
+
+       /* NEVER do CSE on volatile Stores */
+       return (get_Store_volatility(a) == volatility_is_volatile ||
+               get_Store_volatility(b) == volatility_is_volatile);
 }  /* node_cmp_attr_Store */
 
+/** Compares two exception attributes */
+static int node_cmp_exception(ir_node *a, ir_node *b) {
+       const except_attr *ea = get_irn_except_attr(a);
+       const except_attr *eb = get_irn_except_attr(b);
+
+       return ea->pin_state != eb->pin_state;
+}
+
+#define node_cmp_attr_Bound  node_cmp_exception
+
+/** Compares the attributes of two Div nodes. */
+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->no_remainder  != mb->no_remainder;
+}  /* node_cmp_attr_Div */
+
+/** Compares the attributes of two DivMod nodes. */
+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;
+}  /* node_cmp_attr_DivMod */
+
+/** Compares the attributes of two Mod nodes. */
+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;
+}  /* node_cmp_attr_Mod */
+
+/** Compares the attributes of two Quot nodes. */
+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;
+}  /* node_cmp_attr_Quot */
+
 /** Compares the attributes of two Confirm nodes. */
 static int node_cmp_attr_Confirm(ir_node *a, ir_node *b) {
-  return (get_Confirm_cmp(a) != get_Confirm_cmp(b));
+       return (get_Confirm_cmp(a) != get_Confirm_cmp(b));
 }  /* node_cmp_attr_Confirm */
 
+/** Compares the attributes of two ASM nodes. */
+static int node_cmp_attr_ASM(ir_node *a, ir_node *b) {
+       int i, n;
+       const ir_asm_constraint *ca;
+       const ir_asm_constraint *cb;
+       ident **cla, **clb;
+
+       if (get_ASM_text(a) != get_ASM_text(b))
+               return 1;
+
+       /* Should we really check the constraints here? Should be better, but is strange. */
+       n = get_ASM_n_input_constraints(a);
+       if (n != get_ASM_n_input_constraints(b))
+               return 0;
+
+       ca = get_ASM_input_constraints(a);
+       cb = get_ASM_input_constraints(b);
+       for (i = 0; i < n; ++i) {
+               if (ca[i].pos != cb[i].pos || ca[i].constraint != cb[i].constraint)
+                       return 1;
+       }
+
+       n = get_ASM_n_output_constraints(a);
+       if (n != get_ASM_n_output_constraints(b))
+               return 0;
+
+       ca = get_ASM_output_constraints(a);
+       cb = get_ASM_output_constraints(b);
+       for (i = 0; i < n; ++i) {
+               if (ca[i].pos != cb[i].pos || ca[i].constraint != cb[i].constraint)
+                       return 1;
+       }
+
+       n = get_ASM_n_clobbers(a);
+       if (n != get_ASM_n_clobbers(b))
+               return 0;
+
+       cla = get_ASM_clobbers(a);
+       clb = get_ASM_clobbers(b);
+       for (i = 0; i < n; ++i) {
+               if (cla[i] != clb[i])
+                       return 1;
+       }
+       return 0;
+}  /* node_cmp_attr_ASM */
+
 /**
  * Set the default node attribute compare operation for an ir_op_ops.
  *
@@ -3552,293 +5885,326 @@ static int node_cmp_attr_Confirm(ir_node *a, ir_node *b) {
  * @return
  *    The operations.
  */
-static ir_op_ops *firm_set_default_node_cmp_attr(opcode code, ir_op_ops *ops)
+static ir_op_ops *firm_set_default_node_cmp_attr(ir_opcode code, ir_op_ops *ops)
 {
 #define CASE(a)                              \
-  case iro_##a:                              \
-    ops->node_cmp_attr  = node_cmp_attr_##a; \
-    break
-
-  switch (code) {
-  CASE(Const);
-  CASE(Proj);
-  CASE(Filter);
-  CASE(Alloc);
-  CASE(Free);
-  CASE(SymConst);
-  CASE(Call);
-  CASE(Sel);
-  CASE(Phi);
-  CASE(Conv);
-  CASE(Cast);
-  CASE(Load);
-  CASE(Store);
-  CASE(Confirm);
-  default:
-    /* leave NULL */;
-  }
-
-  return ops;
+       case iro_##a:                              \
+               ops->node_cmp_attr  = node_cmp_attr_##a; \
+               break
+
+       switch (code) {
+       CASE(Const);
+       CASE(Proj);
+       CASE(Filter);
+       CASE(Alloc);
+       CASE(Free);
+       CASE(SymConst);
+       CASE(Call);
+       CASE(Sel);
+       CASE(Phi);
+       CASE(Conv);
+       CASE(Cast);
+       CASE(Load);
+       CASE(Store);
+       CASE(Confirm);
+       CASE(ASM);
+       CASE(Div);
+       CASE(DivMod);
+       CASE(Mod);
+       CASE(Quot);
+       CASE(Bound);
+       /* FIXME CopyB */
+       default:
+         /* leave NULL */;
+       }
+
+       return ops;
 #undef CASE
 }  /* firm_set_default_node_cmp_attr */
 
 /*
- * Compare function for two nodes in the hash table. Gets two
- * nodes as parameters.  Returns 0 if the nodes are a cse.
+ * Compare function for two nodes in the value table. Gets two
+ * nodes as parameters.  Returns 0 if the nodes are a Common Sub Expression.
  */
-int identities_cmp(const void *elt, const void *key)
-{
-  ir_node *a, *b;
-  int i, irn_arity_a;
-
-  a = (void *)elt;
-  b = (void *)key;
-
-  if (a == b) return 0;
-
-  if ((get_irn_op(a) != get_irn_op(b)) ||
-      (get_irn_mode(a) != get_irn_mode(b))) return 1;
-
-  /* compare if a's in and b's in are of equal length */
-  irn_arity_a = get_irn_intra_arity (a);
-  if (irn_arity_a != get_irn_intra_arity(b))
-    return 1;
-
-  /* for block-local cse and op_pin_state_pinned nodes: */
-  if (!get_opt_global_cse() || (get_irn_pinned(a) == op_pin_state_pinned)) {
-    if (get_irn_intra_n(a, -1) != get_irn_intra_n(b, -1))
-      return 1;
-  }
-
-  /* compare a->in[0..ins] with b->in[0..ins] */
-  for (i = 0; i < irn_arity_a; i++)
-    if (get_irn_intra_n(a, i) != get_irn_intra_n(b, i))
-      return 1;
-
-  /*
-   * here, we already now that the nodes are identical except their
-   * attributes
-   */
-  if (a->op->ops.node_cmp_attr)
-    return a->op->ops.node_cmp_attr(a, b);
-
-  return 0;
+int identities_cmp(const void *elt, const void *key) {
+       ir_node *a = (ir_node *)elt;
+       ir_node *b = (ir_node *)key;
+       int i, irn_arity_a;
+
+       if (a == b) return 0;
+
+       if ((get_irn_op(a) != get_irn_op(b)) ||
+           (get_irn_mode(a) != get_irn_mode(b))) return 1;
+
+       /* compare if a's in and b's in are of equal length */
+       irn_arity_a = get_irn_intra_arity(a);
+       if (irn_arity_a != get_irn_intra_arity(b))
+               return 1;
+
+       if (get_irn_pinned(a) == op_pin_state_pinned) {
+               /* for pinned nodes, the block inputs must be equal */
+               if (get_irn_intra_n(a, -1) != get_irn_intra_n(b, -1))
+                       return 1;
+       } else if (! get_opt_global_cse()) {
+               /* for block-local CSE both nodes must be in the same MacroBlock */
+               if (get_irn_MacroBlock(a) != get_irn_MacroBlock(b))
+                       return 1;
+       }
+
+       /* compare a->in[0..ins] with b->in[0..ins] */
+       for (i = 0; i < irn_arity_a; i++)
+               if (get_irn_intra_n(a, i) != get_irn_intra_n(b, i))
+                       return 1;
+
+       /*
+        * here, we already now that the nodes are identical except their
+        * attributes
+        */
+       if (a->op->ops.node_cmp_attr)
+               return a->op->ops.node_cmp_attr(a, b);
+
+       return 0;
 }  /* identities_cmp */
 
 /*
  * Calculate a hash value of a node.
+ *
+ * @param node  The IR-node
  */
-unsigned ir_node_hash(ir_node *node)
-{
-  unsigned h;
-  int i, irn_arity;
-
-  if (node->op == op_Const) {
-    /* special value for const, as they only differ in their tarval. */
-    h = HASH_PTR(node->attr.con.tv);
-    h = 9*h + HASH_PTR(get_irn_mode(node));
-  } else if (node->op == op_SymConst) {
-    /* special value for const, as they only differ in their symbol. */
-    h = HASH_PTR(node->attr.symc.sym.type_p);
-    h = 9*h + HASH_PTR(get_irn_mode(node));
-  } else {
-
-    /* hash table value = 9*(9*(9*(9*(9*arity+in[0])+in[1])+ ...)+mode)+code */
-    h = irn_arity = get_irn_intra_arity(node);
-
-    /* consider all in nodes... except the block if not a control flow. */
-    for (i = is_cfop(node) ? -1 : 0;  i < irn_arity;  i++) {
-      h = 9*h + HASH_PTR(get_irn_intra_n(node, i));
-    }
-
-    /* ...mode,... */
-    h = 9*h + HASH_PTR(get_irn_mode(node));
-    /* ...and code */
-    h = 9*h + HASH_PTR(get_irn_op(node));
-  }
-
-  return h;
+unsigned ir_node_hash(const ir_node *node) {
+       return node->op->ops.hash(node);
 }  /* ir_node_hash */
 
+
 pset *new_identities(void) {
-  return new_pset(identities_cmp, N_IR_NODES);
+       return new_pset(identities_cmp, N_IR_NODES);
 }  /* new_identities */
 
 void del_identities(pset *value_table) {
-  del_pset(value_table);
+       del_pset(value_table);
 }  /* del_identities */
 
 /**
- * Return the canonical node computing the same value as n.
- * Looks up the node in a hash table.
+ * Normalize a node by putting constants (and operands with larger
+ * node index) on the right (operator side).
  *
- * For Const nodes this is performed in the constructor, too.  Const
- * nodes are extremely time critical because of their frequent use in
- * constant string arrays.
+ * @param n   The node to normalize
  */
-static INLINE ir_node *identify(pset *value_table, ir_node *n)
-{
-  ir_node *o = NULL;
-
-  if (!value_table) return n;
-
-  if (get_opt_reassociation()) {
-    if (is_op_commutative(get_irn_op(n))) {
-      ir_node *l = get_binop_left(n);
-      ir_node *r = get_binop_right(n);
-
-      /* for commutative operators perform  a OP b == b OP a */
-      if (get_irn_idx(l) > get_irn_idx(r)) {
-        set_binop_left(n, r);
-        set_binop_right(n, l);
-      }
-    }
-  }
-
-  o = pset_find(value_table, n, ir_node_hash(n));
-  if (!o) return n;
-
-  DBG_OPT_CSE(n, o);
-
-  return o;
-}  /* identify */
+static void 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);
+
+               /* For commutative operators perform  a OP b == b OP a but keep
+                * constants on the RIGHT side. This helps greatly in some
+                * optimizations.  Moreover we use the idx number to make the form
+                * deterministic. */
+               if (!operands_are_normalized(l, r)) {
+                       set_binop_left(n, r);
+                       set_binop_right(n, l);
+               }
+       }
+}  /* normalize_node */
 
 /**
- * During construction we set the op_pin_state_pinned flag in the graph right when the
- * optimization is performed.  The flag turning on procedure global cse could
- * be changed between two allocations.  This way we are safe.
+ * Update the nodes after a match in the value table. If both nodes have
+ * the same MacroBlock but different Blocks, we must ensure that the node
+ * with the dominating Block (the node that is near to the MacroBlock header
+ * is stored in the table.
+ * Because a MacroBlock has only one "non-exception" flow, we don't need
+ * dominance info here: We known, that one block must dominate the other and
+ * following the only block input will allow to find it.
  */
-static INLINE ir_node *identify_cons(pset *value_table, ir_node *n) {
-  ir_node *old = n;
-
-  n = identify(value_table, n);
-  if (get_irn_n(old, -1) != get_irn_n(n, -1))
-    set_irg_pinned(current_ir_graph, op_pin_state_floats);
-  return n;
-}  /* identify_cons */
+static void update_known_irn(ir_node *known_irn, const ir_node *new_ir_node) {
+       ir_node *known_blk, *new_block, *block, *mbh;
+
+       if (get_opt_global_cse()) {
+               /* Block inputs are meaning less */
+               return;
+       }
+       known_blk = get_irn_n(known_irn, -1);
+       new_block = get_irn_n(new_ir_node, -1);
+       if (known_blk == new_block) {
+               /* already in the same block */
+               return;
+       }
+       /*
+        * We expect the typical case when we built the graph. In that case, the
+        * known_irn is already the upper one, so checking this should be faster.
+        */
+       block = new_block;
+       mbh   = get_Block_MacroBlock(new_block);
+       for (;;) {
+               if (block == known_blk) {
+                       /* ok, we have found it: known_block dominates new_block as expected */
+                       return;
+               }
+               if (block == mbh) {
+                       /*
+                        * We have reached the MacroBlock header NOT founding
+                        * the known_block. new_block must dominate known_block.
+                        * Update known_irn.
+                        */
+                       set_irn_n(known_irn, -1, new_block);
+                       return;
+               }
+               assert(get_Block_n_cfgpreds(block) == 1);
+               block = get_Block_cfgpred_block(block, 0);
+       }
+}  /* update_value_table */
 
 /*
  * Return the canonical node computing the same value as n.
  * Looks up the node in a hash table, enters it in the table
  * if it isn't there yet.
+ *
+ * @param value_table  the HashSet containing all nodes in the
+ *                     current IR graph
+ * @param n            the node to look up
+ *
+ * @return a node that computes the same value as n or n if no such
+ *         node could be found
  */
-ir_node *identify_remember(pset *value_table, ir_node *n)
-{
-  ir_node *o = NULL;
+ir_node *identify_remember(pset *value_table, ir_node *n) {
+       ir_node *o = NULL;
 
-  if (!value_table) return n;
+       if (!value_table) return n;
 
-  if (get_opt_reassociation()) {
-    if (is_op_commutative(get_irn_op(n))) {
-      ir_node *l = get_binop_left(n);
-      ir_node *r = get_binop_right(n);
+       normalize_node(n);
+       /* lookup or insert in hash table with given hash key. */
+       o = pset_insert(value_table, n, ir_node_hash(n));
 
-      /* for commutative operators perform  a OP b == b OP a */
-      if (l > r) {
-        set_binop_left(n, r);
-        set_binop_right(n, l);
-      }
-    }
-  }
+       if (o != n) {
+               update_known_irn(o, n);
+               DBG_OPT_CSE(n, o);
+       }
 
-  /* lookup or insert in hash table with given hash key. */
-  o = pset_insert (value_table, n, ir_node_hash (n));
+       return o;
+}  /* identify_remember */
 
-  if (o != n) {
-    DBG_OPT_CSE(n, o);
-  }
+/**
+ * During construction we set the op_pin_state_pinned flag in the graph right when the
+ * optimization is performed.  The flag turning on procedure global cse could
+ * be changed between two allocations.  This way we are safe.
+ *
+ * @param value_table  The value table
+ * @param n            The node to lookup
+ */
+static INLINE ir_node *identify_cons(pset *value_table, ir_node *n) {
+       ir_node *old = n;
 
-  return o;
-}  /* identify_remember */
+       n = identify_remember(value_table, n);
+       if (n != old && get_irn_MacroBlock(old) != get_irn_MacroBlock(n))
+               set_irg_pinned(current_ir_graph, op_pin_state_floats);
+       return n;
+}  /* identify_cons */
 
 /* Add a node to the identities value table. */
 void add_identities(pset *value_table, ir_node *node) {
-  if (get_opt_cse() && is_no_Block(node))
-    identify_remember(value_table, node);
+       if (get_opt_cse() && is_no_Block(node))
+               identify_remember(value_table, node);
 }  /* add_identities */
 
 /* Visit each node in the value table of a graph. */
 void visit_all_identities(ir_graph *irg, irg_walk_func visit, void *env) {
-  ir_node *node;
-  ir_graph *rem = current_ir_graph;
+       ir_node *node;
+       ir_graph *rem = current_ir_graph;
 
-  current_ir_graph = irg;
-  foreach_pset(irg->value_table, node)
-    visit(node, env);
-  current_ir_graph = rem;
+       current_ir_graph = irg;
+       foreach_pset(irg->value_table, node)
+               visit(node, env);
+       current_ir_graph = rem;
 }  /* visit_all_identities */
 
 /**
  * Garbage in, garbage out. If a node has a dead input, i.e., the
  * Bad node is input to the node, return the Bad node.
  */
-static INLINE ir_node *gigo(ir_node *node)
-{
-  int i, irn_arity;
-  ir_op *op = get_irn_op(node);
-
-  /* remove garbage blocks by looking at control flow that leaves the block
-     and replacing the control flow by Bad. */
-  if (get_irn_mode(node) == mode_X) {
-    ir_node *block = get_nodes_block(skip_Proj(node));
-
-    /* Don't optimize nodes in immature blocks. */
-    if (!get_Block_matured(block)) return node;
-     /* Don't optimize End, may have Bads. */
-    if (op == op_End) return node;
-
-    if (is_Block(block)) {
-      irn_arity = get_irn_arity(block);
-      for (i = 0; i < irn_arity; i++) {
-        if (!is_Bad(get_irn_n(block, i)))
-          break;
-      }
-      if (i == irn_arity) return new_Bad();
-    }
-  }
-
-  /* Blocks, Phis and Tuples may have dead inputs, e.g., if one of the
-     blocks predecessors is dead. */
-  if (op != op_Block && op != op_Phi && op != op_Tuple) {
-    irn_arity = get_irn_arity(node);
-
-    /*
-     * Beware: we can only read the block of a non-floating node.
-     */
-    if (is_irn_pinned_in_irg(node) &&
-        is_Block_dead(get_nodes_block(node)))
-      return new_Bad();
-
-    for (i = 0; i < irn_arity; i++) {
-      ir_node *pred = get_irn_n(node, i);
-
-      if (is_Bad(pred))
-        return new_Bad();
+static ir_node *gigo(ir_node *node) {
+       int i, irn_arity;
+       ir_op *op = get_irn_op(node);
+
+       /* remove garbage blocks by looking at control flow that leaves the block
+          and replacing the control flow by Bad. */
+       if (get_irn_mode(node) == mode_X) {
+               ir_node *block = get_nodes_block(skip_Proj(node));
+
+               /* Don't optimize nodes in immature blocks. */
+               if (!get_Block_matured(block))
+                       return node;
+               /* Don't optimize End, may have Bads. */
+               if (op == op_End) return node;
+
+               if (is_Block(block)) {
+                       if (is_Block_dead(block)) {
+                               /* control flow from dead block is dead */
+                               return new_Bad();
+                       }
+
+                       for (i = get_irn_arity(block) - 1; i >= 0; --i) {
+                               if (!is_Bad(get_irn_n(block, i)))
+                                       break;
+                       }
+                       if (i < 0) {
+                               ir_graph *irg = get_irn_irg(block);
+                               /* the start block is never dead */
+                               if (block != get_irg_start_block(irg)
+                                       && block != get_irg_end_block(irg)) {
+                                       /*
+                                        * Do NOT kill control flow without setting
+                                        * the block to dead of bad things can happen:
+                                        * We get a Block that is not reachable be irg_block_walk()
+                                        * but can be found by irg_walk()!
+                                        */
+                                       set_Block_dead(block);
+                                       return new_Bad();
+                               }
+                       }
+               }
+       }
+
+       /* Blocks, Phis and Tuples may have dead inputs, e.g., if one of the
+          blocks predecessors is dead. */
+       if (op != op_Block && op != op_Phi && op != op_Tuple) {
+               irn_arity = get_irn_arity(node);
+
+               /*
+                * Beware: we can only read the block of a non-floating node.
+                */
+               if (is_irn_pinned_in_irg(node) &&
+                       is_Block_dead(get_nodes_block(skip_Proj(node))))
+                       return new_Bad();
+
+               for (i = 0; i < irn_arity; i++) {
+                       ir_node *pred = get_irn_n(node, i);
+
+                       if (is_Bad(pred))
+                               return new_Bad();
 #if 0
-      /* Propagating Unknowns here seems to be a bad idea, because
-         sometimes we need a node as a input and did not want that
-         it kills it's user.
-         However, it might be useful to move this into a later phase
-         (if you think that optimizing such code is useful). */
-      if (is_Unknown(pred) && mode_is_data(get_irn_mode(node)))
-        return new_Unknown(get_irn_mode(node));
+                       /* Propagating Unknowns here seems to be a bad idea, because
+                          sometimes we need a node as a input and did not want that
+                          it kills it's user.
+                          However, it might be useful to move this into a later phase
+                          (if you think that optimizing such code is useful). */
+                       if (is_Unknown(pred) && mode_is_data(get_irn_mode(node)))
+                               return new_Unknown(get_irn_mode(node));
 #endif
-    }
-  }
+               }
+       }
 #if 0
-  /* With this code we violate the agreement that local_optimize
-     only leaves Bads in Block, Phi and Tuple nodes. */
-  /* If Block has only Bads as predecessors it's garbage. */
-  /* If Phi has only Bads as predecessors it's garbage. */
-  if ((op == op_Block && get_Block_matured(node)) || op == op_Phi)  {
-    irn_arity = get_irn_arity(node);
-    for (i = 0; i < irn_arity; i++) {
-      if (!is_Bad(get_irn_n(node, i))) break;
-    }
-    if (i == irn_arity) node = new_Bad();
-  }
+       /* With this code we violate the agreement that local_optimize
+          only leaves Bads in Block, Phi and Tuple nodes. */
+       /* If Block has only Bads as predecessors it's garbage. */
+       /* If Phi has only Bads as predecessors it's garbage. */
+       if ((op == op_Block && get_Block_matured(node)) || op == op_Phi)  {
+               irn_arity = get_irn_arity(node);
+               for (i = 0; i < irn_arity; i++) {
+                       if (!is_Bad(get_irn_n(node, i))) break;
+               }
+               if (i == irn_arity) node = new_Bad();
+       }
 #endif
-  return node;
+       return node;
 }  /* gigo */
 
 /**
@@ -3846,109 +6212,112 @@ static INLINE ir_node *gigo(ir_node *node)
  * It can only be called if it is guaranteed that no other nodes
  * reference this one, i.e., right after construction of a node.
  *
+ * @param n   The node to optimize
+ *
  * current_ir_graph must be set to the graph of the node!
  */
-ir_node *optimize_node(ir_node *n)
-{
-  tarval *tv;
-  ir_node *oldn = n;
-  opcode iro = get_irn_opcode(n);
-
-  /* Always optimize Phi nodes: part of the construction. */
-  if ((!get_opt_optimize()) && (iro != iro_Phi)) return n;
-
-  /* constant expression evaluation / constant folding */
-  if (get_opt_constant_folding()) {
-    /* neither constants nor Tuple values can be evaluated */
-    if (iro != iro_Const && (get_irn_mode(n) != mode_T)) {
-      /* try to evaluate */
-      tv = computed_value(n);
-      if (tv != tarval_bad) {
-        ir_node *nw;
-        ir_type *old_tp = get_irn_type(n);
-        int i, arity = get_irn_arity(n);
-        int node_size;
-
-        /*
-         * Try to recover the type of the new expression.
-         */
-        for (i = 0; i < arity && !old_tp; ++i)
-          old_tp = get_irn_type(get_irn_n(n, i));
-
-        /*
-         * we MUST copy the node here temporary, because it's still needed
-         * for DBG_OPT_CSTEVAL
-         */
-        node_size = offsetof(ir_node, attr) +  n->op->attr_size;
-        oldn = alloca(node_size);
-
-        memcpy(oldn, n, node_size);
-        CLONE_ARR_A(ir_node *, oldn->in, n->in);
-
-        /* ARG, copy the in array, we need it for statistics */
-        memcpy(oldn->in, n->in, ARR_LEN(n->in) * sizeof(n->in[0]));
-
-        /* note the inplace edges module */
-        edges_node_deleted(n, current_ir_graph);
-
-        /* evaluation was successful -- replace the node. */
-        irg_kill_node(current_ir_graph, n);
-        nw = new_Const(get_tarval_mode (tv), tv);
-
-        if (old_tp && get_type_mode(old_tp) == get_tarval_mode (tv))
-          set_Const_type(nw, old_tp);
-        DBG_OPT_CSTEVAL(oldn, nw);
-        return nw;
-      }
-    }
-  }
-
-  /* remove unnecessary nodes */
-  if (get_opt_constant_folding() ||
-    (iro == iro_Phi)  ||   /* always optimize these nodes. */
-    (iro == iro_Id)   ||
-    (iro == iro_Proj) ||
-    (iro == iro_Block)  )  /* Flags tested local. */
-    n = equivalent_node(n);
-
-  optimize_preds(n);                  /* do node specific optimizations of nodes predecessors. */
-
-  /* Common Subexpression Elimination.
-   *
-   * Checks whether n is already available.
-   * The block input is used to distinguish different subexpressions. Right
-   * 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_cons(current_ir_graph->value_table, n);
-
-  if (n != oldn) {
-    edges_node_deleted(oldn, current_ir_graph);
-
-    /* We found an existing, better node, so we can deallocate the old node. */
-    irg_kill_node(current_ir_graph, oldn);
-    return n;
-  }
-
-  /* Some more constant expression evaluation that does not allow to
-     free the node. */
-  iro = get_irn_opcode(n);
-  if (get_opt_constant_folding() ||
-    (iro == iro_Cond) ||
-    (iro == iro_Proj))     /* Flags tested local. */
-    n = transform_node(n);
-
-  /* Remove nodes with dead (Bad) input.
-     Run always for transformation induced Bads. */
-  n = gigo (n);
-
-  /* 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);
-  }
-
-  return n;
+ir_node *optimize_node(ir_node *n) {
+       tarval *tv;
+       ir_node *oldn = n;
+       ir_opcode iro = get_irn_opcode(n);
+
+       /* Always optimize Phi nodes: part of the construction. */
+       if ((!get_opt_optimize()) && (iro != iro_Phi)) return n;
+
+       /* constant expression evaluation / constant folding */
+       if (get_opt_constant_folding()) {
+               /* 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);
+                       /* try to evaluate */
+                       tv = computed_value(n);
+                       if (tv != tarval_bad) {
+                               ir_node *nw;
+                               ir_type *old_tp = get_irn_type(n);
+                               int i, arity = get_irn_arity(n);
+                               int node_size;
+
+                               /*
+                                * Try to recover the type of the new expression.
+                                */
+                               for (i = 0; i < arity && !old_tp; ++i)
+                                       old_tp = get_irn_type(get_irn_n(n, i));
+
+                               /*
+                                * we MUST copy the node here temporary, because it's still needed
+                                * for DBG_OPT_CSTEVAL
+                                */
+                               node_size = offsetof(ir_node, attr) +  n->op->attr_size;
+                               oldn = alloca(node_size);
+
+                               memcpy(oldn, n, node_size);
+                               CLONE_ARR_A(ir_node *, oldn->in, n->in);
+
+                               /* ARG, copy the in array, we need it for statistics */
+                               memcpy(oldn->in, n->in, ARR_LEN(n->in) * sizeof(n->in[0]));
+
+                               /* note the inplace edges module */
+                               edges_node_deleted(n, current_ir_graph);
+
+                               /* evaluation was successful -- replace the node. */
+                               irg_kill_node(current_ir_graph, n);
+                               nw = new_Const(get_tarval_mode(tv), tv);
+
+                               if (old_tp && get_type_mode(old_tp) == get_tarval_mode(tv))
+                                       set_Const_type(nw, old_tp);
+                               DBG_OPT_CSTEVAL(oldn, nw);
+                               tarval_enable_fp_ops(old_fp_mode);
+                               return nw;
+                       }
+                       tarval_enable_fp_ops(old_fp_mode);
+               }
+       }
+
+       /* remove unnecessary nodes */
+       if (get_opt_algebraic_simplification() ||
+           (iro == iro_Phi)  ||   /* always optimize these nodes. */
+           (iro == iro_Id)   ||
+           (iro == iro_Proj) ||
+           (iro == iro_Block)  )  /* Flags tested local. */
+               n = equivalent_node(n);
+
+       /* Common Subexpression Elimination.
+        *
+        * Checks whether n is already available.
+        * The block input is used to distinguish different subexpressions. Right
+        * 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_cons(current_ir_graph->value_table, n);
+
+       if (n != oldn) {
+               edges_node_deleted(oldn, current_ir_graph);
+
+               /* We found an existing, better node, so we can deallocate the old node. */
+               irg_kill_node(current_ir_graph, oldn);
+               return n;
+       }
+
+       /* Some more constant expression evaluation that does not allow to
+          free the node. */
+       iro = get_irn_opcode(n);
+       if (get_opt_algebraic_simplification() ||
+           (iro == iro_Cond) ||
+           (iro == iro_Proj))     /* Flags tested local. */
+               n = transform_node(n);
+
+       /* Remove nodes with dead (Bad) input.
+          Run always for transformation induced Bads. */
+       n = gigo(n);
+
+       /* 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);
+       }
+
+       return n;
 }  /* optimize_node */
 
 
@@ -3957,115 +6326,173 @@ ir_node *optimize_node(ir_node *n)
  * nodes lying on the obstack.  Remove these by a dead node elimination,
  * i.e., a copying garbage collection.
  */
-ir_node *optimize_in_place_2(ir_node *n)
-{
-  tarval *tv;
-  ir_node *oldn = n;
-  opcode iro = get_irn_opcode(n);
-
-  if (!get_opt_optimize() && (get_irn_op(n) != op_Phi)) return n;
-
-  /* constant expression evaluation / constant folding */
-  if (get_opt_constant_folding()) {
-    /* neither constants nor Tuple values can be evaluated */
-    if (iro != iro_Const && get_irn_mode(n) != mode_T) {
-      /* try to evaluate */
-      tv = computed_value(n);
-      if (tv != tarval_bad) {
-        /* evaluation was successful -- replace the node. */
-        ir_type *old_tp = get_irn_type(n);
-        int i, arity = get_irn_arity(n);
-
-        /*
-         * Try to recover the type of the new expression.
-         */
-        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);
-
-        if (old_tp && get_type_mode(old_tp) == get_tarval_mode(tv))
-          set_Const_type(n, old_tp);
-
-        DBG_OPT_CSTEVAL(oldn, n);
-        return n;
-      }
-    }
-  }
+ir_node *optimize_in_place_2(ir_node *n) {
+       tarval *tv;
+       ir_node *oldn = n;
+       ir_opcode iro = get_irn_opcode(n);
+
+       if (!get_opt_optimize() && !is_Phi(n)) return n;
+
+       /* constant expression evaluation / constant folding */
+       if (get_opt_constant_folding()) {
+               /* 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);
+                       /* try to evaluate */
+                       tv = computed_value(n);
+                       if (tv != tarval_bad) {
+                               /* evaluation was successful -- replace the node. */
+                               ir_type *old_tp = get_irn_type(n);
+                               int i, arity = get_irn_arity(n);
+
+                               /*
+                                * Try to recover the type of the new expression.
+                                */
+                               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);
+
+                               if (old_tp && get_type_mode(old_tp) == get_tarval_mode(tv))
+                                       set_Const_type(n, old_tp);
+
+                               DBG_OPT_CSTEVAL(oldn, n);
+                               tarval_enable_fp_ops(old_fp_mode);
+                               return n;
+                       }
+                       tarval_enable_fp_ops(old_fp_mode);
+               }
+       }
+
+       /* remove unnecessary nodes */
+       if (get_opt_constant_folding() ||
+           (iro == iro_Phi)  ||   /* always optimize these nodes. */
+           (iro == iro_Id)   ||   /* ... */
+           (iro == iro_Proj) ||   /* ... */
+           (iro == iro_Block)  )  /* Flags tested local. */
+               n = equivalent_node(n);
+
+       /** common subexpression elimination **/
+       /* Checks whether n is already available. */
+       /* The block input is used to distinguish different subexpressions.  Right
+          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);
+       }
+
+       /* Some more constant expression evaluation. */
+       iro = get_irn_opcode(n);
+       if (get_opt_constant_folding() ||
+               (iro == iro_Cond) ||
+               (iro == iro_Proj))     /* Flags tested local. */
+               n = transform_node(n);
+
+       /* Remove nodes with dead (Bad) input.
+          Run always for transformation induced Bads.  */
+       n = gigo(n);
+
+       /* Now we can verify the node, as it has no dead inputs any more. */
+       irn_vrfy(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);
+
+       return n;
+}  /* optimize_in_place_2 */
 
-  /* remove unnecessary nodes */
-  if (get_opt_constant_folding() ||
-      (iro == iro_Phi)  ||   /* always optimize these nodes. */
-      (iro == iro_Id)   ||   /* ... */
-      (iro == iro_Proj) ||   /* ... */
-      (iro == iro_Block)  )  /* Flags tested local. */
-    n = equivalent_node(n);
-
-  optimize_preds(n);                  /* do node specific optimizations of nodes predecessors. */
-
-  /** common subexpression elimination **/
-  /* Checks whether n is already available. */
-  /* The block input is used to distinguish different subexpressions.  Right
-     now all nodes are op_pin_state_pinned to blocks, i.e., the cse only finds common
-     subexpressions within a block. */
-  if (get_opt_cse()) {
-    n = identify(current_ir_graph->value_table, n);
-  }
+/**
+ * Wrapper for external use, set proper status bits after optimization.
+ */
+ir_node *optimize_in_place(ir_node *n) {
+       /* Handle graph state */
+       assert(get_irg_phase_state(current_ir_graph) != phase_building);
+
+       if (get_opt_global_cse())
+               set_irg_pinned(current_ir_graph, op_pin_state_floats);
+       if (get_irg_outs_state(current_ir_graph) == outs_consistent)
+               set_irg_outs_inconsistent(current_ir_graph);
+
+       /* FIXME: Maybe we could also test whether optimizing the node can
+          change the control graph. */
+       set_irg_doms_inconsistent(current_ir_graph);
+       return optimize_in_place_2(n);
+}  /* optimize_in_place */
 
-  /* Some more constant expression evaluation. */
-  iro = get_irn_opcode(n);
-  if (get_opt_constant_folding() ||
-      (iro == iro_Cond) ||
-      (iro == iro_Proj))     /* Flags tested local. */
-    n = transform_node(n);
+/**
+ * Calculate a hash value of a Const node.
+ */
+static unsigned hash_Const(const ir_node *node) {
+       unsigned h;
 
-  /* Remove nodes with dead (Bad) input.
-     Run always for transformation induced Bads.  */
-  n = gigo(n);
+       /* 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));
 
-  /* Now we can verify the node, as it has no dead inputs any more. */
-  irn_vrfy(n);
+       return h;
+}  /* hash_Const */
 
-  /* 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);
+/**
+ * Calculate a hash value of a SymConst node.
+ */
+static unsigned hash_SymConst(const ir_node *node) {
+       unsigned h;
 
-  return n;
-}  /* optimize_in_place_2 */
+       /* special value for const, as they only differ in their symbol. */
+       h = HASH_PTR(node->attr.symc.sym.type_p);
+       h = 9*h + HASH_PTR(get_irn_mode(node));
+
+       return h;
+}  /* hash_SymConst */
 
 /**
- * Wrapper for external use, set proper status bits after optimization.
+ * 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.
  */
-ir_node *optimize_in_place(ir_node *n)
+static ir_op_ops *firm_set_default_hash(ir_opcode code, ir_op_ops *ops)
 {
-  /* Handle graph state */
-  assert(get_irg_phase_state(current_ir_graph) != phase_building);
-
-  if (get_opt_global_cse())
-    set_irg_pinned(current_ir_graph, op_pin_state_floats);
-  if (get_irg_outs_state(current_ir_graph) == outs_consistent)
-    set_irg_outs_inconsistent(current_ir_graph);
-
-  /* FIXME: Maybe we could also test whether optimizing the node can
-     change the control graph. */
-  set_irg_doms_inconsistent(current_ir_graph);
-  return optimize_in_place_2 (n);
-}  /* optimize_in_place */
+#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(opcode code, ir_op_ops *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);
-  ops = firm_set_default_node_cmp_attr(code, ops);
-  ops = firm_set_default_get_type(code, ops);
-  ops = firm_set_default_get_type_attr(code, ops);
-  ops = firm_set_default_get_entity_attr(code, ops);
-
-  return 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);
+       ops = firm_set_default_node_cmp_attr(code, ops);
+       ops = firm_set_default_get_type(code, ops);
+       ops = firm_set_default_get_type_attr(code, ops);
+       ops = firm_set_default_get_entity_attr(code, ops);
+
+       return ops;
 }  /* firm_set_default_operations */