X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyheur.c;h=7c669b5e3fdca20b01075eea622774ce7a6ef62d;hb=ccdf802c598f7adc5e35fff42fed029c59f48a57;hp=ab6b3d1e3ea9c6fcaaa779cbbfec2f6203a1802b;hpb=2c95d635ef7dc3a9c04b983f14496167dbec3608;p=libfirm

diff --git a/ir/be/becopyheur.c b/ir/be/becopyheur.c
index ab6b3d1e3..7c669b5e3 100644
--- a/ir/be/becopyheur.c
+++ b/ir/be/becopyheur.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -43,7 +43,6 @@
 
 #include "becopyopt_t.h"
 #include "becopystat.h"
-#include "benodesets.h"
 #include "beintlive_t.h"
 #include "beirg_t.h"
 
@@ -56,7 +55,7 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 #define SLOTS_CHANGED_NODES 32
 
 #define list_entry_queue(lh) list_entry(lh, qnode_t, queue)
-#define HASH_CONFLICT(c) (nodeset_hash(c.n1) ^ nodeset_hash(c.n2))
+#define HASH_CONFLICT(c) (hash_irn(c.n1) ^ hash_irn(c.n2))
 
 /**
  * Modeling additional conflicts between nodes. NOT live range interference
@@ -115,7 +114,7 @@ static INLINE void qnode_add_conflict(const qnode_t *qn, const ir_node *n1, cons
 	conflict_t c;
 	DBG((dbg, LEVEL_4, "\t      %+F -- %+F\n", n1, n2));
 
-	if (get_irn_node_nr(n1) < get_irn_node_nr(n2)) {
+	if (get_irn_idx(n1) < get_irn_idx(n2)) {
 		c.n1 = n1;
 		c.n2 = n2;
 	} else {
@@ -134,28 +133,28 @@ static INLINE int qnode_are_conflicting(const qnode_t *qn, const ir_node *n1, co
 	if (n1!=n2 && nodes_interfere(qn->ou->co->cenv, n1, n2))
 		return 1;
 	/* search for recoloring conflicts */
-	if (get_irn_node_nr(n1) < get_irn_node_nr(n2)) {
+	if (get_irn_idx(n1) < get_irn_idx(n2)) {
 		c.n1 = n1;
 		c.n2 = n2;
 	} else {
 		c.n1 = n2;
 		c.n2 = n1;
 	}
-	return (int) set_find(qn->conflicts, &c, sizeof(c), HASH_CONFLICT(c));
+	return set_find(qn->conflicts, &c, sizeof(c), HASH_CONFLICT(c)) != 0;
 }
 
 static int set_cmp_node_stat_t(const void *x, const void *y, size_t size) {
 	(void) size;
-	return ((node_stat_t *)x)->irn != ((node_stat_t *)y)->irn;
+	return ((const node_stat_t*)x)->irn != ((const node_stat_t*)y)->irn;
 }
 
 /**
  * Finds a node status entry of a node if existent. Otherwise return NULL
  */
-static INLINE node_stat_t *qnode_find_node(const qnode_t *qn, ir_node *irn) {
+static INLINE const node_stat_t *qnode_find_node(const qnode_t *qn, ir_node *irn) {
 	node_stat_t find;
 	find.irn = irn;
-	return set_find(qn->changed_nodes, &find, sizeof(find), nodeset_hash(irn));
+	return set_find(qn->changed_nodes, &find, sizeof(find), hash_irn(irn));
 }
 
 /**
@@ -167,14 +166,14 @@ static INLINE node_stat_t *qnode_find_or_insert_node(const qnode_t *qn, ir_node
 	find.irn = irn;
 	find.new_color = NO_COLOR;
 	find.pinned_local = 0;
-	return set_insert(qn->changed_nodes, &find, sizeof(find), nodeset_hash(irn));
+	return set_insert(qn->changed_nodes, &find, sizeof(find), hash_irn(irn));
 }
 
 /**
  * Returns the virtual color of a node if set before, else returns the real color.
  */
 static INLINE int qnode_get_new_color(const qnode_t *qn, ir_node *irn) {
-	node_stat_t *found = qnode_find_node(qn, irn);
+	const node_stat_t *found = qnode_find_node(qn, irn);
 	if (found)
 		return found->new_color;
 	else
@@ -196,7 +195,7 @@ static INLINE void qnode_set_new_color(const qnode_t *qn, ir_node *irn, int colo
  * processed node.
  */
 static INLINE int qnode_is_pinned_local(const qnode_t *qn, ir_node *irn) {
-	node_stat_t *found = qnode_find_node(qn, irn);
+	const node_stat_t *found = qnode_find_node(qn, irn);
 	if (found)
 		return found->pinned_local;
 	else
@@ -560,7 +559,8 @@ static void ou_optimize(unit_t *ou) {
 		ou_insert_qnode(ou, new_qnode(ou, idx));
 
 	/* search best */
-	while (!list_empty(&ou->queue)) {
+	for (;;) {
+		assert(!list_empty(&ou->queue));
 		/* get head of queue */
 		curr = list_entry_queue(ou->queue.next);
 		list_del(&curr->queue);