X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbesched.c;h=3bf0b69b28994d8fc1e58be20d838cd917c0680c;hb=8a907f80824671f3ff21569442566dceca8d4f5f;hp=ee15f264ef317c5ec1497474b0300537824c8cac;hpb=1ce363f80e6a204d4011f85813362d9bd1d0e7e4;p=libfirm

diff --git a/ir/be/besched.c b/ir/be/besched.c
index ee15f264e..3bf0b69b2 100644
--- a/ir/be/besched.c
+++ b/ir/be/besched.c
@@ -23,13 +23,9 @@
  * @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"
@@ -39,13 +35,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"
+#include "belive.h"
 
 FIRM_IMPL1(have_sched_info, int, const ir_graph *)
 FIRM_IMPL1(sched_get_time_step, int, const ir_node *)
@@ -56,12 +54,12 @@ 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_VOID(sched_add_after, const ir_node *, const ir_node *)
-FIRM_IMPL2_VOID(sched_add_before, const ir_node *, const ir_node *)
-FIRM_IMPL1_VOID(sched_init_block, const ir_node *)
-FIRM_IMPL1_VOID(sched_reset, const ir_node *)
+FIRM_IMPL2_VOID(sched_add_after, ir_node *, ir_node *)
+FIRM_IMPL2_VOID(sched_add_before, ir_node *, ir_node *)
+FIRM_IMPL1_VOID(sched_init_block, ir_node *)
+FIRM_IMPL1_VOID(sched_remove, 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, const ir_node *)
 
 size_t sched_irn_data_offset = 0;
 
@@ -83,14 +81,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 = 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;
@@ -104,12 +100,14 @@ 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);
 }
@@ -168,10 +166,10 @@ 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)
+		if (env->lv)
 			be_liveness_remove(env->lv, node);
 		sched_remove(node);
-		be_kill_node(node);
+		kill_node(node);
 	}
 }
 
@@ -190,24 +188,3 @@ void be_remove_dead_nodes_from_schedule(be_irg_t *birg)
 	// walk schedule and remove non-marked nodes
 	irg_block_walk_graph(irg, remove_dead_nodes_walker, NULL, &env);
 }
-
-static void *sched_irn_init(ir_phase *ph, const ir_node *irn, void *old)
-{
-	sched_info_t *info = old ? old : phase_alloc(ph, sizeof(*info));
-
-	info->idx  = get_irn_idx(irn);
-	INIT_LIST_HEAD(&info->list);
-	info->scheduled = 0;
-	info->time_step = 0;
-	return info;
-}
-
-void be_sched_init_phase(ir_graph *irg)
-{
-	init_irg_phase(irg, PHASE_BE_SCHED, 0, sched_irn_init);
-}
-
-void be_sched_free_phase(ir_graph *irg)
-{
-	free_irg_phase(irg, PHASE_BE_SCHED);
-}