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

diff --git a/ir/be/besched.c b/ir/be/besched.c
index b35de45cc..1ad2130cc 100644
--- a/ir/be/besched.c
+++ b/ir/be/besched.c
@@ -19,7 +19,7 @@
 #include "debug.h"
 
 #include "bemodule.h"
-#include "bearch.h"
+#include "bearch_t.h"
 #include "besched_t.h"
 #include "beutil.h"
 #include "belistsched.h"
@@ -29,6 +29,7 @@ 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 *)
@@ -79,115 +80,6 @@ void sched_renumber(const ir_node *block)
 	}
 }
 
-/* Verify a schedule. */
-int sched_verify(const ir_node *block)
-{
-	int res = 1;
-	const ir_node *irn;
-	int i, n;
-	int *save_time_step;
-	const ir_node **save_nodes;
-	const ir_edge_t *edge;
-	pset *scheduled_nodes = pset_new_ptr_default();
-	FIRM_DBG_REGISTER(firm_dbg_module_t *dbg_sched, "firm.be.sched");
-
-	/* Count the number of nodes in the schedule. */
-	n = 0;
-	sched_foreach(block, irn)
-		n++;
-
-	if(n <= 0)
-		return 1;
-
-	save_time_step = xmalloc(n * sizeof(save_time_step[0]));
-	save_nodes = xmalloc(n * sizeof(save_nodes[0]));
-
-	i = 0;
-	sched_foreach(block, irn) {
-		sched_info_t *info = get_irn_sched_info(irn);
-		save_time_step[i] = info->time_step;
-		save_nodes[i] = (ir_node *)irn;
-		info->time_step = i;
-		pset_insert_ptr(scheduled_nodes, irn);
-
-		i += 1;
-	}
-
-	/*
-	 * Check if each relevant operand of a node is scheduled before
-	 * the node itself.
-	 */
-	sched_foreach(block, irn) {
-		int i, n;
-		int step = sched_get_time_step(irn);
-
-		for(i = 0, n = get_irn_arity(irn); i < n; i++) {
-			ir_node *op = get_irn_n(irn, i);
-
-			if(to_appear_in_schedule(op)
-				&& !is_Phi(irn)
-				&& get_nodes_block(op) == block
-				&& sched_get_time_step(op) > step) {
-
-				DBG((dbg_sched, LEVEL_DEFAULT,
-					"%+F: %+F is operand of %+F but scheduled after\n", block, op, irn));
-				res = 0;
-			}
-		}
-	}
-
-	/* Check, if the time steps are correct */
-	for(i = 1; i < n; ++i) {
-		if(save_time_step[i] - save_time_step[i - 1] <= 0) {
-			DBG((dbg_sched, LEVEL_DEFAULT,
-				"%+F from %+F(%d) -> %+F(%d) step shrinks from %d -> %d\n",
-				block, save_nodes[i - 1], i - 1, save_nodes[i], i,
-				save_time_step[i - 1], save_time_step[i]));
-			res = 0;
-		}
-	}
-
-	/* Restore the old time steps */
-	i = 0;
-	sched_foreach(block, irn) {
-		sched_info_t *info = get_irn_sched_info(irn);
-		info->time_step = save_time_step[i++];
-	}
-
-	/* Check for all nodes in the block if they are scheduled. */
-	foreach_out_edge(block, edge) {
-		ir_node *irn = get_edge_src_irn(edge);
-		if(to_appear_in_schedule(irn) && !pset_find_ptr(scheduled_nodes, irn)) {
-			DBG((dbg_sched, LEVEL_DEFAULT,
-				"%+F: %+F is in block but not scheduled\n", block, irn));
-			res = 0;
-		}
-	}
-
-	del_pset(scheduled_nodes);
-	free(save_time_step);
-	free((void *) save_nodes);
-	return res;
-}
-
-/**
- * Block-Walker: verify the current block and update the status
- */
-static void sched_verify_walker(ir_node *block, void *data)
-{
-	int *res = data;
-	*res &= sched_verify(block);
-}
-
-/* Verify the schedules in all blocks of the irg. */
-int sched_verify_irg(ir_graph *irg)
-{
-	int res = 1;
-	irg_block_walk_graph(irg, sched_verify_walker, NULL, &res);
-
-	return res;
-}
-
 int sched_skip_cf_predicator(const ir_node *irn, void *data) {
 	arch_env_t *ae = data;
 	return arch_irn_class_is(ae, irn, branch);
@@ -203,10 +95,17 @@ ir_node *sched_skip(ir_node *from, int forward, sched_predicator_t *predicator,
 	const ir_node *bl = get_block(from);
 	ir_node *curr;
 
-	if (is_Block(from))
-		from = forward ? sched_next(from) : sched_prev(from);
-
-	for(curr = from; curr != bl && predicator(curr, data); curr = forward ? sched_next(curr) : sched_prev(curr));
+	if (forward) {
+		if (is_Block(from))
+			from = sched_next(from);
+		for (curr = from; curr != bl && predicator(curr, data); curr = sched_next(curr)) {
+		}
+	} else {
+		if (is_Block(from))
+			from = sched_prev(from);
+		for (curr = from; curr != bl && predicator(curr, data); curr = sched_prev(curr)) {
+		}
+	}
 
 	return curr;
 }
@@ -218,20 +117,25 @@ typedef struct remove_dead_nodes_env_t_ {
 	bitset_t *reachable;
 } remove_dead_nodes_env_t;
 
+/**
+ * Post-walker: remember all visited nodes in a bitset.
+ */
 static void mark_dead_nodes_walker(ir_node *node, void *data)
 {
 	remove_dead_nodes_env_t *env = (remove_dead_nodes_env_t*) data;
 	bitset_set(env->reachable, get_irn_idx(node));
 }
 
+/**
+ * Post-block-walker:
+ * Walk through the schedule of every block and remove all dead nodes from it.
+ */
 static void remove_dead_nodes_walker(ir_node *block, void *data)
 {
 	remove_dead_nodes_env_t *env = (remove_dead_nodes_env_t*) data;
 	ir_node                 *node, *next;
 
 	for (node = sched_first(block); ! sched_is_end(node); node = next) {
-		int i;
-
 		/* get next node now, as after calling sched_remove it will be invalid */
 		next = sched_next(node);
 
@@ -239,13 +143,7 @@ static void remove_dead_nodes_walker(ir_node *block, void *data)
 			continue;
 
 		sched_remove(node);
-
-		/* when a node is exchanged, it is turned into Bad, do not set ins for those */
-		if (is_Bad(node))
-			continue;
-
-		for (i = get_irn_arity(node) - 1; i >= 0; --i)
-			set_irn_n(node, i, new_r_Bad(env->irg));
+		be_kill_node(node);
 	}
 }