X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyheur2.c;h=b1336edae944aefb3aaffac4ae416a1b94cd95c6;hb=1378b3dc871c6dc37488de756bd1022665c125d8;hp=f221136fcd4d81c4a92e81b55356d3633c8d8172;hpb=979e11a67115604f5ca3050ad2fab08d190a13e8;p=libfirm

diff --git a/ir/be/becopyheur2.c b/ir/be/becopyheur2.c
index f221136fc..b1336edae 100644
--- a/ir/be/becopyheur2.c
+++ b/ir/be/becopyheur2.c
@@ -178,7 +178,7 @@ typedef struct {
 
 static co2_irn_t *get_co2_irn(co2_t *env, const ir_node *node)
 {
-	co2_irn_t *ci = ir_nodemap_get(&env->map, node);
+	co2_irn_t *ci = ir_nodemap_get(co2_irn_t, &env->map, node);
 	if (ci == NULL) {
 		ci = OALLOCZ(&env->obst, co2_irn_t);
 
@@ -196,7 +196,7 @@ static co2_irn_t *get_co2_irn(co2_t *env, const ir_node *node)
 
 static co2_cloud_irn_t *get_co2_cloud_irn(co2_t *env, const ir_node *node)
 {
-	co2_cloud_irn_t *ci = ir_nodemap_get(&env->map, node);
+	co2_cloud_irn_t *ci = ir_nodemap_get(co2_cloud_irn_t, &env->map, node);
 	if (ci == NULL) {
 		ci = OALLOCZ(&env->obst, co2_cloud_irn_t);
 
@@ -337,7 +337,6 @@ static void determine_color_costs(co2_t *env, co2_irn_t *ci, col_cost_pair_t *co
 	bitset_t *forb     = bitset_alloca(n_regs);
 	affinity_node_t *a = ci->aff;
 
-	size_t elm;
 	const ir_node *pos;
 	neighbours_iter_t it;
 	int i;
@@ -352,8 +351,6 @@ static void determine_color_costs(co2_t *env, co2_irn_t *ci, col_cost_pair_t *co
 	}
 
 	if (a) {
-		neighb_t *n;
-
 		co_gs_foreach_neighb(a, n) {
 			if (color_is_fix(env, n->irn)) {
 				col_t col = get_col(env, n->irn);
@@ -402,16 +399,12 @@ static void single_color_cost(co2_t *env, co2_irn_t *ci, col_t col, col_cost_pai
 
 static void reject_coloring(struct list_head *h)
 {
-	co2_irn_t *pos;
-
 	list_for_each_entry(co2_irn_t, pos, h, changed_list)
 		pos->tmp_fixed = 0;
 }
 
 static void materialize_coloring(struct list_head *h)
 {
-	co2_irn_t *pos;
-
 	list_for_each_entry(co2_irn_t, pos, h, changed_list) {
 		pos->orig_col  = pos->tmp_col;
 		pos->tmp_fixed = 0;
@@ -622,7 +615,6 @@ static void node_color_badness(co2_cloud_irn_t *ci, int *badness)
 	be_ifg_t *ifg  = env->co->cenv->ifg;
 	bitset_t *bs   = bitset_alloca(n_regs);
 
-	size_t elm;
 	const ir_node *irn;
 	neighbours_iter_t it;
 
@@ -780,7 +772,6 @@ static void populate_cloud(co2_t *env, co2_cloud_t *cloud, affinity_node_t *a, i
 	be_ifg_t *ifg       = env->co->cenv->ifg;
 	co2_cloud_irn_t *ci = get_co2_cloud_irn(env, a->irn);
 	int costs           = 0;
-	neighb_t *n;
 
 	if (ci->cloud)
 		return;
@@ -824,7 +815,6 @@ static void populate_cloud(co2_t *env, co2_cloud_t *cloud, affinity_node_t *a, i
 static co2_cloud_t *new_cloud(co2_t *env, affinity_node_t *a)
 {
 	co2_cloud_t *cloud = OALLOC(&env->obst, co2_cloud_t);
-	co2_cloud_irn_t *ci;
 	int i;
 
 	DBG((env->dbg, LEVEL_2, "new cloud with %+F\n", a->irn));
@@ -893,7 +883,6 @@ static void process_cloud(co2_cloud_t *cloud)
 	obstack_init(&cloud->obst);
 	for (i = 0; i < cloud->n_memb; ++i) {
 		co2_cloud_irn_t *ci = cloud->seq[i];
-		neighb_t *n;
 
 		co_gs_foreach_neighb(ci->inh.aff, n) {
 			co2_cloud_irn_t *ni = get_co2_cloud_irn(cloud->env, n->irn);
@@ -1010,7 +999,6 @@ static void process_cloud(co2_cloud_t *cloud)
 static int cloud_costs(co2_cloud_t *cloud)
 {
 	int i, costs = 0;
-	neighb_t *n;
 
 	for (i = 0; i < cloud->n_memb; ++i) {
 		co2_irn_t *ci = (co2_irn_t *) cloud->seq[i];
@@ -1036,8 +1024,6 @@ static void writeback_colors(co2_t *env)
 
 static void process(co2_t *env)
 {
-	affinity_node_t *a;
-	co2_cloud_t *pos;
 	co2_cloud_t **clouds;
 	int n_clouds;
 	int i;