X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbespillbelady3.c;h=6135e99f5d8dd0b3072f0ab2e1a5471007d0e50d;hb=0b1140d1887f497ef413709e5cda2608f2cd1017;hp=e0fba0e5cb293110204cc1cf7a4421fa85b63545;hpb=a300bcfc42715ffb429ada75d2673550b769870c;p=libfirm

diff --git a/ir/be/bespillbelady3.c b/ir/be/bespillbelady3.c
index e0fba0e5c..6135e99f5 100644
--- a/ir/be/bespillbelady3.c
+++ b/ir/be/bespillbelady3.c
@@ -53,7 +53,9 @@
 #include "besched_t.h"
 #include "be_t.h"
 
+#ifndef NDEBUG
 #define EXPENSIVE_CHECKS
+#endif
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
@@ -84,7 +86,7 @@ typedef struct worklist_t worklist_t;
 struct worklist_t {
 	struct list_head  live_values;
 	size_t            n_live_values;
-	unsigned long     visited;
+	ir_visited_t      visited;
 };
 
 typedef struct block_info_t block_info_t;
@@ -103,7 +105,7 @@ static bool                         tentative_mode;
 static bool                         should_have_reached_fixpoint;
 static bool                         do_push_unused_livethroughs;
 static ir_exec_freq                *exec_freq;
-static unsigned long                worklist_visited;
+static ir_visited_t                 worklist_visited;
 
 static worklist_t *new_worklist(void)
 {
@@ -559,14 +561,16 @@ static bool fill_start_worklist(worklist_t *new_worklist, ir_node *block)
 
 	/* construct worklist */
 	foreach_block_succ(block, edge) {
-		ir_node *succ_block = get_edge_src_irn(edge);
-		double   execfreq   = get_block_execfreq(exec_freq, succ_block);
+		ir_node      *succ_block = get_edge_src_irn(edge);
+		double       execfreq    = get_block_execfreq(exec_freq, succ_block);
+		block_info_t *block_info;
+		worklist_t   *succ_worklist;
 
 		if (execfreq < best_execfreq)
 			continue;
 
-		block_info_t *block_info    = get_block_info(succ_block);
-		worklist_t   *succ_worklist = block_info->start_worklist;
+		block_info    = get_block_info(succ_block);
+		succ_worklist = block_info->start_worklist;
 
 		if (succ_worklist == NULL || succ_worklist->visited >= worklist_visited)
 			continue;
@@ -679,7 +683,10 @@ static void find_in_loop(ir_loop *loop, ir_node *entry)
 		}
 		assert(found);
 	}
+#else
+	(void) entry;
 #endif
+
 	/* check all loop successors */
 	for (edge = loop_info->exit_edges; edge != NULL; edge = edge->next) {
 		ir_node *succ      = edge->block;
@@ -757,15 +764,16 @@ static void worklist_append(worklist_t *worklist, ir_node *value,
 
 static void push_unused_livethrough(loop_info_t *loop_info, ir_node *value)
 {
+	loop_edge_t *edge;
 	++worklist_visited;
 
 	/* add the value to all loop exit and entry blocks */
-	loop_edge_t *edge = loop_info->exit_edges;
-	for ( ; edge != NULL; edge = edge->next) {
+	for (edge = loop_info->exit_edges; edge != NULL; edge = edge->next) {
 		ir_node            *block
 			= get_Block_cfgpred_block(edge->block, edge->pos);
 		const block_info_t *info     = get_block_info(block);
 		worklist_t         *worklist = info->end_worklist;
+		ir_node            *reload_point = NULL;
 
 		if (worklist->visited >= worklist_visited)
 			continue;
@@ -773,7 +781,6 @@ static void push_unused_livethrough(loop_info_t *loop_info, ir_node *value)
 
 		/* TODO: we need a smarter mechanism here, that makes the reloader place
 		 * reload nodes on all loop exits... */
-		ir_node *reload_point = NULL;
 
 		worklist_append(worklist, value, reload_point, loop_info->loop);
 	}
@@ -782,14 +789,15 @@ static void push_unused_livethrough(loop_info_t *loop_info, ir_node *value)
 		ir_node            *entry_block = edge->block;
 		const block_info_t *info        = get_block_info(entry_block);
 		worklist_t         *worklist    = info->start_worklist;
+		ir_node            *pred_block;
+		ir_node            *reload_point;
 
 		if (worklist->visited >= worklist_visited)
 			continue;
 		worklist->visited = worklist_visited;
 
-		ir_node *pred_block
-			= get_Block_cfgpred_block(entry_block, edge->pos);
-		ir_node *reload_point = be_get_end_of_block_insertion_point(pred_block);
+		pred_block   = get_Block_cfgpred_block(entry_block, edge->pos);
+		reload_point = be_get_end_of_block_insertion_point(pred_block);
 
 		worklist_append(worklist, value, reload_point, loop_info->loop);
 	}