X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbelistsched.c;h=53f2616ff5dd6dfad812c078fd5d6226d2c86223;hb=8c27f4c5448ce892ba3429714f7624bc3b05288a;hp=9499dd8e8dbd61b8ad43ac09ae2c1b37d1f47b08;hpb=50b276960fe3b12d5976b03db2fa99afe2537928;p=libfirm

diff --git a/ir/be/belistsched.c b/ir/be/belistsched.c
index 9499dd8e8..53f2616ff 100644
--- a/ir/be/belistsched.c
+++ b/ir/be/belistsched.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -61,8 +61,8 @@
 #include "bestat.h"
 #include "beirg_t.h"
 
-#include <libcore/lc_opts.h>
-#include <libcore/lc_opts_enum.h>
+#include "lc_opts.h"
+#include "lc_opts_enum.h"
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL);
 
@@ -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
@@ -601,7 +598,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 +653,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);