X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fana%2Firextbb2.c;h=310c2a79918353e3fa099131e034f9eadbb8010b;hb=24be66840a207d58dd74a2e41086a652b301641c;hp=0c4a05a4c6552423d8a775ba569b879037d3e741;hpb=20c1ad1ad56f8ff1583f7b43d9f63e1f7fd40530;p=libfirm

diff --git a/ir/ana/irextbb2.c b/ir/ana/irextbb2.c
index 0c4a05a4c..310c2a799 100644
--- a/ir/ana/irextbb2.c
+++ b/ir/ana/irextbb2.c
@@ -1,22 +1,34 @@
 /*
- * Project:     libFIRM
- * File name:   ir/ana/irextbb2.c
- * Purpose:     Alternate extended basic block computation
- * Author:      Matthias Braun
- * Created:     5.2005
- * CVS-ID:      $Id$
- * Copyright:   (c) 2002-2005 Universität Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
  */
 
 /**
- * @file irextbb2.c
- *
+ * @file
+ * @brief     Alternative extended basic block computation
+ * @author    Matthias Braun
+ * @date      5.2005
+ * @version   $Id$
+ * @brief
  *  Alternative algorithm for computing extended basic blocks (using out edges
  *  and execution frequencies)
- *
- *  @author Matthias Braun
  */
+#include "config.h"
+
 #include "irextbb_t.h"
 #include "irgwalk.h"
 #include "irnode_t.h"
@@ -30,7 +42,7 @@
 typedef struct _env {
   	struct obstack *obst;   /**< the obstack where allocations took place */
 	ir_extblk *head;        /**< head of the list of all extended blocks */
-	exec_freq_t *execfreqs;
+	ir_exec_freq *execfreqs;
 } env_t;
 
 /**
@@ -38,7 +50,7 @@ typedef struct _env {
  */
 static ir_extblk *allocate_extblk(ir_node *block, env_t *env)
 {
-	ir_extblk *extblk = obstack_alloc(env->obst, sizeof(*extblk));
+	ir_extblk *extblk = OALLOC(env->obst, ir_extblk);
 
 	extblk->kind    = k_ir_extblk;
 	extblk->visited = 1;
@@ -70,7 +82,8 @@ static void addto_extblk(ir_extblk *extblk, ir_node *block)
  * 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;
 
@@ -95,11 +108,10 @@ static void create_extblk(ir_node *block, env_t *env)
 {
 	ir_extblk *extblk;
 
-	if (irn_visited(block))
+	if (irn_visited_else_mark(block))
 		return;
 
 	extblk = allocate_extblk(block, env);
-	mark_irn_visited(block);
 
 	pick_successor(block, extblk, env);
 }
@@ -116,8 +128,6 @@ static void pick_successor(ir_node *block, ir_extblk *extblk, env_t *env)
 		basic block, so create a new one here.
 	*/
 	if (get_block_n_succs(block) > 2) {
-		const ir_edge_t *edge;
-
 		foreach_block_succ(block, edge) {
 			ir_node *succ = get_edge_src_irn(edge);
 			create_extblk(succ, env);
@@ -130,7 +140,10 @@ static void pick_successor(ir_node *block, ir_extblk *extblk, env_t *env)
 		ir_node *succ = get_edge_src_irn(edge);
 		double execfreq;
 
-		if(get_Block_n_cfgpreds(succ) > 1) {
+		if (irn_visited(succ))
+			continue;
+
+		if (get_Block_n_cfgpreds(succ) > 1) {
 			create_extblk(succ, env);
 			continue;
 		}
@@ -155,7 +168,7 @@ static void pick_successor(ir_node *block, ir_extblk *extblk, env_t *env)
 	}
 
 	/* add best successor and recursively try to pick more */
-	if(best_succ != NULL) {
+	if (best_succ != NULL) {
 		addto_extblk(extblk, best_succ);
 		mark_irn_visited(best_succ);
 		pick_successor(best_succ, extblk, env);
@@ -165,7 +178,8 @@ static void pick_successor(ir_node *block, ir_extblk *extblk, env_t *env)
 /*
  * Compute the extended basic blocks for a graph
  */
-void compute_extbb_execfreqs(ir_graph *irg, exec_freq_t *execfreqs) {
+void compute_extbb_execfreqs(ir_graph *irg, ir_exec_freq *execfreqs)
+{
   	env_t     env;
 	ir_extblk *extbb, *next;
 	ir_node   *endblock;
@@ -174,7 +188,7 @@ void compute_extbb_execfreqs(ir_graph *irg, exec_freq_t *execfreqs) {
 		obstack_free(irg->extbb_obst, NULL);
 	}
 	else {
-		irg->extbb_obst = xmalloc(sizeof(*irg->extbb_obst));
+		irg->extbb_obst = XMALLOC(struct obstack);
 	}
 	obstack_init(irg->extbb_obst);
 
@@ -190,9 +204,7 @@ void compute_extbb_execfreqs(ir_graph *irg, exec_freq_t *execfreqs) {
 
 	/* the end block needs a extbb assigned (even for endless loops) */
 	endblock = get_irg_end_block(irg);
-	if (! irn_visited(endblock)) {
-		create_extblk(endblock, &env);
-	}
+	create_extblk(endblock, &env);
 
 	/*
 		Ok, we have now the list of all extended blocks starting with env.head
@@ -219,8 +231,8 @@ void compute_extbb_execfreqs(ir_graph *irg, exec_freq_t *execfreqs) {
 		}
 
 #if 0
-		for(i = 0; i < len; ++i) {
-			if(i > 0)
+		for (i = 0; i < len; ++i) {
+			if (i > 0)
 				printf(", ");
 			ir_printf("%+F", extbb->blks[i]);
 		}