X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbespillremat.c;h=2d418f6374c3c7478fec1b7d9f2b95c430bf0787;hb=43f61f31f03a0b2f37e2082dddfc7d3c845375d1;hp=5aa573b89da0f3931c6e277c217391765b566de5;hpb=8eee0e6361868153ae82c8d8bdda1446a9af9084;p=libfirm

diff --git a/ir/be/bespillremat.c b/ir/be/bespillremat.c
index 5aa573b89..2d418f637 100644
--- a/ir/be/bespillremat.c
+++ b/ir/be/bespillremat.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -51,6 +51,7 @@
 #include "execfreq.h"
 #include "irvrfy.h"
 #include "irbackedge_t.h"
+#include "irprofile.h"
 
 #include <lpp/lpp.h>
 #include <lpp/mps.h>
@@ -70,13 +71,12 @@
 #include "bespillremat.h"
 #include "bespill.h"
 #include "bepressurestat.h"
-#include "beprofile.h"
 #include "bespilloptions.h"
 #include "bechordal_t.h"
 #include "bemodule.h"
 
-#include <libcore/lc_opts.h>
-#include <libcore/lc_opts_enum.h>
+#include "lc_opts.h"
+#include "lc_opts_enum.h"
 
 #define DUMP_PROBLEM       1
 #define DUMP_MPS           2
@@ -169,7 +169,7 @@ static const lc_opt_table_entry_t options[] = {
 	LC_OPT_ENT_DBL      ("cost_memoperand",  "cost of a memory operand",                        &opt_cost_memoperand),
 	LC_OPT_ENT_DBL      ("cost_spill",  "cost of a spill instruction",                          &opt_cost_spill),
 	LC_OPT_ENT_DBL      ("cost_remat",  "cost of a rematerialization",                          &opt_cost_remat),
-	{ NULL }
+	LC_OPT_LAST
 };
 
 //#define EXECFREQ_LOOPDEPH   /* compute execution frequency from loop depth only */
@@ -304,7 +304,7 @@ static int
 cmp_remat(const void *a, const void *b)
 {
 	const remat_t  *r = a;
-	const remat_t  *s = a;
+	const remat_t  *s = b;
 
 	return !(r == s || r->op == s->op);
 }
@@ -314,6 +314,7 @@ cmp_spill(const void *a, const void *b, size_t size)
 {
 	const spill_t *p = a;
 	const spill_t *q = b;
+	(void) size;
 
 //	return !(p->irn == q->irn && p->bb == q->bb);
 	return !(p->irn == q->irn);
@@ -324,6 +325,7 @@ cmp_memoperands(const void *a, const void *b, size_t size)
 {
 	const memoperand_t *p = a;
 	const memoperand_t *q = b;
+	(void) size;
 
 	return !(p->irn == q->irn && p->pos == q->pos);
 }
@@ -409,6 +411,7 @@ cmp_remat_info(const void *a, const void *b, size_t size)
 {
 	const remat_info_t *p = a;
 	const remat_info_t *q = b;
+	(void) size;
 
 	return !(p->irn == q->irn);
 }
@@ -418,6 +421,7 @@ cmp_defs(const void *a, const void *b, size_t size)
 {
 	const defs_t *p = a;
 	const defs_t *q = b;
+	(void) size;
 
 	return !(p->value == q->value);
 }
@@ -427,6 +431,7 @@ cmp_keyval(const void *a, const void *b, size_t size)
 {
 	const keyval_t *p = a;
 	const keyval_t *q = b;
+	(void) size;
 
 	return !(p->key == q->key);
 }
@@ -435,11 +440,11 @@ static double
 execution_frequency(const spill_ilp_t *si, const ir_node * irn)
 {
 #define FUDGE 0.001
-	if(be_profile_has_data())
-		return ((double)be_profile_get_block_execcount(get_block(irn))) + FUDGE;
+	if(ir_profile_has_data())
+		return ((double)ir_profile_get_block_execcount(get_block_const(irn))) + FUDGE;
 
 #ifndef EXECFREQ_LOOPDEPH
-	return get_block_execfreq(si->birg->exec_freq, get_block(irn)) + FUDGE;
+	return get_block_execfreq(si->birg->exec_freq, get_block_const(irn)) + FUDGE;
 #else
 	if(is_Block(irn))
 		return exp(get_loop_depth(get_irn_loop(irn)) * log(10)) + FUDGE;
@@ -677,6 +682,7 @@ value_is_defined_before(const spill_ilp_t * si, const ir_node * pos, const ir_no
 	ir_node *block;
 	ir_node *def_block = get_nodes_block(val);
 	int      ret;
+	(void) si;
 
 	if(val == pos)
 		return 0;
@@ -721,6 +727,7 @@ sched_block_first_nonphi(const ir_node * bb)
 static int
 sched_skip_proj_predicator(const ir_node * irn, void * data)
 {
+	(void) data;
 	return (is_Proj(irn));
 }
 
@@ -2870,6 +2877,7 @@ cmp_interference(const void *a, const void *b, size_t size)
 {
 	const interference_t *p = a;
 	const interference_t *q = b;
+	(void) size;
 
 	return !(p->a == q->a && p->b == q->b);
 }
@@ -3239,9 +3247,13 @@ is_zero(double x)
 	return fabs(x) < 0.00001;
 }
 
+/**
+ * node attribute hook for changing colors
+ */
 static int mark_remat_nodes_hook(FILE *F, ir_node *n, ir_node *l)
 {
 	spill_ilp_t *si = get_irg_link(current_ir_graph);
+	(void) l;
 
 	if(pset_find_ptr(si->all_possible_remats, n)) {
 		op_t   *op = (op_t*)get_irn_link(n);
@@ -3592,7 +3604,7 @@ new_r_PhiM_nokeep(ir_graph * irg, ir_node *block, int arity, ir_node **in)
 	assert( get_irn_arity(block) == arity );
 
 	res = new_ir_node(NULL, irg, block, op_Phi, mode_M, arity, in);
-	res->attr.phi_backedge = new_backedge_arr(irg->obst, arity);
+	res->attr.phi.u.backedge = new_backedge_arr(irg->obst, arity);
 
 	return res;
 }
@@ -4608,8 +4620,8 @@ BE_REGISTER_MODULE_CONSTRUCTOR(be_init_spillremat);
 
 #else				/* WITH_ILP */
 
-static void INLINE
-only_that_you_can_compile_without_WITH_ILP_defined(void)
+static __attribute__((unused))
+void only_that_you_can_compile_without_WITH_ILP_defined(void)
 {
 }