X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopystat.c;h=958ea67061dd743cd3110cd4966640e20745ebea;hb=c221526a38e632139bb36afb3e059b429e76c2d7;hp=f56e486c61908b8a7ce49549ffbd8853844a0244;hpb=2e291eab8268af551488b1f4fb4d9ca61b625e33;p=libfirm

diff --git a/ir/be/becopystat.c b/ir/be/becopystat.c
index f56e486c6..958ea6706 100644
--- a/ir/be/becopystat.c
+++ b/ir/be/becopystat.c
@@ -24,9 +24,7 @@
  * @date        19.04.2005
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <string.h>
 
@@ -39,10 +37,11 @@
 #include "irnodeset.h"
 
 #include "bechordal_t.h"
+#include "benode.h"
 #include "beutil.h"
 #include "becopyopt_t.h"
 #include "becopystat.h"
-#include "beirg_t.h"
+#include "beirg.h"
 #include "bemodule.h"
 #include "beintlive_t.h"
 
@@ -139,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 */
@@ -149,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;
 }
 
@@ -164,7 +166,7 @@ static void copystat_collect_irg(ir_graph *irg, arch_env_t *arch_env) {
  * @return 1 if the block at pos @p pos removed a critical edge
  * 		   0 else
  */
-static INLINE int was_edge_critical(const ir_node *bl, int pos) {
+static inline int was_edge_critical(const ir_node *bl, int pos) {
 	const ir_edge_t *edge;
 	const ir_node *bl_at_pos, *bl_before;
 	assert(is_Block(bl));
@@ -242,7 +244,7 @@ static void stat_phi_node(be_chordal_env_t *chordal_env, ir_node *phi)
 static void stat_copy_node(be_chordal_env_t *chordal_env, ir_node *root) {
 	curr_vals[I_CPY_CNT]++;
 	curr_vals[I_COPIES_MAX]++;
-	if (values_interfere(chordal_env->birg, root, get_Perm_src(root))) {
+	if (be_values_interfere(chordal_env->birg->lv, root, get_Perm_src(root))) {
 		curr_vals[I_COPIES_IF]++;
 		assert(0 && "A Perm pair (in/out) should never interfere!");
 	}
@@ -278,7 +280,7 @@ static void stat_phi_class(be_chordal_env_t *chordal_env, ir_node **pc) {
 	curr_vals[I_CLS_IF_MAX] += size * (size - 1) / 2;
 	for (if_free = 1, i = 0; i < size - 1; ++i)
 		for (o = i + 1; o < size; ++o)
-			if (values_interfere(chordal_env->birg, pc[i], pc[o])) {
+			if (be_values_interfere(chordal_env->birg->lv, pc[i], pc[o])) {
 				if_free = 0;
 				curr_vals[I_CLS_IF_CNT]++;
 			}
@@ -289,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(n, -1) == cenv->cls)
+		if (arch_get_irn_reg_class_out(n) == cenv->cls)
 			stat_phi_node(cenv, n);
 	}
 
 	foreach_ir_nodeset(all_copy_nodes, n, iter) {
-		if (arch_get_irn_reg_class(n, -1) == cenv->cls)
+		if (arch_get_irn_reg_class_out(n) == cenv->cls)
 			stat_copy_node(cenv, n);
 	}
 
 	foreach_pset(all_phi_classes, pc) {
 		ir_node *member = pc[0];
-		if (arch_get_irn_reg_class(member, -1) == cenv->cls)
+		if (arch_get_irn_reg_class_out(member) == cenv->cls)
 			stat_phi_class(cenv, pc);
 	}
 
@@ -369,7 +370,7 @@ void copystat_dump(ir_graph *irg) {
 	char buf[1024];
 	FILE *out;
 
-	snprintf(buf, sizeof(buf), "%s__%s", get_irp_prog_name(), get_entity_name(get_irg_entity(irg)));
+	snprintf(buf, sizeof(buf), "%s__%s", get_irp_name(), get_entity_name(get_irg_entity(irg)));
 	buf[sizeof(buf) - 1] = '\0';
 	out = be_ffopen(buf, "stat", "wt");
 
@@ -393,7 +394,7 @@ void copystat_dump_pretty(ir_graph *irg) {
 	char buf[1024];
 	FILE *out;
 
-	snprintf(buf, sizeof(buf), "%s__%s", get_irp_prog_name(), get_entity_name(get_irg_entity(irg)));
+	snprintf(buf, sizeof(buf), "%s__%s", get_irp_name(), get_entity_name(get_irg_entity(irg)));
 	buf[sizeof(buf) - 1] = '\0';
 	out = be_ffopen(buf, "pstat", "wt");
 
@@ -441,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 */
@@ -449,7 +449,7 @@ 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(irn, -1)) {
+	if (saver->chordal_env->cls == arch_get_irn_reg_class_out(irn)) {
 		if (saver->flag == 0) { /* save */
 			const arch_register_t *reg = arch_get_irn_register(irn);
 			pmap_insert(saver->saved_colors, irn, (void *) reg);
@@ -489,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);