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

[libfirm] / ir / be / bearch.c

diff --git a/ir/be/bearch.c b/ir/be/bearch.c
index 45c15fd..c7b0ad3 100644 (file)
--- a/ir/be/bearch.c
+++ b/ir/be/bearch.c
@@ -33,7 +33,6 @@
 #include "benode_t.h"
 #include "ircons_t.h"
 #include "irnode_t.h"
-#include "xmalloc.h"
 
 #include "bitset.h"
 #include "pset.h"
@@ -49,29 +48,29 @@ arch_env_t *arch_env_init(const arch_isa_if_t *isa_if, FILE *file_handle, be_mai
        return arch_env;
 }
 
-int arch_register_class_put(const arch_register_class_t *cls, bitset_t *bs)
+/**
+ * Put all registers in a class into a bitset.
+ * @param cls The class.
+ * @param bs The bitset.
+ * @return The number of registers in the class.
+ */
+static int arch_register_class_put(const arch_register_class_t *cls, bitset_t *bs)
 {
-       if(bs) {
-               int i, n;
-               for(i = 0, n = cls->n_regs; i < n; ++i)
-                       bitset_set(bs, i);
-       }
-
-       return cls->n_regs;
+       int i, n = cls->n_regs;
+       for (i = n - 1; i >= 0; --i)
+               bitset_set(bs, i);
+       return n;
 }
 
 /**
  * Get the isa responsible for a node.
- * @param env The arch environment with the isa stack.
  * @param irn The node to get the responsible isa for.
  * @return The irn operations given by the responsible isa.
  */
-static INLINE const arch_irn_ops_t *
-get_irn_ops(const arch_env_t *env, const ir_node *irn)
+static INLINE const arch_irn_ops_t *get_irn_ops(const ir_node *irn)
 {
        const ir_op          *ops;
        const arch_irn_ops_t *be_ops;
-       (void) env;
 
        if (is_Proj(irn)) {
                irn = get_Proj_pred(irn);
@@ -85,44 +84,52 @@ get_irn_ops(const arch_env_t *env, const ir_node *irn)
        return be_ops;
 }
 
-const arch_irn_ops_t *arch_get_irn_ops(const arch_env_t *env, const ir_node *irn) {
-       return get_irn_ops(env, irn);
+const arch_irn_ops_t *arch_get_irn_ops(const arch_env_t *env, const ir_node *irn)
+{
+       (void)env; // TODO remove parameter
+       return get_irn_ops(irn);
 }
 
 const arch_register_req_t *arch_get_register_req(const arch_env_t *env,
                                                  const ir_node *irn, int pos)
 {
-       const arch_irn_ops_t *ops = get_irn_ops(env, irn);
+       const arch_irn_ops_t *ops = get_irn_ops(irn);
+       (void)env; // TODO remove parameter
        return ops->get_irn_reg_req(irn, pos);
 }
 
 void arch_set_frame_offset(const arch_env_t *env, ir_node *irn, int offset)
 {
-       const arch_irn_ops_t *ops = get_irn_ops(env, irn);
+       const arch_irn_ops_t *ops = get_irn_ops(irn);
+       (void)env; // TODO remove parameter
        ops->set_frame_offset(irn, offset);
 }
 
 ir_entity *arch_get_frame_entity(const arch_env_t *env, const ir_node *irn)
 {
-       const arch_irn_ops_t *ops = get_irn_ops(env, irn);
+       const arch_irn_ops_t *ops = get_irn_ops(irn);
+       (void)env; // TODO remove parameter
        return ops->get_frame_entity(irn);
 }
 
 void arch_set_frame_entity(const arch_env_t *env, ir_node *irn, ir_entity *ent)
 {
-       const arch_irn_ops_t *ops = get_irn_ops(env, irn);
+       const arch_irn_ops_t *ops = get_irn_ops(irn);
+       (void)env; // TODO remove parameter
        ops->set_frame_entity(irn, ent);
 }
 
 int arch_get_sp_bias(const arch_env_t *env, ir_node *irn)
 {
-       const arch_irn_ops_t *ops = get_irn_ops(env, irn);
+       const arch_irn_ops_t *ops = get_irn_ops(irn);
+       (void)env; // TODO remove parameter
        return ops->get_sp_bias(irn);
 }
 
 arch_inverse_t *arch_get_inverse(const arch_env_t *env, const ir_node *irn, int i, arch_inverse_t *inverse, struct obstack *obstack)
 {
-       const arch_irn_ops_t *ops = get_irn_ops(env, irn);
+       const arch_irn_ops_t *ops = get_irn_ops(irn);
+       (void)env; // TODO remove parameter
 
        if(ops->get_inverse) {
                return ops->get_inverse(irn, i, inverse, obstack);
@@ -132,7 +139,8 @@ arch_inverse_t *arch_get_inverse(const arch_env_t *env, const ir_node *irn, int
 }
 
 int arch_possible_memory_operand(const arch_env_t *env, const ir_node *irn, unsigned int i) {
-       const arch_irn_ops_t *ops = get_irn_ops(env, irn);
+       const arch_irn_ops_t *ops = get_irn_ops(irn);
+       (void)env; // TODO remove parameter
 
        if(ops->possible_memory_operand) {
                return ops->possible_memory_operand(irn, i);
@@ -142,7 +150,8 @@ int arch_possible_memory_operand(const arch_env_t *env, const ir_node *irn, unsi
 }
 
 void arch_perform_memory_operand(const arch_env_t *env, ir_node *irn, ir_node *spill, unsigned int i) {
-       const arch_irn_ops_t *ops = get_irn_ops(env, irn);
+       const arch_irn_ops_t *ops = get_irn_ops(irn);
+       (void)env; // TODO remove parameter
 
        if(ops->perform_memory_operand) {
                ops->perform_memory_operand(irn, spill, i);
@@ -153,7 +162,8 @@ void arch_perform_memory_operand(const arch_env_t *env, ir_node *irn, ir_node *s
 
 int arch_get_op_estimated_cost(const arch_env_t *env, const ir_node *irn)
 {
-       const arch_irn_ops_t *ops = get_irn_ops(env, irn);
+       const arch_irn_ops_t *ops = get_irn_ops(irn);
+       (void)env; // TODO remove parameter
 
        if(ops->get_op_estimated_cost) {
                return ops->get_op_estimated_cost(irn);
@@ -164,7 +174,8 @@ int arch_get_op_estimated_cost(const arch_env_t *env, const ir_node *irn)
 
 int arch_is_possible_memory_operand(const arch_env_t *env, const ir_node *irn, int i)
 {
-       const arch_irn_ops_t *ops = get_irn_ops(env, irn);
+       const arch_irn_ops_t *ops = get_irn_ops(irn);
+       (void)env; // TODO remove parameter
 
        if(ops->possible_memory_operand) {
                return ops->possible_memory_operand(irn, i);
@@ -175,8 +186,9 @@ int arch_is_possible_memory_operand(const arch_env_t *env, const ir_node *irn, i
 
 int arch_get_allocatable_regs(const arch_env_t *env, const ir_node *irn, int pos, bitset_t *bs)
 {
-       const arch_irn_ops_t *ops = get_irn_ops(env, irn);
+       const arch_irn_ops_t *ops = get_irn_ops(irn);
        const arch_register_req_t *req = ops->get_irn_reg_req(irn, pos);
+       (void)env; // TODO remove parameter
 
        if(req->type == arch_register_req_type_none) {
                bitset_clear_all(bs);
@@ -192,11 +204,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))
@@ -204,26 +214,12 @@ void arch_put_non_ignore_regs(const arch_env_t *env,
        }
 }
 
-int arch_count_non_ignore_regs(const arch_env_t *env,
-                               const arch_register_class_t *cls)
-{
-       unsigned i;
-       int result = 0;
-       (void) env;
-
-       for(i = 0; i < cls->n_regs; ++i) {
-               if(!arch_register_type_is(&cls->regs[i], ignore))
-                       result++;
-       }
-
-       return result;
-}
-
 int arch_is_register_operand(const arch_env_t *env,
     const ir_node *irn, int pos)
 {
-       const arch_irn_ops_t *ops = get_irn_ops(env, irn);
+       const arch_irn_ops_t *ops = get_irn_ops(irn);
        const arch_register_req_t *req = ops->get_irn_reg_req(irn, pos);
+       (void)env; // TODO remove parameter
 
        return req != NULL;
 }
@@ -249,8 +245,9 @@ int arch_reg_is_allocatable(const arch_env_t *env, const ir_node *irn,
 const arch_register_class_t *
 arch_get_irn_reg_class(const arch_env_t *env, const ir_node *irn, int pos)
 {
-       const arch_irn_ops_t *ops = get_irn_ops(env, irn);
+       const arch_irn_ops_t *ops = get_irn_ops(irn);
        const arch_register_req_t *req = ops->get_irn_reg_req(irn, pos);
+       (void)env; // TODO remove parameter
 
        assert(req->type != arch_register_req_type_none || req->cls == NULL);
 
@@ -260,26 +257,30 @@ arch_get_irn_reg_class(const arch_env_t *env, const ir_node *irn, int pos)
 extern const arch_register_t *
 arch_get_irn_register(const arch_env_t *env, const ir_node *irn)
 {
-       const arch_irn_ops_t *ops = get_irn_ops(env, irn);
+       const arch_irn_ops_t *ops = get_irn_ops(irn);
+       (void)env; // TODO remove parameter
        return ops->get_irn_reg(irn);
 }
 
 extern void arch_set_irn_register(const arch_env_t *env,
     ir_node *irn, const arch_register_t *reg)
 {
-       const arch_irn_ops_t *ops = get_irn_ops(env, irn);
+       const arch_irn_ops_t *ops = get_irn_ops(irn);
+       (void)env; // TODO remove parameter
        ops->set_irn_reg(irn, reg);
 }
 
 extern arch_irn_class_t arch_irn_classify(const arch_env_t *env, const ir_node *irn)
 {
-       const arch_irn_ops_t *ops = get_irn_ops(env, irn);
+       const arch_irn_ops_t *ops = get_irn_ops(irn);
+       (void)env; // TODO remove parameter
        return ops->classify(irn);
 }
 
 extern arch_irn_flags_t arch_irn_get_flags(const arch_env_t *env, const ir_node *irn)
 {
-       const arch_irn_ops_t *ops = get_irn_ops(env, irn);
+       const arch_irn_ops_t *ops = get_irn_ops(irn);
+       (void)env; // TODO remove parameter
        return ops->get_flags(irn);
 }