X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbespillbelady.c;h=282f8853a0e4a0100e0d7ad5f62081400a46439c;hb=6bd0f7309f4670de0ada96a3de0a954d1ebe48dd;hp=f1945d8a6bb2ed012cce305472de239e370d7d7d;hpb=ce6161a7e42a48f7422b7babcc64d8ace18e2687;p=libfirm

diff --git a/ir/be/bespillbelady.c b/ir/be/bespillbelady.c
index f1945d8a6..282f8853a 100644
--- a/ir/be/bespillbelady.c
+++ b/ir/be/bespillbelady.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -89,8 +89,6 @@ static workset_t                   *ws;     /**< the main workset used while
 	                                             processing a block. */
 static be_uses_t                   *uses;   /**< env for the next-use magic */
 static ir_node                     *instr;  /**< current instruction */
-static unsigned                     instr_nr; /**< current instruction number
-	                                               (relative to block start) */
 static spill_env_t                 *senv;   /**< see bespill.h */
 static ir_node                    **blocklist;
 
@@ -281,8 +279,7 @@ static inline void set_block_info(ir_node *block, block_info_t *info)
 /**
  * @return The distance to the next use or 0 if irn has dont_spill flag set
  */
-static unsigned get_distance(ir_node *from, unsigned from_step,
-                             const ir_node *def, int skip_from_uses)
+static unsigned get_distance(ir_node *from, const ir_node *def, int skip_from_uses)
 {
 	be_next_use_t use;
 	unsigned      costs;
@@ -290,7 +287,7 @@ static unsigned get_distance(ir_node *from, unsigned from_step,
 
 	assert(!arch_irn_is_ignore(def));
 
-	use  = be_get_next_use(uses, from, from_step, def, skip_from_uses);
+	use  = be_get_next_use(uses, from, def, skip_from_uses);
 	time = use.time;
 	if (USES_IS_INFINITE(time))
 		return USES_INFINITY;
@@ -365,7 +362,7 @@ static void displace(workset_t *new_vals, int is_usage)
 		/* calculate current next-use distance for live values */
 		for (i = 0; i < len; ++i) {
 			ir_node  *val  = workset_get_val(ws, i);
-			unsigned  dist = get_distance(instr, instr_nr, val, !is_usage);
+			unsigned  dist = get_distance(instr, val, !is_usage);
 			workset_set_time(ws, i, dist);
 		}
 
@@ -488,7 +485,7 @@ static loc_t to_take_or_not_to_take(ir_node* first, ir_node *node,
 		return loc;
 	}
 
-	next_use = be_get_next_use(uses, first, 0, node, 0);
+	next_use = be_get_next_use(uses, first, node, 0);
 	if (USES_IS_INFINITE(next_use.time)) {
 		/* the nodes marked as live in shouldn't be dead, so it must be a phi */
 		assert(is_Phi(node));
@@ -620,7 +617,7 @@ static void decide_start_workset(const ir_node *block)
 	}
 
 	pressure            = be_get_loop_pressure(loop_ana, cls, loop);
-	assert(ARR_LEN(delayed) <= (signed)pressure);
+	assert(ARR_LEN(delayed) <= pressure);
 	free_slots          = n_regs - ARR_LEN(starters);
 	free_pressure_slots = n_regs - (pressure - ARR_LEN(delayed));
 	free_slots          = MIN(free_slots, free_pressure_slots);
@@ -631,7 +628,8 @@ static void decide_start_workset(const ir_node *block)
 	DB((dbg, DBG_START, "Loop pressure %d, taking %d delayed vals\n",
 	    pressure, free_slots));
 	if (free_slots > 0) {
-		int i;
+		size_t i;
+
 		qsort(delayed, ARR_LEN(delayed), sizeof(delayed[0]), loc_compare);
 
 		for (i = 0; i < ARR_LEN(delayed) && free_slots > 0; ++i) {
@@ -768,7 +766,7 @@ static void process_block(ir_node *block)
 		/* no predecessor -> empty set */
 		workset_clear(ws);
 	} else if (arity == 1) {
-		/* one predecessor, copy it's end workset */
+		/* one predecessor, copy its end workset */
 		ir_node      *pred_block = get_Block_cfgpred_block(block, 0);
 		block_info_t *pred_info  = get_block_info(pred_block);
 
@@ -795,7 +793,6 @@ static void process_block(ir_node *block)
 
 	/* process the block from start to end */
 	DB((dbg, DBG_WSETS, "Processing...\n"));
-	instr_nr = 0;
 	/* TODO: this leaks (into the obstack)... */
 	new_vals = new_workset();
 
@@ -832,8 +829,6 @@ static void process_block(ir_node *block)
 			workset_insert(new_vals, value, false);
 		);
 		displace(new_vals, 0);
-
-		instr_nr++;
 	}
 
 	/* Remember end-workset for this block */
@@ -1004,7 +999,7 @@ static void be_spill_belady(ir_graph *irg, const arch_register_class_t *rcls)
 	obstack_free(&obst, NULL);
 }
 
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_spillbelady);
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_spillbelady)
 void be_init_spillbelady(void)
 {
 	static be_spiller_t belady_spiller = {