X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbespillbelady.c;h=6b6c66096e07468c9f9f2ce06f255a0ab60962ff;hb=39d4311ea8a4f1bd78d1e0282d77d71f7ef4efdb;hp=1bc57e6bd33d865edd43c78790a9c18982df929e;hpb=2adf84106c02caf097c2d6cf1764706bdc437bcc;p=libfirm

diff --git a/ir/be/bespillbelady.c b/ir/be/bespillbelady.c
index 1bc57e6bd..6b6c66096 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
@@ -377,6 +391,9 @@ static loc_t to_take_or_not_to_take(belady_env_t *env, ir_node* first,
 		assert(is_Phi(node));
 		loc.time = USES_INFINITY;
 		DBG((dbg, DBG_START, "    %+F not taken (dead)\n", node));
+		if(is_Phi(node)) {
+			be_spill_phi(env->senv, node);
+		}
 		return loc;
 	}
 
@@ -431,8 +448,6 @@ static void compute_live_ins(ir_node *block, void *data) {
 				ARR_APP1(loc_t, delayed, loc);
 			else
 				ARR_APP1(loc_t, starters, loc);
-		} else {
-			be_spill_phi(env->senv, irn);
 		}
 	}
 
@@ -451,7 +466,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);
@@ -672,13 +687,27 @@ 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);
 }
 
 void be_spill_belady_spill_env(be_irg_t *birg, const arch_register_class_t *cls, spill_env_t *spill_env) {
 	belady_env_t env;
 	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_invalidate_liveness(birg);
 	be_assure_liveness(birg);
@@ -692,7 +721,7 @@ void be_spill_belady_spill_env(be_irg_t *birg, const arch_register_class_t *cls,
 	env.arch      = birg->main_env->arch_env;
 	env.cls       = cls;
 	env.lv        = be_get_birg_liveness(birg);
-	env.n_regs    = env.cls->n_regs - be_put_ignore_regs(birg, cls, NULL);
+	env.n_regs    = n_regs;
 	env.ws        = new_workset(&env, &env.ob);
 	env.uses      = be_begin_uses(irg, env.lv);
 	env.loop_ana  = be_new_loop_pressure(birg);
@@ -701,7 +730,6 @@ 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 */