Fixed Makefiles

[libfirm] / ir / be / becopyopt_t.h

diff --git a/ir/be/becopyopt_t.h b/ir/be/becopyopt_t.h
index be1a598..48c795f 100644 (file)
--- a/ir/be/becopyopt_t.h
+++ b/ir/be/becopyopt_t.h
@@ -15,6 +15,7 @@
 #include "bearch.h"
 #include "bechordal_t.h"
 #include "becopyopt.h"
+#include "benodesets.h"
 
 /**
  * Data representing the problem of copy minimization.
@@ -51,9 +52,10 @@ struct _copy_opt_t {
 #define is_Perm(arch_env, irn)                         (arch_irn_classify(arch_env, irn) == arch_irn_class_perm)
 #define is_Perm_Proj(arch_env, irn)                    (is_Proj(irn) && is_Perm(arch_env, get_Proj_pred(irn)))
 
-#define is_2addr_code(arch_env, irn, req)      (arch_get_register_req(arch_env, req, irn, -1)->type == arch_register_req_type_should_be_same)
-
-
+static INLINE int is_2addr_code(const arch_register_req_t *req)
+{
+       return req->type == arch_register_req_type_should_be_same;
+}
 
 /******************************************************************************
    ____        _   _    _       _ _          _____ _
@@ -99,7 +101,6 @@ typedef struct _unit_t {
 typedef struct _neighb_t neighb_t;
 typedef struct _affinity_node_t affinity_node_t;
 
-
 struct _neighb_t {
        neighb_t *next;                 /** the next neighbour entry*/
        ir_node *irn;                   /** the neighbour itself */
@@ -120,7 +121,7 @@ static INLINE affinity_node_t *get_affinity_info(const copy_opt_t *co, ir_node *
        ASSERT_GS_AVAIL(co);
 
        find.irn = irn;
-       return set_find(co->nodes, &find, sizeof(find), HASH_PTR(irn));
+       return set_find(co->nodes, &find, sizeof(find), nodeset_hash(irn));
 }
 
 #define co_gs_nodes_begin(co)                  set_first((co)->nodes)