Complement r22830.

[libfirm] / ir / be / becopystat.c

diff --git a/ir/be/becopystat.c b/ir/be/becopystat.c
index 017db7f..37f4e19 100644 (file)
--- a/ir/be/becopystat.c
+++ b/ir/be/becopystat.c
@@ -24,14 +24,11 @@
  * @date        19.04.2005
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <string.h>
 
 #include "timing.h"
-#include "xmalloc.h"
 #include "irgraph.h"
 #include "irgwalk.h"
 #include "irprog.h"
@@ -40,6 +37,7 @@
 #include "irnodeset.h"
 
 #include "bechordal_t.h"
+#include "benode_t.h"
 #include "beutil.h"
 #include "becopyopt_t.h"
 #include "becopystat.h"
@@ -140,8 +138,10 @@ void copystat_reset(void) {
 /**
  * Collect general data
  */
-static void irg_stat_walker(ir_node *node, void *env) {
-       arch_env_t *arch_env = env;
+static void irg_stat_walker(ir_node *node, void *env)
+{
+       (void)env;
+
        curr_vals[I_ALL_NODES]++; /* count all nodes */
 
        if (is_Block(node)) /* count all blocks */
@@ -150,14 +150,15 @@ static void irg_stat_walker(ir_node *node, void *env) {
        if (is_Reg_Phi(node)) /* collect phis */
                ir_nodeset_insert(all_phi_nodes, node);
 
-       if (is_Perm_Proj(arch_env, node))
+       if (is_Perm_Proj(node))
                ir_nodeset_insert(all_copy_nodes, node);
 
        /* TODO: Add 2-Addr-Code nodes */
 }
 
-static void copystat_collect_irg(ir_graph *irg, arch_env_t *arch_env) {
-       irg_walk_graph(irg, irg_stat_walker, NULL, arch_env);
+static void copystat_collect_irg(ir_graph *irg)
+{
+       irg_walk_graph(irg, irg_stat_walker, NULL, NULL);
        last_irg = irg;
 }
 
@@ -290,32 +291,31 @@ static void stat_phi_class(be_chordal_env_t *chordal_env, ir_node **pc) {
 
 static void copystat_collect_cls(be_chordal_env_t *cenv) {
        ir_graph              *irg  = cenv->irg;
-       arch_env_t            *aenv = &cenv->birg->main_env->arch_env;
        ir_node               *n, **pc;
        phi_classes_t         *pc_obj;
        pset                  *all_phi_classes;
        ir_nodeset_iterator_t iter;
 
        copystat_reset();
-       copystat_collect_irg(irg, aenv);
+       copystat_collect_irg(irg);
 
        /* compute the Phi classes of the collected Phis */
        pc_obj          = phi_class_new_from_set(cenv->irg, all_phi_nodes, 0);
        all_phi_classes = get_all_phi_classes(pc_obj);
 
        foreach_ir_nodeset(all_phi_nodes, n, iter) {
-               if (arch_get_irn_reg_class(aenv, n, -1) == cenv->cls)
+               if (arch_get_irn_reg_class(n, -1) == cenv->cls)
                        stat_phi_node(cenv, n);
        }
 
        foreach_ir_nodeset(all_copy_nodes, n, iter) {
-               if (arch_get_irn_reg_class(aenv, n, -1) == cenv->cls)
+               if (arch_get_irn_reg_class(n, -1) == cenv->cls)
                        stat_copy_node(cenv, n);
        }
 
        foreach_pset(all_phi_classes, pc) {
                ir_node *member = pc[0];
-               if (arch_get_irn_reg_class(aenv, member, -1) == cenv->cls)
+               if (arch_get_irn_reg_class(member, -1) == cenv->cls)
                        stat_phi_class(cenv, pc);
        }
 
@@ -442,7 +442,6 @@ void copystat_dump_pretty(ir_graph *irg) {
  * Used to get dependable and comparable benchmark results.
  */
 typedef struct color_saver {
-       arch_env_t *arch_env;
        be_chordal_env_t *chordal_env;
        pmap *saved_colors;
        int flag; /* 0 save, 1 load */
@@ -450,13 +449,13 @@ typedef struct color_saver {
 
 static void save_load(ir_node *irn, void *env) {
        color_save_t *saver = env;
-       if (saver->chordal_env->cls == arch_get_irn_reg_class(saver->arch_env, irn, -1)) {
+       if (saver->chordal_env->cls == arch_get_irn_reg_class(irn, -1)) {
                if (saver->flag == 0) { /* save */
-                       const arch_register_t *reg = arch_get_irn_register(saver->arch_env, irn);
+                       const arch_register_t *reg = arch_get_irn_register(irn);
                        pmap_insert(saver->saved_colors, irn, (void *) reg);
                } else { /*load */
                        arch_register_t *reg = pmap_get(saver->saved_colors, irn);
-                       arch_set_irn_register(saver->arch_env, irn, reg);
+                       arch_set_irn_register(irn, reg);
                }
        }
 }
@@ -490,7 +489,6 @@ void co_compare_solvers(be_chordal_env_t *chordal_env) {
        DBG((dbg, LEVEL_1, "----> CO: %s\n", co->name));
 
        /* save colors */
-       saver.arch_env     = &chordal_env->birg->main_env->arch_env;
        saver.chordal_env  = chordal_env;
        saver.saved_colors = pmap_create();
        save_colors(&saver);