X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbetranshlp.c;h=0f1f5c1db42138f583b79a04952c3e4a608d40b1;hb=dd773fe15c0af814dc5af6fcb0dad913d181a30d;hp=3c1e8e022c41b571a912eedda7a048aa6e73c1c3;hpb=afbbc0b1ccd684c4c24bfd43d0f994123245f39f;p=libfirm diff --git a/ir/be/betranshlp.c b/ir/be/betranshlp.c index 3c1e8e022..0f1f5c1db 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" @@ -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,15 +53,19 @@ 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) { +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); @@ -73,7 +74,8 @@ static INLINE ir_node *be_get_transformed_node(ir_node *old_node) { return NULL; } -void be_duplicate_deps(ir_node *old_node, ir_node *new_node) { +void be_duplicate_deps(ir_node *old_node, ir_node *new_node) +{ int i; int deps = get_irn_deps(old_node); @@ -85,7 +87,16 @@ void be_duplicate_deps(ir_node *old_node, ir_node *new_node) { } } -ir_node *be_duplicate_node(ir_node *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; dbg_info *dbgi = get_irn_dbg_info(node); @@ -103,7 +114,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); @@ -115,24 +126,21 @@ 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; } /** * Calls transformation function for given node and marks it visited. */ -ir_node *be_transform_node(ir_node *node) { +ir_node *be_transform_node(ir_node *node) +{ ir_op *op; ir_node *new_node = be_get_transformed_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); @@ -153,7 +161,8 @@ ir_node *be_transform_node(ir_node *node) { /** * enqueue all inputs into the transform queue. */ -void be_enqueue_preds(ir_node *node) { +void be_enqueue_preds(ir_node *node) +{ int i, arity; /* put the preds in the worklist */ @@ -167,7 +176,8 @@ void be_enqueue_preds(ir_node *node) { /** * Rewire nodes which are potential loops (like Phis) to avoid endless loops. */ -static void fix_loops(ir_node *node) { +static void fix_loops(ir_node *node) +{ int i, arity; int changed; @@ -228,18 +238,14 @@ static void fix_loops(ir_node *node) { } } -ir_node *be_pre_transform_node(ir_node *place) { +ir_node *be_pre_transform_node(ir_node *place) +{ if (place == NULL) return NULL; 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); @@ -256,11 +262,27 @@ static void kill_unused_anchor(int anchor) } } +static ir_node *new_be_Anchor(ir_graph *irg) +{ + struct obstack *obst = be_get_birg_obst(irg); + backend_info_t *info; + ir_node *new_anchor; + + /* Hack: some places in the code ask the Anchor for its register + requirements */ + new_anchor = new_Anchor(irg); + info = be_get_info(new_anchor); + info->out_infos = NEW_ARR_D(reg_out_info_t, obst, 1); + memset(info->out_infos, 0, 1 * sizeof(info->out_infos[0])); + info->out_infos[0].req = arch_no_register_req; + + return new_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; @@ -270,7 +292,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; @@ -285,7 +306,7 @@ static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform, waitq_put(env.worklist, anchor); } - new_anchor = new_Anchor(irg); + new_anchor = new_be_Anchor(irg); irg->anchor = new_anchor; /* pre transform some anchors (so they are available in the other transform @@ -298,7 +319,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)) { @@ -328,29 +349,18 @@ static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform, /** * Transform helper for blocks. */ -static ir_node *gen_Block(ir_node *node) { +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); @@ -365,7 +375,8 @@ static ir_node *gen_Block(ir_node *node) { return block; } -static ir_node *gen_End(ir_node *node) { +static ir_node *gen_End(ir_node *node) +{ /* end has to be duplicated manually because we need a dynamic in array */ ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); @@ -391,7 +402,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; @@ -416,7 +427,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); @@ -443,6 +454,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); } }