X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgwalk.c;h=9ae74d38b4f8e9d6ec97638c4f45a11156c91168;hb=31ef53136fdb86d4a98919c2148c95cadea4ea81;hp=3fc2fa9932fe1001952ff2d05b83efed37b27e3b;hpb=6be9d429e8a25e1a818b9912ca3c038d020c4f8d;p=libfirm diff --git a/ir/ir/irgwalk.c b/ir/ir/irgwalk.c index 3fc2fa993..9ae74d38b 100644 --- a/ir/ir/irgwalk.c +++ b/ir/ir/irgwalk.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. * @@ -36,12 +36,14 @@ #endif #include "irnode_t.h" -#include "irgraph_t.h" /* visited flag */ +#include "irgraph_t.h" #include "irprog.h" #include "irgwalk.h" #include "irhooks.h" #include "ircgcons.h" +#include "entity_t.h" +#include "error.h" #include "pset_new.h" #include "array.h" @@ -49,7 +51,7 @@ * Walk over an interprocedural graph (callgraph). * Visits only graphs in irg_set. */ -static void irg_walk_cg(ir_node * node, unsigned long visited, +static void irg_walk_cg(ir_node * node, ir_visited_t visited, pset_new_t *irg_set, irg_walk_func *pre, irg_walk_func *post, void * env) { int i; @@ -64,43 +66,44 @@ static void irg_walk_cg(ir_node * node, unsigned long visited, if (pre) pre(node, env); pred = skip_Proj(node); - if (get_irn_op(pred) == op_CallBegin - || get_irn_op(pred) == op_EndReg - || get_irn_op(pred) == op_EndExcept) { - current_ir_graph = get_irn_irg(pred); + if (is_CallBegin(pred) || + get_irn_op(pred) == op_EndReg || + get_irn_op(pred) == op_EndExcept) { + current_ir_graph = get_irn_irg(pred); } if (is_no_Block(node)) { /* not block */ irg_walk_cg(get_nodes_block(node), visited, irg_set, pre, post, env); } - if (get_irn_op(node) == op_Block) { /* block */ + if (is_Block(node)) { /* block */ for (i = get_irn_arity(node) - 1; i >= 0; --i) { ir_node * exec = get_irn_n(node, i); ir_node * pred = skip_Proj(exec); - if ((get_irn_op(pred) != op_CallBegin - && get_irn_op(pred) != op_EndReg - && get_irn_op(pred) != op_EndExcept) - || pset_new_contains(irg_set, get_irn_irg(pred))) { - irg_walk_cg(exec, visited, irg_set, pre, post, env); + if (( + !is_CallBegin(pred) && + get_irn_op(pred) != op_EndReg && + get_irn_op(pred) != op_EndExcept + ) || pset_new_contains(irg_set, get_irn_irg(pred))) { + irg_walk_cg(exec, visited, irg_set, pre, post, env); } } - } else if (get_irn_op(node) == op_Filter) { /* filter */ + } else if (is_Filter(node)) { /* filter */ for (i = get_irn_arity(node) - 1; i >= 0; --i) { ir_node * pred = get_irn_n(node, i); - if (get_irn_op(pred) == op_Unknown || get_irn_op(pred) == op_Bad) { + if (is_Unknown(pred) || is_Bad(pred)) { irg_walk_cg(pred, visited, irg_set, pre, post, env); } else { ir_node * exec; exec = skip_Proj(get_Block_cfgpred(get_nodes_block(node), i)); - if (op_Bad == get_irn_op (exec)) { + if (is_Bad(exec)) { continue; } - assert(get_irn_op(exec) == op_CallBegin - || get_irn_op(exec) == op_EndReg - || get_irn_op(exec) == op_EndExcept); + assert(is_CallBegin(exec) || + get_irn_op(exec) == op_EndReg || + get_irn_op(exec) == op_EndExcept); if (pset_new_contains(irg_set, get_irn_irg(exec))) { current_ir_graph = get_irn_irg(exec); irg_walk_cg(pred, visited, irg_set, pre, post, env); @@ -251,10 +254,11 @@ void irg_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env) { assert(is_ir_node(node)); +#ifdef INTERPROCEDURAL_VIEW if (get_interprocedural_view()) { pset_new_t irg_set; pset_new_iterator_t iter; - unsigned long visited; + ir_visited_t visited; ir_graph *irg; assert(get_irp_ip_view_state() == ip_view_valid); @@ -271,12 +275,14 @@ void irg_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env) irg_walk_cg(node, visited, &irg_set, pre, post, env); pset_new_destroy(&irg_set); } else { - set_using_visited(current_ir_graph); +#endif + ir_reserve_resources(current_ir_graph, IR_RESOURCE_IRN_VISITED); inc_irg_visited(current_ir_graph); nodes_touched = irg_walk_2(node, pre, post, env); - clear_using_visited(current_ir_graph); + ir_free_resources(current_ir_graph, IR_RESOURCE_IRN_VISITED); +#ifdef INTERPROCEDURAL_VIEW } - return; +#endif } /* @@ -421,12 +427,11 @@ void irg_walk_in_or_dep(ir_node *node, irg_walk_func *pre, irg_walk_func *post, if (get_interprocedural_view()) { assert(0 && "This is not yet implemented."); } else { - set_using_visited(current_ir_graph); + ir_reserve_resources(current_ir_graph, IR_RESOURCE_IRN_VISITED); inc_irg_visited(current_ir_graph); nodes_touched = irg_walk_in_or_dep_2(node, pre, post, env); - clear_using_visited(current_ir_graph); + ir_free_resources(current_ir_graph, IR_RESOURCE_IRN_VISITED); } - return; } /* @@ -454,9 +459,9 @@ switch_irg(ir_node *n, int index) { if (get_interprocedural_view()) { /* Only Filter and Block nodes can have predecessors in other graphs. */ - if (get_irn_op(n) == op_Filter) + if (is_Filter(n)) n = get_nodes_block(n); - if (get_irn_op(n) == op_Block) { + if (is_Block(n)) { ir_node *cfop = skip_Proj(get_Block_cfgpred(n, index)); if (is_ip_cfop(cfop)) { current_ir_graph = get_irn_irg(cfop); @@ -490,10 +495,9 @@ cg_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void * env) if (post) post(node, env); } - return; } - +#ifdef INTERPROCEDURAL_VIEW /* Walks all irgs in interprocedural view. Visits each node only once. */ void cg_walk(irg_walk_func *pre, irg_walk_func *post, void *env) { int i; @@ -552,28 +556,26 @@ void cg_walk(irg_walk_func *pre, irg_walk_func *post, void *env) { set_interprocedural_view(rem_view); current_ir_graph = rem; } +#endif /***************************************************************************/ /* Walks back from n until it finds a real cf op. */ static ir_node *get_cf_op(ir_node *n) { - ir_node *pred; - - n = skip_Id(n); - n = skip_Tuple(n); - pred = skip_Proj(n); - if (!(is_cfop(pred) || is_fragile_op(pred) || is_Bad(pred))) - n = get_cf_op(n); - - return skip_Proj(n); + while (!is_cfop(n) && !is_fragile_op(n) && !is_Bad(n)) { + n = skip_Id(n); + n = skip_Tuple(n); + n = skip_Proj(n); + } + return n; } static void irg_block_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env) { int i; - if (Block_not_block_visited(node)) { + if (!Block_block_visited(node)) { mark_Block_block_visited(node); if(pre) pre(node, env); @@ -600,26 +602,27 @@ static void irg_block_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *p 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) { + ir_graph *irg = current_ir_graph; ir_node *block, *pred; int i; - hook_irg_block_walk(current_ir_graph, node, (generic_func *)pre, (generic_func *)post); + hook_irg_block_walk(irg, node, (generic_func *)pre, (generic_func *)post); assert(node); assert(!get_interprocedural_view()); /* interprocedural_view not implemented, because it * interleaves with irg_walk */ - set_using_block_visited(current_ir_graph); - inc_irg_block_visited(current_ir_graph); + ir_reserve_resources(irg, IR_RESOURCE_BLOCK_VISITED); + inc_irg_block_visited(irg); block = is_Block(node) ? node : get_nodes_block(node); - assert(get_irn_op(block) == op_Block); + assert(is_Block(block)); irg_block_walk_2(block, pre, post, env); /* keepalive: the endless loops ... */ - if (get_irn_op(node) == op_End) { + if (is_End(node)) { int arity = get_irn_arity(node); for (i = 0; i < arity; i++) { pred = get_irn_n(node, i); - if (get_irn_op(pred) == op_Block) + if (is_Block(pred)) irg_block_walk_2(pred, pre, post, env); } /* Sometimes the blocks died, but are still reachable through Phis. @@ -635,7 +638,7 @@ void irg_block_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void } } - clear_using_block_visited(current_ir_graph); + ir_free_resources(irg, IR_RESOURCE_BLOCK_VISITED); } /* @@ -670,6 +673,29 @@ typedef struct walk_env { void *env; } walk_env; +static void walk_initializer(ir_initializer_t *initializer, walk_env *env) +{ + switch(initializer->kind) { + case IR_INITIALIZER_CONST: + irg_walk(initializer->consti.value, env->pre, env->post, env->env); + return; + case IR_INITIALIZER_TARVAL: + case IR_INITIALIZER_NULL: + return; + + case IR_INITIALIZER_COMPOUND: { + size_t i; + for(i = 0; i < initializer->compound.n_initializers; ++i) { + ir_initializer_t *subinitializer + = initializer->compound.initializers[i]; + walk_initializer(subinitializer, env); + } + return; + } + } + panic("invalid initializer found"); +} + /** * Walk to all constant expressions in this entity. */ @@ -678,7 +704,9 @@ static void walk_entity(ir_entity *ent, void *env) walk_env *my_env = (walk_env *)env; if (get_entity_variability(ent) != variability_uninitialized) { - if (is_atomic_entity(ent)) { + if (ent->has_initializer) { + walk_initializer(ent->attr.initializer, my_env); + } else if (is_atomic_entity(ent)) { irg_walk(get_atomic_ent_value(ent), my_env->pre, my_env->post, my_env->env); } else { int i, n_vals = get_compound_ent_n_values(ent);