projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bescripts: Remove unused features and stale uses of gone features.
[libfirm]
/
ir
/
ir
/
irgwalk.c
diff --git
a/ir/ir/irgwalk.c
b/ir/ir/irgwalk.c
index
6f8db03
..
d6b3a71
100644
(file)
--- a/
ir/ir/irgwalk.c
+++ b/
ir/ir/irgwalk.c
@@
-36,6
+36,7
@@
#include "irgwalk.h"
#include "irhooks.h"
#include "entity_t.h"
#include "irgwalk.h"
#include "irhooks.h"
#include "entity_t.h"
+#include "ircons.h"
#include "error.h"
#include "pset_new.h"
#include "error.h"
#include "pset_new.h"
@@
-43,117
+44,95
@@
/**
* specialized version of irg_walk_2, called if only pre callback exists
/**
* specialized version of irg_walk_2, called if only pre callback exists
- *
- * @return number of visited nodes
*/
*/
-static
unsigne
d irg_walk_2_pre(ir_node *node, irg_walk_func *pre, void *env)
+static
voi
d irg_walk_2_pre(ir_node *node, irg_walk_func *pre, void *env)
{
int i;
{
int i;
- unsigned cnt = 1;
ir_graph *irg = get_irn_irg(node);
set_irn_visited(node, irg->visited);
pre(node, env);
ir_graph *irg = get_irn_irg(node);
set_irn_visited(node, irg->visited);
pre(node, env);
- if (
node->op != op_Block
) {
- ir_node *pred = get_
irn_n(node, -1
);
+ if (
!is_Block(node)
) {
+ ir_node *pred = get_
nodes_block(node
);
if (pred->visited < irg->visited)
if (pred->visited < irg->visited)
-
cnt +=
irg_walk_2_pre(pred, pre, env);
+ irg_walk_2_pre(pred, pre, env);
}
for (i = get_irn_arity(node) - 1; i >= 0; --i) {
ir_node *pred = get_irn_n(node, i);
if (pred->visited < irg->visited)
}
for (i = get_irn_arity(node) - 1; i >= 0; --i) {
ir_node *pred = get_irn_n(node, i);
if (pred->visited < irg->visited)
-
cnt +=
irg_walk_2_pre(pred, pre, env);
+ irg_walk_2_pre(pred, pre, env);
}
}
- return cnt;
}
/**
* specialized version of irg_walk_2, called if only post callback exists
}
/**
* specialized version of irg_walk_2, called if only post callback exists
- *
- * @return number of visited nodes
*/
*/
-static
unsigne
d irg_walk_2_post(ir_node *node, irg_walk_func *post, void *env)
+static
voi
d irg_walk_2_post(ir_node *node, irg_walk_func *post, void *env)
{
int i;
{
int i;
- unsigned cnt = 1;
ir_graph *irg = get_irn_irg(node);
set_irn_visited(node, irg->visited);
ir_graph *irg = get_irn_irg(node);
set_irn_visited(node, irg->visited);
- if (
node->op != op_Block
) {
- ir_node *pred = get_
irn_n(node, -1
);
+ if (
!is_Block(node)
) {
+ ir_node *pred = get_
nodes_block(node
);
if (pred->visited < irg->visited)
if (pred->visited < irg->visited)
-
cnt +=
irg_walk_2_post(pred, post, env);
+ irg_walk_2_post(pred, post, env);
}
for (i = get_irn_arity(node) - 1; i >= 0; --i) {
ir_node *pred = get_irn_n(node, i);
if (pred->visited < irg->visited)
}
for (i = get_irn_arity(node) - 1; i >= 0; --i) {
ir_node *pred = get_irn_n(node, i);
if (pred->visited < irg->visited)
-
cnt +=
irg_walk_2_post(pred, post, env);
+ irg_walk_2_post(pred, post, env);
}
post(node, env);
}
post(node, env);
-
- return cnt;
}
/**
* specialized version of irg_walk_2, called if pre and post callbacks exist
}
/**
* specialized version of irg_walk_2, called if pre and post callbacks exist
- *
- * @return number of visited nodes
*/
*/
-static
unsigne
d irg_walk_2_both(ir_node *node, irg_walk_func *pre,
+static
voi
d irg_walk_2_both(ir_node *node, irg_walk_func *pre,
irg_walk_func *post, void *env)
{
int i;
irg_walk_func *post, void *env)
{
int i;
- unsigned cnt = 1;
ir_graph *irg = get_irn_irg(node);
set_irn_visited(node, irg->visited);
pre(node, env);
ir_graph *irg = get_irn_irg(node);
set_irn_visited(node, irg->visited);
pre(node, env);
- if (
node->op != op_Block
) {
- ir_node *pred = get_
irn_n(node, -1
);
+ if (
!is_Block(node)
) {
+ ir_node *pred = get_
nodes_block(node
);
if (pred->visited < irg->visited)
if (pred->visited < irg->visited)
-
cnt +=
irg_walk_2_both(pred, pre, post, env);
+ irg_walk_2_both(pred, pre, post, env);
}
for (i = get_irn_arity(node) - 1; i >= 0; --i) {
ir_node *pred = get_irn_n(node, i);
if (pred->visited < irg->visited)
}
for (i = get_irn_arity(node) - 1; i >= 0; --i) {
ir_node *pred = get_irn_n(node, i);
if (pred->visited < irg->visited)
-
cnt +=
irg_walk_2_both(pred, pre, post, env);
+ irg_walk_2_both(pred, pre, post, env);
}
post(node, env);
}
post(node, env);
-
- 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)
+void irg_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post,
+ void *env)
{
if (irn_visited(node))
{
if (irn_visited(node))
- return
0
;
+ return;
- if (!post)
return
irg_walk_2_pre (node, pre, env);
- else if (!pre)
return
irg_walk_2_post(node, post, env);
- else
return
irg_walk_2_both(node, pre, post, env);
+ if (!post) irg_walk_2_pre (node, pre, env);
+ else if (!pre) irg_walk_2_post(node, post, env);
+ else irg_walk_2_both(node, pre, post, env);
}
}
-/* a counter */
-static unsigned nodes_touched = 0;
-
void irg_walk_core(ir_node *node, irg_walk_func *pre, irg_walk_func *post,
void *env)
{
assert(is_ir_node(node));
void irg_walk_core(ir_node *node, irg_walk_func *pre, irg_walk_func *post,
void *env)
{
assert(is_ir_node(node));
-
nodes_touched =
irg_walk_2(node, pre, post, env);
+ irg_walk_2(node, pre, post, env);
}
void irg_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post,
}
void irg_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post,
@@
-170,9
+149,6
@@
void irg_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post,
current_ir_graph = rem;
}
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;
void irg_walk_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env)
{
ir_graph * rem = current_ir_graph;
@@
-180,13
+156,9
@@
void irg_walk_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void
hook_irg_walk(irg, (generic_func *)pre, (generic_func *)post);
current_ir_graph = irg;
irg_walk(get_irg_end(irg), pre, post, env);
hook_irg_walk(irg, (generic_func *)pre, (generic_func *)post);
current_ir_graph = irg;
irg_walk(get_irg_end(irg), pre, post, env);
- irg->estimated_node_count = nodes_touched;
current_ir_graph = rem;
}
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;
void all_irg_walk(irg_walk_func *pre, irg_walk_func *post, void *env)
{
size_t i, n;
@@
-198,127
+170,103
@@
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
/**
* specialized version of irg_walk_in_or_dep_2, called if only pre callback exists
- *
- * @return number of visited nodes
*/
*/
-static
unsigne
d irg_walk_in_or_dep_2_pre(ir_node *node, irg_walk_func *pre, void *env)
+static
voi
d irg_walk_in_or_dep_2_pre(ir_node *node, irg_walk_func *pre, void *env)
{
int i;
{
int i;
- unsigned cnt = 1;
ir_graph *irg = get_irn_irg(node);
set_irn_visited(node, irg->visited);
pre(node, env);
ir_graph *irg = get_irn_irg(node);
set_irn_visited(node, irg->visited);
pre(node, env);
- if (
node->op != op_Block
) {
- ir_node *pred = get_
irn_n(node, -1
);
+ if (
!is_Block(node)
) {
+ ir_node *pred = get_
nodes_block(node
);
if (pred->visited < irg->visited)
if (pred->visited < irg->visited)
-
cnt +=
irg_walk_in_or_dep_2_pre(pred, pre, env);
+ irg_walk_in_or_dep_2_pre(pred, pre, env);
}
for (i = get_irn_ins_or_deps(node) - 1; i >= 0; --i) {
ir_node *pred = get_irn_in_or_dep(node, i);
if (pred->visited < irg->visited)
}
for (i = get_irn_ins_or_deps(node) - 1; i >= 0; --i) {
ir_node *pred = get_irn_in_or_dep(node, i);
if (pred->visited < irg->visited)
-
cnt +=
irg_walk_in_or_dep_2_pre(pred, pre, env);
+ irg_walk_in_or_dep_2_pre(pred, pre, env);
}
}
- return cnt;
}
/**
* specialized version of irg_walk_in_or_dep_2, called if only post callback exists
}
/**
* specialized version of irg_walk_in_or_dep_2, called if only post callback exists
- *
- * @return number of visited nodes
*/
*/
-static
unsigne
d irg_walk_in_or_dep_2_post(ir_node *node, irg_walk_func *post, void *env)
+static
voi
d irg_walk_in_or_dep_2_post(ir_node *node, irg_walk_func *post, void *env)
{
int i;
{
int i;
- unsigned cnt = 1;
ir_graph *irg = get_irn_irg(node);
set_irn_visited(node, irg->visited);
ir_graph *irg = get_irn_irg(node);
set_irn_visited(node, irg->visited);
- if (
node->op != op_Block
) {
- ir_node *pred = get_
irn_n(node, -1
);
+ if (
!is_Block(node)
) {
+ ir_node *pred = get_
nodes_block(node
);
if (pred->visited < irg->visited)
if (pred->visited < irg->visited)
-
cnt +=
irg_walk_in_or_dep_2_post(pred, post, env);
+ irg_walk_in_or_dep_2_post(pred, post, env);
}
for (i = get_irn_ins_or_deps(node) - 1; i >= 0; --i) {
ir_node *pred = get_irn_in_or_dep(node, i);
if (pred->visited < irg->visited)
}
for (i = get_irn_ins_or_deps(node) - 1; i >= 0; --i) {
ir_node *pred = get_irn_in_or_dep(node, i);
if (pred->visited < irg->visited)
-
cnt +=
irg_walk_in_or_dep_2_post(pred, post, env);
+ irg_walk_in_or_dep_2_post(pred, post, env);
}
post(node, env);
}
post(node, env);
-
- return cnt;
}
/**
* specialized version of irg_walk_in_or_dep_2, called if pre and post callbacks exist
}
/**
* specialized version of irg_walk_in_or_dep_2, called if pre and post callbacks exist
- *
- * @return number of visited nodes
*/
*/
-static
unsigne
d irg_walk_in_or_dep_2_both(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
+static
voi
d irg_walk_in_or_dep_2_both(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
{
int i;
{
int i;
- unsigned cnt = 1;
ir_graph *irg = get_irn_irg(node);
set_irn_visited(node, irg->visited);
pre(node, env);
ir_graph *irg = get_irn_irg(node);
set_irn_visited(node, irg->visited);
pre(node, env);
- if (
node->op != op_Block
) {
- ir_node *pred = get_
irn_n(node, -1
);
+ if (
!is_Block(node)
) {
+ ir_node *pred = get_
nodes_block(node
);
if (pred->visited < irg->visited)
if (pred->visited < irg->visited)
-
cnt +=
irg_walk_in_or_dep_2_both(pred, pre, post, env);
+ irg_walk_in_or_dep_2_both(pred, pre, post, env);
}
for (i = get_irn_ins_or_deps(node) - 1; i >= 0; --i) {
ir_node *pred = get_irn_in_or_dep(node, i);
if (pred->visited < irg->visited)
}
for (i = get_irn_ins_or_deps(node) - 1; i >= 0; --i) {
ir_node *pred = get_irn_in_or_dep(node, i);
if (pred->visited < irg->visited)
-
cnt +=
irg_walk_in_or_dep_2_both(pred, pre, post, env);
+ irg_walk_in_or_dep_2_both(pred, pre, post, env);
}
post(node, env);
}
post(node, env);
-
- return cnt;
}
/**
* Intraprozedural graph walker. Follows dependency edges as well.
}
/**
* Intraprozedural graph walker. Follows dependency edges as well.
- *
- * @return number of visited nodes
*/
*/
-static
unsigne
d irg_walk_in_or_dep_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
+static
voi
d irg_walk_in_or_dep_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
{
if (irn_visited(node))
{
if (irn_visited(node))
- return
0
;
+ return;
- if (! post)
return
irg_walk_in_or_dep_2_pre (node, pre, env);
- else if (! pre)
return
irg_walk_in_or_dep_2_post(node, post, env);
- else
return
irg_walk_in_or_dep_2_both(node, pre, post, env);
+ if (! post) irg_walk_in_or_dep_2_pre (node, pre, env);
+ else if (! pre) irg_walk_in_or_dep_2_post(node, post, env);
+ else 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));
ir_reserve_resources(current_ir_graph, IR_RESOURCE_IRN_VISITED);
inc_irg_visited(current_ir_graph);
void irg_walk_in_or_dep(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
{
assert(is_ir_node(node));
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);
+ irg_walk_in_or_dep_2(node, pre, post, env);
ir_free_resources(current_ir_graph, IR_RESOURCE_IRN_VISITED);
}
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;
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;
@@
-326,17
+274,13
@@
void irg_walk_in_or_dep_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *
hook_irg_walk(irg, (generic_func *)pre, (generic_func *)post);
current_ir_graph = irg;
irg_walk_in_or_dep(get_irg_end(irg), pre, post, env);
hook_irg_walk(irg, (generic_func *)pre, (generic_func *)post);
current_ir_graph = irg;
irg_walk_in_or_dep(get_irg_end(irg), pre, post, env);
- irg->estimated_node_count = nodes_touched;
current_ir_graph = rem;
}
current_ir_graph = rem;
}
-/***************************************************************************/
-
/* Walks back from n until it finds a real cf op. */
static ir_node *get_cf_op(ir_node *n)
{
while (!is_cfop(n) && !is_fragile_op(n) && !is_Bad(n)) {
/* Walks back from n until it finds a real cf op. */
static ir_node *get_cf_op(ir_node *n)
{
while (!is_cfop(n) && !is_fragile_op(n) && !is_Bad(n)) {
- n = skip_Id(n);
n = skip_Tuple(n);
n = skip_Proj(n);
}
n = skip_Tuple(n);
n = skip_Proj(n);
}
@@
-371,9
+315,6
@@
static void irg_block_walk_2(ir_node *node, irg_walk_func *pre,
post(node, env);
}
post(node, env);
}
-
-/* walks only over Block nodes in the graph. Has its 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)
{
@@
-401,9
+342,6
@@
void irg_block_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post,
ir_free_resources(irg, IR_RESOURCE_BLOCK_VISITED);
}
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)
{
void irg_block_walk_graph(ir_graph *irg, irg_walk_func *pre,
irg_walk_func *post, void *env)
{
@@
-413,9
+351,6
@@
void irg_block_walk_graph(ir_graph *irg, irg_walk_func *pre,
current_ir_graph = rem;
}
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;
void irg_walk_anchors(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env)
{
ir_graph * rem = current_ir_graph;
@@
-429,8
+364,6
@@
void irg_walk_anchors(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, vo
current_ir_graph = rem;
}
current_ir_graph = rem;
}
-/********************************************************************/
-
typedef struct walk_env {
irg_walk_func *pre;
irg_walk_func *post;
typedef struct walk_env {
irg_walk_func *pre;
irg_walk_func *post;
@@
-469,15
+402,9
@@
static void walk_entity(ir_entity *ent, void *env)
if (ent->initializer != NULL) {
walk_initializer(ent->initializer, my_env);
if (ent->initializer != NULL) {
walk_initializer(ent->initializer, my_env);
- } else if (entity_has_compound_ent_values(ent)) {
- size_t i, n_vals = get_compound_ent_n_values(ent);
-
- for (i = 0; i < n_vals; i++)
- irg_walk(get_compound_ent_value(ent, i), my_env->pre, my_env->post, my_env->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;
void walk_const_code(irg_walk_func *pre, irg_walk_func *post, void *env)
{
walk_env my_env;