remove #ifdef HAVE_CONFIG_Hs

[libfirm] / ir / be / becopyheur.c

diff --git a/ir/be/becopyheur.c b/ir/be/becopyheur.c
index cef42f0..55dd2a1 100644 (file)
--- a/ir/be/becopyheur.c
+++ b/ir/be/becopyheur.c
@@ -32,9 +32,7 @@
  * and the qnode is reinserted in the queue. The first qnode colored without
  * conflicts is the best one.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "debug.h"
 #include "bitset.h"
@@ -177,7 +175,7 @@ static INLINE int qnode_get_new_color(const qnode_t *qn, ir_node *irn) {
        if (found)
                return found->new_color;
        else
-               return get_irn_col(qn->ou->co, irn);
+               return get_irn_col(irn);
 }
 
 /**
@@ -210,7 +208,7 @@ static INLINE void qnode_pin_local(const qnode_t *qn, ir_node *irn) {
        node_stat_t *found = qnode_find_or_insert_node(qn, irn);
        found->pinned_local = 1;
        if (found->new_color == NO_COLOR)
-               found->new_color = get_irn_col(qn->ou->co, irn);
+               found->new_color = get_irn_col(irn);
 }
 
 
@@ -301,7 +299,7 @@ static ir_node *qnode_color_irn(const qnode_t *qn, ir_node *irn, int col, const
 #endif /* SEARCH_FREE_COLORS */
 
        /* If target color is not allocatable changing color is impossible */
-       if (!arch_reg_is_allocatable(co->aenv, irn, -1, arch_register_for_index(cls, col))) {
+       if (!arch_reg_is_allocatable(irn, -1, arch_register_for_index(cls, col))) {
                DBG((dbg, LEVEL_3, "\t      %+F impossible\n", irn));
                return CHANGE_IMPOSSIBLE;
        }
@@ -534,7 +532,6 @@ static INLINE void ou_insert_qnode(unit_t *ou, qnode_t *qn) {
 static void ou_optimize(unit_t *ou) {
        int i;
        qnode_t *curr = NULL, *tmp;
-       const arch_env_t *aenv = ou->co->aenv;
        const arch_register_class_t *cls = ou->co->cls;
        bitset_pos_t idx;
        bitset_t *pos_regs = bitset_alloca(cls->n_regs);
@@ -546,7 +543,7 @@ static void ou_optimize(unit_t *ou) {
        /* init queue */
        INIT_LIST_HEAD(&ou->queue);
 
-       arch_get_allocatable_regs(aenv, ou->nodes[0], -1, pos_regs);
+       arch_get_allocatable_regs(ou->nodes[0], -1, pos_regs);
 
        /* exclude ignore colors */
        bitset_andnot(pos_regs, ou->co->cenv->ignore_colors);