fix some warnings, represent mode size as unsigned value
[libfirm] / ir / ir / iropt.c
index b034544..81f9edc 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -1159,7 +1159,6 @@ static ir_node *equivalent_node_And(ir_node *n) {
 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);
@@ -1189,11 +1188,8 @@ static ir_node *equivalent_node_Conv(ir_node *n) {
                n = a;
                DBG_OPT_ALGSIM0(oldn, n, FS_OPT_CONV);
        } else if (is_Conv(a)) { /* Conv(Conv(b)) */
-               ir_mode *b_mode;
-
-               b = get_Conv_op(a);
-               n_mode = get_irn_mode(n);
-               b_mode = get_irn_mode(b);
+               ir_node *b      = get_Conv_op(a);
+               ir_mode *b_mode = get_irn_mode(b);
 
                if (n_mode == b_mode) {
                        if (n_mode == mode_b) {
@@ -1760,6 +1756,50 @@ static ir_node *apply_binop_on_phi(ir_node *phi, tarval *other, tarval *(*eval)(
        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)(tarval *, tarval *), 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   = eval(tv_l, tv_r);
+
+               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).
  *
@@ -1842,13 +1882,13 @@ 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);
+               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 *mode = get_irn_mode(left);
-                       int bits      = get_mode_size_bits(mode);
+                       unsigned bits = get_mode_size_bits(mode);
 
                        if (ref_bits == bits &&
                            mode_is_int(mode) &&
@@ -1871,7 +1911,7 @@ static ir_node *transform_node_AddSub(ir_node *n) {
 
                if (is_Conv(right)) {
                        ir_mode *mode = get_irn_mode(right);
-                       int bits      = get_mode_size_bits(mode);
+                       unsigned bits = get_mode_size_bits(mode);
 
                        if (ref_bits == bits &&
                                mode_is_int(mode) &&
@@ -1905,6 +1945,10 @@ static ir_node *transform_node_AddSub(ir_node *n) {
     /* 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;                                                     \
@@ -1983,74 +2027,6 @@ static ir_node *transform_node_Add(ir_node *n) {
                        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_A_MINUS_B);
                        return n;
                }
-               if (! is_reassoc_running()) {
-                       /* do NOT execute this code if reassociation is enabled, it does the inverse! */
-                       if (is_Mul(a)) {
-                               ir_node *ma = get_Mul_left(a);
-                               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);
-                                       return n;
-                               } 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);
-                                       return n;
-                               }
-                       }
-                       if (is_Mul(b)) {
-                               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);
-                                       return n;
-                               }
-                               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;
-                               }
-                       }
-               }
                if (get_mode_arithmetic(mode) == irma_twos_complement) {
                        /* Here we rely on constants be on the RIGHT side */
                        if (is_Not(a)) {
@@ -2267,16 +2243,16 @@ restart:
 
                if (mode == get_irn_mode(b)) {
                        ir_mode *ma, *mb;
-
-                       a = get_Conv_op(a);
-                       b = get_Conv_op(b);
+                       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(a);
-                       mb = get_irn_mode(b);
+                       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);
 
@@ -2385,12 +2361,14 @@ static ir_node *transform_node_Mul2n(ir_node *n, ir_mode *mode) {
        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);
@@ -2398,12 +2376,14 @@ static ir_node *transform_node_Mul2n(ir_node *n, ir_mode *mode) {
                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);
@@ -2489,7 +2469,8 @@ static ir_node *transform_node_Mul(ir_node *n) {
                if (is_Const(a)) {
                        tarval *tv = get_Const_tarval(a);
                        if (tarval_ieee754_get_exponent(tv) == 1 && tarval_ieee754_zero_mantissa(tv)) {
-                               n = new_rd_Add(get_irn_dbg_info(n), current_ir_graph, get_irn_n(n, -1), b, b, mode);
+                               /* 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;
                        }
@@ -2497,7 +2478,8 @@ static ir_node *transform_node_Mul(ir_node *n) {
                else if (is_Const(b)) {
                        tarval *tv = get_Const_tarval(b);
                        if (tarval_ieee754_get_exponent(tv) == 1 && tarval_ieee754_zero_mantissa(tv)) {
-                               n = new_rd_Add(get_irn_dbg_info(n), current_ir_graph, get_irn_n(n, -1), a, a, mode);
+                               /* 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;
                        }
@@ -2510,10 +2492,39 @@ static ir_node *transform_node_Mul(ir_node *n) {
  * Transform a Div Node.
  */
 static ir_node *transform_node_Div(ir_node *n) {
-       tarval *tv = value_of(n);
        ir_mode *mode = get_Div_resmode(n);
-       ir_node *value = 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);
 
@@ -2569,10 +2580,39 @@ make_tuple:
  * Transform a Mod node.
  */
 static ir_node *transform_node_Mod(ir_node *n) {
-       tarval *tv = value_of(n);
        ir_mode *mode = get_Mod_resmode(n);
-       ir_node *value = 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);
 
@@ -2632,14 +2672,48 @@ static ir_node *transform_node_DivMod(ir_node *n) {
        ir_node *a = get_DivMod_left(n);
        ir_node *b = get_DivMod_right(n);
        ir_mode *mode = get_DivMod_resmode(n);
-       tarval *ta = value_of(a);
-       tarval *tb = value_of(b);
+       tarval *ta, *tb;
        int evaluated = 0;
+       ir_node *va, *vb;
+
+       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))) {
-                       b = new_Const(mode, get_mode_null(mode));
-                       DBG_OPT_CSTEVAL(n, b);
+                       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;
@@ -2648,28 +2722,30 @@ static ir_node *transform_node_DivMod(ir_node *n) {
                                                             Jmp for X result!? */
                        resb = tarval_mod(ta, tb);
                        if (resb == tarval_bad) return n; /* Causes exception! */
-                       a = new_Const(mode, resa);
-                       b = new_Const(mode, resb);
-                       DBG_OPT_CSTEVAL(n, a);
-                       DBG_OPT_CSTEVAL(n, b);
+                       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)) {
-                       a = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, get_irn_n(n, -1), a, mode);
-                       b = new_Const(mode, get_mode_null(mode));
-                       DBG_OPT_CSTEVAL(n, a);
-                       DBG_OPT_CSTEVAL(n, b);
+                       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 */
-                       arch_dep_replace_divmod_by_const(&a, &b, n);
-                       evaluated = a != NULL;
+                       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 */
-                       a = new_Const(mode, get_mode_one(mode));
-                       b = new_Const(mode, get_mode_null(mode));
-                       DBG_OPT_CSTEVAL(n, a);
-                       DBG_OPT_CSTEVAL(n, b);
+                       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 */
@@ -2677,7 +2753,7 @@ static ir_node *transform_node_DivMod(ir_node *n) {
                }
        } else if (ta == get_mode_null(mode) && value_not_zero(b, &dummy)) {
                /* 0 / non-Const = 0 */
-               b = a;
+               vb = va = a;
                goto make_tuple;
        }
 
@@ -2695,8 +2771,8 @@ make_tuple:
                set_Tuple_pred(n, pn_DivMod_M,         mem);
                set_Tuple_pred(n, pn_DivMod_X_regular, new_r_Jmp(current_ir_graph, blk));
                set_Tuple_pred(n, pn_DivMod_X_except,  new_Bad());  /* no exception */
-               set_Tuple_pred(n, pn_DivMod_res_div,   a);
-               set_Tuple_pred(n, pn_DivMod_res_mod,  b);
+               set_Tuple_pred(n, pn_DivMod_res_div,   va);
+               set_Tuple_pred(n, pn_DivMod_res_mod,   vb);
        }
 
        return n;
@@ -2745,6 +2821,7 @@ static ir_node *transform_node_Quot(ir_node *n) {
 /**
  * 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 *c, *oldn = n;
@@ -2765,7 +2842,7 @@ static ir_node *transform_node_Abs(ir_node *n) {
                 * 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);
+                               get_nodes_block(n), a, mode);
 
                DBG_OPT_CONFIRM(oldn, n);
                return n;
@@ -2776,8 +2853,17 @@ static ir_node *transform_node_Abs(ir_node *n) {
                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 */
 
 /**
@@ -2867,7 +2953,8 @@ static ir_node *transform_bitwise_distributive(ir_node *n,
                ir_node *b_left  = get_binop_left(b);
                ir_node *b_right = get_binop_right(b);
                ir_node *c       = NULL;
-               ir_node *op1, *op2;
+               ir_node *op1     = NULL;
+               ir_node *op2     = NULL;
 
                if (is_op_commutative(op)) {
                        if (a_left == b_left) {
@@ -3208,7 +3295,7 @@ static ir_node *transform_node_Minus(ir_node *n) {
                        if (is_Const(c)) {
                                tarval *tv = get_Const_tarval(c);
 
-                               if (tarval_is_long(tv) && get_tarval_long(tv) == get_mode_size_bits(mode) - 1) {
+                               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);
 
@@ -3224,7 +3311,7 @@ static ir_node *transform_node_Minus(ir_node *n) {
                        if (is_Const(c)) {
                                tarval *tv = get_Const_tarval(c);
 
-                               if (tarval_is_long(tv) && get_tarval_long(tv) == get_mode_size_bits(mode) - 1) {
+                               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);
 
@@ -3277,8 +3364,8 @@ static ir_node *transform_node_Cast(ir_node *n) {
                        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_SymConst_symbol(pred),
-                       get_SymConst_kind(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);
        }
 
@@ -3481,27 +3568,63 @@ static ir_node *transform_node_Proj_Cond(ir_node *proj) {
        return proj;
 }  /* transform_node_Proj_Cond */
 
+/**
+ * Create a 0 constant of given mode.
+ */
+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 (is_Const(n))         return const_const;
+       if (is_irn_constlike(n)) return const_like;
+       return const_other;
+}
+
+/**
+ * Determines whether r is more constlike or has a larger index (in that order)
+ * than l.
+ */
+static int operands_are_normalized(const ir_node *l, const ir_node *r)
+{
+       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));
+}
+
 /**
  * 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);
-       ir_node *c     = NULL;
-       tarval *tv     = NULL;
-       int changed    = 0;
-       ir_mode *mode  = NULL;
-       long proj_nr   = get_Proj_proj(proj);
-
-       /* we can evaluate this direct */
+       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)))
+               if (!mode_is_float(get_irn_mode(left)))
                        return new_Const(mode_b, get_tarval_b_true());
                break;
        default:
@@ -3523,7 +3646,8 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
                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)) {
+               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);
 
@@ -3548,88 +3672,129 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
 
        /* remove operation of both sides if possible */
        if (proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg) {
-               ir_opcode lop = get_irn_opcode(left);
-
-               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;
+               /*
+                * 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_Rot:
+                                       if (get_Rot_right(left) == get_Rot_right(right)) {
+                                               /* a ROT X CMP b ROT X ==> a CMP b */
+                                               left  = get_Rot_left(left);
+                                               right = get_Rot_left(right);
+                                               changed |= 1;
+                                               DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP);
+                                       }
+                                       break;
+                               default:
+                                       break;
                                }
-                               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;
+                       }
+
+                       /* 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);
                                }
-                               break;
-                       case iro_Rot:
-                               if (get_Rot_right(left) == get_Rot_right(right)) {
-                                       /* a ROT X CMP b ROT X */
-                                       left  = get_Rot_left(left);
-                                       right = get_Rot_left(right);
+                       }
+                       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);
                                }
-                               break;
-                       default:
-                               break;
                        }
-               }
-       }
+               }  /* 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);
@@ -3650,28 +3815,12 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
                }
        }
 
-       if (!get_opt_reassociation())
-               return proj;
-
        /*
         * First step: normalize the compare op
         * by placing the constant on the right side
         * or moving the lower address node to the left.
-        * We ignore the case that both are constants
-        * this case should be optimized away.
         */
-       if (is_Const(right)) {
-               c = right;
-       } else if (is_irn_constlike(left)) {
-               c     = left;
-               left  = right;
-               right = c;
-               if(!is_Const(c))
-                       c = NULL;
-
-               proj_nr = get_inversed_pnc(proj_nr);
-               changed |= 1;
-       } else if (get_irn_idx(left) > get_irn_idx(right)) {
+       if (!operands_are_normalized(left, right)) {
                ir_node *t = left;
 
                left  = right;
@@ -3687,9 +3836,9 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
         * later and may help to normalize more compares.
         * Of course this is only possible for integer values.
         */
-       if (c) {
-               mode = get_irn_mode(c);
-               tv = get_Const_tarval(c);
+       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)) {
@@ -4046,9 +4195,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
 
                /* 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);
+               proj = new_rd_Proj(get_irn_dbg_info(proj), current_ir_graph, block, n, get_irn_mode(proj), proj_nr);
        }
 
        return proj;
@@ -4291,7 +4438,7 @@ static ir_node *transform_node_Or_Rot(ir_node *or) {
                        return or;
 
                if (get_tarval_long(tv1) + get_tarval_long(tv2)
-                       != get_mode_size_bits(mode))
+                               != (int) get_mode_size_bits(mode))
                        return or;
 
                /* yet, condition met */
@@ -4316,7 +4463,7 @@ static ir_node *transform_node_Or_Rot(ir_node *or) {
                if (! tarval_is_long(tv1))
                        return or;
 
-               if (get_tarval_long(tv1) != get_mode_size_bits(mode))
+               if (get_tarval_long(tv1) != (int) get_mode_size_bits(mode))
                        return or;
 
                /* yet, condition met */
@@ -4339,7 +4486,7 @@ static ir_node *transform_node_Or_Rot(ir_node *or) {
                if (! tarval_is_long(tv1))
                        return or;
 
-               if (get_tarval_long(tv1) != get_mode_size_bits(mode))
+               if (get_tarval_long(tv1) != (int) get_mode_size_bits(mode))
                        return or;
 
                /* yet, condition met */
@@ -4535,6 +4682,12 @@ static ir_node *transform_node_Conv(ir_node *n) {
                        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 */
 
@@ -4674,7 +4827,6 @@ static ir_node *transform_node_Mux(ir_node *n) {
                                                return n;
                                        }
                                }
-
                        }
                }
        }
@@ -5086,30 +5238,23 @@ void del_identities(pset *value_table) {
 }  /* del_identities */
 
 /**
- * Normalize a node by putting constants (and operands with smaller
+ * Normalize a node by putting constants (and operands with larger
  * node index) on the right
  *
  * @param n   The node to normalize
  */
 static void normalize_node(ir_node *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);
-                       int l_idx = get_irn_idx(l);
-                       int r_idx = get_irn_idx(r);
-
-                       /* 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 (is_irn_constlike(l))
-                               l_idx = -l_idx;
-                       if (is_irn_constlike(r))
-                               r_idx = -r_idx;
-                       if (l_idx < r_idx) {
-                               set_binop_left(n, r);
-                               set_binop_right(n, l);
-                       }
+       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 */