Remove the unused attribute const arch_env_t *arch_env from struct be_verify_schedule...

[libfirm] / ir / be / beverify.c

diff --git a/ir/be/beverify.c b/ir/be/beverify.c
index b311eea..810e4d5 100644 (file)
--- a/ir/be/beverify.c
+++ b/ir/be/beverify.c
@@ -53,7 +53,6 @@ static int my_values_interfere(const ir_node *a, const ir_node *b);
 typedef struct be_verify_register_pressure_env_t_ {
        ir_graph                    *irg;                 /**< the irg to verify */
         be_lv_t                    *lv;                  /**< Liveness information. */
-       const arch_env_t            *arch_env;            /**< an architecture environment */
        const arch_register_class_t *cls;                 /**< the register class to check for */
        int                         registers_available;  /**< number of available registers */
        int                         problem_found;        /**< flag indicating if a problem was found */
@@ -85,7 +84,7 @@ static void verify_liveness_walker(ir_node *block, void *data) {
        /* collect register pressure info, start with end of a block */
        // ir_fprintf(stderr, "liveness check %+F\n", block);
        ir_nodeset_init(&live_nodes);
-       be_liveness_end_of_block(env->lv, env->arch_env, env->cls, block,
+       be_liveness_end_of_block(env->lv, env->cls, block,
                                 &live_nodes);
 
        // print_living_values(stderr, &live_nodes);
@@ -102,7 +101,7 @@ static void verify_liveness_walker(ir_node *block, void *data) {
                        break;
 
                // print_living_values(stderr, &live_nodes);
-               be_liveness_transfer(env->arch_env, env->cls, irn, &live_nodes);
+               be_liveness_transfer(env->cls, irn, &live_nodes);
 
                pressure = ir_nodeset_size(&live_nodes);
 
@@ -127,7 +126,6 @@ int be_verify_register_pressure(const be_irg_t *birg,
 
        env.lv                  = be_liveness(birg);
        env.irg                 = irg;
-       env.arch_env            = birg->main_env->arch_env;
        env.cls                 = cls;
        env.registers_available = env.cls->n_regs - be_put_ignore_regs(birg, env.cls, NULL);
        env.problem_found       = 0;
@@ -149,7 +147,6 @@ typedef struct be_verify_schedule_env_t_ {
        int      problem_found;     /**< flags indicating if there was a problem */
        bitset_t *scheduled;        /**< bitset of scheduled nodes */
        ir_graph *irg;              /**< the irg to check */
-       const arch_env_t *arch_env; /**< the arch_env */
 } be_verify_schedule_env_t;
 
 /**
@@ -287,7 +284,8 @@ static void verify_schedule_walker(ir_node *block, void *data) {
        }
 }
 
-static int should_be_scheduled(be_verify_schedule_env_t *env, ir_node *node) {
+static int should_be_scheduled(ir_node *node)
+{
        if(is_Block(node))
                return -1;
 
@@ -311,7 +309,7 @@ static int should_be_scheduled(be_verify_schedule_env_t *env, ir_node *node) {
                break;
        }
 
-       if(arch_irn_get_flags(env->arch_env, node) & arch_irn_flags_ignore)
+       if (arch_irn_get_flags(node) & arch_irn_flags_ignore)
                return -1;
 
        return 1;
@@ -322,7 +320,7 @@ static void check_schedule(ir_node *node, void *data) {
        int should_be;
        int scheduled;
 
-       should_be = should_be_scheduled(env, node);
+       should_be = should_be_scheduled(node);
        if(should_be == -1)
                return;
 
@@ -345,7 +343,6 @@ int be_verify_schedule(const be_irg_t *birg)
        env.problem_found = 0;
        env.irg           = be_get_birg_irg(birg);
        env.scheduled     = bitset_alloca(get_irg_last_idx(env.irg));
-       env.arch_env      = birg->main_env->arch_env;
 
        irg_block_walk_graph(env.irg, verify_schedule_walker, NULL, &env);
        /* check if all nodes are scheduled */
@@ -527,13 +524,12 @@ static void collect(be_verify_spillslots_env_t *env, ir_node *node, ir_node *rel
  */
 static void collect_spills_walker(ir_node *node, void *data) {
        be_verify_spillslots_env_t *env = data;
-       const arch_env_t *arch_env = env->arch_env;
 
        /* @@@ ia32_classify returns classification of Proj_pred :-/ */
        if(is_Proj(node))
                return;
 
-       if(arch_irn_class_is(arch_env, node, reload)) {
+       if (arch_irn_class_is(node, reload)) {
                ir_node *spill = get_memory_edge(node);
                ir_entity *ent;
 
@@ -706,7 +702,7 @@ static void check_register_constraints(ir_node *node)
 
        /* verify output register */
        if (arch_get_irn_reg_class(node, -1) != NULL) {
-               reg = arch_get_irn_register(arch_env, node);
+               reg = arch_get_irn_register(node);
                if (reg == NULL) {
                        ir_fprintf(stderr, "Verify warning: Node %+F in block %+F(%s) should have a register assigned\n",
                                        node, get_nodes_block(node), get_irg_dump_name(irg));
@@ -736,7 +732,7 @@ static void check_register_constraints(ir_node *node)
                if (arch_get_irn_reg_class(node, i) == NULL)
                        continue;
 
-               reg = arch_get_irn_register(arch_env, pred);
+               reg = arch_get_irn_register(pred);
                if (reg == NULL) {
                        ir_fprintf(stderr, "Verify warning: Node %+F in block %+F(%s) should have a register assigned (%+F input constraint)\n",
                                   pred, get_nodes_block(pred), get_irg_dump_name(irg), node);
@@ -754,12 +750,12 @@ static void check_register_constraints(ir_node *node)
        if (is_Phi(node)) {
                int i, arity;
 
-               reg = arch_get_irn_register(arch_env, node);
+               reg = arch_get_irn_register(node);
 
                arity = get_irn_arity(node);
                for (i = 0; i < arity; ++i) {
                        ir_node               *pred     = get_Phi_pred(node, i);
-                       const arch_register_t *pred_reg = arch_get_irn_register(arch_env, pred);
+                       const arch_register_t *pred_reg = arch_get_irn_register(pred);
 
                        if (reg != pred_reg && !arch_register_type_is(pred_reg, joker)) {
                                ir_fprintf(stderr, "Verify warning: Input %d of %+F in block %+F(%s) uses register %s instead of %s\n",
@@ -777,7 +773,7 @@ static void value_used(ir_node *node) {
        if (arch_get_irn_reg_class(node, -1) != regclass)
                return;
 
-       reg = arch_get_irn_register(arch_env, node);
+       reg = arch_get_irn_register(node);
        if (reg->type & arch_register_type_virtual)
                return;
 
@@ -800,7 +796,7 @@ static void value_def(ir_node *node)
        if (arch_get_irn_reg_class(node, -1) != regclass)
                return;
 
-       reg = arch_get_irn_register(arch_env, node);
+       reg = arch_get_irn_register(node);
        if (reg->type & arch_register_type_virtual)
                return;