X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Fircfscc.c;h=0b0e7622446c1c0a2f1dd085d894b6e26cd5946a;hb=24be66840a207d58dd74a2e41086a652b301641c;hp=c643afad3fc3a68d5a17365b2946e124ab7a674e;hpb=d935aa267d00966c360931d2f0f43008030c0592;p=libfirm

diff --git a/ir/ana/ircfscc.c b/ir/ana/ircfscc.c
index c643afad3..0b0e76224 100644
--- a/ir/ana/ircfscc.c
+++ b/ir/ana/ircfscc.c
@@ -26,13 +26,9 @@
  * @date      7.2002
  * @version   $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
 
 #include "irloop_t.h"
 #include "irnode_t.h"
@@ -80,16 +76,16 @@ typedef struct scc_info {
 } scc_info;
 
 /** Allocate a new scc_info on the given obstack */
-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;
+static inline scc_info *new_scc_info(struct obstack *obst)
+{
+	return OALLOCZ(obst, scc_info);
 }
 
 /**
  * Marks the node n to be on the stack.
  */
-static INLINE void mark_irn_in_stack(ir_node *n) {
+static inline void mark_irn_in_stack(ir_node *n)
+{
 	scc_info *info = get_irn_link(n);
 	info->in_stack = 1;
 }
@@ -97,7 +93,8 @@ static INLINE void mark_irn_in_stack(ir_node *n) {
 /**
  * Marks the node n to be not on the 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 *info = get_irn_link(n);
 	info->in_stack = 0;
 }
@@ -105,7 +102,8 @@ static INLINE void mark_irn_not_in_stack(ir_node *n) {
 /**
  * Returns whether node n is on the stack.
  */
-static INLINE int irn_is_in_stack(ir_node *n) {
+static inline int irn_is_in_stack(ir_node *n)
+{
 	scc_info *info = get_irn_link(n);
 	return info->in_stack;
 }
@@ -113,7 +111,8 @@ static INLINE int irn_is_in_stack(ir_node *n) {
 /**
  * Sets node n uplink value.
  */
-static INLINE void set_irn_uplink(ir_node *n, int uplink) {
+static inline void set_irn_uplink(ir_node *n, int uplink)
+{
 	scc_info *info = get_irn_link(n);
 	info->uplink = uplink;
 }
@@ -121,7 +120,8 @@ static INLINE void set_irn_uplink(ir_node *n, int uplink) {
 /**
  * Return node n uplink value.
  */
-static INLINE int get_irn_uplink(ir_node *n) {
+static inline int get_irn_uplink(ir_node *n)
+{
 	scc_info *info = get_irn_link(n);
 	return info->uplink;
 }
@@ -129,7 +129,8 @@ static INLINE int get_irn_uplink(ir_node *n) {
 /**
  * Sets node n dfn value.
  */
-static INLINE void set_irn_dfn(ir_node *n, int dfn) {
+static inline void set_irn_dfn(ir_node *n, int dfn)
+{
 	scc_info *info = get_irn_link(n);
 	info->dfn = dfn;
 }
@@ -137,7 +138,8 @@ static INLINE void set_irn_dfn(ir_node *n, int dfn) {
 /**
  * Returns node n dfn value.
  */
-static INLINE int get_irn_dfn(ir_node *n) {
+static inline int get_irn_dfn(ir_node *n)
+{
 	scc_info *info = get_irn_link(n);
 	return info->dfn;
 }
@@ -154,7 +156,8 @@ static int tos = 0;
 /**
  * Initializes the IR-node stack
  */
-static INLINE void init_stack(void) {
+static inline void init_stack(void)
+{
 	if (stack) {
 		ARR_RESIZE(ir_node *, stack, 1000);
 	} else {
@@ -172,7 +175,8 @@ static void finish_stack(void)
 /**
  * Push a node n onto the IR-node stack.
  */
-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);
@@ -184,7 +188,8 @@ static INLINE void push(ir_node *n) {
 /**
  * Pop a node from the IR-node stack and return it.
  */
-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;
@@ -194,7 +199,8 @@ static INLINE ir_node *pop(void) {
  * The nodes from tos 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;
 
 	do {
@@ -209,7 +215,8 @@ static INLINE void pop_scc_to_loop(ir_node *n) {
 /* GL ??? my last son is my grandson???  Removes cfloops with no
    ir_nodes in them.  Such loops have only another loop as son. (Why
    can't they have two loops as sons? Does it never get that far? ) */
-static void close_loop(ir_loop *l) {
+static void close_loop(ir_loop *l)
+{
 	int last = get_loop_n_elements(l) - 1;
 	loop_element lelement = get_loop_element(l, last);
 	ir_loop *last_son = lelement.son;
@@ -239,7 +246,8 @@ static void close_loop(ir_loop *l) {
  * 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;
 
 	do {
@@ -257,7 +265,8 @@ static INLINE void pop_scc_unmark_visit(ir_node *n) {
  * to the new loop and returns its father.
  * The loop is allocated on the outermost_ir_graphs's obstack.
  */
-static ir_loop *new_loop(void) {
+static ir_loop *new_loop(void)
+{
 	ir_loop *father = current_loop;
 	ir_loop *son    = alloc_loop(father, outermost_ir_graph->obst);
 
@@ -277,7 +286,8 @@ static ir_loop *new_loop(void) {
  * Clear the backedges for all nodes.
  * Called from a walker.
  */
-static INLINE void init_node(ir_node *n, void *env) {
+static inline void init_node(ir_node *n, void *env)
+{
 	struct obstack *obst = env;
 	if (is_Block(n))
 		set_irn_link(n, new_scc_info(obst));
@@ -287,7 +297,8 @@ static INLINE void init_node(ir_node *n, void *env) {
 /**
  * Initializes the common global settings for the scc algorithm
  */
-static INLINE void init_scc_common(void) {
+static inline void init_scc_common(void)
+{
 	current_dfn   = 1;
 	loop_node_cnt = 0;
 	init_stack();
@@ -297,35 +308,23 @@ static INLINE void init_scc_common(void) {
  * Initializes the scc algorithm for the intraprocedural case.
  * Add scc info to every block node.
  */
-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)
+static inline void finish_scc(void)
 {
 	finish_stack();
 }
 
-#ifdef INTERPROCEDURAL_VIEW
-/**
- * Initializes the scc algorithm for the interprocedural case.
- */
-static INLINE void init_ip_scc(struct obstack *obst) {
-	init_scc_common();
-	cg_walk(init_node, NULL, obst);
-
-#if EXPERIMENTAL_CFLOOP_TREE
-	cg_walk(link_to_reg_end, NULL, NULL);
-#endif
-}
-#endif
-
 /**
  * Condition for breaking the recursion: n is the block
  * that gets the initial control flow from the Start node.
  */
-static int is_outermost_StartBlock(ir_node *n) {
+static int is_outermost_StartBlock(ir_node *n)
+{
 	/* Test whether this is the outermost Start node.  If so
 	   recursion must end. */
 	assert(is_Block(n));
@@ -343,7 +342,8 @@ static int is_outermost_StartBlock(ir_node *n) {
  *  @param n     the block node to check
  *  @param root  only needed for assertion.
  */
-static int is_head(ir_node *n, ir_node *root) {
+static int is_head(ir_node *n, ir_node *root)
+{
 	int i, arity;
 	int some_outof_loop = 0, some_in_loop = 0;
 	(void) root;
@@ -379,7 +379,8 @@ static int is_head(ir_node *n, ir_node *root) {
  * @param n     the block node to check
  * @param root  only needed for assertion.
  */
-static int is_endless_head(ir_node *n, ir_node *root) {
+static int is_endless_head(ir_node *n, ir_node *root)
+{
 	int i, arity;
 	int none_outof_loop = 1, some_in_loop = 0;
 	(void) root;
@@ -410,7 +411,8 @@ static int is_endless_head(ir_node *n, ir_node *root) {
  * Returns index of the predecessor with the smallest dfn number
  * greater-equal than limit.
  */
-static int smallest_dfn_pred(ir_node *n, int limit) {
+static int smallest_dfn_pred(ir_node *n, int limit)
+{
 	int i, index = -2, min = -1;
 
 	if (!is_outermost_StartBlock(n)) {
@@ -434,7 +436,8 @@ static int smallest_dfn_pred(ir_node *n, int limit) {
 /**
  * Returns index of the predecessor with the largest dfn number.
  */
-static int largest_dfn_pred(ir_node *n) {
+static int largest_dfn_pred(ir_node *n)
+{
 	int i, index = -2, max = -1;
 
 	if (!is_outermost_StartBlock(n)) {
@@ -461,7 +464,8 @@ static int largest_dfn_pred(ir_node *n) {
  * returns the tail of the loop.
  * If it finds no backedge returns NULL.
  */
-static ir_node *find_tail(ir_node *n) {
+static ir_node *find_tail(ir_node *n)
+{
 	ir_node *m;
 	int i, res_index = -2;
 
@@ -521,7 +525,8 @@ static ir_node *find_tail(ir_node *n) {
 /**
  * returns non.zero if l is the outermost loop.
  */
-INLINE static int is_outermost_loop(ir_loop *l) {
+inline static int is_outermost_loop(ir_loop *l)
+{
 	return l == get_loop_outer_loop(l);
 }
 
@@ -532,7 +537,8 @@ INLINE static int is_outermost_loop(ir_loop *l) {
 /**
  * Walks over all blocks of a graph
  */
-static void cfscc(ir_node *n) {
+static void cfscc(ir_node *n)
+{
 	int i;
 
 	assert(is_Block(n));
@@ -637,15 +643,14 @@ static void cfscc(ir_node *n) {
 }
 
 /* Constructs control flow backedge information for irg. */
-int construct_cf_backedges(ir_graph *irg) {
+int construct_cf_backedges(ir_graph *irg)
+{
 	ir_graph *rem = current_ir_graph;
 	ir_loop *head_rem;
 	ir_node *end = get_irg_end(irg);
 	struct obstack temp;
 	int i;
 
-	assert(!get_interprocedural_view() &&
-		"use construct_ip_cf_backedges()");
 	max_loop_depth = 0;
 
 	current_ir_graph   = irg;
@@ -680,149 +685,10 @@ int construct_cf_backedges(ir_graph *irg) {
 	return max_loop_depth;
 }
 
-void assure_cf_loop(ir_graph *irg) {
+void assure_cf_loop(ir_graph *irg)
+{
 	irg_loopinfo_state state = get_irg_loopinfo_state(irg);
 
 	if (state != loopinfo_cf_consistent)
 		construct_cf_backedges(irg);
 }
-
-#ifdef INTERPROCEDURAL_VIEW
-int construct_ip_cf_backedges (void) {
-	ir_graph *rem = current_ir_graph;
-	int rem_ipv = get_interprocedural_view();
-	struct obstack temp;
-	int i;
-
-	assert(get_irp_ip_view_state() == ip_view_valid);
-	max_loop_depth = 0;
-	outermost_ir_graph = get_irp_main_irg();
-
-	obstack_init(&temp);
-	init_ip_scc(&temp);
-
-	current_loop = NULL;
-	new_loop();  /* sets current_loop */
-	set_interprocedural_view(1);
-
-	inc_max_irg_visited();
-	for (i = 0; i < get_irp_n_irgs(); i++)
-	  set_irg_visited(get_irp_irg(i), get_max_irg_visited());
-
-	/** We have to start the walk at the same nodes as cg_walk. **/
-	/* 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;
-
-		cfscc(get_irg_end_block(current_ir_graph));
-	}
-
-	/* 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)) cfscc(sb);
-	}
-
-	/* Walk all endless cfloops 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++) {
-				ir_node *el = get_End_keepalive(e, j);
-				if (is_Block(el)) cfscc(el);
-			}
-		}
-	}
-
-	set_irg_loop(outermost_ir_graph, current_loop);
-	set_irg_loopinfo_state(current_ir_graph, loopinfo_cf_ip_consistent);
-	assert(get_irg_loop(outermost_ir_graph)->kind == k_ir_loop);
-
-	obstack_free(&temp, NULL);
-	current_ir_graph = rem;
-	set_interprocedural_view(rem_ipv);
-	return max_loop_depth;
-}
-#endif
-
-/**
- * Clear the intra- and the interprocedural
- * backedge information pf a block.
- */
-static void reset_backedges(ir_node *block) {
-	int rem;
-
-	assert(is_Block(block));
-#ifdef INTERPROCEDURAL_VIEW
-	rem = get_interprocedural_view();
-	set_interprocedural_view(1);
-	clear_backedges(block);
-	set_interprocedural_view(0);
-	clear_backedges(block);
-	set_interprocedural_view(rem);
-#else
-	(void) rem;
-	clear_backedges(block);
-#endif
-}
-
-/**
- * Reset all backedges of the first block of
- * a loop as well as all loop info for all nodes of this loop.
- * Recurse into all nested loops.
- */
-static void loop_reset_backedges(ir_loop *l) {
-	int i;
-	reset_backedges(get_loop_node(l, 0));
-	for (i = 0; i < get_loop_n_nodes(l); ++i)
-		set_irn_loop(get_loop_node(l, i), NULL);
-	for (i = 0; i < get_loop_n_sons(l); ++i) {
-		loop_reset_backedges(get_loop_son(l, i));
-	}
-}
-
-/* Removes all cfloop information.
-   Resets all backedges */
-void free_cfloop_information(ir_graph *irg) {
-	ir_loop *loop = get_irg_loop(irg);
-	if (loop != NULL) {
-		loop_reset_backedges(loop);
-		set_irg_loop(irg, NULL);
-	}
-	set_irg_loopinfo_state(irg, loopinfo_none);
-	/* We cannot free the cfloop nodes, they are on the obstack. */
-}
-
-
-void free_all_cfloop_information(void) {
-	int i;
-#ifdef INTERPROCEDURAL_VIEW
-	int rem = get_interprocedural_view();
-	set_interprocedural_view(1);  /* To visit all filter nodes */
-#endif
-	for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
-		free_cfloop_information(get_irp_irg(i));
-	}
-#ifdef INTERPROCEDURAL_VIEW
-	set_interprocedural_view(rem);
-#endif
-}