X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopystat.c;h=7fa9c069b356ba0dc55e735276a187031a908e0e;hb=1b8713c0eca7389d9db2a74302e206d718edc902;hp=dcd9a47e0e5df1c5107b75c5ed9e0b483feef1a9;hpb=4080eec4a207a1f6d231230677ecaacc16b87207;p=libfirm

diff --git a/ir/be/becopystat.c b/ir/be/becopystat.c
index dcd9a47e0..7fa9c069b 100644
--- a/ir/be/becopystat.c
+++ b/ir/be/becopystat.c
@@ -23,9 +23,9 @@
 #define DEBUG_LVL SET_LEVEL_1
 static firm_dbg_module_t *dbg = NULL;
 
-#define MAX_ARITY 10
-#define MAX_CLS_SIZE 10
-#define MAX_CLS_PHIS 10
+#define MAX_ARITY 20
+#define MAX_CLS_SIZE 20
+#define MAX_CLS_PHIS 20
 
 /**
  * For an explanation of these values see the code of copystat_dump_pretty
@@ -122,11 +122,13 @@ static void irg_stat_walker(ir_node *node, void *env) {
  	if (is_Block(node)) /* count all blocks */
  		curr_vals[I_BLOCKS]++;
 
- 	if (is_Phi(node) && is_firm_be_mode(get_irn_mode(node))) /* collect phis */
+ 	if (is_Reg_Phi(node)) /* collect phis */
  		pset_insert_ptr(all_phi_nodes, node);
 
- 	if (is_Copy(arch_env, node))
+ 	if (is_Perm_Proj(arch_env, node))
  		pset_insert_ptr(all_copy_nodes, node);
+
+	/* TODO: Add 2-Addr-Code nodes */
 }
 
 static void copystat_collect_irg(ir_graph *irg, arch_env_t *arch_env) {
@@ -274,17 +276,17 @@ static void stat_phi_class(be_chordal_env_t *chordal_env, pset *pc) {
 }
 
 #define is_curr_reg_class(irn) \
-  (arch_get_irn_reg_class(chordal_env->session_env->main_env->arch_env, irn, \
-                          arch_pos_make_out(0)) == chordal_env->cls)
+  (arch_get_irn_reg_class(chordal_env->main_env->arch_env, irn, \
+                          -1) == chordal_env->cls)
 
 void copystat_collect_cls(be_chordal_env_t *chordal_env) {
 	ir_node *n;
 	pset *pc;
-	ir_graph *irg = chordal_env->session_env->irg;
+	ir_graph *irg = chordal_env->irg;
 
 	if (last_irg != irg) {
 		copystat_reset();
-		copystat_collect_irg(irg, chordal_env->session_env->main_env->arch_env);
+		copystat_collect_irg(irg, chordal_env->main_env->arch_env);
 	}
 
 	for (n = pset_first(all_phi_nodes); n; n = pset_next(all_phi_nodes))