X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbestate.c;h=52dc3df93a5b5622ea06b98a011deb2c368b08fc;hb=929bd10ba046d7482e572d97ec592a4055c65970;hp=1a02a0695a04ed3890708dcdfab5928d892053a8;hpb=5619c9122551713adbefc33977572639408dd8b9;p=libfirm

diff --git a/ir/be/bestate.c b/ir/be/bestate.c
index 1a02a0695..52dc3df93 100644
--- a/ir/be/bestate.c
+++ b/ir/be/bestate.c
@@ -38,9 +38,10 @@
 #include "irgmod.h"
 #include "irnodeset.h"
 #include "irnodehashmap.h"
-#include "adt/cpset.h"
+#include "cpset.h"
 
 #include "bearch.h"
+#include "beirg.h"
 #include "beuses.h"
 #include "besched.h"
 #include "belive_t.h"
@@ -110,8 +111,7 @@ static inline spill_info_t *create_spill_info(minibelady_env_t *env, ir_node *st
 
 static inline spill_info_t *get_spill_info(minibelady_env_t *env, const ir_node *node)
 {
-	spill_info_t *spill_info
-		= (spill_info_t*) ir_nodehashmap_get(&env->spill_infos, node);
+	spill_info_t *spill_info = ir_nodehashmap_get(spill_info_t, &env->spill_infos, node);
 	//ir_fprintf(stderr, "Get %+F -> %p\n", node, spill_info);
 	return spill_info;
 }
@@ -215,11 +215,9 @@ static block_info_t *compute_block_start_state(minibelady_env_t *env, ir_node *b
 	be_next_use_t  next_use;
 	ir_loop       *loop;
 	ir_node       *best_starter, *first;
-	ir_node       *node;
 	int            n_cfgpreds;
 	unsigned       best_time;
 	int            outer_loop_allowed;
-	int            i;
 
 	/* Create the block info for this block. */
 	block_info = new_block_info(&env->obst, block);
@@ -302,9 +300,7 @@ static block_info_t *compute_block_start_state(minibelady_env_t *env, ir_node *b
 	}
 
 	/* check all Live-Ins */
-	be_lv_foreach(env->lv, block, be_lv_state_in, i) {
-		node = be_lv_get_irn(env->lv, block, i);
-
+	be_lv_foreach(env->lv, block, be_lv_state_in, node) {
 		if (!mode_is_data(get_irn_mode(node)))
 			continue;
 
@@ -359,7 +355,6 @@ static block_info_t *compute_block_start_state(minibelady_env_t *env, ir_node *b
 static void belady(minibelady_env_t *env, ir_node *block)
 {
 	ir_node *current_state;
-	ir_node *node;
 	block_info_t *block_info;
 
 	/* Don't do a block twice */