X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyheur4.c;h=feb2b79eba2461a8d4ce45b19a7a1fb6b686a80e;hb=04906225f6fe1bc22f73b5d6a98eb9c0992a9b54;hp=3c2a262885c8ab7b6c493a55622a435d7c9a8fa5;hpb=d64ea79ebc6d41bc4253f6b6fd0a09582dce20eb;p=libfirm

diff --git a/ir/be/becopyheur4.c b/ir/be/becopyheur4.c
index 3c2a26288..feb2b79eb 100644
--- a/ir/be/becopyheur4.c
+++ b/ir/be/becopyheur4.c
@@ -29,9 +29,7 @@
  * (also known as "heur3" :)
  * Performs simple copy minimization.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif /* HAVE_CONFIG_H */
 
 #define DISABLE_STATEV
 
@@ -124,7 +122,6 @@ typedef struct _co_mst_env_t {
 	pqueue_t         *chunks;        /**< priority queue for chunks */
 	pset             *chunkset;      /**< set holding all chunks */
 	be_ifg_t         *ifg;           /**< the interference graph */
-	const arch_env_t *aenv;          /**< the arch environment */
 	copy_opt_t       *co;            /**< the copy opt object */
 	unsigned         chunk_visited;
 	col_cost_t      **single_cols;
@@ -371,7 +368,7 @@ static void *co_mst_irn_init(ir_phase *ph, const ir_node *irn, void *old) {
 		res->tmp_col       = -1;
 		res->int_neighs    = NULL;
 		res->int_aff_neigh = 0;
-		res->col           = arch_register_get_index(arch_get_irn_register(env->aenv, irn));
+		res->col           = arch_register_get_index(arch_get_irn_register(irn));
 		res->init_col      = res->col;
 		INIT_LIST_HEAD(&res->list);
 
@@ -399,7 +396,7 @@ static void *co_mst_irn_init(ir_phase *ph, const ir_node *irn, void *old) {
 		/* build list of interfering neighbours */
 		len = 0;
 		be_ifg_foreach_neighbour(env->ifg, nodes_it, irn, neigh) {
-			if (! arch_irn_is(env->aenv, neigh, ignore)) {
+			if (!arch_irn_is(neigh, ignore)) {
 				obstack_ptr_grow(phase_obst(ph), neigh);
 				++len;
 			}
@@ -558,7 +555,7 @@ static void aff_chunk_assure_weight(co_mst_env_t *env, aff_chunk_t *c) {
 					const ir_node *m    = neigh->irn;
 
 					/* skip ignore nodes */
-					if (arch_irn_is(env->aenv, m, ignore))
+					if (arch_irn_is(m, ignore))
 						continue;
 
 					w += node_contains(c->n, m) ? neigh->costs : 0;
@@ -589,7 +586,7 @@ static int count_interfering_aff_neighs(co_mst_env_t *env, const affinity_node_t
 		int           i;
 
 		/* skip ignore nodes */
-		if (arch_irn_is(env->aenv, n, ignore))
+		if (arch_irn_is(n, ignore))
 			continue;
 
 		/* check if the affinity neighbour interfere */
@@ -625,7 +622,7 @@ static void build_affinity_chunks(co_mst_env_t *env) {
 		affinity_node_t *an;
 
 		/* skip ignore nodes */
-		if (arch_irn_is(env->aenv, n, ignore))
+		if (arch_irn_is(n, ignore))
 			continue;
 
 		n1 = get_co_mst_irn(env, n);
@@ -648,7 +645,7 @@ static void build_affinity_chunks(co_mst_env_t *env) {
 					aff_edge_t   edge;
 
 					/* skip ignore nodes */
-					if (arch_irn_is(env->aenv, m, ignore))
+					if (arch_irn_is(m, ignore))
 						continue;
 
 					edge.src = n;
@@ -724,7 +721,7 @@ static __attribute__((unused)) void chunk_order_nodes(co_mst_env_t *env, aff_chu
 		int w = 0;
 		neighb_t *neigh;
 
-		if (arch_irn_is(env->aenv, irn, ignore))
+		if (arch_irn_is(irn, ignore))
 			continue;
 
 		if (an) {
@@ -752,7 +749,7 @@ static __attribute__((unused)) void chunk_order_nodes(co_mst_env_t *env, aff_chu
 			affinity_node_t *an = get_affinity_info(env->co, irn);
 			neighb_t *neigh;
 
-			if (arch_irn_is(env->aenv, irn, ignore))
+			if (arch_irn_is(irn, ignore))
 				continue;
 
 			assert(i <= ARR_LEN(chunk->n));
@@ -806,7 +803,7 @@ static void expand_chunk_from(co_mst_env_t *env, co_mst_irn_t *node, bitset_t *v
 				co_mst_irn_t *n2;
 
 				/* skip ignore nodes */
-				if (arch_irn_is(env->aenv, m, ignore))
+				if (arch_irn_is(m, ignore))
 					continue;
 
 				n2 = get_co_mst_irn(env, m);
@@ -1049,7 +1046,7 @@ static int recolor_nodes(co_mst_env_t *env, co_mst_irn_t *node, col_cost_t *cost
 			neigh = node->int_neighs[j];
 
 			/* skip ignore nodes */
-			if (arch_irn_is(env->aenv, neigh, ignore))
+			if (arch_irn_is(neigh, ignore))
 				continue;
 
 			nn = get_co_mst_irn(env, neigh);
@@ -1413,7 +1410,6 @@ int co_solve_heuristic_mst(copy_opt_t *co) {
 	mst_env.co            = co;
 	mst_env.ignore_regs   = ignore_regs;
 	mst_env.ifg           = co->cenv->ifg;
-	mst_env.aenv          = co->aenv;
 	mst_env.chunkset      = pset_new_ptr(512);
 	mst_env.chunk_visited = 0;
 	mst_env.single_cols   = phase_alloc(&mst_env.ph, sizeof(*mst_env.single_cols) * n_regs);
@@ -1452,7 +1448,7 @@ int co_solve_heuristic_mst(copy_opt_t *co) {
 		co_mst_irn_t *mirn;
 		const arch_register_t *reg;
 
-		if (arch_irn_is(mst_env.aenv, irn, ignore))
+		if (arch_irn_is(irn, ignore))
 			continue;
 
 		mirn = get_co_mst_irn(&mst_env, irn);
@@ -1463,7 +1459,7 @@ int co_solve_heuristic_mst(copy_opt_t *co) {
 			continue;
 
 		reg = arch_register_for_index(co->cls, mirn->col);
-		arch_set_irn_register(co->aenv, irn, reg);
+		arch_set_irn_register(irn, reg);
 		DB((dbg, LEVEL_1, "%+F set color from %d to %d\n", irn, mirn->init_col, mirn->col));
 	}