X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_t.h;h=aa72eed3425527716c3b4985161a257ee4d98a49;hb=e6ad8ee4680a88db8652483c2c6f3124f3d9a888;hp=38ccf74e0484ca3edce1cfbcb16b4503421e4b3a;hpb=1779f8a4e0ee93544e4e89bbe91f22c7be4bb568;p=libfirm

diff --git a/ir/be/bechordal_t.h b/ir/be/bechordal_t.h
index 38ccf74e0..aa72eed34 100644
--- a/ir/be/bechordal_t.h
+++ b/ir/be/bechordal_t.h
@@ -27,42 +27,41 @@
 #include "bechordal.h"
 #include "beirgmod.h"
 
+typedef struct _be_ra_chordal_opts_t be_ra_chordal_opts_t;
+
 /** Defines an invalid register index. */
 #define NO_COLOR (-1)
 
-#define DBG_CHORDAL "firm.be.ra.chordal"
-
 /**
  * A liveness interval border.
  */
 typedef struct _border_t {
-	unsigned magic;								/**< A magic number for checking. */
-	struct list_head list;				/**< list head for queuing. */
-	struct _border_t *other_end;	/**< The other end of the border. */
-	ir_node *irn;						      /**< The node. */
-	unsigned step;								/**< The number equal to the interval border. */
-	unsigned pressure;						/**< The pressure at this interval border.
-																	(The border itself is counting). */
-	unsigned is_def : 1;					/**< Does this border denote a use or a def. */
-	unsigned is_real : 1;					/**< Is the def/use real? Or is it just inserted
-												at block beginnings or ends to ensure that inside
-												a block, each value has one begin and one end. */
+	unsigned magic;                 /**< A magic number for checking. */
+	struct list_head list;          /**< list head for queuing. */
+	struct _border_t *other_end;    /**< The other end of the border. */
+	ir_node *irn;                   /**< The node. */
+	unsigned step;                  /**< The number equal to the interval border. */
+	unsigned pressure;              /**< The pressure at this interval border. (The border itself is counting). */
+	unsigned is_def : 1;            /**< Does this border denote a use or a def. */
+	unsigned is_real : 1;           /**< Is the def/use real? Or is it just inserted
+                                        at block beginnings or ends to ensure that inside
+                                        a block, each value has one begin and one end. */
 } border_t;
 
 /**
  * Environment for each of the chordal register allocator phases
  */
 struct _be_chordal_env_t {
-	struct obstack obst;       /**< An obstack for temporary storage. */
-	firm_dbg_module_t *dbg;    /**< Debug module for the chordal register allocator. */
-	const be_main_env_t *main_env;   /**< Environment with back-end data. */
-	dom_front_info_t *dom_front; /**< Dominance frontiers. */
-	ir_graph *irg;             /**< The graph under examination. */
-	const arch_register_class_t *cls;   /**< The current register class. */
-	pmap *border_heads;        /**< Maps blocks to border heads. */
-	be_ifg_t *ifg;             /**< The interference graph. */
-	void *data;                /**< Some pointer, to which different
-                                    phases can attach data to. */
+	struct obstack obst;              /**< An obstack for temporary storage. */
+	be_ra_chordal_opts_t *opts;       /**< A pointer to the chordal ra options. */
+	firm_dbg_module_t *dbg;           /**< Debug module for the chordal register allocator. */
+	const be_irg_t *birg;             /**< Back-end IRG session. */
+	dom_front_info_t *dom_front;      /**< Dominance frontiers. */
+	ir_graph *irg;                    /**< The graph under examination. */
+	const arch_register_class_t *cls; /**< The current register class. */
+	pmap *border_heads;               /**< Maps blocks to border heads. */
+	be_ifg_t *ifg;                    /**< The interference graph. */
+	void *data;                       /**< Some pointer, to which different phases can attach data to. */
 };
 
 static INLINE struct list_head *_get_block_border_head(const be_chordal_env_t *inf, ir_node *bl) {
@@ -72,9 +71,11 @@ static INLINE struct list_head *_get_block_border_head(const be_chordal_env_t *i
 #define get_block_border_head(info, bl)     _get_block_border_head(info, bl)
 
 #define foreach_border_head(head, pos)		list_for_each_entry_reverse(border_t, pos, head, list)
+#define border_next(b)                      (list_entry((b)->list.next, border_t, list))
+#define border_prev(b)                      (list_entry((b)->list.prev, border_t, list))
 
 #define chordal_has_class(chordal_env, irn) \
-	arch_irn_has_reg_class(chordal_env->main_env->arch_env, irn, -1, chordal_env->cls)
+	arch_irn_consider_in_reg_alloc(chordal_env->birg->main_env->arch_env, chordal_env->cls, irn)
 
 int nodes_interfere(const be_chordal_env_t *env, const ir_node *a, const ir_node *b);
 
@@ -88,11 +89,14 @@ enum {
 	/* Dump flags */
 	BE_CH_DUMP_NONE       = (1 << 0),
 	BE_CH_DUMP_SPILL      = (1 << 1),
-	BE_CH_DUMP_COPYMIN    = (1 << 2),
-	BE_CH_DUMP_SSADESTR	  = (1 << 3),
-	BE_CH_DUMP_TREE_INTV  = (1 << 4),
-	BE_CH_DUMP_CONSTR     = (1 << 5),
-	BE_CH_DUMP_ALL        = 2 * BE_CH_DUMP_CONSTR - 1,
+	BE_CH_DUMP_LIVE       = (1 << 2),
+	BE_CH_DUMP_COLOR      = (1 << 3),
+	BE_CH_DUMP_COPYMIN    = (1 << 4),
+	BE_CH_DUMP_SSADESTR   = (1 << 5),
+	BE_CH_DUMP_TREE_INTV  = (1 << 6),
+	BE_CH_DUMP_CONSTR     = (1 << 7),
+	BE_CH_DUMP_LOWER      = (1 << 8),
+	BE_CH_DUMP_ALL        = 2 * BE_CH_DUMP_LOWER - 1,
 
 	/* copymin method */
 	BE_CH_COPYMIN_HEUR    = 1,
@@ -107,7 +111,7 @@ enum {
 	BE_CH_LOWER_PERM_COPY = 2
 };
 
-typedef struct {
+struct _be_ra_chordal_opts_t {
 	int dump_flags;
 	int spill_method;
 	int copymin_method;
@@ -116,7 +120,7 @@ typedef struct {
 
 	char ilp_server[128];
 	char ilp_solver[128];
-} be_ra_chordal_opts_t;
+};
 
 
 #endif /* _BECHORDAL_T_H */