X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbetranshlp.c;h=c7582cdc6aee721543310341abbe10581fb541c5;hb=c1fdf770d4d000dd5cf22daead32369342c5f5d1;hp=4da063bd245e084b37b88520377a5f7f50f51ea2;hpb=9c6ef39a9a1f9401eb46b5b577f109f704fa92b9;p=libfirm

diff --git a/ir/be/betranshlp.c b/ir/be/betranshlp.c
index 4da063bd2..c7582cdc6 100644
--- a/ir/be/betranshlp.c
+++ b/ir/be/betranshlp.c
@@ -24,9 +24,7 @@
  * @date        14.06.2007
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "pdeq.h"
 #include "irop_t.h"
@@ -46,8 +44,6 @@
 
 typedef struct be_transform_env_t {
 	ir_graph *irg;         /**< The irg, the node should be created in */
-	int      visited;      /**< visited count that indicates whether a
-	                            node is already transformed */
 	waitq    *worklist;    /**< worklist of nodes that still need to be
 	                            transformed */
 	ir_node  *old_anchor;  /**< the old anchor node in the old irg */
@@ -56,8 +52,10 @@ typedef struct be_transform_env_t {
 
 static be_transform_env_t env;
 
-void be_set_transformed_node(ir_node *old_node, ir_node *new_node) {
+void be_set_transformed_node(ir_node *old_node, ir_node *new_node)
+{
 	set_irn_link(old_node, new_node);
+	mark_irn_visited(old_node);
 }
 
 int be_is_transformed(const ir_node *node) {
@@ -85,6 +83,14 @@ void be_duplicate_deps(ir_node *old_node, ir_node *new_node) {
 	}
 }
 
+void be_dep_on_frame(ir_node *const node)
+{
+	ir_graph *const irg = current_ir_graph;
+
+	if (get_irg_start_block(irg) == get_nodes_block(node))
+		add_irn_dep(node, get_irg_frame(irg));
+}
+
 ir_node *be_duplicate_node(ir_node *node) {
 	ir_node  *block = be_transform_node(get_nodes_block(node));
 	ir_graph *irg   = env.irg;
@@ -132,7 +138,6 @@ ir_node *be_transform_node(ir_node *node) {
 	if (new_node != NULL)
 		return new_node;
 
-	mark_irn_visited(node);
 	DEBUG_ONLY(be_set_transformed_node(node, NULL));
 
 	op = get_irn_op(node);
@@ -146,7 +151,6 @@ ir_node *be_transform_node(ir_node *node) {
 	}
 
 	be_set_transformed_node(node, new_node);
-	mark_irn_visited(new_node);
 	hook_dead_node_elim_subst(current_ir_graph, node, new_node);
 	return new_node;
 }
@@ -174,11 +178,9 @@ static void fix_loops(ir_node *node) {
 
 	assert(node_is_in_irgs_storage(env.irg, node));
 
-	if (irn_visited(node))
+	if (irn_visited_else_mark(node))
 		return;
 
-	mark_irn_visited(node);
-
 	changed = 0;
 	if (! is_Block(node)) {
 		ir_node *block     = get_nodes_block(node);
@@ -238,11 +240,6 @@ 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);
@@ -262,8 +259,7 @@ static void kill_unused_anchor(int anchor)
 /**
  * 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)
+static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform)
 {
 	int       i;
 	ir_node  *old_end, *new_anchor;
@@ -273,7 +269,6 @@ static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform,
 	inc_irg_visited(irg);
 
 	env.irg         = irg;
-	env.visited     = get_irg_visited(irg);
 	env.worklist    = new_waitq();
 	env.old_anchor  = irg->anchor;
 
@@ -301,7 +296,7 @@ static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform,
 	kill_unused_anchor(anchor_tls);
 
 	if (pre_transform)
-		(*pre_transform)(cg);
+		pre_transform();
 
 	/* process worklist (this should transform all nodes in the graph) */
 	while (! waitq_empty(env.worklist)) {
@@ -362,8 +357,6 @@ static ir_node *gen_Block(ir_node *node) {
 		set_Block_MacroBlock(block, macroblock);
 	}
 
-	be_set_transformed_node(node, block);
-
 	/* put the preds in the worklist */
 	be_enqueue_preds(node);
 
@@ -383,7 +376,6 @@ static ir_node *gen_End(ir_node *node) {
 	be_duplicate_deps(node, new_end);
 
 	set_irg_end(irg, new_end);
-	be_set_transformed_node(new_end, new_end);
 
 	/* transform preds */
 	arity = get_irn_arity(node);
@@ -397,7 +389,7 @@ static ir_node *gen_End(ir_node *node) {
 	return new_end;
 }
 
-void be_transform_graph(be_irg_t *birg, arch_pretrans_nodes *func, void *cg)
+void be_transform_graph(be_irg_t *birg, arch_pretrans_nodes *func)
 {
 	ir_graph *irg = birg->irg;
 	ir_graph *old_current_ir_graph = current_ir_graph;
@@ -408,7 +400,7 @@ void be_transform_graph(be_irg_t *birg, arch_pretrans_nodes *func, void *cg)
 
 	/* create a new obstack */
 	old_obst = irg->obst;
-	new_obst = xmalloc(sizeof(*new_obst));
+	new_obst = XMALLOC(struct obstack);
 	obstack_init(new_obst);
 	irg->obst = new_obst;
 	irg->last_node_idx = 0;
@@ -422,7 +414,7 @@ void be_transform_graph(be_irg_t *birg, arch_pretrans_nodes *func, void *cg)
 	op_End->ops.generic   = (op_func)gen_End;
 
 	/* do the main transformation */
-	transform_nodes(irg, func, cg);
+	transform_nodes(irg, func);
 
 	/* free the old obstack */
 	obstack_free(old_obst, 0);