X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyheur2.c;h=60f8b6646cf736f51cfd89b4f7fa99a736590d1f;hb=4d808298b72e72bd06c7466e837dd9dda4eb1070;hp=a219e5d0bc8f4a8002ddffaa6a0913bd421a94d0;hpb=bb5461e3f6f900c09222814f2eec779684f28f73;p=libfirm

diff --git a/ir/be/becopyheur2.c b/ir/be/becopyheur2.c
index a219e5d0b..60f8b6646 100644
--- a/ir/be/becopyheur2.c
+++ b/ir/be/becopyheur2.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.
  *
@@ -28,8 +28,8 @@
 #include "config.h"
 #endif
 
-#include <libcore/lc_opts.h>
-#include <libcore/lc_opts_enum.h>
+#include "lc_opts.h"
+#include "lc_opts_enum.h"
 
 #include <stdlib.h>
 #include <limits.h>
@@ -66,7 +66,6 @@ static int      subtree_iter    = 4;
 static int      max_depth       = 20;
 static double   constr_factor   = 0.9;
 
-/* Options using libcore */
 static const lc_opt_enum_mask_items_t dump_items[] = {
 	{ "before",  DUMP_BEFORE },
 	{ "after",   DUMP_AFTER  },
@@ -84,7 +83,7 @@ static const lc_opt_table_entry_t options[] = {
 	LC_OPT_ENT_INT      ("iter", "iterations for subtree nodes",                           &subtree_iter),
 	LC_OPT_ENT_DBL      ("cf",   "factor of constraint importance (between 0.0 and 1.0)",  &constr_factor),
 	LC_OPT_ENT_INT      ("max",  "maximum recursion depth",                                &max_depth),
-	LC_OPT_ENT_NULL
+	LC_OPT_LAST
 };
 
 void be_init_copyheur2(void)
@@ -135,7 +134,7 @@ typedef struct {
 } co2_t;
 
 struct _co2_irn_t {
-	ir_node         *irn;
+	const ir_node   *irn;
 	affinity_node_t *aff;
 	co2_irn_t       *touched_next;
 	col_t            tmp_col;
@@ -195,7 +194,7 @@ typedef struct {
 #define get_co2_irn(co2, irn)         ((co2_irn_t *)       phase_get_or_set_irn_data(&co2->ph, irn))
 #define get_co2_cloud_irn(co2, irn)   ((co2_cloud_irn_t *) phase_get_or_set_irn_data(&co2->ph, irn))
 
-static void *co2_irn_init(ir_phase *ph, ir_node *irn, void *data)
+static void *co2_irn_init(ir_phase *ph, const ir_node *irn, void *data)
 {
 	co2_t *env         = (co2_t *) ph;
 	affinity_node_t *a = get_affinity_info(env->co, irn);
@@ -250,13 +249,13 @@ int cmp_edges(const void *a, const void *b)
 	return QSORT_CMP(q->costs, p->costs);
 }
 
-static col_t get_col(co2_t *env, ir_node *irn)
+static col_t get_col(co2_t *env, const ir_node *irn)
 {
 	co2_irn_t *ci = get_co2_irn(env, irn);
 	return ci->tmp_fixed ? ci->tmp_col : ci->orig_col;
 }
 
-static INLINE int color_is_fix(co2_t *env, ir_node *irn)
+static INLINE int color_is_fix(co2_t *env, const ir_node *irn)
 {
 	co2_irn_t *ci = get_co2_irn(env, irn);
 	return ci->fixed || ci->tmp_fixed;
@@ -306,7 +305,7 @@ static INLINE int is_constrained(co2_t *env, co2_irn_t *ci)
 	return ci->is_constrained;
 }
 
-static void incur_constraint_costs(co2_t *env, ir_node *irn, col_cost_pair_t *col_costs, int costs)
+static void incur_constraint_costs(co2_t *env, const ir_node *irn, col_cost_pair_t *col_costs, int costs)
 {
 	const arch_register_req_t *req;
 
@@ -338,14 +337,14 @@ static void incur_constraint_costs(co2_t *env, ir_node *irn, col_cost_pair_t *co
  */
 static void determine_color_costs(co2_t *env, co2_irn_t *ci, col_cost_pair_t *col_costs)
 {
-	ir_node *irn       = ci->irn;
+	const ir_node *irn = ci->irn;
 	be_ifg_t *ifg      = env->co->cenv->ifg;
 	int n_regs         = env->co->cls->n_regs;
 	bitset_t *forb     = bitset_alloca(n_regs);
 	affinity_node_t *a = ci->aff;
 
 	bitset_pos_t elm;
-	ir_node *pos;
+	const ir_node *pos;
 	void *it;
 	int i;
 
@@ -401,6 +400,7 @@ static void single_color_cost(co2_t *env, co2_irn_t *ci, col_t col, col_cost_pai
 		seq[i].costs = INT_MAX;
 	}
 
+	(void) ci;
 	assert(is_color_admissible(env, ci, col));
 	seq[col].col = 0;
 	seq[0].col   = col;
@@ -425,9 +425,9 @@ static void materialize_coloring(struct list_head *h)
 	}
 }
 
-static int change_color_not(co2_t *env, ir_node *irn, col_t not_col, struct list_head *parent_changed, int depth);
+static int change_color_not(co2_t *env, const ir_node *irn, col_t not_col, struct list_head *parent_changed, int depth);
 
-static int recolor(co2_t *env, ir_node *irn, col_cost_pair_t *col_list, struct list_head *parent_changed, int depth)
+static int recolor(co2_t *env, const ir_node *irn, col_cost_pair_t *col_list, struct list_head *parent_changed, int depth)
 {
 	int n_regs         = env->co->cls->n_regs;
 	be_ifg_t *ifg      = env->co->cenv->ifg;
@@ -445,7 +445,7 @@ static int recolor(co2_t *env, ir_node *irn, col_cost_pair_t *col_list, struct l
 		int neigh_ok   = 1;
 
 		struct list_head changed;
-		ir_node *n;
+		const ir_node *n;
 		void *it;
 
 		DBG((env->dbg, LEVEL_3, "\t\t%2{firm:indent}trying color %d(%d) on %+F\n", depth, tgt_col, costs, irn));
@@ -512,7 +512,7 @@ static int recolor(co2_t *env, ir_node *irn, col_cost_pair_t *col_list, struct l
 	return res;
 }
 
-static int change_color_not(co2_t *env, ir_node *irn, col_t not_col, struct list_head *parent_changed, int depth)
+static int change_color_not(co2_t *env, const ir_node *irn, col_t not_col, struct list_head *parent_changed, int depth)
 {
 	co2_irn_t *ci = get_co2_irn(env, irn);
 	int res       = 0;
@@ -553,7 +553,7 @@ static int change_color_not(co2_t *env, ir_node *irn, col_t not_col, struct list
 	return res;
 }
 
-static int change_color_single(co2_t *env, ir_node *irn, col_t tgt_col, struct list_head *parent_changed, int depth)
+static int change_color_single(co2_t *env, const ir_node *irn, col_t tgt_col, struct list_head *parent_changed, int depth)
 {
 	co2_irn_t *ci = get_co2_irn(env, irn);
 	col_t col     = get_col(env, irn);
@@ -631,7 +631,7 @@ static void node_color_badness(co2_cloud_irn_t *ci, int *badness)
 	bitset_t *bs   = bitset_alloca(n_regs);
 
 	bitset_pos_t elm;
-	ir_node *irn;
+	const ir_node *irn;
 	void *it;
 
 	admissible_colors(env, &ci->inh, bs);
@@ -702,7 +702,7 @@ static int coalesce_top_down(co2_cloud_irn_t *ci, int child_nr, int depth)
 	co2_t *env           = ci->cloud->env;
 	col_cost_pair_t *seq = alloca(env->n_regs * sizeof(seq[0]));
 	int is_root          = ci->mst_parent == ci;
-	col_t parent_col     = is_root ? -1 : get_col(env, ci->mst_parent->inh.irn);
+	col_t parent_col     = is_root ? (col_t) -1 : get_col(env, ci->mst_parent->inh.irn);
 	int min_badness      = INT_MAX;
 	int best_col_costs   = INT_MAX;
 	int best_col         = -1;
@@ -862,7 +862,7 @@ static co2_cloud_t *new_cloud(co2_t *env, affinity_node_t *a)
 
 static void apply_coloring(co2_cloud_irn_t *ci, col_t col, int depth)
 {
-	ir_node *irn = ci->inh.irn;
+	const ir_node *irn = ci->inh.irn;
 	int *front   = FRONT_BASE(ci, col);
 	int i, ok;
 	struct list_head changed;
@@ -1103,7 +1103,7 @@ static void writeback_colors(co2_t *env)
 
 	for(irn = env->touched; irn; irn = irn->touched_next) {
 		const arch_register_t *reg = arch_register_for_index(env->co->cls, irn->orig_col);
-		arch_set_irn_register(aenv, irn->irn, reg);
+		arch_set_irn_register(aenv, (ir_node *) irn->irn, reg);
 	}
 }
 
@@ -1117,7 +1117,7 @@ static void writeback_colors(co2_t *env)
                                                            |_|            |___/
 */
 
-static const char *get_dot_color_name(int col)
+static const char *get_dot_color_name(size_t col)
 {
 	static const char *names[] = {
 		"blue",
@@ -1153,7 +1153,7 @@ static const char *get_dot_color_name(int col)
 		"palevioletred"
 	};
 
-	return col < sizeof(names)/sizeof(names[0]) ? names[col] : "white";
+	return col < (sizeof(names)/sizeof(names[0])) ? names[col] : "white";
 }
 
 static const char *get_dot_shape_name(co2_t *env, co2_irn_t *ci)
@@ -1175,6 +1175,7 @@ static const char *get_dot_shape_name(co2_t *env, co2_irn_t *ci)
 
 static void ifg_dump_graph_attr(FILE *f, void *self)
 {
+	(void) self;
 	fprintf(f, "overlay=false");
 }