X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeschedrss.c;h=5ab8513c2c56c417ff1b748e931a12dec30cdabb;hb=59528405f7e6b495a3092ff206e4ca4626869ddc;hp=3659127b2c6bd05da40c974c6127aa48864171ca;hpb=429d687f06baeeb63d04750f846d39e55fb62343;p=libfirm

diff --git a/ir/be/beschedrss.c b/ir/be/beschedrss.c
index 3659127b2..5ab8513c2 100644
--- a/ir/be/beschedrss.c
+++ b/ir/be/beschedrss.c
@@ -45,6 +45,7 @@
 #include "irtools.h"
 #include "irbitset.h"
 #include "irprintf.h"
+#include "irnodeset.h"
 #include "bipartite.h"
 #include "hungarian.h"
 #include "plist.h"
@@ -55,8 +56,9 @@
 #include "beabi.h"
 #include "bemodule.h"
 #include "benode_t.h"
-#include "besched_t.h"
-#include "beirg_t.h"
+#include "besched.h"
+#include "beirg.h"
+#include "belive.h"
 
 #include "lc_opts.h"
 #include "lc_opts_enum.h"
@@ -632,7 +634,7 @@ static void collect_descendants(rss_t *rss, rss_irn_t *rirn, ir_node *irn, int *
 			ir_node *user = get_edge_src_irn(edge);
 
 			/* skip ignore nodes as they do not really contribute to register pressure */
-			if (arch_irn_is(user, ignore))
+			if (arch_irn_is_ignore(user))
 				continue;
 
 			/*
@@ -680,7 +682,7 @@ static void collect_single_consumer(rss_t *rss, rss_irn_t *rss_irn, ir_node *con
 	assert(! is_Proj(consumer) && "Cannot handle Projs");
 
 	if (! is_Phi(consumer) && ! is_Block(consumer) && get_nodes_block(consumer) == block) {
-		if (!arch_irn_is(consumer, ignore) &&
+		if (!arch_irn_is_ignore(consumer) &&
 				!plist_has_value(rss_irn->consumer_list, consumer)) {
 			plist_insert_back(rss_irn->consumer_list, consumer);
 			DBG((rss->dbg, LEVEL_2, "\t\tconsumer %+F\n", consumer));
@@ -1469,7 +1471,7 @@ static ir_nodeset_t *compute_maximal_antichain(rss_t *rss, dvg_t *dvg, int itera
 	if (pset_count(dvg->edges) == 0)
 		return NULL;
 
-	bp = hungarian_new(n, n, 1, HUNGARIAN_MATCH_NORMAL);
+	bp = hungarian_new(n, n, HUNGARIAN_MATCH_NORMAL);
 
 	/*
 		At first, we build an index map for the nodes in the DVG,
@@ -2111,7 +2113,7 @@ static void process_block(ir_node *block, void *env) {
 			if (be_is_Keep(irn))
 				continue;
 
-			if (!arch_irn_is(irn, ignore) &&
+			if (!arch_irn_is_ignore(irn) &&
 					arch_get_irn_reg_class_out(irn) == cls) {
 				plist_insert_back(rss->nodes, skip_Proj(irn));
 			}
@@ -2168,7 +2170,7 @@ void rss_schedule_preparation(be_irg_t *birg) {
 	rss.h        = heights_new(irg);
 	rss.nodes    = plist_new();
 	rss.opts     = &rss_options;
-	rss.liveness = be_liveness(birg);
+	rss.liveness = be_liveness(irg);
 	be_liveness_assure_sets(rss.liveness);
 	irg_block_walk_graph(irg, NULL, process_block, &rss);
 	heights_free(rss.h);