X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyilp2.c;h=e3d7963adbdf550ffd297409e4d736d0a269c11b;hb=41658443cdd74a5ce93c986ab9e623cc92d11f38;hp=f031ee4fc2c26351185b386795064d687fdda081;hpb=bb9f2e36362333c6635b89f5258171b06c786608;p=libfirm

diff --git a/ir/be/becopyilp2.c b/ir/be/becopyilp2.c
index f031ee4fc..e3d7963ad 100644
--- a/ir/be/becopyilp2.c
+++ b/ir/be/becopyilp2.c
@@ -89,7 +89,7 @@ static void build_coloring_cstr(ilp_env_t *ienv) {
 
 			pmap_insert(lenv->nr_2_irn, INT_TO_PTR(node_nr), irn);
 
-			req = arch_get_register_req(irn, -1);
+			req = arch_get_register_req_out(irn);
 
 			bitset_clear_all(colors);
 
@@ -125,16 +125,17 @@ static void build_coloring_cstr(ilp_env_t *ienv) {
 		}
 }
 
-static void build_interference_cstr(ilp_env_t *ienv) {
-	lpp_t *lpp        = ienv->lp;
-	local_env_t *lenv = ienv->env;
-	be_ifg_t *ifg     = ienv->co->cenv->ifg;
-	int n_colors      = lenv->n_colors;
-	int i, col;
-
-	void *iter = be_ifg_cliques_iter_alloca(ifg);
-	ir_node **clique = alloca(sizeof(*clique) * n_colors);
-	int size;
+static void build_interference_cstr(ilp_env_t *ienv)
+{
+	lpp_t       *lpp      = ienv->lp;
+	local_env_t *lenv     = ienv->env;
+	be_ifg_t    *ifg      = ienv->co->cenv->ifg;
+	int          n_colors = lenv->n_colors;
+	void        *iter     = be_ifg_cliques_iter_alloca(ifg);
+	ir_node    **clique   = ALLOCAN(ir_node*, n_colors);
+	int          size;
+	int          col;
+	int          i;
 
 	char buf[16];
 
@@ -292,7 +293,7 @@ static void build_clique_star_cstr(ilp_env_t *ienv) {
 		set *edges;
 		int i, o, n_nodes, n_edges;
 
-		if (arch_irn_is(aff->irn, ignore))
+		if (arch_irn_is_ignore(aff->irn))
 			continue;
 
 		obstack_init(&ob);
@@ -301,7 +302,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(nbr->irn, ignore)) {
+			if (!arch_irn_is_ignore(nbr->irn)) {
 				obstack_ptr_grow(&ob, nbr->irn);
 				++n_nodes;
 			}
@@ -405,7 +406,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(irn, ignore))
+	if (arch_irn_is_ignore(irn))
 		return;
 
 	/* insert the new irn */
@@ -414,8 +415,8 @@ static void extend_path(ilp_env_t *ienv, pdeq *path, const ir_node *irn) {
 
 
 	/* check for forbidden interferences */
-	len = pdeq_len(path);
-	curr_path = alloca(len * sizeof(*curr_path));
+	len       = pdeq_len(path);
+	curr_path = ALLOCAN(ir_node*, len);
 	pdeq_copyl(path, (const void **)curr_path);
 
 	for (i=1; i<len; ++i)