X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgmod.c;h=a19f30d60ac6732348003ff1ee9d62b392bf237c;hb=eb47aca33f2f8c414409f3695e73277b47442334;hp=f9a4f481610f86510817e3306162bd48a4064a16;hpb=c53635d6f071e2f833d6d053faa632efdff02703;p=libfirm diff --git a/ir/ir/irgmod.c b/ir/ir/irgmod.c index f9a4f4816..a19f30d60 100644 --- a/ir/ir/irgmod.c +++ b/ir/ir/irgmod.c @@ -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,22 +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 { - 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); + 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); } /** @@ -69,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); @@ -88,10 +82,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; @@ -124,17 +119,16 @@ void exchange(ir_node *old, ir_node *nw) { /** * 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; if (is_Phi(n)) { ir_node *block = get_nodes_block(n); - set_Phi_next(n, get_Block_phis(block)); - set_Block_phis(block, n); + add_Block_phi(block, n); } else if (is_Proj(n)) { pred = n; do { @@ -143,31 +137,14 @@ 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); - } } } -/** - * clear all links, including the Phi list of blocks and Phi nodes. - */ -static void clear_node_and_phis_links(ir_node *n, void *env) { - (void) env; - - set_irn_link(n, NULL); - if (is_Block(n)) - set_Block_phis(n, NULL); - else if (is_Phi(n)) - set_Phi_next(n, NULL); -} - -void collect_phiprojs(ir_graph *irg) { - irg_walk_graph(irg, clear_node_and_phis_links, collect_phiprojs_walker, 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); } /*--------------------------------------------------------------------*/ @@ -178,7 +155,8 @@ 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; /* move this node */ @@ -186,18 +164,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); @@ -206,11 +184,47 @@ 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; +/** + * 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(); @@ -218,23 +232,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(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); - } + /* 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); @@ -248,48 +251,38 @@ void part_block(ir_node *node) { phi = get_Phi_next(phi); } - /* rewire partBlocks */ - if (mbh != old_block) { - ir_node *next, *block = get_irn_link(mbh); - - set_irn_link(mbh, NULL); - set_irn_link(old_block, NULL); - - /* 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); - 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, get_irn_link(old_block)); - set_irn_link(old_block, 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); - } - } + set_optimize(rem_opt); +} + +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); } - 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;