X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyilp2.c;h=db68195be7db19a9bf65746d11b3ec38d0db291d;hb=fcb579b8959da1d7563b1a7b9f008a423ffdf75a;hp=35ec959aaa9a5e9e375d3079ebaf2c757e0e39dc;hpb=0e5f781d021c0b1e20ba08f583d4971419fedb5d;p=libfirm

diff --git a/ir/be/becopyilp2.c b/ir/be/becopyilp2.c
index 35ec959aa..db68195be 100644
--- a/ir/be/becopyilp2.c
+++ b/ir/be/becopyilp2.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.
  *
@@ -87,13 +87,13 @@ static void build_coloring_cstr(ilp_env_t *ienv) {
 			bitset_pos_t col;
 			int cst_idx;
 			const arch_register_req_t *req;
-			int curr_node_color = get_irn_col(ienv->co, irn);
+			int curr_node_color = get_irn_col(irn);
 			int node_nr = (int)get_irn_idx(irn);
 			local_env_t *lenv = ienv->env;
 
 			pmap_insert(lenv->nr_2_irn, INT_TO_PTR(node_nr), irn);
 
-			req = arch_get_register_req(ienv->co->aenv, irn, -1);
+			req = arch_get_register_req(irn, -1);
 
 			bitset_clear_all(colors);
 
@@ -190,12 +190,12 @@ static void build_affinity_cstr(ilp_env_t *ienv) {
 
 		root = curr->nodes[0];
 		root_nr = (int) get_irn_idx(root);
-		root_col = get_irn_col(ienv->co, root);
+		root_col = get_irn_col(root);
 
 		for (i = 1; i < curr->node_count; ++i) {
 			arg = curr->nodes[i];
 			arg_nr = (int) get_irn_idx(arg);
-			arg_col = get_irn_col(ienv->co, arg);
+			arg_col = get_irn_col(arg);
 
 			/* add a new affinity variable */
 			y_idx = lpp_add_var(ienv->lp, name_cdd_sorted(buf, 'y', root_nr, arg_nr), lpp_binary, curr->costs[i]);
@@ -296,7 +296,7 @@ static void build_clique_star_cstr(ilp_env_t *ienv) {
 		set *edges;
 		int i, o, n_nodes, n_edges;
 
-		if (arch_irn_is(ienv->co->aenv, aff->irn, ignore))
+		if (arch_irn_is(aff->irn, ignore))
 			continue;
 
 		obstack_init(&ob);
@@ -305,7 +305,7 @@ static void build_clique_star_cstr(ilp_env_t *ienv) {
 		/* get all affinity neighbours */
 		n_nodes = 0;
 		co_gs_foreach_neighb(aff, nbr) {
-			if (!arch_irn_is(ienv->co->aenv, nbr->irn, ignore)) {
+			if (!arch_irn_is(nbr->irn, ignore)) {
 				obstack_ptr_grow(&ob, nbr->irn);
 				++n_nodes;
 			}
@@ -409,7 +409,7 @@ static void extend_path(ilp_env_t *ienv, pdeq *path, const ir_node *irn) {
 	if (pdeq_contains(path, irn))
 		return;
 
-	if (arch_irn_is(ienv->co->aenv, irn, ignore))
+	if (arch_irn_is(irn, ignore))
 		return;
 
 	/* insert the new irn */
@@ -500,16 +500,14 @@ static void ilp2_build(ilp_env_t *ienv) {
 
 static void ilp2_apply(ilp_env_t *ienv) {
 	local_env_t *lenv = ienv->env;
-	double *sol;
-	lpp_sol_state_t state;
-	int i, count;
+	int i;
 
 	/* first check if there was sth. to optimize */
 	if (lenv->first_x_var >= 0) {
+		int              count = lenv->last_x_var - lenv->first_x_var + 1;
+		double          *sol   = XMALLOCN(double, count);
+		lpp_sol_state_t  state = lpp_get_solution(ienv->lp, sol, lenv->first_x_var, lenv->last_x_var);
 
-		count = lenv->last_x_var - lenv->first_x_var + 1;
-		sol = xmalloc(count * sizeof(sol[0]));
-		state = lpp_get_solution(ienv->lp, sol, lenv->first_x_var, lenv->last_x_var);
 		if (state != lpp_optimal) {
 			printf("WARNING %s: Solution state is not 'optimal': %d\n", ienv->co->name, state);
 			assert(state >= lpp_feasible && "The solution should at least be feasible!");
@@ -531,6 +529,8 @@ static void ilp2_apply(ilp_env_t *ienv) {
 					assert(0 && "This should be a x-var");
 			}
 		}
+
+		xfree(sol);
 	}
 
 #ifdef COPYOPT_STAT
@@ -558,7 +558,7 @@ int co_solve_ilp2(copy_opt_t *co) {
 
 	my.normal_colors = bitset_alloca(arch_register_class_n_regs(co->cls));
 	bitset_clear_all(my.normal_colors);
-	arch_put_non_ignore_regs(co->aenv, co->cls, my.normal_colors);
+	arch_put_non_ignore_regs(co->cls, my.normal_colors);
 	my.n_colors = bitset_popcnt(my.normal_colors);
 
 	ienv = new_ilp_env(co, ilp2_build, ilp2_apply, &my);