/*
- * 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.
*
#include "becopyopt_t.h"
#include "becopystat.h"
-#include "benodesets.h"
#include "beintlive_t.h"
#include "beirg_t.h"
#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
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 {
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 {
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));
}
/**
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));
}
/**
* 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;
}
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 !!?");