X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_t.h;h=44a513a9eea2161aa506cfa32a77b9e196876271;hb=755e96e2816108e2bef2317b741e49aac230d5bb;hp=c53e27bdc93741be7e52443fae53555beaae5af4;hpb=071b81998b17c006621e299c51aafd7ffc19f27a;p=libfirm

diff --git a/ir/be/bechordal_t.h b/ir/be/bechordal_t.h
index c53e27bdc..44a513a9e 100644
--- a/ir/be/bechordal_t.h
+++ b/ir/be/bechordal_t.h
@@ -1,6 +1,6 @@
 
 /**
- * Internal datastructures for the chordal register allocator.
+ * Internal data structures for the chordal register allocator.
  * @author Sebastian Hack
  * @date 25.1.2005
  */
@@ -8,6 +8,9 @@
 #ifndef _BECHORDAL_T_H
 #define _BECHORDAL_T_H
 
+#include "firm_types.h"
+#include "firm_config.h"
+
 #include <stdlib.h>
 
 #include "bitset.h"
@@ -17,8 +20,7 @@
 #include "pmap.h"
 #include "set.h"
 
-#include "irnode.h"
-#include "irgraph.h"
+#include "execfreq.h"
 
 #include "be_t.h"
 #include "beifg.h"
@@ -26,6 +28,10 @@
 #include "bearch.h"
 #include "bechordal.h"
 #include "beirgmod.h"
+#include "belive.h"
+#include "beirg.h"
+
+typedef struct _be_ra_chordal_opts_t be_ra_chordal_opts_t;
 
 /** Defines an invalid register index. */
 #define NO_COLOR (-1)
@@ -50,16 +56,15 @@ typedef struct _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. */
+	struct obstack obst;                /**< An obstack for temporary storage. */
+	be_ra_chordal_opts_t *opts;         /**< A pointer to the chordal ra options. */
+	be_irg_t *birg;                     /**< Back-end IRG session. */
+	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. */
+	pmap *border_heads;                 /**< Maps blocks to border heads. */
+	be_ifg_t *ifg;                      /**< The interference graph. */
+	bitset_t *ignore_colors;            /**< A set of colors which shall be ignored in register allocation. */
+	DEBUG_ONLY(firm_dbg_module_t *dbg;) /**< Debug module for the chordal register allocator. */
 };
 
 static INLINE struct list_head *_get_block_border_head(const be_chordal_env_t *inf, ir_node *bl) {
@@ -73,17 +78,11 @@ static INLINE struct list_head *_get_block_border_head(const be_chordal_env_t *i
 #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)
-
-int nodes_interfere(const be_chordal_env_t *env, const ir_node *a, const ir_node *b);
+	arch_irn_consider_in_reg_alloc(chordal_env->birg->main_env->arch_env, chordal_env->cls, irn)
 
 void be_ra_chordal_color(be_chordal_env_t *chordal_env);
 
 enum {
-	/* spill method */
-	BE_CH_SPILL_BELADY    = 1,
-	BE_CH_SPILL_ILP       = 2,
-
 	/* Dump flags */
 	BE_CH_DUMP_NONE       = (1 << 0),
 	BE_CH_DUMP_SPILL      = (1 << 1),
@@ -93,32 +92,30 @@ enum {
 	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,
-	BE_CH_COPYMIN_ILP     = 2,
-
-	/* ifg flavor */
-	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
+	BE_CH_DUMP_SPILLSLOTS = (1 << 8),
+	BE_CH_DUMP_LOWER      = (1 << 9),
+	BE_CH_DUMP_APPEL      = (1 << 10),
+	BE_CH_DUMP_ALL        = 2 * BE_CH_DUMP_APPEL - 1,
+
+	/* lower perm options */
+	BE_CH_LOWER_PERM_SWAP   = 1,
+	BE_CH_LOWER_PERM_COPY   = 2,
+
+	/* verify options */
+	BE_CH_VRFY_OFF    = 1,
+	BE_CH_VRFY_WARN   = 2,
+	BE_CH_VRFY_ASSERT = 3,
 };
 
-typedef struct {
-	unsigned dump_flags;
-	int spill_method;
-	int copymin_method;
-	int ifg_flavor;
-	int lower_perm_method;
+struct _be_ra_chordal_opts_t {
+	int dump_flags;
+	int lower_perm_opt;
+	int vrfy_option;
 
 	char ilp_server[128];
 	char ilp_solver[128];
-} be_ra_chordal_opts_t;
+};
 
+void be_pre_spill_prepare_constr(be_chordal_env_t *cenv);
 
 #endif /* _BECHORDAL_T_H */