X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbetranshlp.c;h=71937f80e3c99895918d34f200c46ccc7817db03;hb=15769c9f67d00b398ff43e013eddbe5269ba5787;hp=ab4a4c67b2fd7c1799ecb09e80f9f17062a627b3;hpb=bb9f2e36362333c6635b89f5258171b06c786608;p=libfirm

diff --git a/ir/be/betranshlp.c b/ir/be/betranshlp.c
index ab4a4c67b..71937f80e 100644
--- a/ir/be/betranshlp.c
+++ b/ir/be/betranshlp.c
@@ -39,8 +39,9 @@
 #include "cgana.h"
 #include "debug.h"
 
-#include "beirg_t.h"
+#include "beirg.h"
 #include "betranshlp.h"
+#include "belive.h"
 
 typedef struct be_transform_env_t {
 	ir_graph *irg;         /**< The irg, the node should be created in */
@@ -83,7 +84,7 @@ void be_duplicate_deps(ir_node *old_node, ir_node *new_node) {
 	}
 }
 
-void be_dep_on_frame(ir_node *const node)
+void be_dep_on_frame(ir_node* node)
 {
 	ir_graph *const irg = current_ir_graph;
 
@@ -109,7 +110,7 @@ ir_node *be_duplicate_node(ir_node *node) {
 			add_irn_n(new_node, in);
 		}
 	} else {
-		ir_node **ins = alloca(arity * sizeof(ins[0]));
+		ir_node **ins = ALLOCAN(ir_node*, arity);
 		for (i = 0; i < arity; ++i) {
 			ir_node *in = get_irn_n(node, i);
 			ins[i] = be_transform_node(in);
@@ -121,10 +122,7 @@ ir_node *be_duplicate_node(ir_node *node) {
 	copy_node_attr(node, new_node);
 	be_duplicate_deps(node, new_node);
 
-#ifdef DEBUG_libfirm
 	new_node->node_nr = node->node_nr;
-#endif
-
 	return new_node;
 }
 
@@ -329,26 +327,14 @@ static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform)
 static ir_node *gen_Block(ir_node *node) {
 	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  *macroblock      = get_Block_MacroBlock(node);
 	ir_node  *block;
 
-	/*
-	 * We replace the ProjX from the start node with a jump,
-	 * so the startblock has no preds anymore now
-	 */
-	if (node == old_start_block) {
-		return new_rd_Block(dbgi, irg, 0, NULL);
-	}
-
-	/* we use the old blocks for now, because jumps allow cycles in the graph
-	 * we have to fix this later */
 	block = new_ir_node(dbgi, irg, NULL, get_irn_op(node), get_irn_mode(node),
 	                    get_irn_arity(node), get_irn_in(node) + 1);
 	copy_node_attr(node, block);
-#ifdef DEBUG_libfirm
 	block->node_nr = node->node_nr;
-#endif
+
 	if (node == macroblock) {
 		/* this node is a macroblock header */
 		set_Block_MacroBlock(block, block);
@@ -441,6 +427,6 @@ void be_transform_graph(be_irg_t *birg, arch_pretrans_nodes *func)
 
 	if (birg->lv) {
 		be_liveness_free(birg->lv);
-		birg->lv = be_liveness(birg);
+		birg->lv = be_liveness(irg);
 	}
 }