X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgwalk.c;h=48b8165aabad9bf76485db4f57883efbf743b95d;hb=7eb9592b75afa78475ceec1625ce2a67b805efbf;hp=98c5c9ffe0a20c77f9c6da1c6e97c47c39e061e8;hpb=7ef5abc25f375591792e271084aaf26237dfaa25;p=libfirm diff --git a/ir/ir/irgwalk.c b/ir/ir/irgwalk.c index 98c5c9ffe..48b8165aa 100644 --- a/ir/ir/irgwalk.c +++ b/ir/ir/irgwalk.c @@ -21,7 +21,6 @@ * @file * @brief Functions for traversing ir graphs * @author Boris Boesler, Goetz Lindenmaier, Michael Beck - * @version $Id$ * @brief * traverse an ir graph * - execute the pre function before recursion @@ -37,6 +36,7 @@ #include "irgwalk.h" #include "irhooks.h" #include "entity_t.h" +#include "ircons.h" #include "error.h" #include "pset_new.h" @@ -131,11 +131,6 @@ static unsigned irg_walk_2_both(ir_node *node, irg_walk_func *pre, return cnt; } -/** - * Intraprozedural graph walker. - * - * @return number of visited nodes - */ unsigned irg_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env) { @@ -171,9 +166,6 @@ void irg_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, current_ir_graph = rem; } -/* - * walk over a graph - */ void irg_walk_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env) { ir_graph * rem = current_ir_graph; @@ -185,9 +177,6 @@ void irg_walk_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void current_ir_graph = rem; } -/* Executes irg_walk(end, pre, post, env) for all irgraphs in irprog. - Sets current_ir_graph properly for each walk. Conserves current - current_ir_graph. */ void all_irg_walk(irg_walk_func *pre, irg_walk_func *post, void *env) { size_t i, n; @@ -199,8 +188,6 @@ void all_irg_walk(irg_walk_func *pre, irg_walk_func *post, void *env) } } -/***************************************************************************/ - /** * specialized version of irg_walk_in_or_dep_2, called if only pre callback exists * @@ -304,9 +291,6 @@ static unsigned irg_walk_in_or_dep_2(ir_node *node, irg_walk_func *pre, irg_walk else return irg_walk_in_or_dep_2_both(node, pre, post, env); } -/* - * Generic graph walker. Follows dependency edges as well. - */ void irg_walk_in_or_dep(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env) { assert(is_ir_node(node)); @@ -317,9 +301,6 @@ void irg_walk_in_or_dep(ir_node *node, irg_walk_func *pre, irg_walk_func *post, ir_free_resources(current_ir_graph, IR_RESOURCE_IRN_VISITED); } -/* - * Walk over a graph. Follow all edges (including dependencies) - */ void irg_walk_in_or_dep_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env) { ir_graph * rem = current_ir_graph; @@ -331,8 +312,6 @@ void irg_walk_in_or_dep_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func * current_ir_graph = rem; } -/***************************************************************************/ - /* Walks back from n until it finds a real cf op. */ static ir_node *get_cf_op(ir_node *n) { @@ -372,38 +351,26 @@ static void irg_block_walk_2(ir_node *node, irg_walk_func *pre, post(node, env); } - -/* walks only over Block nodes in the graph. Has it's own visited - flag, so that it can be interleaved with the other walker. */ -void irg_block_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env) +void irg_block_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, + void *env) { - ir_graph *irg = get_irn_irg(node); - ir_node *block, *pred; - int i; + ir_graph *irg = get_irn_irg(node); + ir_node *block = is_Block(node) ? node : get_nodes_block(node); hook_irg_block_walk(irg, node, (generic_func *)pre, (generic_func *)post); - assert(node); ir_reserve_resources(irg, IR_RESOURCE_BLOCK_VISITED); inc_irg_block_visited(irg); - block = is_Block(node) ? node : get_nodes_block(node); - assert(is_Block(block)); irg_block_walk_2(block, pre, post, env); - /* keepalive: the endless loops ... */ + /* Some blocks might be only reachable through keep-alive edges */ if (is_End(node)) { int arity = get_irn_arity(node); + int i; for (i = 0; i < arity; i++) { - pred = get_irn_n(node, i); - if (!is_Block(pred)) { - pred = get_nodes_block(pred); - if (!is_Block(pred)) { - /* if rare cases a kept node might have a bad block input */ - continue; - } - } - /* Sometimes the blocks died, but are still reachable through kept nodes. - * Make sure the algorithms that try to remove these reach them. */ + ir_node *pred = get_irn_n(node, i); + if (!is_Block(pred)) + continue; irg_block_walk_2(pred, pre, post, env); } } @@ -411,9 +378,6 @@ void irg_block_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void ir_free_resources(irg, IR_RESOURCE_BLOCK_VISITED); } -/* - * walk over a graph block wise - */ void irg_block_walk_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env) { @@ -423,22 +387,19 @@ void irg_block_walk_graph(ir_graph *irg, irg_walk_func *pre, current_ir_graph = rem; } -/* - * Additionally walk over all anchors. Do NOT increase the visit flag. - */ void irg_walk_anchors(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env) { ir_graph * rem = current_ir_graph; current_ir_graph = irg; + ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED); inc_irg_visited(irg); irg_walk_2(irg->anchor, pre, post, env); + ir_free_resources(irg, IR_RESOURCE_IRN_VISITED); current_ir_graph = rem; } -/********************************************************************/ - typedef struct walk_env { irg_walk_func *pre; irg_walk_func *post; @@ -485,7 +446,6 @@ static void walk_entity(ir_entity *ent, void *env) } } -/* Walks over all code in const_code_irg. */ void walk_const_code(irg_walk_func *pre, irg_walk_func *post, void *env) { walk_env my_env;