X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyilp2.c;h=768e47d169cc8a54c898d4de3fb3561750d2d5f9;hb=2428e8c0513d2b96a64dfa072e8cd1b861d62b8e;hp=42fb15cc9d953e076ab7974cd71d6fb8e30b7abe;hpb=e07b61c6ed5d198a484761f8a40a4f26520d964d;p=libfirm

diff --git a/ir/be/becopyilp2.c b/ir/be/becopyilp2.c
index 42fb15cc9..768e47d16 100644
--- a/ir/be/becopyilp2.c
+++ b/ir/be/becopyilp2.c
@@ -44,11 +44,7 @@
  *
  *		x_nc, y_ij \in N,   w_ij \in R^+
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif /* HAVE_CONFIG_H */
-
-#include "firm_config.h"
 
 #ifdef WITH_ILP
 
@@ -87,13 +83,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_out(irn);
 
 			bitset_clear_all(colors);
 
@@ -190,12 +186,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]);
@@ -232,7 +228,7 @@ static int compare_edge_t(const void *k1, const void *k2, size_t size) {
 
 #define HASH_EDGE(e) (hash_irn((e)->n1) ^ hash_irn((e)->n2))
 
-static INLINE edge_t *add_edge(set *edges, ir_node *n1, ir_node *n2, int *counter) {
+static inline edge_t *add_edge(set *edges, ir_node *n1, ir_node *n2, int *counter) {
 	edge_t new_edge;
 
 	if (PTR_TO_INT(n1) < PTR_TO_INT(n2)) {
@@ -246,7 +242,7 @@ static INLINE edge_t *add_edge(set *edges, ir_node *n1, ir_node *n2, int *counte
 	return set_insert(edges, &new_edge, sizeof(new_edge), HASH_EDGE(&new_edge));
 }
 
-static INLINE edge_t *find_edge(set *edges, ir_node *n1, ir_node *n2) {
+static inline edge_t *find_edge(set *edges, ir_node *n1, ir_node *n2) {
 	edge_t new_edge;
 
 	if (PTR_TO_INT(n1) < PTR_TO_INT(n2)) {
@@ -259,7 +255,7 @@ static INLINE edge_t *find_edge(set *edges, ir_node *n1, ir_node *n2) {
 	return set_find(edges, &new_edge, sizeof(new_edge), HASH_EDGE(&new_edge));
 }
 
-static INLINE void remove_edge(set *edges, ir_node *n1, ir_node *n2, int *counter) {
+static inline void remove_edge(set *edges, ir_node *n1, ir_node *n2, int *counter) {
 	edge_t new_edge, *e;
 
 	if (PTR_TO_INT(n1) < PTR_TO_INT(n2)) {
@@ -296,7 +292,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 +301,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 +405,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 */
@@ -558,7 +554,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);
@@ -573,7 +569,7 @@ int co_solve_ilp2(copy_opt_t *co) {
 
 #else /* WITH_ILP */
 
-static INLINE void only_that_you_can_compile_without_WITH_ILP_defined(void) {
+static inline void only_that_you_can_compile_without_WITH_ILP_defined(void) {
 }
 
 #endif /* WITH_ILP */