X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeabi.c;h=d6c0bbdb5c784b3761402ec0dc54db6ccdec5d43;hb=89dc24503c04139bb05504059b291d6d89f99661;hp=63ee2598b56a1e6a00b1eab0899979116ec19b0d;hpb=1ce363f80e6a204d4011f85813362d9bd1d0e7e4;p=libfirm

diff --git a/ir/be/beabi.c b/ir/be/beabi.c
index 63ee2598b..d6c0bbdb5 100644
--- a/ir/be/beabi.c
+++ b/ir/be/beabi.c
@@ -1310,7 +1310,7 @@ static reg_node_map_t *reg_map_to_arr(struct obstack *obst, pmap *reg_map)
 	int i = 0;
 	reg_node_map_t *res = obstack_alloc(obst, n * sizeof(res[0]));
 
-	pmap_foreach(reg_map, ent) {
+	foreach_pmap(reg_map, ent) {
 		res[i].reg = ent->key;
 		res[i].irn = ent->value;
 		i++;
@@ -1429,7 +1429,7 @@ static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl,
 	}
 
 	/* Add uses of the callee save registers. */
-	pmap_foreach(env->regs, ent) {
+	foreach_pmap(env->regs, ent) {
 		const arch_register_t *reg = ent->key;
 		if(arch_register_type_is(reg, callee_save) || arch_register_type_is(reg, ignore))
 			pmap_insert(reg_map, ent->key, ent->value);
@@ -1469,7 +1469,7 @@ static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl,
 	}
 
 	/* grow the rest of the stuff. */
-	pmap_foreach(reg_map, ent) {
+	foreach_pmap(reg_map, ent) {
 		if(ent->value) {
 			in[n]     = ent->value;
 			regs[n++] = ent->key;
@@ -1937,7 +1937,9 @@ static void modify_irg(be_abi_irg_t *env)
 		ir_node *irn = get_Block_cfgpred(end, i);
 
 		if (is_Return(irn)) {
-			ir_node *ret = create_be_return(env, irn, get_nodes_block(irn), get_Return_mem(irn), get_Return_n_ress(irn));
+			ir_node *blk = get_nodes_block(irn);
+			ir_node *mem = get_Return_mem(irn);
+			ir_node *ret = create_be_return(env, irn, blk, mem, get_Return_n_ress(irn));
 			exchange(irn, ret);
 		}
 	}
@@ -2063,7 +2065,7 @@ be_abi_irg_t *be_abi_introduce(be_irg_t *birg)
 
 	/* Make some important node pointers survive the dead node elimination. */
 	survive_dce_register_irn(env->dce_survivor, &env->init_sp);
-	pmap_foreach(env->regs, ent) {
+	foreach_pmap(env->regs, ent) {
 		survive_dce_register_irn(env->dce_survivor, (ir_node **) &ent->value);
 	}