X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbetranshlp.c;h=71937f80e3c99895918d34f200c46ccc7817db03;hb=15769c9f67d00b398ff43e013eddbe5269ba5787;hp=4af94e01ed0814aacc8a725f4589bc59065b2c1b;hpb=b0e09fe0aada2e5d9dc0299e969b3c93c1092d97;p=libfirm diff --git a/ir/be/betranshlp.c b/ir/be/betranshlp.c index 4af94e01e..71937f80e 100644 --- a/ir/be/betranshlp.c +++ b/ir/be/betranshlp.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2007 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -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" @@ -41,13 +39,12 @@ #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 */ - 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,13 +53,23 @@ 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) { + return irn_visited(node); } -static INLINE ir_node *be_get_transformed_node(ir_node *old_node) { - assert(irn_visited(old_node)); - return (ir_node*) get_irn_link(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); + return new_node; + } + return NULL; } void be_duplicate_deps(ir_node *old_node, ir_node *new_node) { @@ -77,6 +84,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; @@ -95,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); @@ -107,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; } @@ -118,16 +130,12 @@ ir_node *be_duplicate_node(ir_node *node) { * Calls transformation function for given node and marks it visited. */ ir_node *be_transform_node(ir_node *node) { - ir_node *new_node; ir_op *op; + ir_node *new_node = be_get_transformed_node(node); - if (irn_visited(node)) { - new_node = be_get_transformed_node(node); - assert(new_node != NULL); + if (new_node != NULL) return new_node; - } - mark_irn_visited(node); DEBUG_ONLY(be_set_transformed_node(node, NULL)); op = get_irn_op(node); @@ -141,7 +149,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; } @@ -169,11 +176,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); @@ -233,11 +238,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); @@ -257,8 +257,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; @@ -268,7 +267,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; @@ -296,7 +294,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)) { @@ -316,7 +314,7 @@ static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform, fix_loops(anchor); set_irn_n(new_anchor, i, anchor); } - set_irn_n(new_anchor, -1, get_irg_anchor(irg, anchor_end_block)); + set_nodes_block(new_anchor, get_irg_anchor(irg, anchor_end_block)); del_waitq(env.worklist); free_End(old_end); @@ -329,27 +327,21 @@ 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 - be_set_transformed_node(node, block); + + if (node == macroblock) { + /* this node is a macroblock header */ + set_Block_MacroBlock(block, block); + } else { + macroblock = be_transform_node(macroblock); + set_Block_MacroBlock(block, macroblock); + } /* put the preds in the worklist */ be_enqueue_preds(node); @@ -370,7 +362,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); @@ -384,30 +375,18 @@ 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; - int old_interprocedural_view = get_interprocedural_view(); struct obstack *old_obst = NULL; struct obstack *new_obst = NULL; current_ir_graph = irg; - set_interprocedural_view(0); - - /* most analysis info is wrong after transformation */ - free_callee_info(irg); - free_irg_outs(irg); - free_trouts(); - free_loop_information(irg); - set_irg_doms_inconsistent(irg); - - be_liveness_invalidate(be_get_birg_liveness(birg)); - be_invalidate_dom_front(birg); /* 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; @@ -421,10 +400,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); - - /* we don't want the globals anchor anymore */ - set_irg_globals(irg, new_r_Bad(irg)); + transform_nodes(irg, func); /* free the old obstack */ obstack_free(old_obst, 0); @@ -432,7 +408,18 @@ void be_transform_graph(be_irg_t *birg, arch_pretrans_nodes *func, void *cg) /* restore state */ current_ir_graph = old_current_ir_graph; - set_interprocedural_view(old_interprocedural_view); + + /* most analysis info is wrong after transformation */ + free_callee_info(irg); + free_irg_outs(irg); + free_trouts(); + free_loop_information(irg); + set_irg_doms_inconsistent(irg); + + be_liveness_invalidate(be_get_birg_liveness(birg)); + /* Hack for now, something is buggy with invalidate liveness... */ + birg->lv = NULL; + be_invalidate_dom_front(birg); /* recalculate edges */ edges_deactivate(irg); @@ -440,6 +427,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); } }