X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fberaextern.c;h=74a2b54a8e3101310760642456b8defe269eae10;hb=89dc24503c04139bb05504059b291d6d89f99661;hp=c6530c52ccf60a518ec5cd048be0b1604c678001;hpb=39f3a8dbd0f00f90b7b12a849d1bf7b9c1329479;p=libfirm

diff --git a/ir/be/beraextern.c b/ir/be/beraextern.c
index c6530c52c..74a2b54a8 100644
--- a/ir/be/beraextern.c
+++ b/ir/be/beraextern.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.
  *
@@ -78,8 +78,8 @@ alloc		::= node-nr reg-nr .
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
-#include <libcore/lc_opts.h>
-#include <libcore/lc_opts_enum.h>
+#include "lc_opts.h"
+#include "lc_opts_enum.h"
 
 #include "set.h"
 #include "pset.h"
@@ -97,7 +97,6 @@ alloc		::= node-nr reg-nr .
 #include "phiclass.h"
 
 #include "bemodule.h"
-#include "beraextern.h"
 #include "beabi.h"
 #include "bearch_t.h"
 #include "benode_t.h"
@@ -428,13 +427,18 @@ static void dump_affinities_walker(ir_node *irn, void *env) {
 	/* should_be_equal constraints are affinites */
 	for (pos = 0, max = get_irn_arity(irn); pos<max; ++pos) {
 		req = arch_get_register_req(raenv->aenv, irn, pos);
-
 		if (arch_register_req_is(req, should_be_same)) {
-			ir_node *other = get_irn_n(irn, req->other_same);
-			if(arch_irn_is(raenv->aenv, other, ignore)) {
-				vi2 = be_get_var_info(other);
+			const int* i;
+			for (i = req->other_same; i != ENDOF(req->other_same); ++i) {
+				ir_node *other;
+
+				if (*i == -1) break;
 
-				fprintf(raenv->f, "(%d, %d, %d)\n",  vi1->var_nr, vi2->var_nr, get_affinity_weight(irn));
+				other = get_irn_n(skip_Proj(irn), *i);
+				if(arch_irn_is(raenv->aenv, other, ignore)) {
+					vi2 = be_get_var_info(other);
+					fprintf(raenv->f, "(%d, %d, %d)\n",  vi1->var_nr, vi2->var_nr, get_affinity_weight(irn));
+				}
 			}
 		}
 	}
@@ -784,7 +788,7 @@ static void be_ra_extern_main(be_irg_t *birg) {
 	/* Clean up */
 	free_ssa_destr_simple(raenv.vars);
 
-	be_invalidate_liveness(birg);
+	be_liveness_invalidate(be_get_birg_liveness(birg));
 }
 
 /******************************************************************************
@@ -830,4 +834,4 @@ void be_init_raextern(void) {
 }
 BE_REGISTER_MODULE_CONSTRUCTOR(be_init_raextern);
 
-#endif
+#endif /* NOT_PORTED */