# 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"
{
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 (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
}
if (is_no_Block(node))
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);
/* 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 *eb;
+ ir_node *sb;
current_ir_graph = get_irp_irg(i);
- eb = get_irg_start_block(current_ir_graph);
- if (get_irn_visited(eb) < get_irg_visited(current_ir_graph)) {
- cg_walk_2(get_irg_end(current_ir_graph), pre, post, env);
+ /* 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);
}
}
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;
}