X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_t.h;h=3c7e7bb276b7e883d8c4ee2bd6f506fd68ac536e;hb=4ed245f5007168dab7850942a7ee6b6b29a19817;hp=62d878cc1c5b1ae69882effcb3e043e176740a99;hpb=e7cad2f17cb3e282d309bf95475a83f944236a6f;p=libfirm

diff --git a/ir/be/bechordal_t.h b/ir/be/bechordal_t.h
index 62d878cc1..3c7e7bb27 100644
--- a/ir/be/bechordal_t.h
+++ b/ir/be/bechordal_t.h
@@ -20,12 +20,15 @@
 #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"
 
 typedef struct _be_ra_chordal_opts_t be_ra_chordal_opts_t;
 
@@ -58,6 +61,8 @@ struct _be_chordal_env_t {
 	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. */
+	exec_freq_t *exec_freq;             /**< Adam's execution frequencies. */
+	be_lv_t *lv;                        /**< Liveness information. */
 	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. */
@@ -91,10 +96,8 @@ void be_ra_chordal_check(be_chordal_env_t *chordal_env);
 enum {
 	/* spill method */
 	BE_CH_SPILL_BELADY    = 1,
-	BE_CH_SPILL_ILP       = 2,
-	BE_CH_SPILL_MORGAN    = 3,
-        BE_CH_SPILL_REMAT     = 4,
-        BE_CH_SPILL_APPEL     = 5,
+	BE_CH_SPILL_MORGAN    = 2,
+	BE_CH_SPILL_REMAT     = 3,
 
 	/* Dump flags */
 	BE_CH_DUMP_NONE       = (1 << 0),
@@ -105,17 +108,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,
+	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,
 
 	/* ifg flavor */
 	BE_CH_IFG_STD     = 1,
@@ -126,8 +122,8 @@ enum {
 	BE_CH_IFG_CHECK   = 6,
 
 	/* lower perm options */
-	BE_CH_LOWER_PERM_SWAP   = (1 << 0),
-	BE_CH_LOWER_PERM_COPY   = (1 << 1),
+	BE_CH_LOWER_PERM_SWAP   = 1,
+	BE_CH_LOWER_PERM_COPY   = 2,
 
 	/* verify options */
 	BE_CH_VRFY_OFF    = 1,
@@ -138,7 +134,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;
@@ -156,4 +151,6 @@ struct _be_ra_chordal_opts_t {
  */
 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 */