X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyopt_t.h;h=31068c81c6bc3f00d2e7ad30540d22882b20f336;hb=5ce100386043a57a864379c8b6d8e6bb95a98596;hp=c5d0c1f22cdaba2a7be9fd14e388bed874a3ac08;hpb=f8cc15664f571aa7ef89d6f6bc8d5bd2b8ca7d53;p=libfirm

diff --git a/ir/be/becopyopt_t.h b/ir/be/becopyopt_t.h
index c5d0c1f22..31068c81c 100644
--- a/ir/be/becopyopt_t.h
+++ b/ir/be/becopyopt_t.h
@@ -57,8 +57,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))
+static inline unsigned get_irn_col(const ir_node *node)
+{
+	return arch_get_irn_register(node)->index;
+}
+
+static inline void set_irn_col(const arch_register_class_t *cls, ir_node *node,
+                               unsigned color)
+{
+	const arch_register_t *reg = arch_register_for_index(cls, color);
+	arch_set_irn_register(node, reg);
+}
 
 #define list_entry_units(lh) list_entry(lh, unit_t, units)
 
@@ -67,11 +76,6 @@ struct copy_opt_t {
 #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)
-{
-	return (req->type & arch_register_req_type_should_be_same) != 0;
-}
-
 /******************************************************************************
    ____        _   _    _       _ _          _____ _
   / __ \      | | | |  | |     (_) |        / ____| |
@@ -130,21 +134,17 @@ 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);
 
 	find.irn = irn;
-	return (affinity_node_t*)set_find(co->nodes, &find, sizeof(find), hash_irn(irn));
+	return set_find(affinity_node_t, 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_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)
-
+#define co_gs_foreach_aff_node(co, aff_node)     foreach_set((co)->nodes, affinity_node_t, (aff_node))
+#define co_gs_foreach_neighb(aff_node, neighb)   for (neighb_t *neighb = aff_node->neighbours; neighb; neighb = neighb->next)
 
 #endif /* FIRM_BE_BECOPYOPT_T_H */