X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbepeephole.c;h=1afc7edc03b7ff8619135df22fd5f37cb2a41475;hb=3f807bf48426a29da4129ff29c44a4b4690c45f6;hp=b0fe0ca8d40d2b54d4ac91bb20dad7732d225beb;hpb=3619ae08c1d392ab6e88a0471bc9631bb20027c8;p=libfirm

diff --git a/ir/be/bepeephole.c b/ir/be/bepeephole.c
index b0fe0ca8d..1afc7edc0 100644
--- a/ir/be/bepeephole.c
+++ b/ir/be/bepeephole.c
@@ -32,6 +32,7 @@
 #include "iredges_t.h"
 #include "irgwalk.h"
 #include "irprintf.h"
+#include "ircons.h"
 #include "irgmod.h"
 #include "error.h"
 
@@ -47,7 +48,6 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 static const arch_env_t *arch_env;
 static be_lv_t          *lv;
 static ir_node          *current_node;
-static ir_node          *prev_node;
 ir_node               ***register_values;
 
 static void clear_reg_value(ir_node *node)
@@ -62,7 +62,7 @@ static void clear_reg_value(ir_node *node)
 
 	reg     = arch_get_irn_register(arch_env, node);
 	if(reg == NULL) {
-		panic("No register assigned at %+F\n", node);
+		panic("No register assigned at %+F", node);
 	}
 	if(arch_register_type_is(reg, virtual))
 		return;
@@ -87,7 +87,7 @@ static void set_reg_value(ir_node *node)
 
 	reg = arch_get_irn_register(arch_env, node);
 	if(reg == NULL) {
-		panic("No register assigned at %+F\n", node);
+		panic("No register assigned at %+F", node);
 	}
 	if(arch_register_type_is(reg, virtual))
 		return;
@@ -125,7 +125,7 @@ static void set_uses(ir_node *node)
 	}
 }
 
-void be_peephole_new_node(ir_node *const nw)
+void be_peephole_new_node(ir_node * nw)
 {
 	be_liveness_introduce(lv, nw);
 }
@@ -148,9 +148,10 @@ void be_peephole_before_exchange(const ir_node *old_node, ir_node *new_node)
 	DBG((dbg, LEVEL_1, "About to exchange and kill %+F with %+F\n", old_node, new_node));
 
 	if (current_node == old_node) {
-	  /* next node to be processed will be killed. Its scheduling predecessor
-	   * must be processed next. */
-		prev_node = sched_prev(current_node);
+		/* next node to be processed will be killed. Its scheduling predecessor
+		 * must be processed next. */
+		current_node = sched_next(current_node);
+		assert (!is_Bad(current_node));
 	}
 
 	if (!mode_is_data(get_irn_mode(old_node)))
@@ -158,7 +159,7 @@ void be_peephole_before_exchange(const ir_node *old_node, ir_node *new_node)
 
 	reg = arch_get_irn_register(arch_env, old_node);
 	if (reg == NULL) {
-		panic("No register assigned at %+F\n", old_node);
+		panic("No register assigned at %+F", old_node);
 	}
 	assert(reg == arch_get_irn_register(arch_env, new_node) &&
 	      "KILLING a node and replacing by different register is not allowed");
@@ -174,7 +175,7 @@ void be_peephole_before_exchange(const ir_node *old_node, ir_node *new_node)
 	be_liveness_remove(lv, old_node);
 }
 
-void be_peephole_exchange(ir_node *const old, ir_node *const nw)
+void be_peephole_exchange(ir_node *old, ir_node *nw)
 {
 	be_peephole_before_exchange(old, nw);
 	sched_remove(old);
@@ -211,30 +212,45 @@ static void process_block(ir_node *block, void *data)
 	/* walk the block from last insn to the first */
 	current_node = sched_last(block);
 	for( ; !sched_is_begin(current_node);
-		current_node = prev_node != NULL ? prev_node : sched_prev(current_node)) {
+			current_node = sched_prev(current_node)) {
 		ir_op             *op;
-		ir_node           *last;
 		peephole_opt_func  peephole_node;
 
 		assert(!is_Bad(current_node));
-		prev_node = NULL;
 		if (is_Phi(current_node))
 			break;
 
 		clear_defs(current_node);
 		set_uses(current_node);
 
-		op   = get_irn_op(current_node);
+		op            = get_irn_op(current_node);
 		peephole_node = (peephole_opt_func)op->ops.generic;
 		if (peephole_node == NULL)
 			continue;
 
-		last = current_node;
 		peephole_node(current_node);
-		/* was the current node replaced? */
-		if (current_node != last)
-			set_uses(current_node);
+		assert(!is_Bad(current_node));
+	}
+}
+
+static void kill_node_and_preds(ir_node *node)
+{
+	int arity, i;
+
+	arity = get_irn_arity(node);
+	for (i = 0; i < arity; ++i) {
+		ir_node *pred = get_irn_n(node, i);
+
+		set_irn_n(node, i, new_Bad());
+		if (get_irn_n_edges(pred) != 0)
+			continue;
+
+		kill_node_and_preds(pred);
 	}
+
+	if (!is_Proj(node))
+		sched_remove(node);
+	kill_node(node);
 }
 
 /**
@@ -244,21 +260,22 @@ static void skip_barrier(ir_node *ret_blk, ir_graph *irg) {
 	ir_node *irn;
 
 	sched_foreach_reverse(ret_blk, irn) {
-		if (be_is_Barrier(irn)) {
-			const ir_edge_t *edge, *next;
-
-			foreach_out_edge_safe(irn, edge, next) {
-				ir_node *proj = get_edge_src_irn(edge);
-				int      pn   = (int)get_Proj_proj(proj);
-				ir_node *pred = get_irn_n(irn, pn);
-
-				edges_reroute_kind(proj, pred, EDGE_KIND_NORMAL, irg);
-				edges_reroute_kind(proj, pred, EDGE_KIND_DEP, irg);
-			}
-			sched_remove(irn);
-			kill_node(irn);
-			break;
+		const ir_edge_t *edge, *next;
+
+		if (!be_is_Barrier(irn))
+			continue;
+
+		foreach_out_edge_safe(irn, edge, next) {
+			ir_node *proj = get_edge_src_irn(edge);
+			int      pn   = (int)get_Proj_proj(proj);
+			ir_node *pred = get_irn_n(irn, pn);
+
+			edges_reroute_kind(proj, pred, EDGE_KIND_NORMAL, irg);
+			edges_reroute_kind(proj, pred, EDGE_KIND_DEP, irg);
 		}
+
+		kill_node_and_preds(irn);
+		break;
 	}
 }
 
@@ -366,4 +383,4 @@ void be_init_peephole(void)
 	FIRM_DBG_REGISTER(dbg, "firm.be.peephole");
 }
 
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_spillbelady);
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_peephole);