X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgmod.c;h=a19f30d60ac6732348003ff1ee9d62b392bf237c;hb=eb47aca33f2f8c414409f3695e73277b47442334;hp=0a06562804b2c9222c7fec8f308a8600a47e2a2b;hpb=98c21a869cebe3db3aec1d823ddbd7000416ff83;p=libfirm diff --git a/ir/ir/irgmod.c b/ir/ir/irgmod.c index 0a0656280..a19f30d60 100644 --- a/ir/ir/irgmod.c +++ b/ir/ir/irgmod.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. * @@ -23,11 +23,8 @@ * @author Martin Trapp, Christian Schaefer, Goetz Lindenmaier * @version $Id$ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" -#include "irvrfy.h" #include "irflag_t.h" #include "irgwalk.h" #include "irnode_t.h" @@ -46,21 +43,18 @@ * 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 { - /* don't use get_nodes_block here, we allow turn_into_tuple for unpinned nodes */ - ir_node *block = get_irn_n(node, -1); - /* Allocate new array, don't free old in_array, it's on the obstack. */ - edges_node_deleted(node, current_ir_graph); - node->in = NEW_ARR_D(ir_node *, current_ir_graph->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_irn_n(node, -1, block); +void turn_into_tuple(ir_node *node, int arity) +{ + ir_graph *irg = get_irn_irg(node); + ir_node **in = ALLOCAN(ir_node*, arity); + int i; + + /* construct a new in array, with every input being bad */ + for (i = 0; i < arity; ++i) { + in[i] = new_r_Bad(irg); } + set_irn_in(node, arity, in); + set_irn_op(node, op_Tuple); } /** @@ -68,7 +62,8 @@ void turn_into_tuple(ir_node *node, int arity) { * 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); @@ -87,16 +82,15 @@ 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; - assert(get_irn_op(old)->opar != oparity_dynamic); - hook_turn_into_id(old); block = old->in[0]; @@ -108,6 +102,10 @@ void exchange(ir_node *old, ir_node *nw) { } } + if (get_irn_op(old)->opar == oparity_dynamic) { + DEL_ARR_F(get_irn_in(old)); + } + old->op = op_Id; old->in = NEW_ARR_D (ir_node *, irg->obst, 2); old->in[0] = block; @@ -120,16 +118,17 @@ void exchange(ir_node *old, ir_node *nw) { /*--------------------------------------------------------------------*/ /** - * Walker: links all Phi nodes to their Blocks and - * all Proj nodes to there predecessors + * Walker: links all Phi nodes to their Blocks lists, + * all Proj nodes to there predecessors. */ -static void collect(ir_node *n, void *env) { +static void collect_phiprojs_walker(ir_node *n, void *env) +{ ir_node *pred; (void) env; if (is_Phi(n)) { - set_irn_link(n, get_irn_link(get_nodes_block(n))); - set_irn_link(get_nodes_block(n), n); + ir_node *block = get_nodes_block(n); + add_Block_phi(block, n); } else if (is_Proj(n)) { pred = n; do { @@ -141,11 +140,13 @@ static void collect(ir_node *n, void *env) { } } -void collect_phiprojs(ir_graph *irg) { - irg_walk_graph(irg, firm_clear_link, collect, NULL); +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 */ /*--------------------------------------------------------------------*/ @@ -154,38 +155,76 @@ void collect_phiprojs(ir_graph *irg) { * 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; - ir_node *proj, *pred; /* move this node */ set_nodes_block(node, to_bl); - /* move its projs */ + /* move its Projs */ if (get_irn_mode(node) == mode_T) { - 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 (get_irn_op(node) == op_Phi) return; + if (is_Phi(node)) + return; + /* recursion ... */ arity = get_irn_arity(node); for (i = 0; i < arity; i++) { - pred = get_irn_n(node, i); + ir_node *pred = get_irn_n(node, i); if (get_nodes_block(pred) == from_bl) move(pred, from_bl, to_bl); } } -void part_block(ir_node *node) { - ir_node *new_block; - ir_node *old_block; - ir_node *phi; +/** + * 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 */ + if (get_irn_mode(node) == mode_T) { + const ir_edge_t *edge; + foreach_out_edge(node, edge) { + ir_node *proj = get_edge_src_irn(edge); + set_nodes_block(proj, 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(); @@ -193,32 +232,57 @@ void part_block(ir_node *node) { /* Transform the control flow */ old_block = get_nodes_block(node); - new_block = new_Block(get_Block_n_cfgpreds(old_block), - get_Block_cfgpred_arr(old_block)); - set_irg_current_block(current_ir_graph, new_block); - { - ir_node *jmp = new_Jmp(); - set_irn_in(old_block, 1, &jmp); - irn_vrfy_irg(old_block, current_ir_graph); - } + new_block = new_r_Block(irg, get_Block_n_cfgpreds(old_block), + get_Block_cfgpred_arr(old_block)); + + /* 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); /* move Phi nodes to new_block */ - phi = get_irn_link(old_block); - set_irn_link(new_block, phi); - set_irn_link(old_block, NULL); + phi = get_Block_phis(old_block); + set_Block_phis(new_block, phi); + set_Block_phis(old_block, NULL); while (phi) { set_nodes_block(phi, new_block); - phi = get_irn_link(phi); + phi = get_Phi_next(phi); } set_optimize(rem_opt); } -/* kill a node by setting its predecessors to Bad and finally exchange the node by Bad itself. */ -void kill_node(ir_node *node) { +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)); + const ir_edge_t *edge; + const ir_edge_t *next; + + /* old_block has no predecessors anymore for now */ + set_irn_in(old_block, 0, NULL); + + /* move node and its predecessors to new_block */ + move_edges(node, old_block, new_block); + + /* move Phi nodes to new_block */ + foreach_out_edge_safe(old_block, edge, next) { + ir_node *phi = get_edge_src_irn(edge); + if (!is_Phi(phi)) + continue; + set_nodes_block(phi, new_block); + } + + return old_block; +} + +void kill_node(ir_node *node) +{ ir_graph *irg = get_irn_irg(node); ir_node *bad = get_irg_bad(irg); int i;