X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgmod.c;h=a19f30d60ac6732348003ff1ee9d62b392bf237c;hb=7d070c58e7bef1ed875fac066b57f29de449724b;hp=872dc9ab4a11dd72cc27f17f2fc56666089d6eae;hpb=43aca1df83b9862e00da7d604c09521a0aabe770;p=libfirm

diff --git a/ir/ir/irgmod.c b/ir/ir/irgmod.c
index 872dc9ab4..a19f30d60 100644
--- a/ir/ir/irgmod.c
+++ b/ir/ir/irgmod.c
@@ -82,9 +82,9 @@ void exchange(ir_node *old, ir_node *nw)
 		/* copy all dependencies from old to new */
 		add_irn_deps(nw, old);
 
-		edges_reroute(old, nw, irg);
-		edges_reroute_kind(old, nw, EDGE_KIND_DEP, irg);
-		edges_node_deleted(old, irg);
+		edges_reroute(old, nw);
+		edges_reroute_kind(old, nw, EDGE_KIND_DEP);
+		edges_node_deleted(old);
 		/* noone is allowed to reference this node anymore */
 		set_irn_op(old, op_Deleted);
 	} else {
@@ -164,18 +164,18 @@ static void move(ir_node *node, ir_node *from_bl, ir_node *to_bl)
 
 	/* move its Projs */
 	if (get_irn_mode(node) == mode_T) {
-		ir_node *proj = get_irn_link(node);
+		ir_node *proj = (ir_node*)get_irn_link(node);
 		while (proj) {
 			if (get_nodes_block(proj) == from_bl)
 				set_nodes_block(proj, to_bl);
-			proj = get_irn_link(proj);
+			proj = (ir_node*)get_irn_link(proj);
 		}
 	}
 
-	/* recursion ... */
 	if (is_Phi(node))
 		return;
 
+	/* recursion ... */
 	arity = get_irn_arity(node);
 	for (i = 0; i < arity; i++) {
 		ir_node *pred = get_irn_n(node, i);
@@ -184,22 +184,56 @@ static void move(ir_node *node, ir_node *from_bl, ir_node *to_bl)
 	}
 }
 
+/**
+ * Moves node and all predecessors of node from from_bl to to_bl.
+ * Does not move predecessors of Phi nodes (or block nodes).
+ */
+static void move_edges(ir_node *node, ir_node *from_bl, ir_node *to_bl)
+{
+	int i, arity;
+
+	/* move this node */
+	set_nodes_block(node, to_bl);
+
+	/* move its Projs */
+	if (get_irn_mode(node) == mode_T) {
+		const ir_edge_t *edge;
+		foreach_out_edge(node, edge) {
+			ir_node *proj = get_edge_src_irn(edge);
+			set_nodes_block(proj, to_bl);
+		}
+	}
+
+	/* We must not move predecessors of Phi nodes, even if they are in
+	 * from_bl. (because these are values from an earlier loop iteration
+	 * which are not predecessors of node here)
+	 */
+	if (is_Phi(node))
+		return;
+
+	/* recursion ... */
+	arity = get_irn_arity(node);
+	for (i = 0; i < arity; i++) {
+		ir_node *pred = get_irn_n(node, i);
+		if (get_nodes_block(pred) == from_bl)
+			move_edges(pred, from_bl, to_bl);
+	}
+}
+
 void part_block(ir_node *node)
 {
-	ir_node *new_block, *old_block;
-	ir_node *phi, *jmp;
-	ir_graph *rem = current_ir_graph;
+	ir_graph *irg = get_irn_irg(node);
+	ir_node  *new_block, *old_block;
+	ir_node  *phi, *jmp;
 
 	/* Turn off optimizations so that blocks are not merged again. */
 	int rem_opt = get_opt_optimize();
 	set_optimize(0);
 
-	current_ir_graph = get_irn_irg(node);
-
 	/* Transform the control flow */
 	old_block = get_nodes_block(node);
-	new_block = new_Block(get_Block_n_cfgpreds(old_block),
-	                      get_Block_cfgpred_arr(old_block));
+	new_block = new_r_Block(irg, get_Block_n_cfgpreds(old_block),
+	                        get_Block_cfgpred_arr(old_block));
 
 	/* create a jump from new_block to old_block, which is now the lower one */
 	jmp = new_r_Jmp(new_block);
@@ -218,7 +252,33 @@ void part_block(ir_node *node)
 	}
 
 	set_optimize(rem_opt);
-	current_ir_graph = rem;
+}
+
+ir_node *part_block_edges(ir_node *node)
+{
+	ir_graph        *irg       = get_irn_irg(node);
+	ir_node         *old_block = get_nodes_block(node);
+	ir_node         *new_block = new_r_Block(irg,
+	                                         get_Block_n_cfgpreds(old_block),
+	                                         get_Block_cfgpred_arr(old_block));
+	const ir_edge_t *edge;
+	const ir_edge_t *next;
+
+	/* old_block has no predecessors anymore for now */
+	set_irn_in(old_block, 0, NULL);
+
+	/* move node and its predecessors to new_block */
+	move_edges(node, old_block, new_block);
+
+	/* move Phi nodes to new_block */
+	foreach_out_edge_safe(old_block, edge, next) {
+		ir_node *phi = get_edge_src_irn(edge);
+		if (!is_Phi(phi))
+			continue;
+		set_nodes_block(phi, new_block);
+	}
+
+	return old_block;
 }
 
 void kill_node(ir_node *node)