X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyheur.c;h=dd3574df853b80e4706921d96589dd09e84ea076;hb=afbbc0b1ccd684c4c24bfd43d0f994123245f39f;hp=23ddfc7c9dea48791e84fb2b734a6f3bcef28092;hpb=e88d01f68808c997c6f265fbae3ea636c375ab2b;p=libfirm

diff --git a/ir/be/becopyheur.c b/ir/be/becopyheur.c
index 23ddfc7c9..dd3574df8 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,7 +133,7 @@ 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 {
@@ -155,7 +154,7 @@ static int set_cmp_node_stat_t(const void *x, const void *y, size_t size) {
 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,7 +166,7 @@ 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));
 }
 
 /**
@@ -481,11 +480,11 @@ no_stable_set:
  * Creates a new qnode
  */
 static INLINE qnode_t *new_qnode(const unit_t *ou, int color) {
-	qnode_t *qn = xmalloc(sizeof(*qn));
-	qn->ou = ou;
-	qn->color = color;
-	qn->mis = xmalloc(ou->node_count * sizeof(*qn->mis));
-	qn->conflicts = new_set(set_cmp_conflict_t, SLOTS_CONFLICTS);
+	qnode_t *qn = XMALLOC(qnode_t);
+	qn->ou            = ou;
+	qn->color         = color;
+	qn->mis           = XMALLOCN(ir_node*, ou->node_count);
+	qn->conflicts     = new_set(set_cmp_conflict_t, SLOTS_CONFLICTS);
 	qn->changed_nodes = new_set(set_cmp_node_stat_t, SLOTS_CHANGED_NODES);
 	return qn;
 }
@@ -550,7 +549,7 @@ static void ou_optimize(unit_t *ou) {
 
 	arch_get_allocatable_regs(aenv, ou->nodes[0], -1, pos_regs);
 
-	/* exclude ingore colors */
+	/* exclude ignore colors */
 	bitset_andnot(pos_regs, ou->co->cenv->ignore_colors);
 
 	assert(bitset_popcnt(pos_regs) != 0 && "No register is allowed for this node !!?");