X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyopt_t.h;h=d631b92971f444691609f05c5b08ede0cdb7d8a6;hb=5cb14f12bacb0c7d1c646112b4660d57e14236a2;hp=3a6a7236b52350c710ee124af0079a2463aec360;hpb=d6768d8d4427959eb045aafb1d15bd189beaa5dd;p=libfirm

diff --git a/ir/be/becopyopt_t.h b/ir/be/becopyopt_t.h
index 3a6a7236b..d631b9297 100644
--- a/ir/be/becopyopt_t.h
+++ b/ir/be/becopyopt_t.h
@@ -1,5 +1,5 @@
 /*
- * 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.
  *
@@ -30,11 +30,11 @@
 #include "obst.h"
 #include "list.h"
 #include "set.h"
+#include "irnode_t.h"
 
 #include "bearch_t.h"
 #include "bechordal_t.h"
 #include "becopyopt.h"
-#include "benodesets.h"
 
 /**
  * Data representing the problem of copy minimization.
@@ -73,7 +73,7 @@ struct _copy_opt_t {
 
 static INLINE int is_2addr_code(const arch_register_req_t *req)
 {
-	return req->type == arch_register_req_type_should_be_same;
+	return (req->type & arch_register_req_type_should_be_same) != 0;
 }
 
 /******************************************************************************
@@ -122,25 +122,25 @@ typedef struct _affinity_node_t affinity_node_t;
 
 struct _neighb_t {
 	neighb_t *next;   /** the next neighbour entry*/
-	ir_node  *irn;    /** the neighbour itself */
+	const ir_node  *irn;    /** the neighbour itself */
 	int      costs;   /** the costs of the edge (affinity_node_t->irn, neighb_t->irn) */
 };
 
 struct _affinity_node_t {
-	ir_node  *irn;          /** a node with affinity edges */
+	const ir_node  *irn;          /** a node with affinity edges */
 	int      degree;        /** number of affinity edges in the linked list below */
 	neighb_t *neighbours;   /** a linked list of all affinity neighbours */
 	void     *data;         /** stuff that is attachable. */
 };
 
 
-static INLINE affinity_node_t *get_affinity_info(const copy_opt_t *co, ir_node *irn) {
+static INLINE affinity_node_t *get_affinity_info(const copy_opt_t *co, const ir_node *irn) {
 	affinity_node_t find;
 
 	ASSERT_GS_AVAIL(co);
 
 	find.irn = irn;
-	return set_find(co->nodes, &find, sizeof(find), nodeset_hash(irn));
+	return set_find(co->nodes, &find, sizeof(find), hash_irn(irn));
 }
 
 #define co_gs_nodes_begin(co)			set_first((co)->nodes)