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

diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c
index 7755ac7c5..192a571d5 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"
 
@@ -47,9 +46,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 +104,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       },
@@ -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
 };
 
@@ -247,8 +246,7 @@ static void pre_spill(post_spill_env_t *pse, const arch_register_class_t *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);
@@ -380,8 +378,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 +444,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);