X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbelive.c;h=3129520630fcc8719015320490d2b36ffd8b0ea2;hb=3c3425a50a1d721b74a015c6812257e32feeac85;hp=5021d5f85b8947ca0f454b178c18c0f300bd9193;hpb=a8ee9cf831b6aa9c41312a7d380eb31c30fa5548;p=libfirm

diff --git a/ir/be/belive.c b/ir/be/belive.c
index 5021d5f85..312952063 100644
--- a/ir/be/belive.c
+++ b/ir/be/belive.c
@@ -122,7 +122,7 @@ be_lv_info_node_t *be_lv_get(const be_lv_t *li, const ir_node *bl,
 	be_lv_info_node_t *res = NULL;
 
 	stat_ev_tim_push();
-	irn_live = (be_lv_info_t*)ir_nodehashmap_get(&li->map, bl);
+	irn_live = ir_nodehashmap_get(be_lv_info_t, &li->map, bl);
 	if (irn_live != NULL) {
 		unsigned idx = get_irn_idx(irn);
 
@@ -144,7 +144,7 @@ be_lv_info_node_t *be_lv_get(const be_lv_t *li, const ir_node *bl,
 static be_lv_info_node_t *be_lv_get_or_set(be_lv_t *li, ir_node *bl,
                                            ir_node *irn)
 {
-	be_lv_info_t *irn_live = (be_lv_info_t*)ir_nodehashmap_get(&li->map, bl);
+	be_lv_info_t *irn_live = ir_nodehashmap_get(be_lv_info_t, &li->map, bl);
 	if (irn_live == NULL) {
 		irn_live = OALLOCNZ(&li->obst, be_lv_info_t, LV_STD_SIZE);
 		irn_live[0].head.n_size = LV_STD_SIZE-1;
@@ -203,7 +203,7 @@ static be_lv_info_node_t *be_lv_get_or_set(be_lv_t *li, ir_node *bl,
 static int be_lv_remove(be_lv_t *li, const ir_node *bl,
                         const ir_node *irn)
 {
-	be_lv_info_t *irn_live = (be_lv_info_t*)ir_nodehashmap_get(&li->map, bl);
+	be_lv_info_t *irn_live = ir_nodehashmap_get(be_lv_info_t, &li->map, bl);
 
 	if (irn_live != NULL) {
 		unsigned n   = irn_live[0].head.n_members;
@@ -318,7 +318,6 @@ typedef struct lv_remove_walker_t {
  */
 static void liveness_for_node(ir_node *irn)
 {
-	const ir_edge_t *edge;
 	ir_node *def_block;
 
 	bitset_clear_all(re.visited);
@@ -517,8 +516,6 @@ void be_liveness_transfer(const arch_register_class_t *cls,
 	assert(!is_Phi(node) && "liveness_transfer produces invalid results for phi nodes");
 
 	if (get_irn_mode(node) == mode_T) {
-		const ir_edge_t *edge;
-
 		foreach_out_edge(node, edge) {
 			ir_node *proj = get_edge_src_irn(edge);
 
@@ -545,11 +542,8 @@ void be_liveness_end_of_block(const be_lv_t *lv,
                               const arch_register_class_t *cls,
                               const ir_node *block, ir_nodeset_t *live)
 {
-	int i;
-
 	assert(lv->sets_valid && "live sets must be computed");
-	be_lv_foreach(lv, block, be_lv_state_end, i) {
-		ir_node *node = be_lv_get_irn(lv, block, i);
+	be_lv_foreach(lv, block, be_lv_state_end, node) {
 		if (!arch_irn_consider_in_reg_alloc(cls, node))
 			continue;
 
@@ -564,7 +558,6 @@ void be_liveness_nodes_live_at(const be_lv_t *lv,
                                const ir_node *pos, ir_nodeset_t *live)
 {
 	const ir_node *bl = is_Block(pos) ? pos : get_nodes_block(pos);
-	ir_node *irn;
 
 	be_liveness_end_of_block(lv, cls, bl, live);
 	sched_foreach_reverse(bl, irn) {