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

diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c
index a34ade573..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,11 +104,7 @@ static const lc_opt_enum_int_items_t lower_perm_items[] = {
 	{ NULL, 0 }
 };
 
-static const lc_opt_enum_int_items_t lower_perm_stat_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       },
@@ -136,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
 };
 
@@ -145,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
 };
 
@@ -164,10 +159,7 @@ void be_register_chordal_coloring(const char *name, be_ra_chordal_coloring_t *co
 
 static void be_ra_chordal_coloring(be_chordal_env_t *env)
 {
-	assert(selected_coloring != NULL);
-	if (selected_coloring != NULL) {
-		selected_coloring->allocate(env);
-	}
+	selected_coloring->allocate(env);
 }
 
 static void dump(unsigned mask, ir_graph *irg,
@@ -186,7 +178,9 @@ static void dump(unsigned mask, ir_graph *irg,
 }
 
 /**
- * Checks for every reload if its user can perform the load on itself.
+ * Post-Walker: Checks for the given reload if has only one user that can perform the
+ * reload as part of its address mode.
+ * Fold the reload into the user it that is possible.
  */
 static void memory_operand_walker(ir_node *irn, void *env)
 {
@@ -217,12 +211,13 @@ static void memory_operand_walker(ir_node *irn, void *env)
 		}
 	}
 
-	/* kill the Reload */
+	/* kill the Reload if it was folded */
 	if (get_irn_n_edges(irn) == 0) {
 		ir_graph *irg = get_irn_irg(irn);
+		ir_mode  *frame_mode = get_irn_mode(get_irn_n(irn, n_be_Reload_frame));
 		sched_remove(irn);
-		set_irn_n(irn, n_be_Reload_mem, new_r_Bad(irg));
-		set_irn_n(irn, n_be_Reload_frame, new_r_Bad(irg));
+		set_irn_n(irn, n_be_Reload_mem, new_r_Bad(irg, mode_X));
+		set_irn_n(irn, n_be_Reload_frame, new_r_Bad(irg, frame_mode));
 	}
 }
 
@@ -251,10 +246,11 @@ 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);
 
-	stat_ev_do(pse->pre_spill_cost = be_estimate_irg_costs(irg, exec_freq));
+	if (stat_ev_enabled) {
+		pse->pre_spill_cost = be_estimate_irg_costs(irg, exec_freq);
+	}
 
 	/* put all ignore registers into the ignore register set. */
 	be_put_allocatable_regs(irg, pse->cls, chordal_env->allocatable_regs);
@@ -317,7 +313,7 @@ static void post_spill(post_spill_env_t *pse, int iteration)
 		chordal_env->ifg = be_create_ifg(chordal_env);
 		be_timer_pop(T_RA_IFG);
 
-		stat_ev_if {
+		if (stat_ev_enabled) {
 			be_ifg_stat_t   stat;
 			be_node_stats_t node_stats;
 
@@ -382,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;
@@ -395,7 +389,7 @@ static void be_ra_chordal_main(ir_graph *irg)
 
 	be_timer_pop(T_RA_PROLOG);
 
-	stat_ev_if {
+	if (stat_ev_enabled) {
 		be_collect_node_stats(&last_node_stats, irg);
 	}
 
@@ -412,11 +406,11 @@ static void be_ra_chordal_main(ir_graph *irg)
 
 		stat_ev_ctx_push_str("bechordal_cls", cls->name);
 
-		stat_ev_if {
+		if (stat_ev_enabled) {
 			be_do_stat_reg_pressure(irg, cls);
 		}
 
-		memcpy(&pse.cenv, &chordal_env, sizeof(chordal_env));
+		pse.cenv = chordal_env;
 		pse.irg = irg;
 		pre_spill(&pse, cls);
 
@@ -428,7 +422,7 @@ static void be_ra_chordal_main(ir_graph *irg)
 
 		post_spill(&pse, 0);
 
-		stat_ev_if {
+		if (stat_ev_enabled) {
 			be_node_stats_t node_stats;
 
 			be_collect_node_stats(&node_stats, irg);
@@ -450,18 +444,17 @@ 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);
 }
 
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_chordal_main);
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_chordal_main)
 void be_init_chordal_main(void)
 {
 	static be_ra_t be_ra_chordal_allocator = {