register options for cmdline

[libfirm] / ir / be / becopyheur.c

diff --git a/ir/be/becopyheur.c b/ir/be/becopyheur.c
index 3631a40..2bda705 100644 (file)
--- a/ir/be/becopyheur.c
+++ b/ir/be/becopyheur.c
@@ -28,17 +28,15 @@
 #include "becopyopt_t.h"
 #include "becopystat.h"
 #include "bitset.h"
-#include "bearch.h"
 
-static firm_dbg_module_t *dbg = NULL;
+DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
 #define SEARCH_FREE_COLORS
 
-#define SLOTS_PINNED_GLOBAL 256
+#define SLOTS_PINNED_GLOBAL 64
 #define SLOTS_CONFLICTS 8
 #define SLOTS_CHANGED_NODES 32
 
-#define MIN(a,b) ((a<b)?(a):(b))
 #define list_entry_queue(lh) list_entry(lh, qnode_t, queue)
 #define HASH_CONFLICT(c) (HASH_PTR(c.n1) ^ HASH_PTR(c.n2))
 
@@ -457,7 +455,7 @@ 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 = malloc(ou->node_count * sizeof(*qn->mis));
+       qn->mis = xmalloc(ou->node_count * sizeof(*qn->mis));
        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;
@@ -527,6 +525,8 @@ static void ou_optimize(unit_t *ou) {
        arch_put_non_ignore_regs(aenv, cls, ign_regs);
        bitset_and(pos_regs, ign_regs);
 
+       assert(bitset_popcnt(pos_regs) != 0 && "No register is allowed for this node !!?");
+
        /* create new qnode */
        bitset_foreach(pos_regs, i)
                ou_insert_qnode(ou, new_qnode(ou, i));
@@ -580,7 +580,9 @@ static void ou_optimize(unit_t *ou) {
 
 int co_solve_heuristic(copy_opt_t *co) {
        unit_t *curr;
-       dbg = firm_dbg_register("ir.be.copyoptheur");
+       FIRM_DBG_REGISTER(dbg, "ir.be.copyoptheur");
+
+       ASSERT_OU_AVAIL(co);
 
        pinned_global = pset_new_ptr(SLOTS_PINNED_GLOBAL);
        list_for_each_entry(unit_t, curr, &co->units, units)