X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fir%2Firgmod.c;h=5af1b94a9e26905ca1ea163390d47cefde700382;hb=ba4ac6da01ea81263911248239cf1e5affcb1885;hp=7616f60d5e23e83a62f3d684d908e5b15219b511;hpb=a423b8b874cda00d6c79c0774e11427ac6984155;p=libfirm

diff --git a/ir/ir/irgmod.c b/ir/ir/irgmod.c
index 7616f60d5..5af1b94a9 100644
--- a/ir/ir/irgmod.c
+++ b/ir/ir/irgmod.c
@@ -23,9 +23,7 @@
  * @author   Martin Trapp, Christian Schaefer, Goetz Lindenmaier
  * @version  $Id$
  */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "irvrfy.h"
 #include "irflag_t.h"
@@ -133,7 +131,7 @@ static void collect_phiprojs_walker(ir_node *n, void *env) {
 
 	if (is_Phi(n)) {
 		ir_node *block = get_nodes_block(n);
-		add_Block_phi(n, n);
+		add_Block_phi(block, n);
 	} else if (is_Proj(n)) {
 		pred = n;
 		do {
@@ -152,21 +150,10 @@ static void collect_phiprojs_walker(ir_node *n, void *env) {
 	}
 }
 
-/**
- * clear all links, including the Phi list of blocks and Phi nodes.
- */
-static void clear_node_and_phis_links(ir_node *n, void *env) {
-	(void) env;
-
-	set_irn_link(n, NULL);
-	if (is_Block(n))
-		set_Block_phis(n, NULL);
-	else if (is_Phi(n))
-		set_Phi_next(n, NULL);
-}
-
 void collect_phiprojs(ir_graph *irg) {
-	irg_walk_graph(irg, clear_node_and_phis_links, collect_phiprojs_walker, NULL);
+	assert((ir_resources_reserved(irg) & (IR_RESOURCE_IRN_LINK|IR_RESOURCE_PHI_LIST)) ==
+		(IR_RESOURCE_IRN_LINK|IR_RESOURCE_PHI_LIST));
+	irg_walk_graph(irg, firm_clear_node_and_phi_links, collect_phiprojs_walker, NULL);
 }
 
 /*--------------------------------------------------------------------*/
@@ -206,15 +193,16 @@ static void move(ir_node *node, ir_node *from_bl, ir_node *to_bl) {
 }
 
 void part_block(ir_node *node) {
-	ir_node *new_block;
-	ir_node *old_block;
-	ir_node *phi;
-	ir_node *mbh;
+	ir_node *new_block, *old_block, *mbh;
+	ir_node *phi, *jmp, *next, *block;
+	ir_graph *rem = current_ir_graph;
 
 	/* 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);
 	mbh       = get_Block_MacroBlock(old_block);
@@ -228,12 +216,10 @@ void part_block(ir_node *node) {
 		/* we are splitting a header: this creates a new header */
 		set_Block_MacroBlock(new_block, new_block);
 	}
-	set_irg_current_block(current_ir_graph, new_block);
-	{
-		ir_node *jmp = new_Jmp();
-		set_irn_in(old_block, 1, &jmp);
-		irn_vrfy_irg(old_block, current_ir_graph);
-	}
+
+	/* create a jump from new_block to old_block, which is now the lower one */
+	jmp = new_r_Jmp(new_block);
+	set_irn_in(old_block, 1, &jmp);
 
 	/* move node and its predecessors to new_block */
 	move(node, old_block, new_block);
@@ -247,12 +233,18 @@ void part_block(ir_node *node) {
 		phi = get_Phi_next(phi);
 	}
 
-	/* rewire partBlocks */
+	/* rewire partBlocks: This is necessary, because old_block is a new MacroBlock
+	   header now */
 	if (mbh != old_block) {
-		ir_node *next, *block = get_irn_link(mbh);
+		ir_node *list = NULL;
+
+		/* move blocks from mbh to old_block if old_block dominates them */
+		block = get_irn_link(mbh);
 
+		/* mbh's list will be rebuild */
 		set_irn_link(mbh, NULL);
-		set_irn_link(old_block, NULL);
+		/* old_block is a new mbh */
+		set_Block_MacroBlock(old_block, old_block);
 
 		/* note that we must splice the list of partBlock here */
 		for (; block != NULL; block = next) {
@@ -260,6 +252,12 @@ void part_block(ir_node *node) {
 			assert(is_Block(curr));
 
 			next = get_irn_link(block);
+
+			if (block == old_block) {
+				/* this effectively removed old_block from mbh's list */
+				continue;
+			}
+
 			assert(get_Block_MacroBlock(curr) == mbh);
 
 			for (;;) {
@@ -267,8 +265,8 @@ void part_block(ir_node *node) {
 					/* old_block dominates the block, so old_block will be
 					   the new macro block header */
 					set_Block_MacroBlock(block, old_block);
-					set_irn_link(block, get_irn_link(old_block));
-					set_irn_link(old_block, block);
+					set_irn_link(block, list);
+					list = block;
 					break;
 				}
 				if (curr == mbh) {
@@ -282,9 +280,20 @@ void part_block(ir_node *node) {
 				curr = get_Block_cfgpred_block(curr, 0);
 			}
 		}
+		/* beware: do NOT directly manipulate old_block's list, as old_block is
+		   in mbh's list and this would destroy the list! */
+		set_irn_link(old_block, list);
+
+		/* finally add new_block to mbh's list */
+		set_irn_link(new_block, get_irn_link(mbh));
+		set_irn_link(mbh, new_block);
+	} else {
+		/* old_block is the mbh, as well as new_block */
+		set_Block_MacroBlock(new_block, new_block);
 	}
 
 	set_optimize(rem_opt);
+	current_ir_graph = rem;
 }
 
 /* kill a node by setting its predecessors to Bad and finally exchange the node by Bad itself. */