X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_main.c;h=8e6536db06a711e655426197ca1f94e53db75108;hb=532ca14c1686c1b14cf923371c079055670de7e6;hp=7755ac7c59ea6aa46128ae79452a39d2eb4de818;hpb=8ccfe04ca59ff56fc32b2323b80cee2a5194694d;p=libfirm

diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c
index 7755ac7c5..8e6536db0 100644
--- a/ir/be/bechordal_main.c
+++ b/ir/be/bechordal_main.c
@@ -22,7 +22,6 @@
  * @brief       Driver for the chordal register allocator.
  * @author      Sebastian Hack
  * @date        29.11.2005
- * @version     $Id$
  */
 #include "config.h"
 
@@ -33,7 +32,6 @@
 #include "pset.h"
 #include "list.h"
 #include "bitset.h"
-#include "iterator.h"
 
 #include "lc_opts.h"
 #include "lc_opts_enum.h"
@@ -47,9 +45,9 @@
 #include "irdump.h"
 #include "irdom.h"
 #include "ircons.h"
-#include "irbitset.h"
 #include "irnode.h"
 #include "ircons.h"
+#include "irtools.h"
 #include "debug.h"
 #include "execfreq.h"
 #include "iredges_t.h"
@@ -105,7 +103,7 @@ static const lc_opt_enum_int_items_t lower_perm_items[] = {
 	{ NULL, 0 }
 };
 
-static const lc_opt_enum_int_items_t dump_items[] = {
+static const lc_opt_enum_mask_items_t dump_items[] = {
 	{ "none",       BE_CH_DUMP_NONE       },
 	{ "spill",      BE_CH_DUMP_SPILL      },
 	{ "live",       BE_CH_DUMP_LIVE       },
@@ -113,6 +111,7 @@ static const lc_opt_enum_int_items_t dump_items[] = {
 	{ "copymin",    BE_CH_DUMP_COPYMIN    },
 	{ "ssadestr",   BE_CH_DUMP_SSADESTR   },
 	{ "tree",       BE_CH_DUMP_TREE_INTV  },
+	{ "split",      BE_CH_DUMP_SPLIT      },
 	{ "constr",     BE_CH_DUMP_CONSTR     },
 	{ "lower",      BE_CH_DUMP_LOWER      },
 	{ "spillslots", BE_CH_DUMP_SPILLSLOTS },
@@ -132,7 +131,7 @@ static lc_opt_enum_int_var_t lower_perm_var = {
 	&options.lower_perm_opt, lower_perm_items
 };
 
-static lc_opt_enum_int_var_t dump_var = {
+static lc_opt_enum_mask_var_t dump_var = {
 	&options.dump_flags, dump_items
 };
 
@@ -141,9 +140,9 @@ static lc_opt_enum_int_var_t be_ch_vrfy_var = {
 };
 
 static const lc_opt_table_entry_t be_chordal_options[] = {
-	LC_OPT_ENT_ENUM_PTR ("perm",          "perm lowering options", &lower_perm_var),
+	LC_OPT_ENT_ENUM_INT ("perm",          "perm lowering options", &lower_perm_var),
 	LC_OPT_ENT_ENUM_MASK("dump",          "select dump phases", &dump_var),
-	LC_OPT_ENT_ENUM_PTR ("verify",        "verify options", &be_ch_vrfy_var),
+	LC_OPT_ENT_ENUM_INT ("verify",        "verify options", &be_ch_vrfy_var),
 	LC_OPT_LAST
 };
 
@@ -185,9 +184,8 @@ static void dump(unsigned mask, ir_graph *irg,
  */
 static void memory_operand_walker(ir_node *irn, void *env)
 {
-	const ir_edge_t  *edge, *ne;
-	ir_node          *block;
-	ir_node          *spill;
+	ir_node *block;
+	ir_node *spill;
 
 	(void)env;
 
@@ -201,7 +199,7 @@ static void memory_operand_walker(ir_node *irn, void *env)
 	spill = be_get_Reload_mem(irn);
 	block = get_nodes_block(irn);
 
-	foreach_out_edge_safe(irn, edge, ne) {
+	foreach_out_edge_safe(irn, edge) {
 		ir_node *src = get_edge_src_irn(edge);
 		int     pos  = get_edge_src_pos(edge);
 
@@ -240,18 +238,16 @@ static void pre_spill(post_spill_env_t *pse, const arch_register_class_t *cls)
 {
 	be_chordal_env_t *chordal_env = &pse->cenv;
 	ir_graph         *irg         = pse->irg;
-	ir_exec_freq     *exec_freq   = be_get_irg_exec_freq(irg);
 
 	pse->cls                      = cls;
 	chordal_env->cls              = cls;
 	chordal_env->border_heads     = pmap_create();
 	chordal_env->allocatable_regs = bitset_malloc(chordal_env->cls->n_regs);
 
-	be_assure_liveness(irg);
-	be_liveness_assure_chk(be_get_irg_liveness(irg));
+	be_assure_live_chk(irg);
 
 	if (stat_ev_enabled) {
-		pse->pre_spill_cost = be_estimate_irg_costs(irg, exec_freq);
+		pse->pre_spill_cost = be_estimate_irg_costs(irg);
 	}
 
 	/* put all ignore registers into the ignore register set. */
@@ -271,12 +267,11 @@ static void post_spill(post_spill_env_t *pse, int iteration)
 {
 	be_chordal_env_t *chordal_env = &pse->cenv;
 	ir_graph         *irg         = pse->irg;
-	ir_exec_freq     *exec_freq   = be_get_irg_exec_freq(irg);
 	int               allocatable_regs = be_get_n_allocatable_regs(irg, chordal_env->cls);
 
 	/* some special classes contain only ignore regs, no work to be done */
 	if (allocatable_regs > 0) {
-		stat_ev_dbl("bechordal_spillcosts", be_estimate_irg_costs(irg, exec_freq) - pse->pre_spill_cost);
+		stat_ev_dbl("bechordal_spillcosts", be_estimate_irg_costs(irg) - pse->pre_spill_cost);
 
 		/*
 			If we have a backend provided spiller, post spill is
@@ -380,8 +375,6 @@ static void be_ra_chordal_main(ir_graph *irg)
 
 	be_timer_push(T_RA_PROLOG);
 
-	be_assure_liveness(irg);
-
 	chordal_env.obst             = &obst;
 	chordal_env.opts             = &options;
 	chordal_env.irg              = irg;
@@ -448,12 +441,11 @@ static void be_ra_chordal_main(ir_graph *irg)
 	be_timer_pop(T_VERIFY);
 
 	be_timer_push(T_RA_EPILOG);
-	lower_nodes_after_ra(irg,
-	                     options.lower_perm_opt&BE_CH_LOWER_PERM_COPY ? 1 : 0);
+	lower_nodes_after_ra(irg, options.lower_perm_opt == BE_CH_LOWER_PERM_COPY);
 	dump(BE_CH_DUMP_LOWER, irg, NULL, "belower-after-ra");
 
 	obstack_free(&obst, NULL);
-	be_liveness_invalidate(be_get_irg_liveness(irg));
+	be_invalidate_live_sets(irg);
 	be_timer_pop(T_RA_EPILOG);
 
 	be_timer_pop(T_RA_OTHER);
@@ -473,5 +465,5 @@ void be_init_chordal_main(void)
 	be_register_allocator("chordal", &be_ra_chordal_allocator);
 
 	lc_opt_add_table(chordal_grp, be_chordal_options);
-	be_add_module_list_opt(chordal_grp, "coloring", "select coloring methode", &colorings, (void**) &selected_coloring);
+	be_add_module_list_opt(chordal_grp, "coloring", "select coloring method", &colorings, (void**) &selected_coloring);
 }