X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbesched.c;h=8e88f39bdfee42c25dccff0eee90e7e18a6355c2;hb=3f807bf48426a29da4129ff29c44a4b4690c45f6;hp=1ad2130ccf551c02c6a782ec4f1ecfb62c6d5775;hpb=205396c4f4f5abe7abd6dc2350c8c398a7623afc;p=libfirm

diff --git a/ir/be/besched.c b/ir/be/besched.c
index 1ad2130cc..8e88f39bd 100644
--- a/ir/be/besched.c
+++ b/ir/be/besched.c
@@ -1,5 +1,28 @@
-/* $Id$ */
+/*
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ */
 
+/**
+ * @file
+ * @brief       Scheduling utilities for nodes in Blocks and Blocks.
+ * @author      Sebastian Hack
+ * @version     $Id$
+ */
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
@@ -16,6 +39,7 @@
 #include "iredges_t.h"
 #include "ircons.h"
 #include "irextbb.h"
+#include "irgmod.h"
 #include "debug.h"
 
 #include "bemodule.h"
@@ -24,6 +48,7 @@
 #include "beutil.h"
 #include "belistsched.h"
 
+FIRM_IMPL1(have_sched_info, int, const ir_graph *)
 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 *)
@@ -32,12 +57,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(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_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(sched_comes_after, int, const ir_node *, const ir_node *)
-FIRM_IMPL1_VOID(sched_remove, ir_node *)
+FIRM_IMPL1_VOID(sched_remove, const ir_node *)
 
 size_t sched_irn_data_offset = 0;
 
@@ -62,7 +87,7 @@ void be_sched_dump(FILE *f, ir_graph *irg)
 /* Init the scheduling stuff. */
 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);
@@ -86,13 +111,14 @@ int sched_skip_cf_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) {
@@ -113,8 +139,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;
 
 /**
@@ -142,16 +169,21 @@ 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)
+void be_remove_dead_nodes_from_schedule(be_irg_t *birg)
 {
+	ir_graph *irg = be_get_birg_irg(birg);
+
 	remove_dead_nodes_env_t env;
-	env.irg = irg;
 	env.reachable = bitset_alloca(get_irg_last_idx(irg));
+	env.lv  = be_get_birg_liveness(birg);
+	env.irg = irg;
 
 	// mark all reachable nodes
 	irg_walk_graph(irg, mark_dead_nodes_walker, NULL, &env);
@@ -159,3 +191,24 @@ 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);
 }
+
+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);
+}