X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopystat.c;h=a8a74a63e7ddfd8a46e9f911b7686d13cfd80cec;hb=0f3f5dcf8b021c4c43eb8b47f59c6aad0972ce0e;hp=1f7f657d4c431549e5b6d70d91d5f3e15a174f51;hpb=d6768d8d4427959eb045aafb1d15bd189beaa5dd;p=libfirm

diff --git a/ir/be/becopystat.c b/ir/be/becopystat.c
index 1f7f657d4..a8a74a63e 100644
--- a/ir/be/becopystat.c
+++ b/ir/be/becopystat.c
@@ -45,7 +45,7 @@
 #include "becopystat.h"
 #include "beirg_t.h"
 #include "bemodule.h"
-#include "bera.h"
+#include "beintlive_t.h"
 
 #define DEBUG_LVL SET_LEVEL_1
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
@@ -188,10 +188,12 @@ static INLINE int was_edge_critical(const ir_node *bl, int pos) {
 /**
  * Collect phi node data
  */
-static void stat_phi_node(be_chordal_env_t *chordal_env, ir_node *phi) {
+static void stat_phi_node(be_chordal_env_t *chordal_env, ir_node *phi)
+{
  	int arity, i;
  	ir_node *phi_bl;
 	assert(is_Phi(phi));
+	(void) chordal_env;
 
 	/* count all phi phis */
 	curr_vals[I_PHI_CNT]++;
@@ -239,10 +241,9 @@ static void stat_phi_node(be_chordal_env_t *chordal_env, ir_node *phi) {
  * Collect register-constrained node data
  */
 static void stat_copy_node(be_chordal_env_t *chordal_env, ir_node *root) {
-	be_lv_t *lv = be_get_birg_liveness(chordal_env->birg);
 	curr_vals[I_CPY_CNT]++;
 	curr_vals[I_COPIES_MAX]++;
-	if (values_interfere(lv, root, get_Perm_src(root))) {
+	if (values_interfere(chordal_env->birg, root, get_Perm_src(root))) {
 		curr_vals[I_COPIES_IF]++;
 		assert(0 && "A Perm pair (in/out) should never interfere!");
 	}
@@ -253,7 +254,6 @@ static void stat_copy_node(be_chordal_env_t *chordal_env, ir_node *root) {
  */
 static void stat_phi_class(be_chordal_env_t *chordal_env, ir_node **pc) {
 	int i, o, size, if_free, phis;
-	be_lv_t *lv = be_get_birg_liveness(chordal_env->birg);
 
 	/* phi class count */
 	curr_vals[I_CLS_CNT]++;
@@ -279,7 +279,7 @@ static void stat_phi_class(be_chordal_env_t *chordal_env, ir_node **pc) {
 	curr_vals[I_CLS_IF_MAX] += size * (size - 1) / 2;
 	for (if_free = 1, i = 0; i < size - 1; ++i)
 		for (o = i + 1; o < size; ++o)
-			if (values_interfere(lv, pc[i], pc[o])) {
+			if (values_interfere(chordal_env->birg, pc[i], pc[o])) {
 				if_free = 0;
 				curr_vals[I_CLS_IF_CNT]++;
 			}
@@ -372,7 +372,7 @@ void copystat_dump(ir_graph *irg) {
 
 	snprintf(buf, sizeof(buf), "%s__%s", get_irp_prog_name(), get_entity_name(get_irg_entity(irg)));
 	buf[sizeof(buf) - 1] = '\0';
-	out = ffopen(buf, "stat", "wt");
+	out = be_ffopen(buf, "stat", "wt");
 
 	fprintf(out, "%d\n", ASIZE);
 	for (i = 0; i < ASIZE; i++) {
@@ -396,7 +396,7 @@ void copystat_dump_pretty(ir_graph *irg) {
 
 	snprintf(buf, sizeof(buf), "%s__%s", get_irp_prog_name(), get_entity_name(get_irg_entity(irg)));
 	buf[sizeof(buf) - 1] = '\0';
-	out = ffopen(buf, "pstat", "wt");
+	out = be_ffopen(buf, "pstat", "wt");
 
 	fprintf(out, "Nodes     %4d\n", curr_vals[I_ALL_NODES]);
 	fprintf(out, "Blocks    %4d\n", curr_vals[I_BLOCKS]);