X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbespillslots.c;h=bba1a81898f655f3b01a3f7919b75f34a752c4dc;hb=69c991e03a0eb1b284e6d0c41623d340a8e26d16;hp=cc58ba36fdc8190b2178e7ec8e1d72421093bbd3;hpb=d419b3b5cea65d0b9dee503092f256da1773d74f;p=libfirm

diff --git a/ir/be/bespillslots.c b/ir/be/bespillslots.c
index cc58ba36f..bba1a8189 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>
 
@@ -108,7 +106,7 @@ 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;
 
@@ -357,9 +355,9 @@ static void do_greedy_coalescing(be_fec_env_t *env)
 
 	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       = ALLOCAN(bitset_t*, spillcount);
+	spillslot_unionfind = ALLOCAN(int,       spillcount);
+	spilllist           = ALLOCAN(spill_t*,  spillcount);
 
 	uf_init(spillslot_unionfind, 0, spillcount);
 
@@ -583,15 +581,10 @@ static void assign_spill_entity(ir_node *node, ir_entity *entity)
  */
 static void assign_spillslots(be_fec_env_t *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;
@@ -707,11 +700,11 @@ static void create_memperms(be_fec_env_t *env)
 	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;
+		ir_node         **nodes = ALLOCAN(ir_node*, memperm->entrycount);
+		memperm_entry_t  *entry;
+		ir_node          *blockend;
+		ir_node          *mempermnode;
+		int               i;
 
 		assert(memperm->entrycount > 0);
 
@@ -814,7 +807,6 @@ 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;
 	const arch_register_class_t *cls;
 	int align;
@@ -823,12 +815,12 @@ static void collect_spills_walker(ir_node *node, void *data)
 	if (is_Proj(node))
 		return;
 
-	if (!arch_irn_class_is(arch_env, node, reload))
+	if (!arch_irn_class_is(node, reload))
 		return;
 
 	mode  = get_irn_mode(node);
-	cls   = arch_get_irn_reg_class(node, -1);
-	align = arch_env_get_reg_class_alignment(arch_env, cls);
+	cls   = arch_get_irn_reg_class_out(node);
+	align = arch_env_get_reg_class_alignment(env->arch_env, cls);
 
 	be_node_needs_frame_entity(env, node, mode, align);
 }