X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeblocksched.c;h=872c63040cda974023d6f0121817a743d42dd8ff;hb=8974b94349462d835b33ad4f896d1821986458bd;hp=507fc07490e885e9d0f462eb4b7e84190856c2df;hpb=a1bbd1afcfe001280b293f94518e7ffc711fbf9c;p=libfirm

diff --git a/ir/be/beblocksched.c b/ir/be/beblocksched.c
index 507fc0749..872c63040 100644
--- a/ir/be/beblocksched.c
+++ b/ir/be/beblocksched.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -58,10 +58,10 @@
 #include "beirgmod.h"
 #include "bemodule.h"
 #include "be.h"
+#include "error.h"
 
-#include <libcore/lc_opts.h>
-#include <libcore/lc_opts_enum.h>
-#include <libcore/lc_timing.h>
+#include "lc_opts.h"
+#include "lc_opts_enum.h"
 
 #ifdef WITH_ILP
 #include <lpp/lpp.h>
@@ -115,7 +115,7 @@ typedef struct _edge_t {
 	int     pos;                /**< number of cfg predecessor (target) */
 	double  execfreq;           /**< the frequency */
 	int     highest_execfreq;   /**< flag that indicates whether this edge is the edge with the highest
-							   	     execfreq pointing away from this block */
+	                                 execfreq pointing away from this block */
 } edge_t;
 
 typedef struct _blocksched_env_t {
@@ -147,8 +147,10 @@ static void collect_egde_frequency(ir_node *block, void *data)
 	arity = get_Block_n_cfgpreds(block);
 
 	if (arity == 0) {
-		assert(block == get_irg_start_block(env->irg));
-		/* must be the start block, nothing to do here */
+		assert(block == get_irg_start_block(env->irg)
+				|| block == get_irg_end_block(env->irg));
+		/* must be the start block (or end-block for endless loops), nothing to
+		 * do here */
 		return;
 	} else if (arity == 1) {
 		edge.block            = block;
@@ -201,18 +203,19 @@ static void coalesce_blocks(blocksched_env_t *env)
 	for (i = 0; i < edge_count; ++i) {
 		const edge_t *edge  = &env->edges[i];
 		ir_node      *block = edge->block;
+		int           pos   = edge->pos;
 		ir_node      *pred_block;
 		blocksched_entry_t *entry, *pred_entry;
 
-		/* the block might have been removed already... */
-		if (is_Bad(get_Block_cfgpred(block, 0)))
-			continue;
-
 		/* only check edge with highest frequency */
 		if (! edge->highest_execfreq)
 			continue;
 
-		pred_block = get_Block_cfgpred_block(block, edge->pos);
+		/* the block might have been removed already... */
+		if (is_Bad(get_Block_cfgpred(block, 0)))
+			continue;
+
+		pred_block = get_Block_cfgpred_block(block, pos);
 		entry      = get_irn_link(block);
 		pred_entry = get_irn_link(pred_block);
 
@@ -242,8 +245,8 @@ static void coalesce_blocks(blocksched_env_t *env)
 		if (is_Bad(get_Block_cfgpred(block, 0)))
 			continue;
 
-		/* we can't fallthroughs in backedges */
-		if (is_backedge(block, edge->pos))
+		/* we can't do fallthroughs in backedges */
+		if (is_backedge(block, pos))
 			continue;
 
 		pred_block = get_Block_cfgpred_block(block, pos);
@@ -359,7 +362,7 @@ static blocksched_entry_t *finish_block_schedule(blocksched_env_t *env)
 	ir_node            *startblock = get_irg_start_block(irg);
 	blocksched_entry_t *entry      = get_irn_link(startblock);
 
-	set_using_visited(irg);
+	ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED);
 	inc_irg_visited(irg);
 
 	env->worklist = new_pdeq();
@@ -367,7 +370,7 @@ static blocksched_entry_t *finish_block_schedule(blocksched_env_t *env)
 	assert(pdeq_empty(env->worklist));
 	del_pdeq(env->worklist);
 
-	clear_using_visited(irg);
+	ir_free_resources(irg, IR_RESOURCE_IRN_VISITED);
 
 	return entry;
 }
@@ -710,8 +713,7 @@ static ir_node **create_extbb_block_schedule(ir_graph *irg, ir_exec_freq *execfr
 	list.end    = NULL;
 	list.n_blks = 0;
 
-	set_using_irn_link(irg);
-	set_using_visited(irg);
+	ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED | IR_RESOURCE_IRN_LINK);
 	inc_irg_block_visited(irg);
 
 	create_block_list(get_irg_start_block(irg), &list);
@@ -724,8 +726,7 @@ static ir_node **create_extbb_block_schedule(ir_graph *irg, ir_exec_freq *execfr
 		blk_list[i] = b;
 	}
 
-	clear_using_irn_link(irg);
-	clear_using_visited(irg);
+	ir_free_resources(irg, IR_RESOURCE_IRN_VISITED | IR_RESOURCE_IRN_LINK);
 
 	return blk_list;
 }
@@ -764,6 +765,6 @@ ir_node **be_create_block_schedule(ir_graph *irg, ir_exec_freq *execfreqs)
 #endif /* WITH_ILP */
 	}
 
-	assert(0 && "unknown blocksched algo");
+	panic("unknown blocksched algo");
 	return NULL;
 }