X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_t.h;h=4c02ed398d33d4ea9a3eb864e9a6665f131e4ede;hb=0d841728a12986b13b56bc5c019ff9466f1bd3ae;hp=9c4e735f2aed9bbc55a8ee5b785f28666936abf9;hpb=4c66ebcce62ceffb68a891142dd309429e03351a;p=libfirm

diff --git a/ir/be/bechordal_t.h b/ir/be/bechordal_t.h
index 9c4e735f2..4c02ed398 100644
--- a/ir/be/bechordal_t.h
+++ b/ir/be/bechordal_t.h
@@ -30,23 +30,20 @@
 /** 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;
 
 /**
@@ -72,6 +69,8 @@ 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)
@@ -82,31 +81,38 @@ void be_ra_chordal_color(be_chordal_env_t *chordal_env);
 
 enum {
 	/* spill method */
-	BE_CH_SPILL_BELADY = 1,
-	BE_CH_SPILL_ILP = 2,
+	BE_CH_SPILL_BELADY    = 1,
+	BE_CH_SPILL_ILP       = 2,
 
 	/* 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_ALL          = 2 * BE_CH_DUMP_TREE_INTV - 1,
+	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_LOWER      = (1 << 6),
+	BE_CH_DUMP_ALL        = 2 * BE_CH_DUMP_LOWER - 1,
 
 	/* copymin method */
-	BE_CH_COPYMIN_HEUR      = 1,
-	BE_CH_COPYMIN_ILP       = 2,
+	BE_CH_COPYMIN_HEUR    = 1,
+	BE_CH_COPYMIN_ILP     = 2,
 
 	/* ifg flavor */
-	BE_CH_IFG_STD           = 1,
-	BE_CH_IFG_FAST          = 2
+	BE_CH_IFG_STD         = 1,
+	BE_CH_IFG_FAST        = 2,
+
+	/* lower perm method */
+	BE_CH_LOWER_PERM_SWAP = 1,
+	BE_CH_LOWER_PERM_COPY = 2
 };
 
 typedef struct {
-	int dump_flags;
+	unsigned dump_flags;
 	int spill_method;
 	int copymin_method;
 	int ifg_flavor;
+	int lower_perm_method;
 
 	char ilp_server[128];
 	char ilp_solver[128];