X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyheur.c;h=7f24bccfab3ada13d4df0cb28b0bda0ba2a0141f;hb=b9d45e08e23bcf058fa8f2d9e18dd78e8cccd044;hp=381457e33fc95125c11c6496900a506b9671c53f;hpb=fa194e1164598e282e57273135e8c183c3e5dc21;p=libfirm diff --git a/ir/be/becopyheur.c b/ir/be/becopyheur.c index 381457e33..7f24bccfa 100644 --- a/ir/be/becopyheur.c +++ b/ir/be/becopyheur.c @@ -27,6 +27,7 @@ #include "xmalloc.h" #include "becopyopt_t.h" #include "becopystat.h" +#include "benodesets.h" #include "bitset.h" DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) @@ -38,7 +39,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) (HASH_PTR(c.n1) ^ HASH_PTR(c.n2)) +#define HASH_CONFLICT(c) (nodeset_hash(c.n1) ^ nodeset_hash(c.n2)) /** * Modeling additional conflicts between nodes. NOT live range interference @@ -126,7 +127,7 @@ static int set_cmp_node_stat_t(const void *x, const void *y, size_t size) { static INLINE 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), HASH_PTR(irn)); + return set_find(qn->changed_nodes, &find, sizeof(find), nodeset_hash(irn)); } /** @@ -138,7 +139,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), HASH_PTR(irn)); + return set_insert(qn->changed_nodes, &find, sizeof(find), nodeset_hash(irn)); } /** @@ -589,6 +590,5 @@ int co_solve_heuristic(copy_opt_t *co) { ou_optimize(curr); del_pset(pinned_global); - return 0; }