X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbespillbelady.c;h=db7f4a8ec822e5fe4a7bd4878a9d9bc8390095de;hb=87a515f6ddc89aabf9ce4a18213e6dd20f71d776;hp=49e85b7b6309f3f11d92c19484b303903c073dec;hpb=c0acb5cc9a2967e31e2b2961a98831d674cea3b8;p=libfirm

diff --git a/ir/be/bespillbelady.c b/ir/be/bespillbelady.c
index 49e85b7b6..db7f4a8ec 100644
--- a/ir/be/bespillbelady.c
+++ b/ir/be/bespillbelady.c
@@ -1,22 +1,33 @@
-/**
- * Author:      Daniel Grund, Matthias Braun
- * Date:        20.09.2005
- * Copyright:   (c) Universitaet Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+/*
+ * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
  *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ */
+
+/**
+ * @file
+ * @brief       Beladys spillalgorithm.
+ * @author      Daniel Grund, Matthias Braun
+ * @date        20.09.2005
+ * @version     $Id$
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
 #include "obst.h"
 #include "set.h"
 #include "pset.h"
@@ -29,11 +40,12 @@
 #include "iredges_t.h"
 #include "ircons_t.h"
 #include "irprintf.h"
+#include "xmalloc.h"
 
 #include "beutil.h"
-#include "bearch.h"
+#include "bearch_t.h"
 #include "bespillbelady.h"
-#include "beuses_t.h"
+#include "beuses.h"
 #include "besched_t.h"
 #include "beirgmod.h"
 #include "belive_t.h"
@@ -41,6 +53,8 @@
 #include "bechordal_t.h"
 #include "bespilloptions.h"
 #include "beloopana.h"
+#include "beirg_t.h"
+#include "bemodule.h"
 
 #define DBG_SPILL   1
 #define DBG_WSETS   2
@@ -69,7 +83,7 @@ typedef struct _belady_env_t {
 	struct obstack ob;
 	const arch_env_t *arch;
 	const arch_register_class_t *cls;
-	const be_lv_t *lv;
+	be_lv_t *lv;
 	be_loopana_t *loop_ana;
 	int n_regs;			/** number of regs in this reg-class */
 
@@ -358,6 +372,7 @@ static loc_t to_take_or_not_to_take(belady_env_t *env, ir_node* first,
 	loc_t loc;
 	loc.time = USES_INFINITY;
 	loc.irn = node;
+	(void) block;
 
 	if (!arch_irn_consider_in_reg_alloc(env->arch, env->cls, node)) {
 		loc.time = USES_INFINITY;
@@ -452,7 +467,7 @@ static void compute_live_ins(ir_node *block, void *data) {
 	}
 
 	pressure            = be_get_loop_pressure(env->loop_ana, env->cls, loop);
-	assert(ARR_LEN(delayed) <= pressure);
+	assert(ARR_LEN(delayed) <= (signed)pressure);
 	free_slots          = env->n_regs - ARR_LEN(starters);
 	free_pressure_slots = env->n_regs - (pressure - ARR_LEN(delayed));
 	free_slots          = MIN(free_slots, free_pressure_slots);
@@ -594,9 +609,12 @@ static void belady(ir_node *block, void *data) {
 		/* allocate all values _defined_ by this instruction */
 		workset_clear(new_vals);
 		if (get_irn_mode(irn) == mode_T) { /* special handling for tuples and projs */
-			ir_node *proj;
-			for(proj=sched_next(irn); is_Proj(proj); proj=sched_next(proj))
+			const ir_edge_t *edge;
+
+			foreach_out_edge(irn, edge) {
+				ir_node *proj = get_edge_src_irn(edge);
 				workset_insert(env, new_vals, proj);
+			}
 		} else {
 			workset_insert(env, new_vals, irn);
 		}
@@ -673,7 +691,15 @@ next_value:
 	}
 }
 
-void be_spill_belady(be_irg_t *birg, const arch_register_class_t *cls) {
+/**
+ * Do spilling for a register class on a graph using the belady heuristic.
+ * In the transformed graph, the register pressure never exceeds the number
+ * of available registers.
+ *
+ * @param birg  The backend graph
+ * @param cls   The register class to spill
+ */
+static void be_spill_belady(be_irg_t *birg, const arch_register_class_t *cls) {
 	be_spill_belady_spill_env(birg, cls, NULL);
 }
 
@@ -682,18 +708,16 @@ void be_spill_belady_spill_env(be_irg_t *birg, const arch_register_class_t *cls,
 	ir_graph *irg = be_get_birg_irg(birg);
 	int n_regs;
 
-	/* some special classes contain only ignore regs, nothing to do then */
 	n_regs = cls->n_regs - be_put_ignore_regs(birg, cls, NULL);
-	if(n_regs == 0)
-		return;
+	be_liveness_assure_sets(be_assure_liveness(birg));
 
-	be_invalidate_liveness(birg);
-	be_assure_liveness(birg);
 	/* construct control flow loop tree */
 	if(! (get_irg_loopinfo_state(irg) & loopinfo_cf_consistent)) {
 		construct_cf_backedges(irg);
 	}
 
+	be_clear_links(irg);
+
 	/* init belady env */
 	obstack_init(&env.ob);
 	env.arch      = birg->main_env->arch_env;
@@ -708,9 +732,7 @@ void be_spill_belady_spill_env(be_irg_t *birg, const arch_register_class_t *cls,
 	} else {
 		env.senv = spill_env;
 	}
-	DEBUG_ONLY(be_set_spill_env_dbg_module(env.senv, dbg);)
 
-	be_clear_links(irg);
 	/* Decide which phi nodes will be spilled and place copies for them into the graph */
 	irg_block_walk_graph(irg, compute_live_ins, NULL, &env);
 	/* Fix high register pressure with belady algorithm */