X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgmod.c;h=a19f30d60ac6732348003ff1ee9d62b392bf237c;hb=4f92e524762e0febc361676111b3b5b79addd03a;hp=f2f0517e3c4853e40323b0c8aed300e6cd006b9e;hpb=d417a996c72a98d53da742562f1bc52c4083f6c5;p=libfirm

diff --git a/ir/ir/irgmod.c b/ir/ir/irgmod.c
index f2f0517e3..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,11 +164,11 @@ 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);
 		}
 	}
 
@@ -222,20 +222,18 @@ static void move_edges(ir_node *node, ir_node *from_bl, ir_node *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);
@@ -254,7 +252,6 @@ void part_block(ir_node *node)
 	}
 
 	set_optimize(rem_opt);
-	current_ir_graph = rem;
 }
 
 ir_node *part_block_edges(ir_node *node)