X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbespillslots.c;h=fe4df32f4a1548b953a5f942430582afc6d0371d;hb=5474a1c188c9d59eea2c915515980cd9cbab58d8;hp=3a5c2c2f8c6d481241931ce607033936e2d90fe8;hpb=1a3b7d363474ab544c13093a2f0b578718d37c7a;p=libfirm

diff --git a/ir/be/bespillslots.c b/ir/be/bespillslots.c
index 3a5c2c2f8..fe4df32f4 100644
--- a/ir/be/bespillslots.c
+++ b/ir/be/bespillslots.c
@@ -22,7 +22,6 @@
  * @brief       Spillslot coalescer.
  * @author      Matthias Braun
  * @date        26.07.2006
- * @version     $Id$
  */
 #include "config.h"
 
@@ -199,15 +198,14 @@ void be_node_needs_frame_entity(be_fec_env_t *env, ir_node *node,
                                 const ir_mode *mode, int align)
 {
 	ir_node *spillnode = get_memory_edge(node);
-	spill_t *spill;
 
 	assert(spillnode != NULL);
 
 	/* walk upwards and collect all phis and spills on this way */
 	if (is_Phi(spillnode)) {
-		spill = collect_memphi(env, spillnode, mode, align);
+		collect_memphi(env, spillnode, mode, align);
 	} else {
-		spill = collect_spill(env, spillnode, mode, align);
+		collect_spill(env, spillnode, mode, align);
 	}
 
 	ARR_APP1(ir_node *, env->reloads, node);
@@ -369,7 +367,7 @@ static void do_greedy_coalescing(be_fec_env_t *env)
 
 	DEBUG_ONLY(
 		memset(spilllist, 0, spillcount * sizeof(spilllist[0]));
-	);
+	)
 
 	i = 0;
 	foreach_set(env->spills, spill_t*, spill) {
@@ -528,11 +526,6 @@ static ir_entity* create_stack_entity(be_fec_env_t *env, spill_slot_t *slot)
 	ir_type   *frame = get_irg_frame_type(irg);
 	ir_entity *res   = frame_alloc_area(frame, slot->size, slot->align,
 	                                    env->at_begin);
-
-	/* adjust size of the entity type... */
-	ir_type *enttype = get_entity_type(res);
-	set_type_size_bytes(enttype, slot->size);
-
 	slot->entity = res;
 
 	return res;
@@ -624,7 +617,7 @@ static void assign_spillslots(be_fec_env_t *env)
 			ir_node *block = get_nodes_block(node);
 
 			/* should be a PhiM */
-			assert(is_Phi(node));
+			assert(get_irn_mode(node) == mode_M);
 
 			for (i = 0, arity = get_irn_arity(node); i < arity; ++i) {
 				ir_node *arg = get_irn_n(node, i);
@@ -759,7 +752,7 @@ be_fec_env_t *be_new_frame_entity_coalescer(ir_graph *irg)
 {
 	be_fec_env_t *env = XMALLOCZ(be_fec_env_t);
 
-	be_liveness_assure_chk(be_assure_liveness(irg));
+	be_assure_live_chk(irg);
 
 	obstack_init(&env->obst);
 	env->irg            = irg;
@@ -802,7 +795,7 @@ void be_assign_entities(be_fec_env_t *env,
 	create_memperms(env);
 }
 
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_spillslots);
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_spillslots)
 void be_init_spillslots(void)
 {
 	FIRM_DBG_REGISTER(dbg, "firm.be.spillslots");