* @date 7.2002
* @version $Id$
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
#ifdef HAVE_STRING_H
# include <string.h>
/**
* Allocates a new SCC info on the given obstack.
*/
-static INLINE scc_info *new_scc_info(struct obstack *obst) {
+static inline scc_info *new_scc_info(struct obstack *obst) {
scc_info *info = obstack_alloc(obst, sizeof(*info));
memset(info, 0, sizeof(*info));
return info;
/**
* Mark node n being on the SCC stack.
*/
-static INLINE void mark_irn_in_stack(ir_node *n) {
+static inline void mark_irn_in_stack(ir_node *n) {
scc_info *scc = get_irn_link(n);
assert(scc);
scc->in_stack = 1;
/**
* Mark node n NOT being on the SCC stack.
*/
-static INLINE void mark_irn_not_in_stack(ir_node *n) {
+static inline void mark_irn_not_in_stack(ir_node *n) {
scc_info *scc = get_irn_link(n);
assert(scc);
scc->in_stack = 0;
/**
* Checks if a node is on the SCC stack.
*/
-static INLINE int irn_is_in_stack(ir_node *n) {
+static inline int irn_is_in_stack(ir_node *n) {
scc_info *scc = get_irn_link(n);
assert(scc);
return scc->in_stack;
/**
* Sets the uplink number for a node.
*/
-static INLINE void set_irn_uplink(ir_node *n, int uplink) {
+static inline void set_irn_uplink(ir_node *n, int uplink) {
scc_info *scc = get_irn_link(n);
assert(scc);
scc->uplink = uplink;
/**
* Sets the depth-first-search number for a node.
*/
-static INLINE void set_irn_dfn(ir_node *n, int dfn) {
+static inline void set_irn_dfn(ir_node *n, int dfn) {
scc_info *scc = get_irn_link(n);
assert(scc);
scc->dfn = dfn;
/**
* initializes the stack
*/
-static INLINE void init_stack(void) {
+static inline void init_stack(void) {
if (stack) {
ARR_RESIZE(ir_node *, stack, 1000);
} else {
tos = 0;
}
-#if 0
/**
* Frees the stack.
*/
-static INLINE void free_stack(void) {
- if (stack != NULL) {
- DEL_ARR_F(stack);
- stack = NULL;
- }
- tos = 0;
+static void finish_stack(void) {
+ DEL_ARR_F(stack);
+ stack = NULL;
}
-#endif
/**
* push a node onto the stack
*
* @param n The node to push
*/
-static INLINE void push(ir_node *n) {
+static inline void push(ir_node *n) {
if (tos == ARR_LEN(stack)) {
int nlen = ARR_LEN(stack) * 2;
ARR_RESIZE(ir_node *, stack, nlen);
*
* @return The topmost node
*/
-static INLINE ir_node *pop(void) {
+static inline ir_node *pop(void) {
ir_node *n = stack[--tos];
mark_irn_not_in_stack(n);
return n;
* The nodes up to n belong to the current loop.
* Removes them from the stack and adds them to the current loop.
*/
-static INLINE void pop_scc_to_loop(ir_node *n) {
+static inline void pop_scc_to_loop(ir_node *n) {
ir_node *m;
int i = 0;
/* Removes and unmarks all nodes up to n from the stack.
The nodes must be visited once more to assign them to a scc. */
-static INLINE void pop_scc_unmark_visit(ir_node *n) {
+static inline void pop_scc_unmark_visit(ir_node *n) {
ir_node *m = NULL;
while (m != n) {
/* Initialization steps. **********************************************/
-static INLINE void init_node(ir_node *n, void *env) {
+static inline void init_node(ir_node *n, void *env) {
struct obstack *obst = env;
set_irn_link(n, new_scc_info(obst));
clear_backedges(n);
}
-static INLINE void init_scc_common(void) {
+static inline void init_scc_common(void) {
current_dfn = 1;
loop_node_cnt = 0;
init_stack();
}
-static INLINE void init_scc(ir_graph *irg, struct obstack *obst) {
+static inline void init_scc(ir_graph *irg, struct obstack *obst) {
init_scc_common();
irg_walk_graph(irg, init_node, NULL, obst);
/*
*/
}
+static inline void finish_scc(void)
+{
+ finish_stack();
+}
+
#ifdef INTERPROCEDURAL_VIEW
-static INLINE void init_ip_scc(struct obstack *obst) {
+static inline void init_ip_scc(struct obstack *obst) {
init_scc_common();
cg_walk(init_node, NULL, obst);
}
/* When to walk from nodes to blocks. Only for Control flow operations? */
-static INLINE int get_start_index(ir_node *n) {
+static inline int get_start_index(ir_node *n) {
#undef BLOCK_BEFORE_NODE
#define BLOCK_BEFORE_NODE 1
not reachable.
I.e., with this code, the order on the loop tree is correct. But a (single)
test showed the loop tree is deeper. */
- if (get_irn_op(n) == op_Phi ||
- get_irn_op(n) == op_Block ||
- (get_irn_op(n) == op_Filter && get_interprocedural_view()) ||
- (get_irg_pinned(get_irn_irg(n)) == op_pin_state_floats &&
- get_irn_pinned(n) == op_pin_state_floats))
+ if (get_irn_op(n) == op_Phi ||
+ is_Block(n) ||
+ (is_Filter(n) && get_interprocedural_view()) || (
+ get_irg_pinned(get_irn_irg(n)) == op_pin_state_floats &&
+ get_irn_pinned(n) == op_pin_state_floats
+ ))
// Here we could test for backedge at -1 which is illegal
return 0;
else
But it guarantees that Blocks are analysed before nodes contained in the
block. If so, we can set the value to undef if the block is not \
executed. */
- if (is_cfop(n) || is_fragile_op(n) || get_irn_op(n) == op_Start)
+ if (is_cfop(n) || is_fragile_op(n) || is_Start(n))
return -1;
else
return 0;
*
* @param n the node to check
*/
-static INLINE int is_possible_loop_head(ir_node *n) {
+static inline int is_possible_loop_head(ir_node *n) {
ir_op *op = get_irn_op(n);
return ((op == op_Block) ||
(op == op_Phi) ||
if (!is_outermost_Start(n)) {
#ifndef NDEBUG
int uplink = get_irn_uplink(root);
+#else
+ (void) root;
#endif
arity = get_irn_arity(n);
for (i = get_start_index(n); i < arity; i++) {
if (!is_outermost_Start(n)) {
#ifndef NDEBUG
int uplink = get_irn_uplink(root);
+#else
+ (void) root;
#endif
arity = get_irn_arity(n);
for (i = get_start_index(n); i < arity; i++) {
#endif
-static INLINE int is_outermost_loop(ir_loop *l) {
+static inline int is_outermost_loop(ir_loop *l) {
return l == get_loop_outer_loop(l);
}
* @param n node to start
*/
static void scc(ir_node *n) {
- if (irn_visited(n))
+ if (irn_visited_else_mark(n))
return;
- mark_irn_visited(n);
/* Initialize the node */
set_irn_dfn(n, current_dfn); /* Depth first number for this node */
#ifdef INTERPROCEDURAL_VIEW
static void my_scc(ir_node *n) {
int i;
- if (irn_visited(n))
+ if (irn_visited_else_mark(n))
return;
- mark_irn_visited(n);
/* Initialize the node */
set_irn_dfn(n, current_dfn); /* Depth first number for this node */
ir_node *m;
if (is_backedge(n, i)) continue;
m = get_irn_n(n, i); /* get_irn_ip_pred(n, i); */
- /* if ((!m) || (get_irn_op(m) == op_Unknown)) continue; */
+ /* if (!m || is_Unknown(m)) continue; */
my_scc(m);
if (irn_is_in_stack(m)) {
/* Uplink of m is smaller if n->m is a backedge.
inc_irg_visited(irg);
scc(get_irg_end(irg));
+
+ finish_scc();
obstack_free(&temp, NULL);
assert(head_rem == current_loop);