X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyopt_t.h;h=5c12ab8ef2ab152688c26aef3d492295a79fdefb;hb=80a6158fdd766f42ee6c508a773bc114ff1b61f3;hp=2be79b0281a43291373ba1e005b76449e13226bd;hpb=87d3e7eba011a02e25e216fc299dd41f82d6e30d;p=libfirm

diff --git a/ir/be/becopyopt_t.h b/ir/be/becopyopt_t.h
index 2be79b028..5c12ab8ef 100644
--- 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.
@@ -36,13 +37,13 @@ struct _copy_opt_t {
 };
 
 /* Helpers */
+#define ASSERT_OU_AVAIL(co)		assert((co)->units.next && "Representation as optimization-units not build")
+#define ASSERT_GS_AVAIL(co)		assert((co)->nodes && "Representation as graph not build")
+
 #define get_irn_col(co, irn)		arch_register_get_index(arch_get_irn_register((co)->aenv, irn))
 #define set_irn_col(co, irn, col)	arch_set_irn_register((co)->aenv, irn, arch_register_for_index((co)->cls, col))
 #define is_curr_reg_class(co, irn)	(arch_get_irn_reg_class((co)->aenv, irn, -1) == (co)->cls)
 
-#define MIN(a,b) ((a<b)?(a):(b))
-#define MAX(a,b) ((a<b)?(b):(a))
-
 #define list_entry_units(lh) list_entry(lh, unit_t, units)
 
 #define is_Reg_Phi(irn)						(is_Phi(irn) && mode_is_data(get_irn_mode(irn)))
@@ -54,6 +55,7 @@ struct _copy_opt_t {
 #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)
 
 
+
 /******************************************************************************
    ____        _   _    _       _ _          _____ _
   / __ \      | | | |  | |     (_) |        / ____| |
@@ -96,34 +98,37 @@ typedef struct _unit_t {
  ******************************************************************************/
 
 typedef struct _neighb_t neighb_t;
-typedef struct _affinity_t affinity_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 */
-	int costs;				/** the costs of the edge (node_t->irn, neighb_t->irn) */
+	int costs;				/** the costs of the edge (affinity_node_t->irn, neighb_t->irn) */
 };
 
-struct _affinity_t {
+struct _affinity_node_t {
 	ir_node *irn;			/** a node with affinity edges */
-	int count;				/** number of affinity edges in the linked list below */
+	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_t *get_affinity_info(const copy_opt_t *co, ir_node *irn) {
-	affinity_t find;
+static INLINE affinity_node_t *get_affinity_info(const copy_opt_t *co, ir_node *irn) {
+	affinity_node_t find;
+
+	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)
 #define co_gs_nodes_next(co)			set_next((co)->nodes)
 #define co_gs_nodes_break(co)			set_break((co)->nodes)
-#define co_gs_foreach_aff_node(co, aff_node)	for (aff_node = co_gs_nodes_begin(co); aff_node; aff_node = co_gs_nodes_next(co))
 
+#define co_gs_foreach_aff_node(co, aff_node)	for (aff_node = co_gs_nodes_begin(co); aff_node; aff_node = co_gs_nodes_next(co))
 #define co_gs_foreach_neighb(aff_node, neighb)	for (neighb = aff_node->neighbours; neighb; neighb = neighb->next)
 
+
 #endif