X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbetranshlp.c;h=4da063bd245e084b37b88520377a5f7f50f51ea2;hb=3f807bf48426a29da4129ff29c44a4b4690c45f6;hp=93f77584e6b6ddbf02bcf0bba304762b641eaad1;hpb=c9a4240b57fe5713ae881d2f5964ddbf2989540a;p=libfirm diff --git a/ir/be/betranshlp.c b/ir/be/betranshlp.c index 93f77584e..4da063bd2 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. * @@ -33,7 +33,7 @@ #include "iropt_t.h" #include "irnode_t.h" #include "irgraph_t.h" -#include "ircons.h" +#include "ircons_t.h" #include "irhooks.h" #include "iredges.h" #include "irouts.h" @@ -50,7 +50,7 @@ typedef struct be_transform_env_t { node is already transformed */ waitq *worklist; /**< worklist of nodes that still need to be transformed */ - ir_node **old_anchors;/**< the list of anchors nodes in the old irg */ + ir_node *old_anchor; /**< the old anchor node in the old irg */ } be_transform_env_t; @@ -60,13 +60,17 @@ void be_set_transformed_node(ir_node *old_node, ir_node *new_node) { set_irn_link(old_node, new_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); +int be_is_transformed(const ir_node *node) { + return irn_visited(node); } -ir_node *be_get_old_anchor(unsigned anchor) { - return env.old_anchors[anchor]; +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) { @@ -122,14 +126,11 @@ 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)); @@ -169,6 +170,7 @@ void be_enqueue_preds(ir_node *node) { */ static void fix_loops(ir_node *node) { int i, arity; + int changed; assert(node_is_in_irgs_storage(env.irg, node)); @@ -177,6 +179,7 @@ static void fix_loops(ir_node *node) { mark_irn_visited(node); + changed = 0; if (! is_Block(node)) { ir_node *block = get_nodes_block(node); ir_node *new_block = get_irn_link(block); @@ -184,6 +187,7 @@ static void fix_loops(ir_node *node) { if (new_block != NULL) { set_nodes_block(node, new_block); block = new_block; + changed = 1; } fix_loops(block); @@ -197,10 +201,16 @@ static void fix_loops(ir_node *node) { if (nw != NULL && nw != in) { set_irn_n(node, i, nw); in = nw; + changed = 1; } fix_loops(in); } + /* fix proj block */ + if(is_Proj(node)) { + set_nodes_block(node, get_nodes_block(get_Proj_pred(node))); + changed = 1; + } arity = get_irn_deps(node); for (i = 0; i < arity; ++i) { @@ -210,10 +220,15 @@ static void fix_loops(ir_node *node) { if (nw != NULL && nw != in) { set_irn_dep(node, i, nw); in = nw; + changed = 1; } fix_loops(in); } + + if(changed) { + identify_remember(current_ir_graph->value_table, node); + } } ir_node *be_pre_transform_node(ir_node *place) { @@ -223,12 +238,35 @@ 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); + ir_node *transformed = be_transform_node(old_anchor_node); + set_irg_anchor(current_ir_graph, anchor, transformed); +} + +static void kill_unused_anchor(int anchor) +{ + ir_node *old_anchor_node = get_irn_n(env.old_anchor, anchor); + ir_node *old_bad = get_irn_n(env.old_anchor, anchor_bad); + if(old_anchor_node != NULL && get_irn_n_edges(old_anchor_node) <= 1) { + set_irn_n(env.old_anchor, anchor, old_bad); + } +} + /** * 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) { - int i; - ir_node *old_end; +static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform, + void *cg) +{ + int i; + ir_node *old_end, *new_anchor; hook_dead_node_elim(irg, 1); @@ -237,31 +275,30 @@ static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform, v env.irg = irg; env.visited = get_irg_visited(irg); env.worklist = new_waitq(); - env.old_anchors = alloca(anchor_max * sizeof(env.old_anchors[0])); + env.old_anchor = irg->anchor; old_end = get_irg_end(irg); /* put all anchor nodes in the worklist */ - for (i = 0; i < anchor_max; ++i) { - ir_node *anchor = irg->anchors[i]; + for (i = get_irg_n_anchors(irg) - 1; i >= 0; --i) { + ir_node *anchor = get_irg_anchor(irg, i); if (anchor == NULL) continue; waitq_put(env.worklist, anchor); - - /* remember anchor */ - env.old_anchors[i] = anchor; - /* and set it to NULL to make sure we don't accidently use it */ - irg->anchors[i] = NULL; } + new_anchor = new_Anchor(irg); + irg->anchor = new_anchor; + /* pre transform some anchors (so they are available in the other transform * functions) */ - set_irg_bad(irg, be_transform_node(env.old_anchors[anchor_bad])); - set_irg_no_mem(irg, be_transform_node(env.old_anchors[anchor_no_mem])); - set_irg_start_block(irg, be_transform_node(env.old_anchors[anchor_start_block])); - set_irg_start(irg, be_transform_node(env.old_anchors[anchor_start])); - set_irg_frame(irg, be_transform_node(env.old_anchors[anchor_frame])); + pre_transform_anchor(anchor_bad); + pre_transform_anchor(anchor_no_mem); + pre_transform_anchor(anchor_start_block); + pre_transform_anchor(anchor_start); + pre_transform_anchor(anchor_frame); + kill_unused_anchor(anchor_tls); if (pre_transform) (*pre_transform)(cg); @@ -274,17 +311,17 @@ static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform, v /* fix loops and set new anchors*/ inc_irg_visited(irg); - for (i = 0; i < anchor_max; ++i) { - ir_node *anchor = env.old_anchors[i]; + for (i = get_irg_n_anchors(irg) - 1; i >= 0; --i) { + ir_node *anchor = get_irn_n(env.old_anchor, i); if (anchor == NULL) continue; anchor = get_irn_link(anchor); fix_loops(anchor); - assert(irg->anchors[i] == NULL || irg->anchors[i] == anchor); - irg->anchors[i] = anchor; + set_irn_n(new_anchor, i, anchor); } + set_nodes_block(new_anchor, get_irg_anchor(irg, anchor_end_block)); del_waitq(env.worklist); free_End(old_end); @@ -295,16 +332,17 @@ static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform, v * Transform helper for blocks. */ static ir_node *gen_Block(ir_node *node) { - ir_graph *irg = current_ir_graph; - dbg_info *dbgi = get_irn_dbg_info(node); - ir_node *start_block = be_get_old_anchor(anchor_start_block); + 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 == start_block) { + if (node == old_start_block) { return new_rd_Block(dbgi, irg, 0, NULL); } @@ -313,10 +351,17 @@ static ir_node *gen_Block(ir_node *node) { 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); + } else { + macroblock = be_transform_node(macroblock); + set_Block_MacroBlock(block, macroblock); + } + be_set_transformed_node(node, block); /* put the preds in the worklist */ @@ -356,22 +401,10 @@ void be_transform_graph(be_irg_t *birg, arch_pretrans_nodes *func, void *cg) { 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; @@ -391,16 +424,24 @@ void be_transform_graph(be_irg_t *birg, arch_pretrans_nodes *func, void *cg) /* 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)); - /* free the old obstack */ obstack_free(old_obst, 0); xfree(old_obst); /* 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); @@ -408,6 +449,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->irg); + birg->lv = be_liveness(birg); } }