X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgmod.c;h=3731be5c746964f66fdd0567a8e6391e096a06b6;hb=908b8128537a1a06531a1013382e274a66fe817a;hp=6e72a0122146a57fab16aa7c2f5e44d2b139b02b;hpb=616559e5ffe35d19cddc658fb9de5622635afb97;p=libfirm diff --git a/ir/ir/irgmod.c b/ir/ir/irgmod.c index 6e72a0122..3731be5c7 100644 --- a/ir/ir/irgmod.c +++ b/ir/ir/irgmod.c @@ -21,11 +21,9 @@ * @file * @brief Support for ir graph modification. * @author Martin Trapp, Christian Schaefer, Goetz Lindenmaier - * @version $Id$ */ #include "config.h" -#include "irvrfy.h" #include "irflag_t.h" #include "irgwalk.h" #include "irnode_t.h" @@ -38,36 +36,23 @@ #include "irtools.h" #include "error.h" -/** - * Turns a node into a "useless" Tuple. The Tuple just forms a tuple - * from several inputs. - * This is useful if a node returning a tuple is removed, but the Projs - * extracting values from the tuple are not available. - */ -void turn_into_tuple(ir_node *node, int arity) { - assert(node); - set_irn_op(node, op_Tuple); - if (get_irn_arity(node) == arity) { - /* keep old array */ - } else { - ir_graph *irg = get_irn_irg(node); - ir_node *block = get_nodes_block(node); - edges_node_deleted(node, irg); - /* Allocate new array, don't free old in_array, it's on the obstack. */ - node->in = NEW_ARR_D(ir_node *, irg->obst, arity+1); - /* clear the new in array, else edge_notify tries to delete garbage */ - memset(node->in, 0, (arity+1) * sizeof(node->in[0])); - /* set the block back */ - set_nodes_block(node, block); +void turn_into_tuple(ir_node *node, int arity) +{ + ir_graph *irg = get_irn_irg(node); + ir_node **in = ALLOCAN(ir_node*, arity); + ir_node *bad = new_r_Bad(irg, mode_ANY); + int i; + + /* construct a new in array, with every input being bad */ + for (i = 0; i < arity; ++i) { + in[i] = bad; } + set_irn_in(node, arity, in); + set_irn_op(node, op_Tuple); } -/** - * Insert irnode `new' in place of irnode `old' - * Since `new' may be bigger than `old' replace `old' - * by an op_Id which is smaller than everything. - */ -void exchange(ir_node *old, ir_node *nw) { +void exchange(ir_node *old, ir_node *nw) +{ ir_graph *irg; assert(old && nw); @@ -86,10 +71,11 @@ void exchange(ir_node *old, ir_node *nw) { /* copy all dependencies from old to new */ add_irn_deps(nw, old); - edges_reroute(old, nw, irg); - edges_reroute_kind(old, nw, EDGE_KIND_DEP, irg); - edges_node_deleted(old, irg); - old->op = op_Bad; + edges_reroute(old, nw); + edges_reroute_kind(old, nw, EDGE_KIND_DEP); + edges_node_deleted(old); + /* noone is allowed to reference this node anymore */ + set_irn_op(old, op_Deleted); } else { /* Else, do it the old-fashioned way. */ ir_node *block; @@ -114,18 +100,18 @@ void exchange(ir_node *old, ir_node *nw) { old->in[0] = block; old->in[1] = nw; } -} -/*--------------------------------------------------------------------*/ -/* Functionality for collect_phis */ -/*--------------------------------------------------------------------*/ + /* update irg flags */ + clear_irg_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_OUTS + | IR_GRAPH_PROPERTY_CONSISTENT_LOOPINFO); +} /** * Walker: links all Phi nodes to their Blocks lists, - * all Proj nodes to there predecessors and all - * partBlocks to there MacroBlock header. + * all Proj nodes to there predecessors. */ -static void collect_phiprojs_walker(ir_node *n, void *env) { +static void collect_phiprojs_walker(ir_node *n, void *env) +{ ir_node *pred; (void) env; @@ -140,31 +126,22 @@ static void collect_phiprojs_walker(ir_node *n, void *env) { set_irn_link(n, get_irn_link(pred)); set_irn_link(pred, n); - } else if (is_Block(n)) { - ir_node *mbh = get_Block_MacroBlock(n); - - if (mbh != n) { - set_irn_link(n, get_irn_link(mbh)); - set_irn_link(mbh, n); - } } } -void collect_phiprojs(ir_graph *irg) { +void collect_phiprojs(ir_graph *irg) +{ assert((ir_resources_reserved(irg) & (IR_RESOURCE_IRN_LINK|IR_RESOURCE_PHI_LIST)) == (IR_RESOURCE_IRN_LINK|IR_RESOURCE_PHI_LIST)); irg_walk_graph(irg, firm_clear_node_and_phi_links, collect_phiprojs_walker, NULL); } -/*--------------------------------------------------------------------*/ -/* Functionality for part_block */ -/*--------------------------------------------------------------------*/ - /** * Moves node and all predecessors of node from from_bl to to_bl. * Does not move predecessors of Phi nodes (or block nodes). */ -static void move(ir_node *node, ir_node *from_bl, ir_node *to_bl) { +static void move(ir_node *node, ir_node *from_bl, ir_node *to_bl) +{ int i, arity; /* move this node */ @@ -172,18 +149,18 @@ static void move(ir_node *node, ir_node *from_bl, ir_node *to_bl) { /* move its Projs */ if (get_irn_mode(node) == mode_T) { - ir_node *proj = get_irn_link(node); + ir_node *proj = (ir_node*)get_irn_link(node); while (proj) { if (get_nodes_block(proj) == from_bl) set_nodes_block(proj, to_bl); - proj = get_irn_link(proj); + proj = (ir_node*)get_irn_link(proj); } } - /* recursion ... */ if (is_Phi(node)) return; + /* recursion ... */ arity = get_irn_arity(node); for (i = 0; i < arity; i++) { ir_node *pred = get_irn_n(node, i); @@ -192,13 +169,55 @@ static void move(ir_node *node, ir_node *from_bl, ir_node *to_bl) { } } -void part_block(ir_node *node) { - ir_node *new_block; - ir_node *old_block; - ir_node *phi; - ir_node *mbh; - ir_node *next, *block; +static void move_projs(const ir_node *node, ir_node *to_bl) +{ + if (get_irn_mode(node) != mode_T) + return; + + foreach_out_edge(node, edge) { + ir_node *proj = get_edge_src_irn(edge); + if (!is_Proj(proj)) + continue; + set_nodes_block(proj, to_bl); + move_projs(proj, to_bl); + } +} + +/** + * Moves node and all predecessors of node from from_bl to to_bl. + * Does not move predecessors of Phi nodes (or block nodes). + */ +static void move_edges(ir_node *node, ir_node *from_bl, ir_node *to_bl) +{ + int i, arity; + + /* move this node */ + set_nodes_block(node, to_bl); + + /* move its Projs */ + move_projs(node, to_bl); + + /* We must not move predecessors of Phi nodes, even if they are in + * from_bl. (because these are values from an earlier loop iteration + * which are not predecessors of node here) + */ + if (is_Phi(node)) + return; + + /* recursion ... */ + arity = get_irn_arity(node); + for (i = 0; i < arity; i++) { + ir_node *pred = get_irn_n(node, i); + if (get_nodes_block(pred) == from_bl) + move_edges(pred, from_bl, to_bl); + } +} + +void part_block(ir_node *node) +{ ir_graph *irg = get_irn_irg(node); + ir_node *new_block, *old_block; + ir_node *phi, *jmp; /* Turn off optimizations so that blocks are not merged again. */ int rem_opt = get_opt_optimize(); @@ -206,23 +225,12 @@ void part_block(ir_node *node) { /* Transform the control flow */ old_block = get_nodes_block(node); - mbh = get_Block_MacroBlock(old_block); - new_block = new_Block(get_Block_n_cfgpreds(old_block), - get_Block_cfgpred_arr(old_block)); + new_block = new_r_Block(irg, get_Block_n_cfgpreds(old_block), + get_Block_cfgpred_arr(old_block)); - if (mbh != old_block) { - /* we splitting a partBlock */ - set_Block_MacroBlock(new_block, mbh); - } else { - /* we are splitting a header: this creates a new header */ - set_Block_MacroBlock(new_block, new_block); - } - set_irg_current_block(irg, new_block); - { - ir_node *jmp = new_Jmp(); - set_irn_in(old_block, 1, &jmp); - irn_vrfy_irg(old_block, irg); - } + /* create a jump from new_block to old_block, which is now the lower one */ + jmp = new_r_Jmp(new_block); + set_irn_in(old_block, 1, &jmp); /* move node and its predecessors to new_block */ move(node, old_block, new_block); @@ -236,82 +244,39 @@ void part_block(ir_node *node) { phi = get_Phi_next(phi); } - /* rewire partBlocks */ - if (mbh != old_block) { - ir_node *list = NULL; - - /* move blocks from mbh to old_block if old_block dominates them */ - block = get_irn_link(mbh); - - set_irn_link(mbh, NULL); - set_Block_MacroBlock(old_block, old_block); - - /* note that we must splice the list of partBlock here */ - for (; block != NULL; block = next) { - ir_node *curr = block; - assert(is_Block(curr)); - - next = get_irn_link(block); - - if (block == old_block) - continue; - - assert(get_Block_MacroBlock(curr) == mbh); - - for (;;) { - if (curr == old_block) { - /* old_block dominates the block, so old_block will be - the new macro block header */ - set_Block_MacroBlock(block, old_block); - set_irn_link(block, list); - list = block; - break; - } - if (curr == mbh) { - /* leave it in the mbh */ - set_irn_link(block, get_irn_link(mbh)); - set_irn_link(mbh, block); - break; - } - - assert(get_Block_n_cfgpreds(curr) == 1); - curr = get_Block_cfgpred_block(curr, 0); - } - } - /* beware: do NOT directly manipulate old_block's list, as old_block is - in mbh's list and this would destroy the list! */ - set_irn_link(old_block, list); + set_optimize(rem_opt); +} - /* finally add new_block to mbh's list */ - set_irn_link(new_block, get_irn_link(mbh)); - set_irn_link(mbh, new_block); - } else { - /* move blocks from mbh to new_block */ - block = get_irn_link(mbh); +ir_node *part_block_edges(ir_node *node) +{ + ir_graph *irg = get_irn_irg(node); + ir_node *old_block = get_nodes_block(node); + ir_node *new_block = new_r_Block(irg, get_Block_n_cfgpreds(old_block), get_Block_cfgpred_arr(old_block)); - set_irn_link(mbh, NULL); - set_irn_link(new_block, NULL); + /* old_block has no predecessors anymore for now */ + set_irn_in(old_block, 0, NULL); - for (; block != NULL; block = next) { - next = get_irn_link(block); + /* move node and its predecessors to new_block */ + move_edges(node, old_block, new_block); - set_Block_MacroBlock(block, new_block); - set_irn_link(block, get_irn_link(new_block)); - set_irn_link(new_block, block); - } + /* move Phi nodes to new_block */ + foreach_out_edge_safe(old_block, edge) { + ir_node *phi = get_edge_src_irn(edge); + if (!is_Phi(phi)) + continue; + set_nodes_block(phi, new_block); } - set_optimize(rem_opt); + return old_block; } -/* kill a node by setting its predecessors to Bad and finally exchange the node by Bad itself. */ -void kill_node(ir_node *node) { +void kill_node(ir_node *node) +{ ir_graph *irg = get_irn_irg(node); - ir_node *bad = get_irg_bad(irg); - int i; - for (i = get_irn_arity(node) - 1; i >= -1; --i) { - set_irn_n(node, i, bad); + if (edges_activated(irg)) { + edges_node_deleted(node); } - exchange(node, bad); + /* noone is allowed to reference this node anymore */ + set_irn_op(node, op_Deleted); }