X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopystat.c;h=d2f794c1046d2d18dee3b62a9333ff483bba7419;hb=9bb328756235509a74ffb9c3fcbfac86d9c409f1;hp=d2f4a22d1b885f6fe9fc0b31a3828b5a08866a2a;hpb=7c767284b8f554996788212eb30709bb949710c4;p=libfirm

diff --git a/ir/be/becopystat.c b/ir/be/becopystat.c
index d2f4a22d1..d2f794c10 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,6 +37,7 @@
 #include "irnodeset.h"
 
 #include "bechordal_t.h"
+#include "benode_t.h"
 #include "beutil.h"
 #include "becopyopt_t.h"
 #include "becopystat.h"
@@ -167,7 +166,7 @@ static void copystat_collect_irg(ir_graph *irg)
  * @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));
@@ -305,18 +304,18 @@ static void copystat_collect_cls(be_chordal_env_t *cenv) {
 	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);
 	}
 
@@ -443,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 */
@@ -451,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);
@@ -491,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);