X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyopt_t.h;h=89d574879352025ab422788a51f0062bd522e1b8;hb=22b354ac921664032c93e5f0176fa668c95dfc60;hp=d5fed9ff00e16fc08d4c1afaca7c999ce87808bb;hpb=2e291eab8268af551488b1f4fb4d9ca61b625e33;p=libfirm

diff --git a/ir/be/becopyopt_t.h b/ir/be/becopyopt_t.h
index d5fed9ff0..89d574879 100644
--- a/ir/be/becopyopt_t.h
+++ b/ir/be/becopyopt_t.h
@@ -32,7 +32,7 @@
 #include "set.h"
 #include "irnode_t.h"
 
-#include "bearch_t.h"
+#include "bearch.h"
 #include "bechordal_t.h"
 #include "becopyopt.h"
 
@@ -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,19 +58,17 @@ 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(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 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 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;
 }
@@ -134,7 +131,7 @@ struct _affinity_node_t {
 };
 
 
-static INLINE affinity_node_t *get_affinity_info(const copy_opt_t *co, const 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);