X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_t.h;h=56261212e17c2fc3d2036e0ffb79044b90b19653;hb=eb798733d50fbfb32b12ae9cb2f989d8b86f0d12;hp=85ff89aa81f11e016735befa698b079621e9447e;hpb=45cbbdb51c0484014fe4ebfbface6c83c3354b28;p=libfirm

diff --git a/ir/be/bechordal_t.h b/ir/be/bechordal_t.h
index 85ff89aa8..56261212e 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
  */
@@ -20,12 +20,16 @@
 #include "pmap.h"
 #include "set.h"
 
+#include "execfreq.h"
+
 #include "be_t.h"
 #include "beifg.h"
 #include "bera.h"
 #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;
 
@@ -36,7 +40,7 @@ typedef struct _be_ra_chordal_opts_t be_ra_chordal_opts_t;
  * A liveness interval border.
  */
 typedef struct _border_t {
-	unsigned magic;                 /**< A magic number for checking. */
+	DEBUG_ONLY(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. */
@@ -54,13 +58,11 @@ typedef struct _border_t {
 struct _be_chordal_env_t {
 	struct obstack obst;                /**< An obstack for temporary storage. */
 	be_ra_chordal_opts_t *opts;         /**< A pointer to the chordal ra options. */
-	const be_irg_t *birg;               /**< Back-end IRG session. */
-	dom_front_info_t *dom_front;        /**< Dominance frontiers. */
+	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. */
 	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. */
 };
@@ -78,24 +80,9 @@ static INLINE struct list_head *_get_block_border_head(const be_chordal_env_t *i
 #define chordal_has_class(chordal_env, irn) \
 	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);
-
 void be_ra_chordal_color(be_chordal_env_t *chordal_env);
 
-/**
- * Check a register allocation obtained with the chordal register allocator.
- * @param chordal_env The chordal environment.
- */
-void be_ra_chordal_check(be_chordal_env_t *chordal_env);
-
 enum {
-	/* spill method */
-	BE_CH_SPILL_BELADY    = 1,
-	BE_CH_SPILL_MORGAN    = 2,
-	BE_CH_SPILL_ILP       = 3,
-	BE_CH_SPILL_REMAT     = 4,
-	BE_CH_SPILL_APPEL     = 5,
-
 	/* Dump flags */
 	BE_CH_DUMP_NONE       = (1 << 0),
 	BE_CH_DUMP_SPILL      = (1 << 1),
@@ -105,25 +92,10 @@ 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_NONE      = 0,
-	BE_CH_COPYMIN_HEUR1     = 1,
-	BE_CH_COPYMIN_HEUR2     = 2,
-	BE_CH_COPYMIN_STAT      = 3,
-	BE_CH_COPYMIN_ILP1      = 4,
-	BE_CH_COPYMIN_ILP2      = 5,
-	BE_CH_COPYMIN_PARK_MOON = 6,
-
-	/* ifg flavor */
-	BE_CH_IFG_STD     = 1,
-	BE_CH_IFG_FAST    = 2,
-	BE_CH_IFG_CLIQUE  = 3,
-	BE_CH_IFG_POINTER = 4,
-	BE_CH_IFG_LIST    = 5,
-	BE_CH_IFG_CHECK   = 6,
+	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,
@@ -137,9 +109,6 @@ enum {
 
 struct _be_ra_chordal_opts_t {
 	int dump_flags;
-	int spill_method;
-	int copymin_method;
-	int ifg_flavor;
 	int lower_perm_opt;
 	int vrfy_option;
 
@@ -147,13 +116,6 @@ struct _be_ra_chordal_opts_t {
 	char ilp_solver[128];
 };
 
-/**
- * Open a file whose name is composed from the graph's name and the current register class.
- * @note The name of the file will be prefix(ifg_name)_(reg_class_name).suffix
- * @param prefix The file name's prefix.
- * @param suffix The file name's ending (the . is inserted automatically).
- * @return       A text file opened for writing.
- */
-FILE *be_chordal_open(const be_chordal_env_t *env, const char *prefix, const char *suffix);
+void be_pre_spill_prepare_constr(be_chordal_env_t *cenv);
 
 #endif /* _BECHORDAL_T_H */