* - execute the pre function before recursion
* - execute the post function after recursion
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
#include "irnode_t.h"
#include "irgraph_t.h"
#include "pset_new.h"
#include "array.h"
+#ifdef INTERPROCEDURAL_VIEW
/**
* 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) {
+ irg_walk_func *post, void * env)
+{
int i;
ir_graph * rem = current_ir_graph;
ir_node * pred;
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);
current_ir_graph = rem;
}
-
+#endif
/**
* Insert all ir_graphs in irg_set, that are (transitive) reachable.
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);
pset_new_destroy(&irg_set);
} else {
#endif
- set_using_irn_visited(current_ir_graph);
+ 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_irn_visited(current_ir_graph);
+ ir_free_resources(current_ir_graph, IR_RESOURCE_IRN_VISITED);
#ifdef INTERPROCEDURAL_VIEW
}
#endif
- return;
}
/*
if (get_interprocedural_view()) {
assert(0 && "This is not yet implemented.");
} else {
- set_using_irn_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_irn_visited(current_ir_graph);
+ ir_free_resources(current_ir_graph, IR_RESOURCE_IRN_VISITED);
}
- return;
}
/*
* Returns current_ir_graph and sets it to the irg of predecessor index
* of node n.
*/
-static INLINE ir_graph *
+static inline ir_graph *
switch_irg(ir_node *n, int index) {
ir_graph *old_current = current_ir_graph;
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);
return old_current;
}
+#ifdef INTERPROCEDURAL_VIEW
static void
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;
/* 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);
+ if (pre) pre(node, env);
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);
- if(get_irn_opcode(pred) == iro_Block) {
+ if (get_irn_opcode(pred) == iro_Block) {
/* recursion */
irg_block_walk_2(pred, pre, post, env);
}
}
}
- if(post) post(node, env);
+ if (post) post(node, env);
}
}
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);
+ * interleaves with irg_walk */
+ 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)
- irg_block_walk_2(pred, pre, post, env);
- }
- /* Sometimes the blocks died, but are still reachable through Phis.
- * Make sure the algorithms that try to remove these reach them. */
- for (i = 0; i < arity; i++) {
- pred = get_irn_n(node, i);
- if (get_irn_op(pred) == op_Phi) {
- ir_node *block = get_nodes_block(pred);
-
- if (! is_Bad(block))
- irg_block_walk_2(block, pre, post, env);
+ 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. */
+ irg_block_walk_2(pred, pre, post, env);
}
}
- clear_using_block_visited(current_ir_graph);
+ ir_free_resources(irg, IR_RESOURCE_BLOCK_VISITED);
}
/*
projects / libfirm / blobdiff