s/new_r_Const_long(current_ir_graph, /new_Const_long(/.

[r23756]

diff --git a/ir/ir/irarch.c b/ir/ir/irarch.c
index 13273ea..43b78e4 100644 (file)
--- a/ir/ir/irarch.c
+++ b/ir/ir/irarch.c
@@ -833,12 +833,12 @@ static ir_node *replace_div_by_mulh(ir_node *div, tarval *tv) {
 
                /* Do we need the shift */
                if (mag.s > 0) {
-                       c = new_r_Const_long(current_ir_graph, mode_Iu, mag.s);
-                       q    = new_rd_Shrs(dbg, current_ir_graph, block, q, c, mode);
+                       c = new_Const_long(mode_Iu, mag.s);
+                       q = new_rd_Shrs(dbg, current_ir_graph, block, q, c, mode);
                }
 
                /* final */
-               c = new_r_Const_long(current_ir_graph, mode_Iu, bits-1);
+               c = new_Const_long(mode_Iu, bits - 1);
                t = new_rd_Shr(dbg, current_ir_graph, block, q, c, mode);
 
                q = new_rd_Add(dbg, current_ir_graph, block, q, t, mode);
@@ -860,14 +860,14 @@ static ir_node *replace_div_by_mulh(ir_node *div, tarval *tv) {
 
                                t = new_rd_Add(dbg, current_ir_graph, block, t, q, mode);
 
-                               c = new_r_Const_long(current_ir_graph, mode_Iu, mag.s-1);
+                               c = new_Const_long(mode_Iu, mag.s - 1);
                                q = new_rd_Shr(dbg, current_ir_graph, block, t, c, mode);
                        } else {
                                /* use the default scheme */
                                q = new_rd_Add(dbg, current_ir_graph, block, q, n, mode);
                        }
                } else if (mag.s > 0) { /* default scheme, shift needed */
-                       c = new_r_Const_long(current_ir_graph, mode_Iu, mag.s);
+                       c = new_Const_long(mode_Iu, mag.s);
                        q = new_rd_Shr(dbg, current_ir_graph, block, q, c, mode);
                }
        }
@@ -930,11 +930,11 @@ ir_node *arch_dep_replace_div_by_const(ir_node *irn) {
                                /* create the correction code for signed values only if there might be a remainder */
                                if (! is_Div_remainderless(irn)) {
                                        if (k != 1) {
-                                               k_node = new_r_Const_long(current_ir_graph, mode_Iu, k - 1);
+                                               k_node = new_Const_long(mode_Iu, k - 1);
                                                curr   = new_rd_Shrs(dbg, current_ir_graph, block, left, k_node, mode);
                                        }
 
-                                       k_node = new_r_Const_long(current_ir_graph, mode_Iu, bits - k);
+                                       k_node = new_Const_long(mode_Iu, bits - k);
                                        curr   = new_rd_Shr(dbg, current_ir_graph, block, curr, k_node, mode);
 
                                        curr   = new_rd_Add(dbg, current_ir_graph, block, left, curr, mode);
@@ -942,7 +942,7 @@ ir_node *arch_dep_replace_div_by_const(ir_node *irn) {
                                        k_node = left;
                                }
 
-                               k_node = new_r_Const_long(current_ir_graph, mode_Iu, k);
+                               k_node = new_Const_long(mode_Iu, k);
                                res    = new_rd_Shrs(dbg, current_ir_graph, block, curr, k_node, mode);
 
                                if (n_flag) { /* negate the result */
@@ -954,7 +954,7 @@ ir_node *arch_dep_replace_div_by_const(ir_node *irn) {
                        } else {      /* unsigned case */
                                ir_node *k_node;
 
-                               k_node = new_r_Const_long(current_ir_graph, mode_Iu, k);
+                               k_node = new_Const_long(mode_Iu, k);
                                res    = new_rd_Shr(dbg, current_ir_graph, block, left, k_node, mode);
                        }
                } else {
@@ -1024,23 +1024,23 @@ ir_node *arch_dep_replace_mod_by_const(ir_node *irn) {
                                ir_node *curr = left;
 
                                if (k != 1) {
-                                       k_node = new_r_Const_long(current_ir_graph, mode_Iu, k - 1);
+                                       k_node = new_Const_long(mode_Iu, k - 1);
                                        curr   = new_rd_Shrs(dbg, current_ir_graph, block, left, k_node, mode);
                                }
 
-                               k_node = new_r_Const_long(current_ir_graph, mode_Iu, bits - k);
+                               k_node = new_Const_long(mode_Iu, bits - k);
                                curr   = new_rd_Shr(dbg, current_ir_graph, block, curr, k_node, mode);
 
                                curr   = new_rd_Add(dbg, current_ir_graph, block, left, curr, mode);
 
-                               k_node = new_r_Const_long(current_ir_graph, mode, (-1) << k);
+                               k_node = new_Const_long(mode, (-1) << k);
                                curr   = new_rd_And(dbg, current_ir_graph, block, curr, k_node, mode);
 
                                res    = new_rd_Sub(dbg, current_ir_graph, block, left, curr, mode);
                        } else {      /* unsigned case */
                                ir_node *k_node;
 
-                               k_node = new_r_Const_long(current_ir_graph, mode, (1 << k) - 1);
+                               k_node = new_Const_long(mode, (1 << k) - 1);
                                res    = new_rd_And(dbg, current_ir_graph, block, left, k_node, mode);
                        }
                } else {
@@ -1118,16 +1118,16 @@ void arch_dep_replace_divmod_by_const(ir_node **div, ir_node **mod, ir_node *irn
                                ir_node *curr = left;
 
                                if (k != 1) {
-                                       k_node = new_r_Const_long(current_ir_graph, mode_Iu, k - 1);
+                                       k_node = new_Const_long(mode_Iu, k - 1);
                                        curr   = new_rd_Shrs(dbg, current_ir_graph, block, left, k_node, mode);
                                }
 
-                               k_node = new_r_Const_long(current_ir_graph, mode_Iu, bits - k);
+                               k_node = new_Const_long(mode_Iu, bits - k);
                                curr   = new_rd_Shr(dbg, current_ir_graph, block, curr, k_node, mode);
 
                                curr   = new_rd_Add(dbg, current_ir_graph, block, left, curr, mode);
 
-                               c_k    = new_r_Const_long(current_ir_graph, mode_Iu, k);
+                               c_k    = new_Const_long(mode_Iu, k);
 
                                *div   = new_rd_Shrs(dbg, current_ir_graph, block, curr, c_k, mode);
 
@@ -1138,17 +1138,17 @@ void arch_dep_replace_divmod_by_const(ir_node **div, ir_node **mod, ir_node *irn
                                        *div = new_rd_Sub(dbg, current_ir_graph, block, k_node, *div, mode);
                                }
 
-                               k_node = new_r_Const_long(current_ir_graph, mode, (-1) << k);
+                               k_node = new_Const_long(mode, (-1) << k);
                                curr   = new_rd_And(dbg, current_ir_graph, block, curr, k_node, mode);
 
                                *mod   = new_rd_Sub(dbg, current_ir_graph, block, left, curr, mode);
                        } else {      /* unsigned case */
                                ir_node *k_node;
 
-                               k_node = new_r_Const_long(current_ir_graph, mode_Iu, k);
+                               k_node = new_Const_long(mode_Iu, k);
                                *div   = new_rd_Shr(dbg, current_ir_graph, block, left, k_node, mode);
 
-                               k_node = new_r_Const_long(current_ir_graph, mode, (1 << k) - 1);
+                               k_node = new_Const_long(mode, (1 << k) - 1);
                                *mod   = new_rd_And(dbg, current_ir_graph, block, left, k_node, mode);
                        }
                } else {

diff --git a/ir/ir/iropt.c b/ir/ir/iropt.c
index 7623240..f678973 100644 (file)
--- a/ir/ir/iropt.c
+++ b/ir/ir/iropt.c
@@ -2256,7 +2256,7 @@ static ir_node *transform_node_Add(ir_node *n) {
                                current_ir_graph,
                                block,
                                a,
-                               new_r_Const_long(current_ir_graph, mode, 2),
+                               new_Const_long(mode, 2),
                                mode);
                        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_A_A);
                        return n;
@@ -2563,7 +2563,7 @@ restart:
                                                get_irn_dbg_info(n),
                                                current_ir_graph, blk,
                                                mb,
-                                               new_r_Const_long(current_ir_graph, mode, 1),
+                                               new_Const_long(mode, 1),
                                                mode),
                                        mode);
                        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_MUL_A_X_A);
@@ -2578,7 +2578,7 @@ restart:
                                                get_irn_dbg_info(n),
                                                current_ir_graph, blk,
                                                ma,
-                                               new_r_Const_long(current_ir_graph, mode, 1),
+                                               new_Const_long(mode, 1),
                                                mode),
                                        mode);
                        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_MUL_A_X_A);