X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyopt_t.h;h=7e5c882d2ea08ea46aca72a8b86af3ce551b68eb;hb=4031d21d0d877acb0582df44dc16851595c313f5;hp=a4481001ac15689eb6d117ebb7e2691f49a6cec5;hpb=0f04127c7b44c3bc243dcea08454e49a29c2c498;p=libfirm

diff --git a/ir/be/becopyopt_t.h b/ir/be/becopyopt_t.h
index a4481001a..7e5c882d2 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.
@@ -42,7 +42,6 @@
 struct _copy_opt_t {
 	be_chordal_env_t            *cenv;
 	const arch_register_class_t *cls;
-	const arch_env_t            *aenv;
 	ir_graph                    *irg;
 	char                        *name;       /**< ProgName__IrgName__RegClassName */
 	cost_fct_t                  get_costs;   /**< function ptr used to get costs for copies */
@@ -59,17 +58,16 @@ struct _copy_opt_t {
 #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 get_irn_col(irn)           arch_register_get_index(arch_get_irn_register(irn))
+#define set_irn_col(co, irn, col)  arch_set_irn_register(irn, arch_register_for_index((co)->cls, col))
+#define is_curr_reg_class(co, irn) (arch_get_irn_reg_class(irn, -1) == (co)->cls)
 
 #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)))
 
-#define get_Perm_src(irn)                   (get_irn_n(get_Proj_pred(irn), get_Proj_proj(irn)))
-#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 get_Perm_src(irn) (get_irn_n(get_Proj_pred(irn), get_Proj_proj(irn)))
+#define is_Perm_Proj(irn) (is_Proj(irn) && be_is_Perm(get_Proj_pred(irn)))
 
 static INLINE int is_2addr_code(const arch_register_req_t *req)
 {
@@ -122,25 +120,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)