becopyopt: Replace is_Reg_Phi() by just is_Phi().

[libfirm] / ir / be / becopyopt_t.h

diff --git a/ir/be/becopyopt_t.h b/ir/be/becopyopt_t.h
index 7deb291..d7f0c77 100644 (file)
--- a/ir/be/becopyopt_t.h
+++ b/ir/be/becopyopt_t.h
@@ -1,20 +1,6 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
- *
  * This file is part of libFirm.
- *
- * This file may be distributed and/or modified under the terms of the
- * GNU General Public License version 2 as published by the Free Software
- * Foundation and appearing in the file LICENSE.GPL included in the
- * packaging of this file.
- *
- * Licensees holding valid libFirm Professional Edition licenses may use
- * this file in accordance with the libFirm Commercial License.
- * Agreement provided with the Software.
- *
- * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE.
+ * Copyright (C) 2012 University of Karlsruhe.
  */
 
 /**
@@ -42,7 +28,6 @@ struct copy_opt_t {
        be_chordal_env_t            *cenv;
        const arch_register_class_t *cls;
        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 */
@@ -54,24 +39,26 @@ 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 built")
+#define ASSERT_GS_AVAIL(co)     assert((co)->nodes && "Representation as graph not built")
 
-#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;
+}
 
-#define list_entry_units(lh) list_entry(lh, unit_t, units)
+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 is_Reg_Phi(irn)        (is_Phi(irn) && mode_is_data(get_irn_mode(irn)))
+#define list_entry_units(lh) list_entry(lh, unit_t, units)
 
 #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;
-}
-
 /******************************************************************************
    ____        _   _    _       _ _          _____ _
   / __ \      | | | |  | |     (_) |        / ____| |
@@ -87,7 +74,6 @@ static inline int is_2addr_code(const arch_register_req_t *req)
 
 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 */
        ir_node          **nodes;            /**< [0] is the root-node, others are non interfering args of it. */
        int              *costs;             /**< costs[i] are incurred, if nodes[i] has a different color */
@@ -124,9 +110,7 @@ struct neighb_t {
 
 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. */
 };
 
 
@@ -137,14 +121,10 @@ static inline affinity_node_t *get_affinity_info(const copy_opt_t *co, const ir_
        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 */