X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbetranshlp.c;h=42c4666856518ca9c5312a4d3594e129f1ac9b1a;hb=e1bfe8d072410f6ca115452bf9c1e3131fa27f4d;hp=0a241910e4567f304ac984a5477c5ac343d62a25;hpb=a2dc796648be8a0e8c85d6488e5ab5a790c218a9;p=libfirm

diff --git a/ir/be/betranshlp.c b/ir/be/betranshlp.c
index 0a241910e..42c466685 100644
--- a/ir/be/betranshlp.c
+++ b/ir/be/betranshlp.c
@@ -33,7 +33,7 @@
 #include "iropt_t.h"
 #include "irnode_t.h"
 #include "irgraph_t.h"
-#include "ircons.h"
+#include "ircons_t.h"
 #include "irhooks.h"
 #include "iredges.h"
 #include "irouts.h"
@@ -50,7 +50,7 @@ typedef struct be_transform_env_t {
 	                            node is already transformed */
 	waitq    *worklist;    /**< worklist of nodes that still need to be
 	                            transformed */
-	ir_node  **old_anchors;/**< the list of anchors nodes in the old irg */
+	ir_node  *old_anchor;  /**< the old anchor node in the old irg */
 } be_transform_env_t;
 
 
@@ -65,10 +65,6 @@ static INLINE ir_node *be_get_transformed_node(ir_node *old_node) {
 	return (ir_node*) get_irn_link(old_node);
 }
 
-ir_node *be_get_old_anchor(unsigned anchor) {
-	return env.old_anchors[anchor];
-}
-
 void be_duplicate_deps(ir_node *old_node, ir_node *new_node) {
 	int i;
 	int deps = get_irn_deps(old_node);
@@ -170,13 +166,13 @@ void be_enqueue_preds(ir_node *node) {
 static void fix_loops(ir_node *node) {
 	int i, arity;
 
+	assert(node_is_in_irgs_storage(env.irg, node));
+
 	if (irn_visited(node))
 		return;
 
 	mark_irn_visited(node);
 
-	assert(node_is_in_irgs_storage(env.irg, node));
-
 	if (! is_Block(node)) {
 		ir_node *block     = get_nodes_block(node);
 		ir_node *new_block = get_irn_link(block);
@@ -201,6 +197,10 @@ static void fix_loops(ir_node *node) {
 
 		fix_loops(in);
 	}
+	/* fix proj block */
+	if(is_Proj(node)) {
+		set_nodes_block(node, get_nodes_block(get_Proj_pred(node)));
+	}
 
 	arity = get_irn_deps(node);
 	for (i = 0; i < arity; ++i) {
@@ -223,12 +223,26 @@ ir_node *be_pre_transform_node(ir_node *place) {
 	return be_transform_node(place);
 }
 
+ir_node *be_get_old_anchor(int anchor)
+{
+	return get_irn_n(env.old_anchor, anchor);
+}
+
+static void pre_transform_anchor(int anchor)
+{
+	ir_node *old_anchor_node = get_irn_n(env.old_anchor, anchor);
+	ir_node *transformed     = be_transform_node(old_anchor_node);
+	set_irg_anchor(current_ir_graph, anchor, transformed);
+}
+
 /**
  * Transforms all nodes. Deletes the old obstack and creates a new one.
  */
-static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform, void *cg) {
-	int      i;
-	ir_node  *old_end;
+static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform,
+                            void *cg)
+{
+	int       i;
+	ir_node  *old_end, *new_anchor;
 
 	hook_dead_node_elim(irg, 1);
 
@@ -237,31 +251,29 @@ static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform, v
 	env.irg         = irg;
 	env.visited     = get_irg_visited(irg);
 	env.worklist    = new_waitq();
-	env.old_anchors = alloca(anchor_max * sizeof(env.old_anchors[0]));
+	env.old_anchor  = irg->anchor;
 
 	old_end = get_irg_end(irg);
 
 	/* put all anchor nodes in the worklist */
-	for (i = 0; i < anchor_max; ++i) {
-		ir_node *anchor = irg->anchors[i];
+	for (i = get_irg_n_anchors(irg) - 1; i >= 0; --i) {
+		ir_node *anchor = get_irg_anchor(irg, i);
 
 		if (anchor == NULL)
 			continue;
 		waitq_put(env.worklist, anchor);
-
-		/* remember anchor */
-		env.old_anchors[i] = anchor;
-		/* and set it to NULL to make sure we don't accidently use it */
-		irg->anchors[i] = NULL;
 	}
 
+	new_anchor  = new_Anchor(irg);
+	irg->anchor = new_anchor;
+
 	/* pre transform some anchors (so they are available in the other transform
 	 * functions) */
-	set_irg_bad(irg, be_transform_node(env.old_anchors[anchor_bad]));
-	set_irg_no_mem(irg, be_transform_node(env.old_anchors[anchor_no_mem]));
-	set_irg_start_block(irg, be_transform_node(env.old_anchors[anchor_start_block]));
-	set_irg_start(irg, be_transform_node(env.old_anchors[anchor_start]));
-	set_irg_frame(irg, be_transform_node(env.old_anchors[anchor_frame]));
+	pre_transform_anchor(anchor_bad);
+	pre_transform_anchor(anchor_no_mem);
+	pre_transform_anchor(anchor_start_block);
+	pre_transform_anchor(anchor_start);
+	pre_transform_anchor(anchor_frame);
 
 	if (pre_transform)
 		(*pre_transform)(cg);
@@ -274,17 +286,17 @@ static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform, v
 
 	/* fix loops and set new anchors*/
 	inc_irg_visited(irg);
-	for (i = 0; i < anchor_max; ++i) {
-		ir_node *anchor = env.old_anchors[i];
+	for (i = get_irg_n_anchors(irg) - 1; i >= 0; --i) {
+		ir_node *anchor = get_irn_n(env.old_anchor, i);
 
 		if (anchor == NULL)
 			continue;
 
 		anchor = get_irn_link(anchor);
 		fix_loops(anchor);
-		assert(irg->anchors[i] == NULL || irg->anchors[i] == anchor);
-		irg->anchors[i] = anchor;
+		set_irn_n(new_anchor, i, anchor);
 	}
+	set_irn_n(new_anchor, -1, get_irg_anchor(irg, anchor_end_block));
 
 	del_waitq(env.worklist);
 	free_End(old_end);
@@ -295,16 +307,16 @@ static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform, v
  * Transform helper for blocks.
  */
 static ir_node *gen_Block(ir_node *node) {
-	ir_graph *irg         = current_ir_graph;
-	dbg_info *dbgi        = get_irn_dbg_info(node);
-	ir_node  *start_block = be_get_old_anchor(anchor_start_block);
+	ir_graph *irg             = current_ir_graph;
+	dbg_info *dbgi            = get_irn_dbg_info(node);
+	ir_node  *old_start_block = get_irn_n(env.old_anchor, anchor_start_block);
 	ir_node  *block;
 
 	/*
 	 * We replace the ProjX from the start node with a jump,
 	 * so the startblock has no preds anymore now
 	 */
-	if (node == start_block) {
+	if (node == old_start_block) {
 		return new_rd_Block(dbgi, irg, 0, NULL);
 	}
 
@@ -408,6 +420,6 @@ void be_transform_graph(be_irg_t *birg, arch_pretrans_nodes *func, void *cg)
 
 	if (birg->lv) {
 		be_liveness_free(birg->lv);
-		birg->lv = be_liveness(birg->irg);
+		birg->lv = be_liveness(birg);
 	}
 }