X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firextbb.c;h=71506c1649c717e381d8c33cac63163d0e65caa6;hb=e775a978fff2841e0722c47f13545b54d48b8f98;hp=78963d92eb48e89710199c8041200f698ec49f2e;hpb=0fbcef83aa6060534172bb13e71cdadb04428806;p=libfirm

diff --git a/ir/ana/irextbb.c b/ir/ana/irextbb.c
index 78963d92e..71506c164 100644
--- a/ir/ana/irextbb.c
+++ b/ir/ana/irextbb.c
@@ -38,21 +38,23 @@
 /**
  * Environment for extbb construction.
  */
-typedef struct _env {
+typedef struct env {
 	struct obstack *obst;   /**< the obstack where allocations took place */
 	ir_extblk *head;        /**< head of the list of all extended blocks */
 	ir_node *start_block;   /**< the start block of the current graph */
 } env_t;
 
-int (is_ir_extbb)(const void *thing) {
+int (is_ir_extbb)(const void *thing)
+{
 	return _is_ir_extbb(thing);
 }
 
 /**
  * allocate a new extended block header.
  */
-static void allocate_extblk(ir_node *block, env_t *env) {
-	ir_extblk *extblk = obstack_alloc(env->obst, sizeof(*extblk));
+static void allocate_extblk(ir_node *block, env_t *env)
+{
+	ir_extblk *extblk = OALLOC(env->obst, ir_extblk);
 
 	extblk->kind    = k_ir_extblk;
 	extblk->visited = 1;
@@ -68,7 +70,8 @@ static void allocate_extblk(ir_node *block, env_t *env) {
  * Returns the number of block successors.
  * we are interested only in 1, 2 and >2.
  */
-static int get_block_n_succs(ir_node *block) {
+static int get_block_n_succs(ir_node *block)
+{
 	if (edges_activated(current_ir_graph)) {
 		const ir_edge_t *edge;
 
@@ -87,9 +90,10 @@ static int get_block_n_succs(ir_node *block) {
 /**
  * Pre block-walker. Calculates the extended block info.
  */
-static void pre_walk_calc_extbb(ir_node *block, void *ctx) {
+static void pre_walk_calc_extbb(ir_node *block, void *ctx)
+{
 	int n = get_Block_n_cfgpreds(block);
-	env_t *env = ctx;
+	env_t *env = (env_t*) ctx;
 
 	if (n <= 0 || n > 1 || block == env->start_block) {
 		/*
@@ -145,7 +149,7 @@ static ir_extblk _sentinel = { k_ir_extblk, 0xFEA1DEAD, NULL, NULL };
 static void post_walk_calc_extbb(ir_node *block, void *ctx)
 {
 	ir_extblk *extbb = get_Block_extbb(block);
-	env_t *env = ctx;
+	env_t *env = (env_t*) ctx;
 	ir_extblk *sentinel = &_sentinel;
 
 	if (! extbb) {
@@ -176,7 +180,7 @@ static void post_walk_calc_extbb(ir_node *block, void *ctx)
 		/* replace all sentinels by the extbb info */
 		prev = block;
 		list = NULL;
-		while (1) {
+		for (;;) {
 			if (get_Block_extbb(prev) != sentinel)
 				break;
 			set_irn_link(prev, list);
@@ -185,7 +189,7 @@ static void post_walk_calc_extbb(ir_node *block, void *ctx)
 		}
 		/* arg, the list is in wrong order, turn around and add to the extbb list */
 		for (curr = list; curr; curr = prev) {
-			prev = get_irn_link(curr);
+			prev = (ir_node*) get_irn_link(curr);
 			set_irn_link(curr, extbb->link);
 			extbb->link = curr;
 			set_Block_extbb(curr, extbb);
@@ -197,7 +201,8 @@ static void post_walk_calc_extbb(ir_node *block, void *ctx)
 /*
  * Compute the extended basic blocks for a graph
  */
-void compute_extbb(ir_graph *irg) {
+void compute_extbb(ir_graph *irg)
+{
 	env_t env;
 	ir_extblk *extbb, *next;
 
@@ -235,8 +240,8 @@ void compute_extbb(ir_graph *irg) {
 
 		extbb->blks = NEW_ARR_D(ir_node *, env.obst, len);
 
-		for (block = extbb->link, i = 0; i < len; ++i) {
-			ir_node *nblock = get_irn_link(block);
+		for (block = (ir_node*) extbb->link, i = 0; i < len; ++i) {
+			ir_node *nblock = (ir_node*) get_irn_link(block);
 
 			/* ensure that the leader is the first one */
 			extbb->blks[len - 1 - i] = block;
@@ -261,81 +266,95 @@ void compute_extbb(ir_graph *irg) {
 		extbb->visited = 0;
 	}
 
-	irg->extblk_state = extblk_valid;
+	irg->extblk_state = ir_extblk_info_valid;
 }
 
 /* free all extended block info. */
-void free_extbb(ir_graph *irg) {
+void free_extbb(ir_graph *irg)
+{
 	if (irg->extbb_obst) {
 		obstack_free(irg->extbb_obst, NULL);
 		xfree(irg->extbb_obst);
 		irg->extbb_obst = NULL;
 	}
-	irg->extblk_state = extblk_none;
+	irg->extblk_state = ir_extblk_info_none;
 }
 
 /* Return the extended block of a node. */
-ir_extblk *get_nodes_extbb(ir_node *node) {
-	ir_node *block = is_Block(node) ? node : get_irn_n(node, -1);
+ir_extblk *get_nodes_extbb(const ir_node *node)
+{
+	const ir_node *block = is_Block(node) ? node : get_nodes_block(node);
 	return get_Block_extbb(block);
 }
 
 /* Gets the visited counter of an extended block. */
-ir_visited_t (get_extbb_visited)(const ir_extblk *blk) {
+ir_visited_t (get_extbb_visited)(const ir_extblk *blk)
+{
 	return _get_extbb_visited(blk);
 }
 
 /* Sets the visited counter of an extended block. */
-void (set_extbb_visited)(ir_extblk *blk, ir_visited_t visited) {
+void (set_extbb_visited)(ir_extblk *blk, ir_visited_t visited)
+{
 	_set_extbb_visited(blk, visited);
 }
 
 /* Mark an extended block as visited in a graph. */
-void (mark_extbb_visited)(ir_extblk *blk) {
+void (mark_extbb_visited)(ir_extblk *blk)
+{
 	_mark_extbb_visited(blk);
 }
 
 /* Returns non-zero if an extended was visited. */
-int (extbb_visited)(const ir_extblk *blk) {
+int (extbb_visited)(const ir_extblk *blk)
+{
 	return _extbb_visited(blk);
 }
 
 /* Returns non-zero if an extended block was NOT visited. */
-int (extbb_not_visited)(const ir_extblk *blk) {
+int (extbb_not_visited)(const ir_extblk *blk)
+{
 	return _extbb_not_visited(blk);
 }
 
 /* Returns the link field of an extended block. */
-void *(get_extbb_link)(const ir_extblk *blk) {
+void *(get_extbb_link)(const ir_extblk *blk)
+{
 	return _get_extbb_link(blk);
 }
 
 /* Sets the link field of an extended block. */
-void (set_extbb_link)(ir_extblk *blk, void *link) {
+void (set_extbb_link)(ir_extblk *blk, void *link)
+{
 	_set_extbb_link(blk, link);
 }
 
 /* Return the number of basic blocks of an extended block */
-int (get_extbb_n_blocks)(const ir_extblk *blk) {
+int (get_extbb_n_blocks)(const ir_extblk *blk)
+{
 	return _get_extbb_n_blocks(blk);
 }
 
 /* Return the i'th basic block of an extended block */
-ir_node *(get_extbb_block)(ir_extblk *blk, int pos) {
+ir_node *(get_extbb_block)(const ir_extblk *blk, int pos)
+{
 	return _get_extbb_block(blk, pos);
 }
 
 /* Return the leader basis block of an extended block. */
-ir_node *(get_extbb_leader)(ir_extblk *blk) {
+ir_node *(get_extbb_leader)(const ir_extblk *blk)
+{
 	return _get_extbb_leader(blk);
 }
 
 /* Return the node number of an extended block. */
-long get_extbb_node_nr(ir_extblk *blk) {
+long get_extbb_node_nr(const ir_extblk *blk)
+{
 	return get_irn_node_nr(get_extbb_leader(blk));
 }
 
-static void irg_extblock_walk_2(ir_extblk *blk, extbb_walk_func *pre, extbb_walk_func *post, void *env) {
+static void irg_extblock_walk_2(ir_extblk *blk, extbb_walk_func *pre, extbb_walk_func *post, void *env)
+{
 	int i;
 	ir_node *node;
 
@@ -361,9 +380,10 @@ static void irg_extblock_walk_2(ir_extblk *blk, extbb_walk_func *pre, extbb_walk
 	}
 }
 
-/* walks only over extended Block nodes in the graph.  Has it's own visited
+/* walks only over extended Block nodes in the graph.  Has its own visited
    flag, so that it can be interleaved with the other walker.         */
-void irg_extblock_walk(ir_extblk *blk, extbb_walk_func *pre, extbb_walk_func *post, void *env) {
+void irg_extblock_walk(ir_extblk *blk, extbb_walk_func *pre, extbb_walk_func *post, void *env)
+{
 	ir_node *pred, *start_bl = get_irg_start_block(current_ir_graph);
 	ir_extblk *start_blk = get_Block_extbb(start_bl);
 	int i;
@@ -401,7 +421,8 @@ void irg_extblock_walk(ir_extblk *blk, extbb_walk_func *pre, extbb_walk_func *po
 }
 
 /* Walks only over reachable Extended Basic Block nodes in the graph. */
-void irg_extblock_walk_graph(ir_graph *irg, extbb_walk_func *pre, extbb_walk_func *post, void *env) {
+void irg_extblock_walk_graph(ir_graph *irg, extbb_walk_func *pre, extbb_walk_func *post, void *env)
+{
 	ir_node *endbl = get_irg_end_block(irg);
 	ir_extblk *blk = get_Block_extbb(endbl);
 	ir_graph *rem  = current_ir_graph;