X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbesched.c;h=0026d35bdd8670ae16470cd4f6b69948b88dbbb6;hb=755e96e2816108e2bef2317b741e49aac230d5bb;hp=beb38858c8fa8c90a42bc57a21d2dd82c1664955;hpb=f6ec8f870694c23ee5928418fcb14f782da9f76a;p=libfirm

diff --git a/ir/be/besched.c b/ir/be/besched.c
index beb38858c..0026d35bd 100644
--- a/ir/be/besched.c
+++ b/ir/be/besched.c
@@ -11,13 +11,14 @@
 #include "impl.h"
 #include "irprintf.h"
 #include "irgwalk.h"
-#include "irnode_t.h"
+#include "firm_types.h"
 #include "irgraph_t.h"
 #include "iredges_t.h"
 #include "ircons.h"
 #include "irextbb.h"
 #include "debug.h"
 
+#include "bemodule.h"
 #include "bearch.h"
 #include "besched_t.h"
 #include "beutil.h"
@@ -41,12 +42,13 @@ size_t sched_irn_data_offset = 0;
 
 static void block_sched_dumper(ir_node *block, void *env)
 {
-	FILE *f = env;
+	FILE  *f = env;
 	const ir_node *curr;
 
 	ir_fprintf(f, "%+F:\n", block);
+
 	sched_foreach(block, curr) {
-    sched_info_t *info = get_irn_sched_info(curr);
+		sched_info_t *info = get_irn_sched_info(curr);
 		ir_fprintf(f, "\t%6d: %+F\n", info->time_step, curr);
 	}
 }
@@ -57,11 +59,13 @@ void be_sched_dump(FILE *f, ir_graph *irg)
 }
 
 /* Init the scheduling stuff. */
-void be_sched_init(void)
+void be_init_sched(void)
 {
 	sched_irn_data_offset = 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;
@@ -199,10 +203,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;
 }
@@ -214,31 +225,41 @@ 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;
+	ir_node                 *node, *next;
 
-	for(node = sched_first(block); !sched_is_end(node); node = next) {
-		int i, arity;
+	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
+		/* get next node now, as after calling sched_remove it will be invalid */
 		next = sched_next(node);
 
-		if(bitset_is_set(env->reachable, get_irn_idx(node)))
+		if (bitset_is_set(env->reachable, get_irn_idx(node)))
 			continue;
 
-		arity = get_irn_arity(node);
-		for(i = 0; i < arity; ++i)
-			set_irn_n(node, i, new_r_Bad(env->irg));
-
 		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));
 	}
 }