# include <stdlib.h>
# include "irnode_t.h"
-# include "irgraph.h" /* visited flag */
+# include "irgraph_t.h" /* visited flag */
# include "irprog.h"
# include "irgwalk.h"
# include "typewalk.h"
+# include "firmstat.h"
+# include "ircgcons.h"
# include "eset.h"
# include "array.h"
ir_graph * rem = current_ir_graph;
ir_node * pred;
- assert(node && node->kind==k_ir_node);
+ assert(node && node->kind == k_ir_node);
if (get_irn_visited(node) >= visited) return;
set_irn_visited(node, visited);
if (pre) pre(node, env);
if (is_no_Block(node))
- irg_walk_cg(get_nodes_Block(node), visited, irg_set, pre, post, env);
+ irg_walk_cg(get_nodes_block(node), visited, irg_set, pre, post, env);
if (get_irn_op(node) == op_Block) { /* block */
for (i = get_irn_arity(node) - 1; i >= 0; --i) {
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));
+ exec = skip_Proj(get_Block_cfgpred(get_nodes_block(node), i));
assert(get_irn_op(exec) == op_CallBegin
|| get_irn_op(exec) == op_EndReg
|| get_irn_op(exec) == op_EndExcept);
{
int i;
assert(node && node->kind==k_ir_node);
-
+#if 0 /* safe */
if (get_irn_visited(node) < get_irg_visited(current_ir_graph)) {
set_irn_visited(node, get_irg_visited(current_ir_graph));
if (pre) pre(node, env);
if (is_no_Block(node))
- irg_walk_2(get_nodes_Block(node), pre, post, env);
+ irg_walk_2(get_nodes_block(node), pre, post, env);
for (i = get_irn_arity(node) - 1; i >= 0; --i)
irg_walk_2(get_irn_n(node, i), pre, post, env);
if (post) post(node, env);
}
- return;
+#else /* faster */
+ if (node->visited < current_ir_graph->visited) {
+ set_irn_visited(node, current_ir_graph->visited);
+
+ if (pre) pre(node, env);
+
+ if (node->op != op_Block)
+ irg_walk_2(get_irn_n(node, -1), pre, post, env);
+ for (i = get_irn_arity(node) - 1; i >= 0; --i)
+ irg_walk_2(get_irn_n(node, i), pre, post, env);
+
+ if (post) post(node, env);
+ }
+#endif
}
void irg_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
{
assert(node && node->kind==k_ir_node);
+
if (interprocedural_view) {
eset * irg_set = eset_create();
int visited;
ir_graph * irg;
+ assert(get_irp_ip_view_state() == ip_view_valid);
+
interprocedural_view = false;
eset_insert(irg_set, current_ir_graph);
irg_walk(node, (irg_walk_func *) collect_irgs, NULL, irg_set);
interprocedural_view = true;
visited = get_max_irg_visited() + 1;
- irg_walk_cg(node, visited, irg_set, pre, post, env);
for (irg = eset_first(irg_set); irg; irg = eset_next(irg_set)) {
set_irg_visited(irg, visited);
}
+ irg_walk_cg(node, visited, irg_set, pre, post, env);
eset_destroy(irg_set);
} else {
inc_irg_visited(current_ir_graph);
void irg_walk_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env) {
ir_graph * rem = current_ir_graph;
+
+ stat_irg_walk(irg, (void *)pre, (void *)post);
current_ir_graph = irg;
irg_walk(get_irg_end(irg), pre, post, env);
current_ir_graph = rem;
if (interprocedural_view) {
/* Only Filter and Block nodes can have predecessors in other graphs. */
if (get_irn_op(n) == op_Filter)
- n = get_nodes_Block(n);
+ n = get_nodes_block(n);
if (get_irn_op(n) == op_Block) {
ir_node *cfop = skip_Proj(get_Block_cfgpred(n, index));
if (is_ip_cfop(cfop)) {
if (pre) pre(node, env);
if (is_no_Block(node))
- cg_walk_2(get_nodes_Block(node), pre, post, env);
+ cg_walk_2(get_nodes_block(node), pre, post, env);
for (i = get_irn_arity(node) - 1; i >= 0; --i) {
- rem = switch_irg(node, i);
+ rem = switch_irg(node, i); /* @@@ AS: Is this wrong? We do have to
+ switch to the irg of the predecessor, don't we? */
cg_walk_2(get_irn_n(node, i), pre, post, env);
current_ir_graph = rem;
}
for (i = 0; i < get_irp_n_irgs(); i++)
set_irg_visited(get_irp_irg(i), get_max_irg_visited());
- /* Walk starting at unreachable procedures. */
+ /* Walk starting at unreachable procedures. Only these
+ * have End blocks visible in interprocedural view. */
for (i = 0; i < get_irp_n_irgs(); i++) {
ir_node *sb;
current_ir_graph = get_irp_irg(i);
sb = get_irg_start_block(current_ir_graph);
+
if ((get_Block_n_cfgpreds(sb) > 1) ||
- (get_nodes_Block(get_Block_cfgpred(sb, 0)) != sb)) continue;
+ (get_nodes_block(get_Block_cfgpred(sb, 0)) != sb)) continue;
cg_walk_2(get_irg_end(current_ir_graph), pre, post, env);
}
+ /* Check whether we walked all procedures: there could be procedures
+ with cyclic calls but no call from the outside. */
+ for (i = 0; i < get_irp_n_irgs(); i++) {
+ ir_node *sb;
+ current_ir_graph = get_irp_irg(i);
+
+ /* Test start block: if inner procedure end and end block are not
+ * visible and therefore not marked. */
+ sb = get_irg_start_block(current_ir_graph);
+ if (get_irn_visited(sb) < get_irg_visited(current_ir_graph)) {
+ cg_walk_2(sb, pre, post, env);
+ }
+ }
+
+ /* Walk all endless loops in inner procedures.
+ * We recognize an inner procedure if the End node is not visited. */
+ for (i = 0; i < get_irp_n_irgs(); i++) {
+ ir_node *e;
+ current_ir_graph = get_irp_irg(i);
+ e = get_irg_end(current_ir_graph);
+ if (get_irn_visited(e) < get_irg_visited(current_ir_graph)) {
+ int j;
+ /* Don't visit the End node. */
+ for (j = 0; j < get_End_n_keepalives(e); j++)
+ cg_walk_2(get_End_keepalive(e, j), pre, post, env);
+ }
+ }
+
interprocedural_view = rem_view;
current_ir_graph = rem;
}
static void irg_block_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
{
int i;
- assert(get_irn_opcode(node) == iro_Block);
if(get_Block_block_visited(node) < get_irg_block_visited(current_ir_graph)) {
set_Block_block_visited(node, get_irg_block_visited(current_ir_graph));
for(i = get_Block_n_cfgpreds(node) - 1; i >= 0; --i) {
/* find the corresponding predecessor block. */
ir_node *pred = get_cf_op(get_Block_cfgpred(node, i));
- pred = get_nodes_Block(pred);
+ pred = get_nodes_block(pred);
if(get_irn_opcode(pred) == iro_Block) {
/* recursion */
irg_block_walk_2(pred, pre, post, env);
ir_node *block, *pred;
int i;
+ stat_irg_block_walk(current_ir_graph, node, (void *)pre, (void *)post);
+
assert(node);
assert(!interprocedural_view); /* interprocedural_view not implemented, because it
* interleaves with irg_walk */
inc_irg_block_visited(current_ir_graph);
- if (is_no_Block(node)) block = get_nodes_Block(node); else block = node;
+ if (is_no_Block(node)) block = get_nodes_block(node); else block = node;
assert(get_irn_opcode(block) == iro_Block);
irg_block_walk_2(block, pre, post, env);
/* keepalive: the endless loops ... */
- if (get_irn_op(node) == op_End)
- for (i = 0; i < get_irn_arity(node); i++) {
+ if (get_irn_op(node) == op_End) {
+ 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)
irg_block_walk_2(pred, pre, post, env);
}
+ }
return;
}
} walk_env;
/* Walk to all constant expressions in this entity. */
-static void walk_entity(entity *ent, void *env) {
+static void walk_entity(entity *ent, void *env)
+{
walk_env *my_env = (walk_env *)env;
- if (get_entity_variability(ent) != uninitialized) {
+
+ if (get_entity_variability(ent) != variability_uninitialized) {
if (is_atomic_entity(ent)) {
irg_walk(get_atomic_ent_value(ent), my_env->pre, my_env->post, my_env->env);
- } else {
- int i;
- for (i = 0; i < get_compound_ent_n_values(ent); i++) {
+ }
+ else {
+ int i, n = get_compound_ent_n_values(ent);
+
+ for (i = 0; i < n; i++)
irg_walk(get_compound_ent_value(ent, i), my_env->pre, my_env->post, my_env->env);
- }
}
}
}
/* Find the cf_pred refering to pos. */
ir_node *block = n;
ir_node *cf_pred;
- if (get_irn_opcode(n) == iro_Filter) block = get_nodes_Block(n);
+ if (get_irn_opcode(n) == iro_Filter) block = get_nodes_block(n);
cf_pred = skip_Proj(get_irn_n(block, pos));
/* Check whether we enter or leave a procedure and act according. */
/* Find the cf_pred refering to pos. */
block = n;
- if (get_irn_opcode(n) == iro_Filter) block = get_nodes_Block(n);
+ if (get_irn_opcode(n) == iro_Filter) block = get_nodes_block(n);
cf_pred = skip_Proj(get_irn_n(block, pos));
/* Check whether we re_enter or re_leave a procedure and act according. */
projects / libfirm / blobdiff