X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbesched.c;h=6fa533e5048c48b6eb930787f36bd74573e8173f;hb=2589efb23f5c24a341529d4f75d6f5f7eddaba00;hp=21060592ec401aca5d2b5a9fc3cdd7deb48baf40;hpb=39f3a8dbd0f00f90b7b12a849d1bf7b9c1329479;p=libfirm

diff --git a/ir/be/besched.c b/ir/be/besched.c
index 21060592e..6fa533e50 100644
--- a/ir/be/besched.c
+++ b/ir/be/besched.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.
  *
@@ -23,15 +23,10 @@
  * @author      Sebastian Hack
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
 
-#include "impl.h"
 #include "irprintf.h"
 #include "irgwalk.h"
 #include "firm_types.h"
@@ -39,28 +34,15 @@
 #include "iredges_t.h"
 #include "ircons.h"
 #include "irextbb.h"
+#include "irgmod.h"
 #include "debug.h"
 
 #include "bemodule.h"
-#include "bearch_t.h"
-#include "besched_t.h"
+#include "bearch.h"
+#include "besched.h"
 #include "beutil.h"
 #include "belistsched.h"
-
-FIRM_IMPL1(sched_get_time_step, int, const ir_node *)
-FIRM_IMPL1(sched_has_next, int, const ir_node *)
-FIRM_IMPL1(sched_has_prev, int, const ir_node *)
-FIRM_IMPL1(sched_next, ir_node *, const ir_node *)
-FIRM_IMPL1(sched_prev, ir_node *, const ir_node *)
-FIRM_IMPL1(sched_is_scheduled, int, const ir_node *)
-FIRM_IMPL1(sched_first, ir_node *, const ir_node *)
-FIRM_IMPL1(sched_last, ir_node *, const ir_node *)
-FIRM_IMPL2(sched_add_after, ir_node *, ir_node *, ir_node *)
-FIRM_IMPL2(sched_add_before, ir_node *, ir_node *, ir_node *)
-FIRM_IMPL1_VOID(sched_init_block, ir_node *)
-FIRM_IMPL1_VOID(sched_reset, ir_node *)
-FIRM_IMPL2(sched_comes_after, int, const ir_node *, const ir_node *)
-FIRM_IMPL1_VOID(sched_remove, ir_node *)
+#include "belive.h"
 
 size_t sched_irn_data_offset = 0;
 
@@ -82,14 +64,12 @@ void be_sched_dump(FILE *f, ir_graph *irg)
 	irg_block_walk_graph(irg, block_sched_dumper, NULL, f);
 }
 
-/* Init the scheduling stuff. */
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_sched);
 void be_init_sched(void)
 {
-	sched_irn_data_offset = register_additional_node_data(sizeof(sched_info_t));
+	sched_irn_data_offset = firm_register_additional_node_data(sizeof(sched_info_t));
 }
 
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_sched);
-
 void sched_renumber(const ir_node *block)
 {
 	ir_node *irn;
@@ -103,19 +83,22 @@ void sched_renumber(const ir_node *block)
 	}
 }
 
-int sched_skip_cf_predicator(const ir_node *irn, void *data) {
-	arch_env_t *ae = data;
-	return arch_irn_class_is(ae, irn, branch);
+int sched_skip_cf_predicator(const ir_node *irn, void *data)
+{
+	(void)data;
+	return is_cfop(irn);
 }
 
-int sched_skip_phi_predicator(const ir_node *irn, void *data) {
+int sched_skip_phi_predicator(const ir_node *irn, void *data)
+{
+	(void) data;
 	return is_Phi(irn);
 }
 
 /* Skip nodes in a schedule. */
 ir_node *sched_skip(ir_node *from, int forward, sched_predicator_t *predicator, void *data)
 {
-	const ir_node *bl = get_block(from);
+	const ir_node *bl = get_block_const(from);
 	ir_node *curr;
 
 	if (forward) {
@@ -136,8 +119,9 @@ ir_node *sched_skip(ir_node *from, int forward, sched_predicator_t *predicator,
 //---------------------------------------------------------------------------
 
 typedef struct remove_dead_nodes_env_t_ {
-	ir_graph *irg;
 	bitset_t *reachable;
+	ir_graph *irg;
+	be_lv_t  *lv;
 } remove_dead_nodes_env_t;
 
 /**
@@ -165,16 +149,19 @@ static void remove_dead_nodes_walker(ir_node *block, void *data)
 		if (bitset_is_set(env->reachable, get_irn_idx(node)))
 			continue;
 
+		if (env->lv)
+			be_liveness_remove(env->lv, node);
 		sched_remove(node);
-		be_kill_node(node);
+		kill_node(node);
 	}
 }
 
 void be_remove_dead_nodes_from_schedule(ir_graph *irg)
 {
 	remove_dead_nodes_env_t env;
-	env.irg = irg;
 	env.reachable = bitset_alloca(get_irg_last_idx(irg));
+	env.lv        = be_get_irg_liveness(irg);
+	env.irg       = irg;
 
 	// mark all reachable nodes
 	irg_walk_graph(irg, mark_dead_nodes_walker, NULL, &env);
@@ -182,3 +169,73 @@ void be_remove_dead_nodes_from_schedule(ir_graph *irg)
 	// walk schedule and remove non-marked nodes
 	irg_block_walk_graph(irg, remove_dead_nodes_walker, NULL, &env);
 }
+
+int (sched_get_time_step)(const ir_node *node)
+{
+	return _sched_get_time_step(node);
+}
+
+int (sched_has_next)(const ir_node *node)
+{
+	return _sched_has_next(node);
+}
+
+int (sched_has_prev)(const ir_node *node)
+{
+	return _sched_has_prev(node);
+}
+
+ir_node *(sched_next)(const ir_node *node)
+{
+	return _sched_next(node);
+}
+
+ir_node *(sched_prev)(const ir_node *node)
+{
+	return _sched_prev(node);
+}
+
+int (sched_is_scheduled)(const ir_node *node)
+{
+	return _sched_is_scheduled(node);
+}
+
+ir_node *(sched_first)(const ir_node *node)
+{
+	return _sched_first(node);
+}
+
+ir_node *(sched_last)(const ir_node *node)
+{
+	return _sched_last(node);
+}
+
+void (sched_add_after)(ir_node *after, ir_node *node)
+{
+	_sched_add_after(after, node);
+}
+
+void (sched_add_before)(ir_node *before, ir_node *node)
+{
+	_sched_add_before(before, node);
+}
+
+void (sched_init_block)(ir_node *block)
+{
+	_sched_init_block(block);
+}
+
+void (sched_remove)(ir_node *node)
+{
+	_sched_remove(node);
+}
+
+void (sched_reset)(ir_node *node)
+{
+	_sched_reset(node);
+}
+
+int (sched_comes_after)(const ir_node *n1, const ir_node *n2)
+{
+	return _sched_comes_after(n1, n2);
+}