X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbespillslots.c;h=5012b144312b370839a29fa699f0e957b776dcf2;hb=c8e1cf6a41fa2077058cce740783ab78990ac0ab;hp=bf3a742a208c3626d94ae6212c072516dc40bcf2;hpb=790bf8a4d7c32afe3dfde57f64664435867ee227;p=libfirm

diff --git a/ir/be/bespillslots.c b/ir/be/bespillslots.c
index bf3a742a2..5012b1443 100644
--- a/ir/be/bespillslots.c
+++ b/ir/be/bespillslots.c
@@ -24,9 +24,7 @@
  * @date        26.07.2006
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdlib.h>
 
@@ -39,43 +37,43 @@
 #include "unionfind.h"
 #include "irdump_t.h"
 
-#include "benode_t.h"
+#include "benode.h"
 #include "besched.h"
+#include "bespill.h"
 #include "bespillslots.h"
 #include "bechordal_t.h"
-#include "bejavacoal.h"
 #include "bestatevent.h"
-#include "bespilloptions.h"
 #include "bemodule.h"
 #include "beintlive_t.h"
-#include "beirg_t.h"
-#include "bearch_t.h"
+#include "beirg.h"
+#include "bearch.h"
 
 #define DBG_COALESCING		1
 #define DBG_INTERFERENCES	2
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
-typedef struct _spill_t {
-	ir_node *spill;
-	const ir_mode *mode;     /**< mode of the spilled value */
-	int alignment;           /**< alignment for the spilled value */
-	int spillslot;           /**< index into spillslot_unionfind structure */
+typedef struct spill_t {
+	ir_node       *spill;
+	const ir_mode *mode;      /**< mode of the spilled value */
+	int            alignment; /**< alignment for the spilled value */
+	int            spillslot; /**< index into spillslot_unionfind structure */
 } spill_t;
 
-typedef struct _affinity_edge_t {
+typedef struct affinity_edge_t {
 	double affinity;
-	int slot1, slot2;
+	int    slot1;
+	int    slot2;
 } affinity_edge_t;
 
-struct _be_fec_env_t {
-	struct obstack obst;
-	const arch_env_t *arch_env;
-	be_irg_t *birg;
-	set *spills;
-	ir_node **reloads;
-	affinity_edge_t **affinity_edges;
-	set *memperms;
+struct be_fec_env_t {
+	struct obstack         obst;
+	ir_graph              *irg;
+	set                   *spills;
+	ir_node              **reloads;
+	affinity_edge_t      **affinity_edges;
+	set                   *memperms;
+	set_frame_entity_func  set_frame_entity;
 };
 
 /** Compare 2 affinity edges (used in quicksort) */
@@ -109,14 +107,14 @@ static spill_t *get_spill(be_fec_env_t *env, ir_node *node)
 }
 
 
-static INLINE ir_node *get_memory_edge(const ir_node *node)
+static inline ir_node *get_memory_edge(const ir_node *node)
 {
 	int i, arity;
 
 	arity = get_irn_arity(node);
-	for(i = arity - 1; i >= 0; --i) {
+	for (i = arity - 1; i >= 0; --i) {
 		ir_node *arg = get_irn_n(node, i);
-		if(get_irn_mode(arg) == mode_M)
+		if (get_irn_mode(arg) == mode_M)
 			return arg;
 	}
 
@@ -133,7 +131,7 @@ static spill_t *collect_spill(be_fec_env_t *env, ir_node *node,
 	spill.spill = node;
 	res         = set_find(env->spills, &spill, sizeof(spill), hash);
 
-	if(res == NULL) {
+	if (res == NULL) {
 		spill.spillslot = set_count(env->spills);
 		spill.mode      = mode;
 		spill.alignment = align;
@@ -153,13 +151,13 @@ static spill_t *collect_memphi(be_fec_env_t *env, ir_node *node,
 	int i, arity;
 	spill_t spill, *res;
 	int hash = hash_irn(node);
-	const ir_exec_freq *exec_freq = be_get_birg_exec_freq(env->birg);
+	const ir_exec_freq *exec_freq = be_get_irg_exec_freq(env->irg);
 
 	assert(is_Phi(node));
 
 	spill.spill = node;
 	res = set_find(env->spills, &spill, sizeof(spill), hash);
-	if(res != NULL) {
+	if (res != NULL) {
 		assert(res->mode == mode);
 		assert(res->alignment == align);
 		return res;
@@ -173,19 +171,19 @@ static spill_t *collect_memphi(be_fec_env_t *env, ir_node *node,
 
 	/* collect attached spills and mem-phis */
 	arity = get_irn_arity(node);
-	for(i = 0; i < arity; ++i) {
+	for (i = 0; i < arity; ++i) {
 		affinity_edge_t *affinty_edge;
 		ir_node *arg = get_irn_n(node, i);
 		spill_t *arg_spill;
 
-		if(is_Phi(arg)) {
+		if (is_Phi(arg)) {
 			arg_spill = collect_memphi(env, arg, mode, align);
 		} else {
 			arg_spill = collect_spill(env, arg, mode, align);
 		}
 
 		/* add an affinity edge */
-		affinty_edge           = obstack_alloc(&env->obst, sizeof(affinty_edge[0]));
+		affinty_edge           = OALLOC(&env->obst, affinity_edge_t);
 		affinty_edge->affinity = get_block_execfreq(exec_freq, get_nodes_block(arg));
 		affinty_edge->slot1    = res->spillslot;
 		affinty_edge->slot2    = arg_spill->spillslot;
@@ -225,7 +223,7 @@ static int merge_interferences(be_fec_env_t *env, bitset_t** interferences,
 	/* merge spillslots and interferences */
 	res = uf_union(spillslot_unionfind, s1, s2);
 	/* we assume that we always merge s2 to s1 so swap s1, s2 if necessary */
-	if(res != 0) {
+	if (res != s1) {
 		int t = s1;
 		s1 = s2;
 		s2 = t;
@@ -235,25 +233,25 @@ static int merge_interferences(be_fec_env_t *env, bitset_t** interferences,
 
 	/* update other interferences */
 	spillcount = set_count(env->spills);
-	for(i = 0; i < spillcount; ++i) {
+	for (i = 0; i < spillcount; ++i) {
 		bitset_t *intfs = interferences[i];
-		if(bitset_is_set(intfs, s2))
+		if (bitset_is_set(intfs, s2))
 			bitset_set(intfs, s1);
 	}
 
 	return res;
 }
 
-static int my_values_interfere2(be_irg_t *birg, const ir_node *a,
+static int my_values_interfere2(ir_graph *irg, const ir_node *a,
                                 const ir_node *b)
 {
-	be_lv_t *lv = be_get_birg_liveness(birg);
+	be_lv_t *lv = be_get_irg_liveness(irg);
 
     int a2b = _value_dominates(a, b);
     int b2a = _value_dominates(b, a);
 
     /* If there is no dominance relation, they do not interfere. */
-    if((a2b | b2a) > 0) {
+    if ((a2b | b2a) > 0) {
         const ir_edge_t *edge;
         ir_node *bb;
 
@@ -261,7 +259,7 @@ static int my_values_interfere2(be_irg_t *birg, const ir_node *a,
          * Adjust a and b so, that a dominates b if
          * a dominates b or vice versa.
          */
-        if(b2a) {
+        if (b2a) {
             const ir_node *t = a;
             a = b;
             b = t;
@@ -273,7 +271,7 @@ static int my_values_interfere2(be_irg_t *birg, const ir_node *a,
          * If a is live end in b's block it is
          * live at b's definition (a dominates b)
          */
-        if(be_is_live_end(lv, bb, a))
+        if (be_is_live_end(lv, bb, a))
             return 1;
 
         /*
@@ -289,17 +287,17 @@ static int my_values_interfere2(be_irg_t *birg, const ir_node *a,
          */
         foreach_out_edge(a, edge) {
             const ir_node *user = get_edge_src_irn(edge);
-			if(is_Sync(user)) {
+			if (is_Sync(user)) {
 				const ir_edge_t *edge2;
 				foreach_out_edge(user, edge2) {
 					const ir_node *user2 = get_edge_src_irn(edge2);
 					assert(!is_Sync(user2));
-					if(get_nodes_block(user2) == bb && !is_Phi(user2) &&
+					if (get_nodes_block(user2) == bb && !is_Phi(user2) &&
 					   _value_strictly_dominates(b, user2))
 						return 1;
 				}
 			} else {
-				if(get_nodes_block(user) == bb && !is_Phi(user) &&
+				if (get_nodes_block(user) == bb && !is_Phi(user) &&
 						_value_strictly_dominates(b, user))
                 return 1;
 			}
@@ -312,28 +310,28 @@ static int my_values_interfere2(be_irg_t *birg, const ir_node *a,
 /**
  * same as values_interfere but with special handling for Syncs
  */
-static int my_values_interfere(be_irg_t *birg, ir_node *a, ir_node *b)
+static int my_values_interfere(ir_graph *irg, ir_node *a, ir_node *b)
 {
-	if(is_Sync(a)) {
+	if (is_Sync(a)) {
 		int i, arity = get_irn_arity(a);
-		for(i = 0; i < arity; ++i) {
+		for (i = 0; i < arity; ++i) {
 			ir_node *in = get_irn_n(a, i);
-			if(my_values_interfere(birg, in, b))
+			if (my_values_interfere(irg, in, b))
 				return 1;
 		}
 		return 0;
-	} else if(is_Sync(b)) {
+	} else if (is_Sync(b)) {
 		int i, arity = get_irn_arity(b);
-		for(i = 0; i < arity; ++i) {
+		for (i = 0; i < arity; ++i) {
 			ir_node *in = get_irn_n(b, i);
 			/* a is not a sync, so no need for my_values_interfere */
-			if(my_values_interfere2(birg, a, in))
+			if (my_values_interfere2(irg, a, in))
 				return 1;
 		}
 		return 0;
 	}
 
-	return my_values_interfere2(birg, a, b);
+	return my_values_interfere2(irg, a, b);
 }
 
 /**
@@ -351,31 +349,34 @@ static void do_greedy_coalescing(be_fec_env_t *env)
 	int affinity_edge_count;
 	bitset_t **interferences;
 	int* spillslot_unionfind;
+	struct obstack data;
 
 	spillcount = set_count(env->spills);
-	if(spillcount == 0)
+	if (spillcount == 0)
 		return;
 
+	obstack_init(&data);
+
 	DB((dbg, DBG_COALESCING, "Coalescing %d spillslots\n", spillcount));
 
-	interferences       = alloca(spillcount * sizeof(interferences[0]));
-	spillslot_unionfind = alloca(spillcount * sizeof(spillslot_unionfind[0]));
-	spilllist           = alloca(spillcount * sizeof(spilllist[0]));
+	interferences       = OALLOCN(&data, bitset_t*, spillcount);
+	spillslot_unionfind = OALLOCN(&data, int,       spillcount);
+	spilllist           = OALLOCN(&data, spill_t*,  spillcount);
 
-	uf_init(spillslot_unionfind, 0, spillcount);
+	uf_init(spillslot_unionfind, spillcount);
 
 	DEBUG_ONLY(
 		memset(spilllist, 0, spillcount * sizeof(spilllist[0]));
 	);
 
-	for(spill = set_first(env->spills), i = 0; spill != NULL;
+	for (spill = set_first(env->spills), i = 0; spill != NULL;
 	    spill = set_next(env->spills), ++i) {
 		assert(spill->spillslot < spillcount);
 		spilllist[spill->spillslot] = spill;
 	}
 
-	for(i = 0; i < spillcount; ++i) {
-		interferences[i] = bitset_alloca(spillcount);
+	for (i = 0; i < spillcount; ++i) {
+		interferences[i] = bitset_obstack_alloc(&data, spillcount);
 	}
 
 	/* construct interferences */
@@ -385,13 +386,13 @@ static void do_greedy_coalescing(be_fec_env_t *env)
 		if (is_NoMem(spill1))
 			continue;
 
-		for(i2 = i+1; i2 < spillcount; ++i2) {
+		for (i2 = i+1; i2 < spillcount; ++i2) {
 			ir_node *spill2 = spilllist[i2]->spill;
 
 			if (is_NoMem(spill2))
 				continue;
 
-			if (my_values_interfere(env->birg, spill1, spill2)) {
+			if (my_values_interfere(env->irg, spill1, spill2)) {
 				DB((dbg, DBG_INTERFERENCES,
 				     "Slot %d and %d interfere\n", i, i2));
 
@@ -409,7 +410,7 @@ static void do_greedy_coalescing(be_fec_env_t *env)
 	/*dump_interference_graph(env, interferences, "before"); */
 
 	/* try to merge affine nodes */
-	for(i = 0; i < affinity_edge_count; ++i) {
+	for (i = 0; i < affinity_edge_count; ++i) {
 		const affinity_edge_t *edge = env->affinity_edges[i];
 		int s1 = uf_find(spillslot_unionfind, edge->slot1);
 		int s2 = uf_find(spillslot_unionfind, edge->slot2);
@@ -427,21 +428,21 @@ static void do_greedy_coalescing(be_fec_env_t *env)
 	}
 
 	/* try to merge as much remaining spillslots as possible */
-	for(i = 0; i < spillcount; ++i) {
+	for (i = 0; i < spillcount; ++i) {
 		int s1 = uf_find(spillslot_unionfind, i);
-		if(s1 != i)
+		if (s1 != i)
 			continue;
 
-		for(i2 = i+1; i2 < spillcount; ++i2) {
+		for (i2 = i+1; i2 < spillcount; ++i2) {
 			int s2 = uf_find(spillslot_unionfind, i2);
-			if(s2 != i2)
+			if (s2 != i2)
 				continue;
 
 			/* test if values interfere
 			 * we have to test n1-n2 and n2-n1, because only 1 side gets updated
 			 * when node merging occurs
 			 */
-			if(bitset_is_set(interferences[s1], s2)) {
+			if (bitset_is_set(interferences[s1], s2)) {
 				assert(bitset_is_set(interferences[s2], s1));
 				continue;
 			}
@@ -449,7 +450,7 @@ static void do_greedy_coalescing(be_fec_env_t *env)
 			DB((dbg, DBG_COALESCING,
 			     "Merging %d and %d because it is possible\n", s1, s2));
 
-			if(merge_interferences(env, interferences, spillslot_unionfind, s1, s2) != 0) {
+			if (merge_interferences(env, interferences, spillslot_unionfind, s1, s2) != 0) {
 				/* we can break the loop here, because s2 is the new supernode
 				 * now and we'll test s2 again later anyway */
 				break;
@@ -458,32 +459,33 @@ static void do_greedy_coalescing(be_fec_env_t *env)
 	}
 
 	/* assign spillslots to spills */
-	for(i = 0; i < spillcount; ++i) {
+	for (i = 0; i < spillcount; ++i) {
 		spill_t *spill = spilllist[i];
 
 		spill->spillslot = uf_find(spillslot_unionfind, i);
 	}
 
 	/*dump_interference_graph(env, interferences, "after");*/
+	obstack_free(&data, 0);
 }
 
 
 
-typedef struct _spill_slot_t {
+typedef struct spill_slot_t {
 	int size;
 	int align;
 	ir_entity *entity;
 } spill_slot_t;
 
-typedef struct _memperm_entry_t {
+typedef struct memperm_entry_t {
 	ir_node* node;
 	int pos;
 	ir_entity *in;
 	ir_entity *out;
-	struct _memperm_entry_t *next;
+	struct memperm_entry_t *next;
 } memperm_entry_t;
 
-typedef struct _memperm_t {
+typedef struct memperm_t {
 	ir_node *block;
 	int entrycount;
 	memperm_entry_t *entries;
@@ -508,7 +510,7 @@ static memperm_t *get_memperm(be_fec_env_t *env, ir_node *block)
 
 	res = set_find(env->memperms, &entry, sizeof(entry), hash);
 
-	if(res == NULL) {
+	if (res == NULL) {
 		entry.entrycount = 0;
 		entry.entries = NULL;
 		res = set_insert(env->memperms, &entry, sizeof(entry), hash);
@@ -519,7 +521,7 @@ static memperm_t *get_memperm(be_fec_env_t *env, ir_node *block)
 
 static ir_entity* create_stack_entity(be_fec_env_t *env, spill_slot_t *slot)
 {
-	ir_graph *irg = be_get_birg_irg(env->birg);
+	ir_graph *irg  = env->irg;
 	ir_type *frame = get_irg_frame_type(irg);
 	/* TODO: backend should be able to specify wether we want spill slots
 	 * at begin or end of frame */
@@ -541,42 +543,42 @@ static ir_entity* create_stack_entity(be_fec_env_t *env, spill_slot_t *slot)
  */
 static void enlarge_spillslot(spill_slot_t *slot, int otheralign, int othersize)
 {
-	if(othersize > slot->size) {
+	if (othersize > slot->size) {
 		slot->size = othersize;
 	}
-	if(otheralign > slot->align) {
-		if(otheralign % slot->align != 0)
+	if (otheralign > slot->align) {
+		if (otheralign % slot->align != 0)
 			slot->align *= otheralign;
 		else
 			slot->align = otheralign;
-	} else if(slot->align % otheralign != 0) {
+	} else if (slot->align % otheralign != 0) {
 		slot->align *= otheralign;
 	}
 }
 
-
-static void assign_spill_entity(const arch_env_t *arch_env, ir_node *node,
-                                ir_entity *entity)
+static void assign_spill_entity(be_fec_env_t *env,
+                                ir_node *node, ir_entity *entity)
 {
-	if(is_NoMem(node))
+	if (is_NoMem(node))
 		return;
-	if(is_Sync(node)) {
+	if (is_Sync(node)) {
 		int i, arity;
 
 		arity = get_irn_arity(node);
-		for(i = 0; i < arity; ++i) {
+		for (i = 0; i < arity; ++i) {
 			ir_node *in = get_irn_n(node, i);
 			assert(!is_Phi(in));
 
-			assign_spill_entity(arch_env, in, entity);
+			assign_spill_entity(env, in, entity);
 		}
 		return;
 	}
 
-	/* beware: we might have Stores with Memory Proj's, ia32 fisttp for instance */
+	/* beware: we might have Stores with Memory Proj's, ia32 fisttp for
+	   instance */
 	node = skip_Proj(node);
 	assert(arch_get_frame_entity(node) == NULL);
-	arch_set_frame_entity(arch_env, node, entity);
+	env->set_frame_entity(node, entity);
 }
 
 /**
@@ -585,19 +587,13 @@ static void assign_spill_entity(const arch_env_t *arch_env, ir_node *node,
  */
 static void assign_spillslots(be_fec_env_t *env)
 {
-	const arch_env_t *arch_env = env->arch_env;
-	int i;
-	int spillcount;
-	spill_t *spill;
-	spill_slot_t* spillslots;
-
-	spillcount = set_count(env->spills);
-	spillslots = alloca(spillcount * sizeof(spillslots[0]));
-
-	memset(spillslots, 0, spillcount * sizeof(spillslots[0]));
+	int           spillcount = set_count(env->spills);
+	spill_slot_t *spillslots = ALLOCANZ(spill_slot_t, spillcount);
+	spill_t      *spill;
+	int           i;
 
 	/* construct spillslots */
-	for(spill = set_first(env->spills); spill != NULL;
+	for (spill = set_first(env->spills); spill != NULL;
 		spill = set_next(env->spills)) {
 
 		int slotid = spill->spillslot;
@@ -606,7 +602,7 @@ static void assign_spillslots(be_fec_env_t *env)
 		int size = get_mode_size_bytes(mode);
 		int align = spill->alignment;
 
-		if(slot->align == 0 && slot->size == 0) {
+		if (slot->align == 0 && slot->size == 0) {
 			slot->align = align;
 			slot->size = size;
 		} else {
@@ -614,7 +610,7 @@ static void assign_spillslots(be_fec_env_t *env)
 		}
 	}
 
-	for(spill = set_first(env->spills); spill != NULL;
+	for (spill = set_first(env->spills); spill != NULL;
 	    spill = set_next(env->spills)) {
 
 		ir_node      *node   = spill->spill;
@@ -622,18 +618,18 @@ static void assign_spillslots(be_fec_env_t *env)
 		spill_slot_t *slot;
 
 		slot = &spillslots[slotid];
-		if(slot->entity == NULL) {
+		if (slot->entity == NULL) {
 			create_stack_entity(env, slot);
 		}
 
-		if(is_Phi(node)) {
+		if (is_Phi(node)) {
 			int i, arity;
 			ir_node *block = get_nodes_block(node);
 
 			/* should be a PhiM */
 			assert(is_Phi(node));
 
-			for(i = 0, arity = get_irn_arity(node); i < arity; ++i) {
+			for (i = 0, arity = get_irn_arity(node); i < arity; ++i) {
 				ir_node *arg = get_irn_n(node, i);
 				ir_node *predblock = get_Block_cfgpred_block(block, i);
 				spill_t *argspill;
@@ -643,17 +639,17 @@ static void assign_spillslots(be_fec_env_t *env)
 				assert(argspill != NULL);
 
 				argslotid = argspill->spillslot;
-				if(slotid != argslotid) {
+				if (slotid != argslotid) {
 					memperm_t *memperm;
 					memperm_entry_t *entry;
 					spill_slot_t *argslot = &spillslots[argslotid];
-					if(argslot->entity == NULL) {
+					if (argslot->entity == NULL) {
 						create_stack_entity(env, argslot);
 					}
 
 					memperm = get_memperm(env, predblock);
 
-					entry = obstack_alloc(&env->obst, sizeof(entry[0]));
+					entry = OALLOC(&env->obst, memperm_entry_t);
 					entry->node = node;
 					entry->pos = i;
 					entry->in = argslot->entity;
@@ -664,11 +660,11 @@ static void assign_spillslots(be_fec_env_t *env)
 				}
 			}
 		} else {
-			assign_spill_entity(arch_env, node, slot->entity);
+			assign_spill_entity(env, node, slot->entity);
 		}
 	}
 
-	for(i = 0; i < ARR_LEN(env->reloads); ++i) {
+	for (i = 0; i < ARR_LEN(env->reloads); ++i) {
 		ir_node            *reload    = env->reloads[i];
 		ir_node            *spillnode = get_memory_edge(reload);
 		spill_t            *spill     = get_spill(env, spillnode);
@@ -676,7 +672,7 @@ static void assign_spillslots(be_fec_env_t *env)
 
 		assert(slot->entity != NULL);
 
-		arch_set_frame_entity(arch_env, reload, slot->entity);
+		env->set_frame_entity(reload, slot->entity);
 	}
 }
 
@@ -686,15 +682,15 @@ static void assign_spillslots(be_fec_env_t *env)
 static ir_node *get_end_of_block_insertion_point(ir_node* block)
 {
 	ir_node* ins = sched_last(block);
-	while(is_Proj(ins) && get_irn_mode(ins) == mode_X) {
+	while (is_Proj(ins) && get_irn_mode(ins) == mode_X) {
 		ins = sched_prev(ins);
 		assert(ins != NULL);
 	}
 
-	if(is_cfop(ins)) {
-		while(1) {
+	if (is_cfop(ins)) {
+		for (;;) {
 			ir_node *prev = sched_prev(ins);
-			if(!is_cfop(prev))
+			if (!is_cfop(prev))
 				break;
 			ins = prev;
 		}
@@ -705,26 +701,25 @@ static ir_node *get_end_of_block_insertion_point(ir_node* block)
 
 static void create_memperms(be_fec_env_t *env)
 {
-	const arch_env_t *arch_env = env->arch_env;
-	ir_graph *irg = be_get_birg_irg(env->birg);
-	memperm_t *memperm;
+	ir_graph         *irg      = env->irg;
+	memperm_t        *memperm;
 
-	for(memperm = set_first(env->memperms); memperm != NULL; memperm = set_next(env->memperms)) {
-		int i;
-		memperm_entry_t *entry;
-		ir_node *blockend;
-		ir_node** nodes = alloca(memperm->entrycount * sizeof(nodes[0]));
-		ir_node* mempermnode;
+	for (memperm = set_first(env->memperms); memperm != NULL; memperm = set_next(env->memperms)) {
+		ir_node         **nodes = ALLOCAN(ir_node*, memperm->entrycount);
+		memperm_entry_t  *entry;
+		ir_node          *blockend;
+		ir_node          *mempermnode;
+		int               i;
 
 		assert(memperm->entrycount > 0);
 
-		for(entry = memperm->entries, i = 0; entry != NULL; entry = entry->next, ++i) {
+		for (entry = memperm->entries, i = 0; entry != NULL; entry = entry->next, ++i) {
 			ir_node* arg = get_irn_n(entry->node, entry->pos);
 			nodes[i] = arg;
 		}
 
-		mempermnode = be_new_MemPerm(arch_env, irg, memperm->block,
-		                             memperm->entrycount, nodes);
+		mempermnode = be_new_MemPerm(memperm->block, memperm->entrycount,
+		                             nodes);
 
 		/* insert node into schedule */
 		blockend = get_end_of_block_insertion_point(memperm->block);
@@ -732,7 +727,7 @@ static void create_memperms(be_fec_env_t *env)
 		stat_ev_dbl("mem_perm", memperm->entrycount);
 
 		i = 0;
-		for(entry = memperm->entries; entry != NULL; entry = entry->next, ++i) {
+		for (entry = memperm->entries; entry != NULL; entry = entry->next, ++i) {
 			ir_node *proj;
 			ir_node* arg = get_irn_n(entry->node, entry->pos);
 
@@ -754,10 +749,10 @@ static int count_spillslots(const be_fec_env_t *env)
 	int slotcount;
 
 	slotcount = 0;
-	for(spill = set_first(env->spills); spill != NULL;
+	for (spill = set_first(env->spills); spill != NULL;
 	    spill = set_next(env->spills)) {
 		int spillslot = spill->spillslot;
-		if(!bitset_is_set(counted, spillslot)) {
+		if (!bitset_is_set(counted, spillslot)) {
 			slotcount++;
 			bitset_set(counted, spillslot);
 		}
@@ -766,16 +761,14 @@ static int count_spillslots(const be_fec_env_t *env)
 	return slotcount;
 }
 
-be_fec_env_t *be_new_frame_entity_coalescer(be_irg_t *birg)
+be_fec_env_t *be_new_frame_entity_coalescer(ir_graph *irg)
 {
-	const arch_env_t *arch_env = birg->main_env->arch_env;
-	be_fec_env_t     *env      = XMALLOC(be_fec_env_t);
+	be_fec_env_t *env = XMALLOCZ(be_fec_env_t);
 
-	be_liveness_assure_chk(be_assure_liveness(birg));
+	be_liveness_assure_chk(be_assure_liveness(irg));
 
 	obstack_init(&env->obst);
-	env->arch_env       = arch_env;
-	env->birg           = birg;
+	env->irg            = irg;
 	env->spills         = new_set(cmp_spill, 10);
 	env->reloads        = NEW_ARR_F(ir_node*, 0);
 	env->affinity_edges = NEW_ARR_F(affinity_edge_t*, 0);
@@ -795,11 +788,14 @@ void be_free_frame_entity_coalescer(be_fec_env_t *env)
 	free(env);
 }
 
-void be_assign_entities(be_fec_env_t *env)
+void be_assign_entities(be_fec_env_t *env,
+                        set_frame_entity_func set_frame_entity)
 {
+	env->set_frame_entity = set_frame_entity;
+
 	stat_ev_dbl("spillslots", set_count(env->spills));
 
-	if(be_coalesce_spill_slots) {
+	if (be_coalesce_spill_slots) {
 		do_greedy_coalescing(env);
 	}
 
@@ -816,41 +812,39 @@ void be_assign_entities(be_fec_env_t *env)
  */
 static void collect_spills_walker(ir_node *node, void *data)
 {
-	be_fec_env_t *env = data;
-	const arch_env_t *arch_env = env->arch_env;
-	const ir_mode *mode;
+	be_fec_env_t                *env = data;
+	const ir_mode               *mode;
 	const arch_register_class_t *cls;
-	int align;
+	int                          align;
+	ir_graph                    *irg;
+	const arch_env_t            *arch_env;
 
-	/* classify returns classification of the irn the proj is attached to */
-	if (is_Proj(node))
+	if (! (arch_irn_classify(node) & arch_irn_class_reload))
 		return;
 
-	if (!arch_irn_class_is(arch_env, node, reload))
-		return;
-
-	mode  = get_irn_mode(node);
-	cls   = arch_get_irn_reg_class(arch_env, node, -1);
-	align = arch_env_get_reg_class_alignment(arch_env, cls);
+	mode     = get_irn_mode(node);
+	cls      = arch_get_irn_reg_class_out(node);
+	irg      = get_irn_irg(node);
+	arch_env = be_get_irg_arch_env(irg);
+	align    = arch_env_get_reg_class_alignment(arch_env, cls);
 
 	be_node_needs_frame_entity(env, node, mode, align);
 }
 
-void be_coalesce_spillslots(be_irg_t *birg)
+void be_coalesce_spillslots(ir_graph *irg)
 {
-	be_fec_env_t *env = be_new_frame_entity_coalescer(birg);
+	be_fec_env_t *env = be_new_frame_entity_coalescer(irg);
 
 	/* collect reloads */
-	irg_walk_graph(birg->irg, NULL, collect_spills_walker, env);
+	irg_walk_graph(irg, NULL, collect_spills_walker, env);
 
-	be_assign_entities(env);
+	be_assign_entities(env, be_node_set_frame_entity);
 
 	be_free_frame_entity_coalescer(env);
 }
 
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_spillslots);
 void be_init_spillslots(void)
 {
 	FIRM_DBG_REGISTER(dbg, "firm.be.spillslots");
 }
-
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_spillslots);