X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbelistsched.c;h=5e98db60c4f78e3b3fc99cee46a0ca89775e1ca8;hb=2008b06dbcc40eb1316f8fd097f0cd3c1002802b;hp=c8cf497ac010473b2d263b744f51ea359f96e7ca;hpb=049e7746fb729a28e90e69f02899c76c7b98b275;p=libfirm

diff --git a/ir/be/belistsched.c b/ir/be/belistsched.c
index c8cf497ac..5e98db60c 100644
--- a/ir/be/belistsched.c
+++ b/ir/be/belistsched.c
@@ -90,7 +90,7 @@ typedef struct _list_sched_options_t {
 } list_sched_options_t;
 
 static list_sched_options_t list_sched_options = {
-	BE_SCHED_SELECT_HEUR,     /* mueller heuristic selector */
+	BE_SCHED_SELECT_NORMAL,   /* mueller heuristic selector */
 	BE_SCHED_PREP_NONE,       /* no scheduling preparation */
 };
 
@@ -229,7 +229,7 @@ static INLINE int make_ready(block_sched_env_t *env, ir_node *pred, ir_node *irn
 
 		/* if irn is an End we have keep-alives and op might be a block, skip that */
 		if (is_Block(op)) {
-		  	assert(get_irn_op(irn) == op_End);
+			assert(is_End(irn));
 			continue;
 		}
 
@@ -486,9 +486,6 @@ static void list_sched_block(ir_node *block, void *env_ptr)
 		else if (irn == start_node) {
 			/* The start block will be scheduled as the first node */
 			add_to_sched(&be, irn);
-#ifdef SCHEDULE_PROJS
-			add_tuple_projs(&be, irn);
-#endif
 		}
 		else {
 			/* Other nodes must have all operands in other blocks to be made
@@ -519,8 +516,6 @@ static void list_sched_block(ir_node *block, void *env_ptr)
 	/* Iterate over all remaining nodes */
 	while (ir_nodeset_size(&be.cands) > 0) {
 		ir_nodeset_iterator_t iter;
-		/* collect statistics about amount of ready nodes */
-		be_do_stat_sched_ready(block, &be.cands);
 
 		/* Keeps must be scheduled immediately */
 		foreach_ir_nodeset(&be.cands, irn, iter) {
@@ -601,7 +596,7 @@ void list_sched(be_irg_t *birg, be_options_t *be_opts)
 
 	/* initialize environment for list scheduler */
 	memset(&env, 0, sizeof(env));
-	env.selector   = arch_env->isa->impl->get_list_sched_selector(arch_env->isa, &sel);
+	env.selector   = arch_env_get_list_sched_selector(arch_env, &sel);
 	env.arch_env   = arch_env;
 	env.irg        = irg;
 	env.sched_info = NEW_ARR_F(sched_irn_t, num_nodes);
@@ -656,7 +651,7 @@ void list_sched_single_block(const be_irg_t *birg, ir_node *block,
 
 	/* initialize environment for list scheduler */
 	memset(&env, 0, sizeof(env));
-	env.selector   = arch_env->isa->impl->get_list_sched_selector(arch_env->isa, &sel);
+	env.selector   = arch_env_get_list_sched_selector(arch_env, &sel);
 	env.arch_env   = arch_env;
 	env.irg        = irg;
 	env.sched_info = NEW_ARR_F(sched_irn_t, num_nodes);