X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbetranshlp.c;h=91a18da3878879321e163c1a4a1fd575b4059d8f;hb=44fdfafcf4d8940cbdc92266b091f18c62832d3a;hp=13382e1ae5deafe5a96f1ea1b282086f9f09b543;hpb=6892f449f2b18be4addedf7f014a675e5af2eccb;p=libfirm diff --git a/ir/be/betranshlp.c b/ir/be/betranshlp.c index 13382e1ae..91a18da38 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" @@ -64,7 +62,7 @@ int be_is_transformed(const ir_node *node) { return irn_visited(node); } -static INLINE ir_node *be_get_transformed_node(ir_node *old_node) { +static inline ir_node *be_get_transformed_node(ir_node *old_node) { if (irn_visited(old_node)) { ir_node *new_node = get_irn_link(old_node); assert(new_node != NULL); @@ -85,6 +83,14 @@ void be_duplicate_deps(ir_node *old_node, ir_node *new_node) { } } +void be_dep_on_frame(ir_node* 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; @@ -103,7 +109,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); @@ -253,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; @@ -291,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)) { @@ -384,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; @@ -409,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); @@ -436,6 +441,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); + birg->lv = be_liveness(irg); } }