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

diff --git a/ir/be/becopyopt_t.h b/ir/be/becopyopt_t.h
index a4481001a..4bf185322 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,25 +30,24 @@
 #include "obst.h"
 #include "list.h"
 #include "set.h"
+#include "irnode_t.h"
 
-#include "bearch_t.h"
+#include "bearch.h"
 #include "bechordal_t.h"
 #include "becopyopt.h"
-#include "benodesets.h"
 
 /**
  * Data representing the problem of copy minimization.
  */
-struct _copy_opt_t {
+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 */
 
 	/** Representation as optimization units */
-	struct list_head units;	   /**< all units to optimize in specific order */
+	struct list_head units;  /**< all units to optimize in specific order */
 
 	/** Representation in graph structure. Only build on demand */
 	struct obstack obst;
@@ -56,22 +55,20 @@ 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 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 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 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)
+static inline int is_2addr_code(const arch_register_req_t *req)
 {
 	return (req->type & arch_register_req_type_should_be_same) != 0;
 }
@@ -89,7 +86,7 @@ static INLINE int is_2addr_code(const arch_register_req_t *req)
 
 #define MIS_HEUR_TRIGGER 8
 
-typedef struct _unit_t {
+typedef struct unit_t {
 	struct list_head units;              /**< chain for all units */
 	copy_opt_t       *co;                /**< the copy opt this unit belongs to */
 	int              node_count;         /**< size of the nodes array */
@@ -101,7 +98,7 @@ typedef struct _unit_t {
 	int              sort_key;           /**< maximum costs. controls the order of ou's in the struct list_head units. */
 
 	/* for heuristic */
-	struct list_head queue;		         /**< list of qn's sorted by weight of qn-mis */
+	struct list_head queue;              /**< list of qn's sorted by weight of qn-mis */
 } unit_t;
 
 
@@ -117,38 +114,38 @@ typedef struct _unit_t {
                   |_|                                      |___/
  ******************************************************************************/
 
-typedef struct _neighb_t neighb_t;
-typedef struct _affinity_node_t affinity_node_t;
+typedef struct neighb_t neighb_t;
+typedef struct affinity_node_t affinity_node_t;
 
-struct _neighb_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 */
+struct affinity_node_t {
+	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 (affinity_node_t*)set_find(co->nodes, &find, sizeof(find), hash_irn(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_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_neighb(aff_node, neighb)	for (neighb = aff_node->neighbours; neighb; neighb = neighb->next)
+#define co_gs_foreach_aff_node(co, aff_node)     for (aff_node = (affinity_node_t*)co_gs_nodes_begin(co); aff_node != NULL; aff_node = (affinity_node_t*)co_gs_nodes_next(co))
+#define co_gs_foreach_neighb(aff_node, neighb)   for (neighb = (neighb_t*)aff_node->neighbours; neighb != NULL; neighb = (neighb_t*)neighb->next)
 
 
 #endif /* FIRM_BE_BECOPYOPT_T_H */