X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeifg.c;h=f7f173c4e20d8d4c6f5db0701ae1f264a05e6b38;hb=e32731e8c4dbbfd7b7f21f0b3baa1a2c0fa8b37e;hp=0dcd3dde06a3fc1bd1978c06a57bc2b776a28408;hpb=fcb579b8959da1d7563b1a7b9f008a423ffdf75a;p=libfirm

diff --git a/ir/be/beifg.c b/ir/be/beifg.c
index 0dcd3dde0..f7f173c4e 100644
--- a/ir/be/beifg.c
+++ b/ir/be/beifg.c
@@ -24,9 +24,7 @@
  * @date        18.11.2005
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdlib.h>
 
@@ -59,7 +57,6 @@ typedef struct _coloring_t coloring_t;
 
 struct _coloring_t {
 	ir_phase         ph;
-	const arch_env_t *arch_env;
 	ir_graph         *irg;
 };
 
@@ -86,10 +83,9 @@ static void *regs_irn_data_init(ir_phase *ph, const ir_node *irn, void *data)
 	return (void*)arch_get_irn_register(irn);
 }
 
-coloring_t *coloring_init(coloring_t *c, ir_graph *irg, const arch_env_t *aenv)
+static coloring_t *coloring_init(coloring_t *c, ir_graph *irg)
 {
 	phase_init(&c->ph, "regs_map", irg, PHASE_DEFAULT_GROWTH, regs_irn_data_init, NULL);
-	c->arch_env = aenv;
 	c->irg = irg;
 	return c;
 }
@@ -108,12 +104,12 @@ static void restore_irn_color(ir_node *irn, void *c)
 		arch_set_irn_register(irn, reg);
 }
 
-void coloring_save(coloring_t *c)
+static void coloring_save(coloring_t *c)
 {
 	irg_walk_graph(c->irg, NULL, get_irn_color, c);
 }
 
-void coloring_restore(coloring_t *c)
+static void coloring_restore(coloring_t *c)
 {
 	irg_walk_graph(c->irg, NULL, restore_irn_color, c);
 }
@@ -400,7 +396,7 @@ void be_ifg_check_performance(be_chordal_env_t *chordal_env)
 
 	if (get_irg_estimated_node_cnt(chordal_env->irg) >= BE_CH_PERFORMANCETEST_MIN_NODES)
 	{
-		coloring_init(&coloring, chordal_env->irg, chordal_env->birg->main_env->arch_env);
+		coloring_init(&coloring, chordal_env->irg);
 		coloring_save(&coloring);
 
 		ir_timer_reset(timer);
@@ -646,10 +642,14 @@ static void int_comp_rec(be_ifg_t *ifg, ir_node *n, bitset_t *seen)
 	ir_node *m;
 
 	be_ifg_foreach_neighbour(ifg, neigh_it, n, m) {
-		if (!bitset_contains_irn(seen, m) && !arch_irn_is(m, ignore)) {
-			bitset_add_irn(seen, m);
-			int_comp_rec(ifg, m, seen);
-		}
+		if (bitset_contains_irn(seen, m))
+			continue;
+
+		if (arch_get_register_req_out(m)->type & arch_register_req_type_ignore)
+			continue;
+
+		bitset_add_irn(seen, m);
+		int_comp_rec(ifg, m, seen);
 	}
 
 }
@@ -663,11 +663,15 @@ static int int_component_stat(be_irg_t *birg, be_ifg_t *ifg)
 	ir_node *n;
 
 	be_ifg_foreach_node(ifg, nodes_it, n) {
-		if (!bitset_contains_irn(seen, n) && !arch_irn_is(n, ignore)) {
-			++n_comp;
-			bitset_add_irn(seen, n);
-			int_comp_rec(ifg, n, seen);
-		}
+		if (bitset_contains_irn(seen, n))
+			continue;
+
+		if (arch_get_register_req_out(n)->type & arch_register_req_type_ignore)
+			continue;
+
+		++n_comp;
+		bitset_add_irn(seen, n);
+		int_comp_rec(ifg, n, seen);
 	}
 
 	free(seen);