- remove block parameter from new_r_Proj and new_rd_Proj

[libfirm] / ir / opt / boolopt.c

diff --git a/ir/opt/boolopt.c b/ir/opt/boolopt.c
index 5696e47..88940f8 100644 (file)
--- a/ir/opt/boolopt.c
+++ b/ir/opt/boolopt.c
@@ -173,7 +173,7 @@ static ir_node *bool_and(cond_pair* const cpair, ir_node *dst_block)
                        p     = new_r_And(dst_block, lol, hil, mode);
                        c     = new_Const(tv_lo);
                        cmp   = new_r_Cmp(dst_block, p, c);
-                       p     = new_r_Proj(dst_block, cmp, mode_b, pn_Cmp_Eq);
+                       p     = new_r_Proj(cmp, mode_b, pn_Cmp_Eq);
                        return p;
                }
        }
@@ -203,14 +203,12 @@ static ir_node *bool_and(cond_pair* const cpair, ir_node *dst_block)
        } else if (tarval_is_one(tarval_sub(tv_hi, tv_lo, NULL))) { /* lo + 1 == hi */
                if (pnc_lo == pn_Cmp_Ge && pnc_hi == pn_Cmp_Lt) {
                        /* x >= c && x < c + 1 ==> x == c */
-                       ir_node  *const block = get_nodes_block(cmp_lo);
-                       ir_node  *const p = new_r_Proj(block, cmp_lo, mode_b, pn_Cmp_Eq);
+                       ir_node  *const p = new_r_Proj(cmp_lo, mode_b, pn_Cmp_Eq);
                        return p;
                } else if (pnc_lo == pn_Cmp_Gt) {
                        if (pnc_hi == pn_Cmp_Lg) {
                                /* x > c && x != c + 1 ==> x > c + 1 */
-                               ir_node  *const block = get_nodes_block(cmp_hi);
-                               ir_node  *const p = new_r_Proj(block, cmp_hi, mode_b, pn_Cmp_Gt);
+                               ir_node  *const p = new_r_Proj(cmp_hi, mode_b, pn_Cmp_Gt);
                                return p;
                        } else if (pnc_hi == pn_Cmp_Lt) {
                                /* x > c && x < c + 1 ==> false */
@@ -218,14 +216,12 @@ static ir_node *bool_and(cond_pair* const cpair, ir_node *dst_block)
                                return t;
                        } else if (pnc_hi == pn_Cmp_Le) {
                                /* x > c && x <= c + 1 ==> x != c + 1 */
-                               ir_node  *const block = get_nodes_block(cmp_hi);
-                               ir_node  *const p = new_r_Proj(block, cmp_hi, mode_b, pn_Cmp_Eq);
+                               ir_node  *const p = new_r_Proj(cmp_hi, mode_b, pn_Cmp_Eq);
                                return p;
                        }
                } else if (pnc_lo == pn_Cmp_Lg && pnc_hi == pn_Cmp_Lt) {
                        /* x != c && c < c + 1 ==> x < c */
-                       ir_node  *const block = get_nodes_block(cmp_lo);
-                       ir_node  *const p     = new_r_Proj(block, cmp_lo, mode_b, pn_Cmp_Lt);
+                       ir_node  *const p     = new_r_Proj(cmp_lo, mode_b, pn_Cmp_Lt);
                        return p;
                }
        } else if ((pnc_lo == pn_Cmp_Gt || pnc_lo == pn_Cmp_Ge) &&
@@ -265,7 +261,7 @@ static ir_node *bool_and(cond_pair* const cpair, ir_node *dst_block)
                        sub  = new_r_Sub(block, x, c, mode);
                        subc = new_r_Sub(block, new_Const(tv_hi), c, mode);
                        cmp  = new_r_Cmp(block, sub, subc);
-                       p    = new_r_Proj(block, cmp, mode_b, pnc_hi);
+                       p    = new_r_Proj(cmp, mode_b, pnc_hi);
                        return p;
                }
        }
@@ -309,7 +305,7 @@ static ir_node *bool_or(cond_pair *const cpair, ir_node *dst_block)
                        p     = new_r_Or(dst_block, lol, hil, mode);
                        c     = new_Const(tv_lo);
                        cmp   = new_r_Cmp(dst_block, p, c);
-                       p     = new_r_Proj(dst_block, cmp, mode_b, pn_Cmp_Lg);
+                       p     = new_r_Proj(cmp, mode_b, pn_Cmp_Lg);
                        return p;
                }
        }
@@ -339,14 +335,12 @@ static ir_node *bool_or(cond_pair *const cpair, ir_node *dst_block)
        } else if (tarval_is_one(tarval_sub(tv_hi, tv_lo, NULL))) { /* lo + 1 == hi */
                if (pnc_lo == pn_Cmp_Lt && pnc_hi == pn_Cmp_Ge) {
                        /* x < c || x >= c + 1 ==> x != c */
-                       ir_node  *const block = get_nodes_block(cmp_lo);
-                       ir_node  *const p = new_r_Proj(block, cmp_lo, mode_b, pn_Cmp_Lg);
+                       ir_node  *const p = new_r_Proj(cmp_lo, mode_b, pn_Cmp_Lg);
                        return p;
                } else if (pnc_lo == pn_Cmp_Le) {
                        if (pnc_hi == pn_Cmp_Eq) {
                                /* x <= c || x == c + 1 ==> x <= c + 1 */
-                               ir_node  *const block = get_nodes_block(cmp_hi);
-                               ir_node  *const p = new_r_Proj(block, cmp_hi, mode_b, pn_Cmp_Le);
+                               ir_node  *const p = new_r_Proj(cmp_hi, mode_b, pn_Cmp_Le);
                                return p;
                        } else if (pnc_hi == pn_Cmp_Ge) {
                                /* x <= c || x >= c + 1 ==> true */
@@ -354,32 +348,30 @@ static ir_node *bool_or(cond_pair *const cpair, ir_node *dst_block)
                                return t;
                        } else if (pnc_hi == pn_Cmp_Gt) {
                                /* x <= c || x > c + 1 ==> x != c + 1 */
-                               ir_node  *const block = get_nodes_block(cmp_hi);
-                               ir_node  *const p = new_r_Proj(block, cmp_hi, mode_b, pn_Cmp_Lg);
+                               ir_node  *const p = new_r_Proj(cmp_hi, mode_b, pn_Cmp_Lg);
                                return p;
                        }
                } else if (pnc_lo == pn_Cmp_Eq && pnc_hi == pn_Cmp_Ge) {
                        /* x == c || x >= c + 1 ==> x >= c */
-                       ir_node  *const block = get_nodes_block(cmp_lo);
-                       ir_node  *const p     = new_r_Proj(block, cmp_lo, mode_b, pn_Cmp_Ge);
+                       ir_node  *const p     = new_r_Proj(cmp_lo, mode_b, pn_Cmp_Ge);
                        return p;
                }
        } else if ((pnc_lo == pn_Cmp_Lt || pnc_lo == pn_Cmp_Le) &&
                   (pnc_hi == pn_Cmp_Gt || pnc_lo == pn_Cmp_Ge) &&
                   get_mode_arithmetic(mode) == irma_twos_complement) {
                /* works for two-complements only */
-               /* x <|\= lo  || x >|>= hi ==> (x - lo) >u|>=u (hi-lo) */
-               if (pnc_lo == pn_Cmp_Lt) {
-                       /* must convert to <= */
+               /* x <|<= lo  || x >|>= hi ==> (x - lo) >u|>=u (hi-lo) */
+               if (pnc_lo == pn_Cmp_Le) {
+                       /* must convert to < */
                        ir_mode *mode = get_tarval_mode(tv_lo);
-                       tarval *n = tarval_sub(tv_lo, get_mode_one(mode), NULL);
-                       if (n != tarval_bad && tarval_cmp(n, tv_lo) == pn_Cmp_Lt) {
+                       tarval *n = tarval_add(tv_lo, get_mode_one(mode));
+                       if (n != tarval_bad && tarval_cmp(n, tv_lo) == pn_Cmp_Gt) {
                                /* no overflow */
                                tv_lo = n;
-                               pnc_lo = pn_Cmp_Le;
+                               pnc_lo = pn_Cmp_Lt;
                        }
                }
-               if (pnc_lo == pn_Cmp_Le) {
+               if (pnc_lo == pn_Cmp_Lt) {
                        /* all fine */
                        ir_node *const block = get_nodes_block(cmp_hi);
                        ir_node *      x     = get_Cmp_left(cmp_hi);
@@ -401,7 +393,7 @@ static ir_node *bool_or(cond_pair *const cpair, ir_node *dst_block)
                        sub  = new_r_Sub(block, x, c, mode);
                        subc = new_r_Sub(block, new_Const(tv_hi), c, mode);
                        cmp  = new_r_Cmp(block, sub, subc);
-                       p    = new_r_Proj(block, cmp, mode_b, pnc_hi);
+                       p    = new_r_Proj(cmp, mode_b, pnc_hi);
                        return p;
                }
        }
@@ -509,7 +501,8 @@ static ir_node *skip_empty_blocks(ir_node *node)
  * This can be done, if block contains no Phi node that depends on
  * different inputs idx_i and idx_j.
  */
-static int can_fuse_block_inputs(const ir_node *block, int idx_i, int idx_j) {
+static int can_fuse_block_inputs(const ir_node *block, int idx_i, int idx_j)
+{
        const ir_node *phi;
 
        for (phi = get_Block_phis(block); phi != NULL; phi = get_Phi_next(phi)) {
@@ -558,7 +551,8 @@ static void remove_block_input(ir_node *block, int idx)
  * Under the preposition that we have a chain of blocks from
  * from_block to to_block, collapse them all into to_block.
  */
-static void move_nodes_to_block(ir_node *jmp, ir_node *to_block) {
+static void move_nodes_to_block(ir_node *jmp, ir_node *to_block)
+{
        ir_node *new_jmp = NULL;
        ir_node *block, *next_block;
 
@@ -669,32 +663,28 @@ restart:
                                if (cpair.proj_lo == cond_selector) {
                                        ir_mode *mode  = get_tarval_mode(cpair.tv_lo);
                                        ir_node *cmp   = get_Proj_pred(cpair.proj_lo);
-                                       ir_node *block = get_nodes_block(cmp);
                                        cpair.pnc_lo   = get_negated_pnc(cpair.pnc_lo, mode);
-                                       cpair.proj_lo  = new_r_Proj(block, cmp, mode_b, cpair.pnc_lo);
+                                       cpair.proj_lo  = new_r_Proj(cmp, mode_b, cpair.pnc_lo);
                                } else {
                                        ir_mode *mode  = get_tarval_mode(cpair.tv_hi);
                                        ir_node *cmp   = get_Proj_pred(cpair.proj_hi);
-                                       ir_node *block = get_nodes_block(cmp);
                                        assert(cpair.proj_hi == cond_selector);
                                        cpair.pnc_hi   = get_negated_pnc(cpair.pnc_hi, mode);
-                                       cpair.proj_hi  = new_r_Proj(block, cmp, mode_b, cpair.pnc_hi);
+                                       cpair.proj_hi  = new_r_Proj(cmp, mode_b, cpair.pnc_hi);
                                }
                        }
                        if (get_Proj_proj(upper_cf) == pn_Cond_false) {
                                if (cpair.proj_lo == upper_cond_selector) {
                                        ir_mode *mode  = get_tarval_mode(cpair.tv_lo);
                                        ir_node *cmp   = get_Proj_pred(cpair.proj_lo);
-                                       ir_node *block = get_nodes_block(cmp);
                                        cpair.pnc_lo   = get_negated_pnc(cpair.pnc_lo, mode);
-                                       cpair.proj_lo  = new_r_Proj(block, cmp, mode_b, cpair.pnc_lo);
+                                       cpair.proj_lo  = new_r_Proj(cmp, mode_b, cpair.pnc_lo);
                                } else {
                                        ir_mode *mode  = get_tarval_mode(cpair.tv_hi);
                                        ir_node *cmp   = get_Proj_pred(cpair.proj_hi);
-                                       ir_node *block = get_nodes_block(cmp);
                                        assert(cpair.proj_hi == upper_cond_selector);
                                        cpair.pnc_hi   = get_negated_pnc(cpair.pnc_hi, mode);
-                                       cpair.proj_hi  = new_r_Proj(block, cmp, mode_b, cpair.pnc_hi);
+                                       cpair.proj_hi  = new_r_Proj(cmp, mode_b, cpair.pnc_hi);
                                }
                        }