X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbespilldaemel.c;h=4f058bf4f53ac09d6abc177d28df2c5b0da4004f;hb=5474a1c188c9d59eea2c915515980cd9cbab58d8;hp=292d864b321e9fe69dafcf102f5aa6db2194863e;hpb=5244f95767968d8b59ef3f2031612b86474e2455;p=libfirm

diff --git a/ir/be/bespilldaemel.c b/ir/be/bespilldaemel.c
index 292d864b3..4f058bf4f 100644
--- a/ir/be/bespilldaemel.c
+++ b/ir/be/bespilldaemel.c
@@ -22,7 +22,6 @@
  * @brief       Naive spilling algorithm
  * @author      Matthias Braun
  * @date        20.09.2005
- * @version     $Id: bespillbelady.c 13913 2007-05-18 12:48:56Z matze $
  * @brief
  *   This implements a naive spilling algorithm. It is designed to produce
  *   similar effects to the spill decisions produced by traditional graph
@@ -135,7 +134,7 @@ static void spill_node(ir_node *node)
 
 static unsigned get_value_width(const ir_node *node)
 {
-	const arch_register_req_t *req = arch_get_register_req_out(node);
+	const arch_register_req_t *req = arch_get_irn_register_req(node);
 	return req->width;
 }
 
@@ -151,6 +150,7 @@ static void do_spilling(ir_nodeset_t *live_nodes, ir_node *node)
 	spill_candidate_t     *candidates;
 	ir_nodeset_iterator_t  iter;
 	int                    i, arity;
+	size_t                 c;
 	int                    spills_needed;
 	size_t                 cand_idx;
 	ir_node               *n;
@@ -184,17 +184,17 @@ static void do_spilling(ir_nodeset_t *live_nodes, ir_node *node)
 	candidates = ALLOCAN(spill_candidate_t, n_live_nodes);
 
 	/* construct array with spill candidates and calculate their costs */
-	i = 0;
+	c = 0;
 	foreach_ir_nodeset(live_nodes, n, iter) {
-		spill_candidate_t *candidate = & candidates[i];
+		spill_candidate_t *candidate = & candidates[c];
 
 		assert(!bitset_is_set(spilled_nodes, get_irn_idx(n)));
 
 		candidate->node  = n;
 		candidate->costs = get_spill_costs(n);
-		++i;
+		++c;
 	}
-	assert(i == n_live_nodes);
+	assert(c == n_live_nodes);
 
 	/* sort spill candidates */
 	qsort(candidates, n_live_nodes, sizeof(candidates[0]),
@@ -369,7 +369,7 @@ static void be_spill_daemel(ir_graph *irg, const arch_register_class_t *new_cls)
 	if (n_regs == 0)
 		return;
 
-	be_liveness_assure_sets(be_assure_liveness(irg));
+	be_assure_live_sets(irg);
 
 	spill_env     = be_new_spill_env(irg);
 	cls           = new_cls;
@@ -386,7 +386,7 @@ static void be_spill_daemel(ir_graph *irg, const arch_register_class_t *new_cls)
 	be_delete_spill_env(spill_env);
 }
 
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_daemelspill);
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_daemelspill)
 void be_init_daemelspill(void)
 {
 	static be_spiller_t daemel_spiller = {