Start block isn't a special case anymore (and now get the old node nr).

[libfirm] / ir / be / becopyopt_t.h

diff --git a/ir/be/becopyopt_t.h b/ir/be/becopyopt_t.h
index 3ada85a..89d5748 100644 (file)
--- 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"
 
@@ -58,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(irn)      (arch_irn_classify(irn) == arch_irn_class_perm)
-#define is_Perm_Proj(irn) (is_Proj(irn) && is_Perm(get_Proj_pred(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;
 }
@@ -133,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);