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

diff --git a/ir/be/becopyopt.c b/ir/be/becopyopt.c
index 065b43d34..47cd566bd 100644
--- a/ir/be/becopyopt.c
+++ b/ir/be/becopyopt.c
@@ -219,8 +219,9 @@ 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(irn);
@@ -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) {
@@ -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);
@@ -771,7 +772,7 @@ 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(irn);
@@ -796,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));
 				}
 			}
@@ -883,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);
 
@@ -906,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);
@@ -917,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);
@@ -991,8 +993,8 @@ 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)