X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyopt.c;h=47cd566bd2f9d4d6889d493e373cbf5a2c0a1b93;hb=4614f17999007f93c7be926c2a2db232c78073ba;hp=5ea97b2c95eefa227fe860407376e854efd949fd;hpb=d419b3b5cea65d0b9dee503092f256da1773d74f;p=libfirm

diff --git a/ir/be/becopyopt.c b/ir/be/becopyopt.c
index 5ea97b2c9..47cd566bd 100644
--- a/ir/be/becopyopt.c
+++ b/ir/be/becopyopt.c
@@ -219,16 +219,17 @@ void free_copy_opt(copy_opt_t *co) {
 int co_is_optimizable_root(const copy_opt_t *co, ir_node *irn) {
 	const arch_register_req_t *req;
 	const arch_register_t *reg;
+	(void)co; // TODO remove parameter
 
-	if (arch_irn_is(co->aenv, irn, ignore))
+	if (arch_irn_is(irn, ignore))
 		return 0;
 
-	reg = arch_get_irn_register(co->aenv, irn);
+	reg = arch_get_irn_register(irn);
 	if (arch_register_type_is(reg, ignore))
 		return 0;
 
 	req = arch_get_register_req(irn, -1);
-	if (is_Reg_Phi(irn) || is_Perm_Proj(co->aenv, irn) || is_2addr_code(req))
+	if (is_Reg_Phi(irn) || is_Perm_Proj(irn) || is_2addr_code(req))
 		return 1;
 
 	return 0;
@@ -415,7 +416,7 @@ static void co_collect_units(ir_node *irn, void *env) {
 			/* Else insert the argument of the phi to the members of this ou */
 			DBG((dbg, LEVEL_1, "\t   Member: %+F\n", arg));
 
-			if (! arch_irn_is(co->aenv, arg, ignore)) {
+			if (!arch_irn_is(arg, ignore)) {
 				/* Check if arg has occurred at a prior position in the arg/list */
 				arg_pos = 0;
 				for (o=1; o<unit->node_count; ++o) {
@@ -438,7 +439,7 @@ static void co_collect_units(ir_node *irn, void *env) {
 		}
 		unit->nodes = XREALLOC(unit->nodes, ir_node*, unit->node_count);
 		unit->costs = XREALLOC(unit->costs, int,      unit->node_count);
-	} else if (is_Perm_Proj(co->aenv, irn)) {
+	} else if (is_Perm_Proj(irn)) {
 		/* Proj of a perm with corresponding arg */
 		assert(!nodes_interfere(co->cenv, irn, get_Perm_src(irn)));
 		unit->nodes = XMALLOCN(ir_node*, 2);
@@ -459,7 +460,7 @@ static void co_collect_units(ir_node *irn, void *env) {
 			for (i = 0; (1U << i) <= other; ++i) {
 				if (other & (1U << i)) {
 					ir_node *o  = get_irn_n(skip_Proj(irn), i);
-					if (!arch_irn_is(co->aenv, o, ignore) &&
+					if (!arch_irn_is(o, ignore) &&
 							!nodes_interfere(co->cenv, irn, o)) {
 						++count;
 					}
@@ -477,7 +478,7 @@ static void co_collect_units(ir_node *irn, void *env) {
 				for (i = 0; 1U << i <= other; ++i) {
 					if (other & (1U << i)) {
 						ir_node *o  = get_irn_n(skip_Proj(irn), i);
-						if (!arch_irn_is(co->aenv, o, ignore) &&
+						if (!arch_irn_is(o, ignore) &&
 								!nodes_interfere(co->cenv, irn, o)) {
 							unit->nodes[k] = o;
 							unit->costs[k] = co->get_costs(co, irn, o, -1);
@@ -650,11 +651,11 @@ int co_get_copy_costs(const copy_opt_t *co) {
 	ASSERT_OU_AVAIL(co);
 
 	list_for_each_entry(unit_t, curr, &co->units, units) {
-		int root_col = get_irn_col(co, curr->nodes[0]);
+		int root_col = get_irn_col(curr->nodes[0]);
 		DBG((dbg, LEVEL_1, "  %3d costs for root %+F color %d\n", curr->inevitable_costs, curr->nodes[0], root_col));
 		res += curr->inevitable_costs;
 		for (i=1; i<curr->node_count; ++i) {
-			int arg_col = get_irn_col(co, curr->nodes[i]);
+			int arg_col = get_irn_col(curr->nodes[i]);
 			if (root_col != arg_col) {
 				DBG((dbg, LEVEL_1, "  %3d for arg %+F color %d\n", curr->costs[i], curr->nodes[i], arg_col));
 				res += curr->costs[i];
@@ -692,7 +693,7 @@ void co_complete_stats(const copy_opt_t *co, co_complete_stats_t *stat)
 				stat->aff_edges += 1;
 				stat->max_costs += neigh->costs;
 
-				if(get_irn_col(co, an->irn) != get_irn_col(co, neigh->irn)) {
+				if (get_irn_col(an->irn) != get_irn_col(neigh->irn)) {
 					stat->costs += neigh->costs;
 					stat->unsatisfied_edges += 1;
 				}
@@ -771,10 +772,10 @@ static void build_graph_walker(ir_node *irn, void *env) {
 	int pos, max;
 	const arch_register_t *reg;
 
-	if (!is_curr_reg_class(co, irn) || arch_irn_is(co->aenv, irn, ignore))
+	if (!is_curr_reg_class(co, irn) || arch_irn_is(irn, ignore))
 		return;
 
-	reg = arch_get_irn_register(co->aenv, irn);
+	reg = arch_get_irn_register(irn);
 	if (arch_register_type_is(reg, ignore))
 		return;
 
@@ -783,8 +784,7 @@ static void build_graph_walker(ir_node *irn, void *env) {
 			ir_node *arg = get_irn_n(irn, pos);
 			add_edges(co, irn, arg, co->get_costs(co, irn, arg, pos));
 		}
-	}
-	else if (is_Perm_Proj(co->aenv, irn)) { /* Perms */
+	} else if (is_Perm_Proj(irn)) { /* Perms */
 		ir_node *arg = get_Perm_src(irn);
 		add_edges(co, irn, arg, co->get_costs(co, irn, arg, 0));
 	}
@@ -797,7 +797,7 @@ static void build_graph_walker(ir_node *irn, void *env) {
 			for (i = 0; 1U << i <= other; ++i) {
 				if (other & (1U << i)) {
 					ir_node *other = get_irn_n(skip_Proj(irn), i);
-					if (! arch_irn_is(co->aenv, other, ignore))
+					if (!arch_irn_is(other, ignore))
 						add_edges(co, irn, other, co->get_costs(co, irn, other, 0));
 				}
 			}
@@ -884,14 +884,14 @@ void co_dump_appel_graph(const copy_opt_t *co, FILE *f)
 
 	n = n_regs;
 	be_ifg_foreach_node(ifg, it, irn) {
-		if(!arch_irn_is(co->aenv, irn, ignore))
+		if (!arch_irn_is(irn, ignore))
 			node_map[get_irn_idx(irn)] = n++;
 	}
 
 	fprintf(f, "%d %d\n", n, n_regs);
 
 	be_ifg_foreach_node(ifg, it, irn) {
-		if(!arch_irn_is(co->aenv, irn, ignore)) {
+		if (!arch_irn_is(irn, ignore)) {
 			int idx            = node_map[get_irn_idx(irn)];
 			affinity_node_t *a = get_affinity_info(co, irn);
 
@@ -907,7 +907,8 @@ void co_dump_appel_graph(const copy_opt_t *co, FILE *f)
 			}
 
 			be_ifg_foreach_neighbour(ifg, nit, irn, adj) {
-				if(!arch_irn_is(co->aenv, adj, ignore) && !co_dump_appel_disjoint_constraints(co, irn, adj)) {
+				if (!arch_irn_is(adj, ignore) &&
+						!co_dump_appel_disjoint_constraints(co, irn, adj)) {
 					int adj_idx = node_map[get_irn_idx(adj)];
 					if(idx < adj_idx)
 						fprintf(f, "%d %d -1\n", idx, adj_idx);
@@ -918,7 +919,7 @@ void co_dump_appel_graph(const copy_opt_t *co, FILE *f)
 				neighb_t *n;
 
 				co_gs_foreach_neighb(a, n) {
-					if(!arch_irn_is(co->aenv, n->irn, ignore)) {
+					if (!arch_irn_is(n->irn, ignore)) {
 						int n_idx = node_map[get_irn_idx(n->irn)];
 						if(idx < n_idx)
 							fprintf(f, "%d %d %d\n", idx, n_idx, (int) n->costs);
@@ -992,14 +993,14 @@ static void ifg_dump_graph_attr(FILE *f, void *self)
 
 static int ifg_is_dump_node(void *self, ir_node *irn)
 {
-	co_ifg_dump_t *cod = self;
-	return !arch_irn_is(cod->co->aenv, irn, ignore);
+	(void)self;
+	return !arch_irn_is(irn, ignore);
 }
 
 static void ifg_dump_node_attr(FILE *f, void *self, ir_node *irn)
 {
 	co_ifg_dump_t *env         = self;
-	const arch_register_t *reg = arch_get_irn_register(env->co->aenv, irn);
+	const arch_register_t *reg = arch_get_irn_register(irn);
 	const arch_register_req_t *req;
 	int limited;
 
@@ -1032,12 +1033,12 @@ static void ifg_dump_at_end(FILE *file, void *self)
 	affinity_node_t *a;
 
 	co_gs_foreach_aff_node(env->co, a) {
-		const arch_register_t *ar = arch_get_irn_register(env->co->aenv, a->irn);
+		const arch_register_t *ar = arch_get_irn_register(a->irn);
 		unsigned aidx = get_irn_idx(a->irn);
 		neighb_t *n;
 
 		co_gs_foreach_neighb(a, n) {
-			const arch_register_t *nr = arch_get_irn_register(env->co->aenv, n->irn);
+			const arch_register_t *nr = arch_get_irn_register(n->irn);
 			unsigned nidx = get_irn_idx(n->irn);
 
 			if(aidx < nidx) {