Nobody cares what a "normal" node is, so do not try to identify one.

[libfirm] / ir / be / becopyopt_t.h

diff --git a/ir/be/becopyopt_t.h b/ir/be/becopyopt_t.h
index 5677a67..7e5c882 100644 (file)
--- a/ir/be/becopyopt_t.h
+++ b/ir/be/becopyopt_t.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 */
@@ -60,16 +59,15 @@ struct _copy_opt_t {
 #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((co)->aenv, irn, arch_register_for_index((co)->cls, col))
+#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)
 {