add be_get_FrameAddr_entity
[libfirm] / ir / ir / iropt.c
index 22df826..5282dbd 100644 (file)
@@ -2551,6 +2551,7 @@ 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)
@@ -2661,6 +2662,23 @@ static ir_node *transform_node_And(ir_node *n) {
 
        HANDLE_BINOP_PHI(tarval_and, a,b,c);
 
+       /* 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);
+               }
+       }
+
        n = transform_bitwise_distributive(n, transform_node_And);
 
        return n;
@@ -2677,6 +2695,23 @@ static ir_node *transform_node_Eor(ir_node *n) {
 
        HANDLE_BINOP_PHI(tarval_eor, a,b,c);
 
+       /* 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);
+               }
+       }
+
        if (a == b) {
                /* a ^ a = 0 */
                n = new_rd_Const(get_irn_dbg_info(n), current_ir_graph, get_irn_n(n, -1),
@@ -2758,6 +2793,14 @@ static ir_node *transform_node_Minus(ir_node *n) {
                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);
+       } else 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;
@@ -2959,225 +3002,290 @@ static ir_node *transform_node_Proj_Cond(ir_node *proj) {
  * Normalizes and optimizes Cmp nodes.
  */
 static ir_node *transform_node_Proj_Cmp(ir_node *proj) {
-       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);
+       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 */
+       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;
+       }
 
-               /*
-                * 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;
+       /* 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)) {
+                       ir_graph* irg   = current_ir_graph;
+                       ir_node*  block = get_nodes_block(n);
+                       ir_node*  new_left;
+                       ir_node*  new_right;
+
+                       if (mode_left == mode_right) {
+                               new_left  = op_left;
+                               new_right = op_right;
+                       } else if (smaller_mode(mode_left, mode_right)) {
+                               new_left  = new_r_Conv(irg, block, op_left, mode_right);
+                               new_right = op_right;
+                       } else if (smaller_mode(mode_right, mode_left)) {
+                               new_left  = op_left;
+                               new_right = new_r_Conv(irg, block, op_right, mode_left);
+                       } else {
+                               goto no_remove_conv;
+                       }
+                       left  = new_left;
+                       right = new_right;
+                       set_Cmp_left( n, left);
+                       set_Cmp_right(n, right);
+no_remove_conv:;
                }
+       }
 
-               /*
-                * 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 (get_irn_mode(left) == mode_b) {
+               ir_graph* irg   = current_ir_graph;
+               ir_node*  block = get_nodes_block(n);
 
-                       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_neg(tv);
+               switch (proj_nr) {
+                       case pn_Cmp_Le: return new_r_Or( irg, block, new_r_Not(irg, block, left, mode_b), right, mode_b);
+                       case pn_Cmp_Lt: return new_r_And(irg, block, new_r_Not(irg, block, left, mode_b), right, mode_b);
+                       case pn_Cmp_Ge: return new_r_Or( irg, block, left, new_r_Not(irg, block, right, mode_b), mode_b);
+                       case pn_Cmp_Gt: return new_r_And(irg, block, left, new_r_Not(irg, block, right, mode_b), mode_b);
+                       case pn_Cmp_Lg: return new_r_Eor(irg, block, left, right, mode_b);
+                       case pn_Cmp_Eq: return new_r_Not(irg, block, new_r_Eor(irg, block, left, right, mode_b), mode_b);
+               }
+       }
+
+       if (!get_opt_reassociation())
+               return 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_neg(tv);
+
+                               if (tv != tarval_bad) {
+                                       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));
 
                                        if (tv != tarval_bad) {
-                                               proj_nr = get_inversed_pnc(proj_nr);
+                                               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));
 
-                               /* 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);
+                                       if (tv != tarval_bad) {
+                                               proj_nr ^= pn_Cmp_Eq;
+                                               changed |= 2;
                                        }
+                               }
 
-                                       /* 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));
+                               /* the following reassociations work only for == and != */
+                               if (proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg) {
 
-                                               if (tv != tarval_bad) {
-                                                       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));
+                                       /* 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);
                                                if (tv != tarval_bad) {
-                                                       proj_nr ^= pn_Cmp_Eq;
-                                                       changed |= 2;
+                                                       changed = 1;
                                                }
                                        }
 
-                                       /* 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);
+                                       if (tv != tarval_bad) {
+                                               ir_op *op = get_irn_op(left);
 
-                                                       tv = value_of(right);
-                                                       if (tv != tarval_bad) {
-                                                               changed = 1;
-                                                       }
-                                               }
+                                               /* 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 (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) {
-                                                                       tv2 = tarval_add(tv, value_of(c1));
-
-                                                                       if (tv2 != tarval_bad) {
-                                                                               left    = get_Sub_left(left);
-                                                                               tv      = tv2;
-                                                                               changed |= 2;
-                                                                       }
+                                                                       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+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);
                                                        }
-                                                       /* -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) {
+                                                               tv2 = tarval_sub(tv, tv2);
 
                                                                if (tv2 != tarval_bad) {
-                                                                       left    = get_Minus_op(left);
+                                                                       left    = a;
                                                                        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);
+                                               /* -a == c ==> a == -c, -a != c ==> a != -c */
+                                               else if (op == op_Minus) {
+                                                       tarval *tv2 = tarval_sub(get_mode_null(mode), tv);
 
-                                                       /* c >= 0 : Abs(a) <= c  ==>  (unsigned)(a + c) <= 2*c */
-                                                       if (op == op_Abs) {
+                                                       if (tv2 != tarval_bad) {
+                                                               left    = get_Minus_op(left);
+                                                               tv      = tv2;
+                                                               changed |= 2;
                                                        }
                                                }
                                        }
-                               } /* mode_is_int */
+                               } /* == 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);
 
-                               /*
-                                * 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 (tarval_is_single_bit(tv)) {
-                                               /* check for Constant's match. We have check hare the tarvals,
-                                                  because our const might be changed */
-                                               ir_node *la = get_And_left(left);
-                                               ir_node *ra = get_And_right(left);
-                                               if ((is_Const(la) && get_Const_tarval(la) == tv) ||
-                                                   (is_Const(ra) && get_Const_tarval(ra) == tv)) {
-                                                               /* fine: do the transformation */
-                                                               tv = get_mode_null(get_tarval_mode(tv));
-                                                               proj_nr ^= pn_Cmp_Leg;
-                                                               changed |= 2;
+                                               /* c >= 0 : Abs(a) <= c  ==>  (unsigned)(a + c) <= 2*c */
+                                               if (op == op_Abs) {
                                                }
                                        }
                                }
-                       } /* tarval != bad */
-               }
+                       } /* mode_is_int */
 
-               if (changed) {
-                       ir_node *block = get_irn_n(n, -1); /* Beware of get_nodes_Block() */
+                       /*
+                        * 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 (tarval_is_single_bit(tv)) {
+                                       /* check for Constant's match. We have check hare the tarvals,
+                                          because our const might be changed */
+                                       ir_node *la = get_And_left(left);
+                                       ir_node *ra = get_And_right(left);
+                                       if ((is_Const(la) && get_Const_tarval(la) == tv) ||
+                                               (is_Const(ra) && get_Const_tarval(ra) == tv)) {
+                                                       /* fine: do the transformation */
+                                                       tv = get_mode_null(get_tarval_mode(tv));
+                                                       proj_nr ^= pn_Cmp_Leg;
+                                                       changed |= 2;
+                                       }
+                               }
+                       }
+               } /* tarval != bad */
+       }
 
-                       if (changed & 2)      /* need a new Const */
-                               right = new_Const(mode, tv);
+       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);
+               if (changed & 2)      /* need a new Const */
+                       right = new_Const(mode, tv);
 
-                       set_Proj_pred(proj, n);
-                       set_Proj_proj(proj, proj_nr);
-               }
+               /* 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 */
 
@@ -3490,6 +3598,23 @@ static ir_node *transform_node_Or(ir_node *n) {
        ir_node *a = get_Or_left(n);
        ir_node *b = get_Or_right(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);
+               }
+       }
+
        HANDLE_BINOP_PHI(tarval_or, a,b,c);
 
        n = transform_node_Or_bf_store(n);
@@ -3629,6 +3754,25 @@ static ir_node *transform_node_End(ir_node *n) {
        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.
  */
@@ -3676,70 +3820,42 @@ static ir_node *transform_node_Mux(ir_node *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);
+               long     pn  = 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);
+               /*
+                * 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
+                               && classify_Const(get_Cmp_right(cmp)) == CNST_NULL) {
+                       ir_node *block    = get_irn_n(n, -1);
+
+                       if(is_negated_value(f, t)) {
+                               ir_node *cmp_left = get_Cmp_left(cmp);
+
+                               /* Psi(a >= 0, a, -a) = Psi(a <= 0, -a, a) ==> Abs(a) */
+                               if ( (cmp_left == t && (pn == pn_Cmp_Ge || pn == pn_Cmp_Gt))
+                                       || (cmp_left == f && (pn == pn_Cmp_Le || pn == pn_Cmp_Lt)))
+                               {
+                                       n = new_rd_Abs(get_irn_dbg_info(n), current_ir_graph, block,
+                                                                  cmp_left, mode);
                                        DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_ABS);
                                        return n;
-                               } 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);
-
+                               /* Psi(a <= 0, a, -a) = Psi(a >= 0, -a, a) ==> -Abs(a) */
+                               } else if ((cmp_left == t && (pn == pn_Cmp_Le || pn == pn_Cmp_Lt))
+                                       || (cmp_left == f && (pn == pn_Cmp_Ge || pn == pn_Cmp_Gt)))
+                               {
+                                       n = new_rd_Abs(get_irn_dbg_info(n), current_ir_graph, block,
+                                                                  cmp_left, mode);
+                                       n = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph,
+                                                        block, n, mode);
                                        DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_ABS);
                                        return n;
                                }
@@ -3757,7 +3873,7 @@ static ir_node *transform_node_Mux(ir_node *n) {
                                         * 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) &&
+                                       if ((pn == pn_Cmp_Lt || pn == pn_Cmp_Le) &&
                                            classify_Const(t) == CNST_ALL_ONE &&
                                            classify_Const(f) == CNST_NULL) {
                                                /*
@@ -3772,7 +3888,7 @@ static ir_node *transform_node_Mux(ir_node *n) {
                                                                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) &&
+                                       } else if ((pn == pn_Cmp_Gt || pn == pn_Cmp_Ge) &&
                                                   classify_Const(t) == CNST_ONE &&
                                                   classify_Const(f) == CNST_NULL) {
                                                /*