Remove the unused parameter const arch_env_t *env from arch_put_non_ignore_regs().

[r22671]

diff --git a/ir/be/bearch.c b/ir/be/bearch.c
index da4d020..92df889 100644 (file)
--- a/ir/be/bearch.c
+++ b/ir/be/bearch.c
@@ -194,11 +194,9 @@ int arch_get_allocatable_regs(const arch_env_t *env, const ir_node *irn, int pos
        return req->cls->n_regs;
 }
 
-void arch_put_non_ignore_regs(const arch_env_t *env,
-                              const arch_register_class_t *cls, bitset_t *bs)
+void arch_put_non_ignore_regs(const arch_register_class_t *cls, bitset_t *bs)
 {
        unsigned i;
-       (void) env;
 
        for(i = 0; i < cls->n_regs; ++i) {
                if(!arch_register_type_is(&cls->regs[i], ignore))

diff --git a/ir/be/bearch.h b/ir/be/bearch.h
index d82889d..30b5e36 100644 (file)
--- a/ir/be/bearch.h
+++ b/ir/be/bearch.h
@@ -186,11 +186,10 @@ extern int arch_get_allocatable_regs(const arch_env_t *env, const ir_node *irn,
 /**
  * Put all registers which shall not be ignored by the register
  * allocator in a bit set.
- * @param env The arch env.
  * @param cls The register class to consider.
  * @param bs  The bit set to put the registers to.
  */
-extern void arch_put_non_ignore_regs(const arch_env_t *env, const arch_register_class_t *cls, bitset_t *bs);
+extern void arch_put_non_ignore_regs(const arch_register_class_t *cls, bitset_t *bs);
 
 /**
  * Check, if a register is assignable to an operand of a node.

diff --git a/ir/be/bechordal.c b/ir/be/bechordal.c
index f7f8e4a..cbe9603 100644 (file)
--- a/ir/be/bechordal.c
+++ b/ir/be/bechordal.c
@@ -644,7 +644,7 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env,
                        pmap_insert(partners, proj, NULL);
 
                        bitset_clear_all(bs);
-                       arch_put_non_ignore_regs(aenv, env->cls, bs);
+                       arch_put_non_ignore_regs(env->cls, bs);
                        bitset_andnot(bs, env->ignore_colors);
                        bitset_foreach(bs, col) {
                                //hungarian_add(bp, n_alloc, col, 1);

diff --git a/ir/be/becopyilp2.c b/ir/be/becopyilp2.c
index 42fb15c..1082713 100644 (file)
--- a/ir/be/becopyilp2.c
+++ b/ir/be/becopyilp2.c
@@ -558,7 +558,7 @@ int co_solve_ilp2(copy_opt_t *co) {
 
        my.normal_colors = bitset_alloca(arch_register_class_n_regs(co->cls));
        bitset_clear_all(my.normal_colors);
-       arch_put_non_ignore_regs(co->aenv, co->cls, my.normal_colors);
+       arch_put_non_ignore_regs(co->cls, my.normal_colors);
        my.n_colors = bitset_popcnt(my.normal_colors);
 
        ienv = new_ilp_env(co, ilp2_build, ilp2_apply, &my);

diff --git a/ir/be/beinsn.c b/ir/be/beinsn.c
index ac9c490..5a705d9 100644 (file)
--- a/ir/be/beinsn.c
+++ b/ir/be/beinsn.c
@@ -184,7 +184,7 @@ be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
                if (type & arch_register_req_type_limited) {
                        rbitset_copy_to_bitset(req->limited, op->regs);
                } else {
-                       arch_put_non_ignore_regs(arch_env, env->cls, op->regs);
+                       arch_put_non_ignore_regs(env->cls, op->regs);
                        if (env->ignore_colors)
                                bitset_andnot(op->regs, env->ignore_colors);
                }

diff --git a/ir/be/bemain.c b/ir/be/bemain.c
index 4cc8d73..a19c983 100644 (file)
--- a/ir/be/bemain.c
+++ b/ir/be/bemain.c
@@ -948,7 +948,7 @@ unsigned be_put_ignore_regs(const be_irg_t *birg, const arch_register_class_t *c
                bitset_clear_all(bs);
 
        assert(bitset_size(bs) == (unsigned)cls->n_regs);
-       arch_put_non_ignore_regs(birg->main_env->arch_env, cls, bs);
+       arch_put_non_ignore_regs(cls, bs);
        bitset_flip_all(bs);
        be_abi_put_ignore_regs(birg->abi, cls, bs);
 

diff --git a/ir/be/beschedrss.c b/ir/be/beschedrss.c
index 1e00876..cbd0df3 100644 (file)
--- a/ir/be/beschedrss.c
+++ b/ir/be/beschedrss.c
@@ -1962,7 +1962,7 @@ static void perform_value_serialization_heuristic(rss_t *rss) {
        pset *ser_set = new_pset(cmp_rss_edges, 20);
 
        /* available_regs = R = |arch_non_ignore_regs cut ~abi_ignore_regs| */
-       arch_put_non_ignore_regs(rss->arch_env, rss->cls, arch_nonign_bs);
+       arch_put_non_ignore_regs(rss->cls, arch_nonign_bs);
        be_abi_put_ignore_regs(rss->abi, rss->cls, abi_ign_bs);
        bitset_andnot(arch_nonign_bs, abi_ign_bs);
        available_regs  = bitset_popcnt(arch_nonign_bs);