bearch: remove arch_register_type_joker.

[libfirm] / ir / be / bessadestr.c

diff --git a/ir/be/bessadestr.c b/ir/be/bessadestr.c
index ae56ca3..0861515 100644 (file)
--- a/ir/be/bessadestr.c
+++ b/ir/be/bessadestr.c
@@ -45,7 +45,7 @@
 #include "belive_t.h"
 #include "benode.h"
 #include "besched.h"
-#include "bestatevent.h"
+#include "statev_t.h"
 #include "beirg.h"
 #include "beintlive_t.h"
 
@@ -66,7 +66,7 @@ static void clear_link(ir_node *irn, void *data)
 static void collect_phis_walker(ir_node *irn, void *data)
 {
        be_chordal_env_t *env = (be_chordal_env_t*)data;
-       if (is_Phi(irn) && chordal_has_class(env, irn)) {
+       if (is_Phi(irn) && arch_irn_consider_in_reg_alloc(env->cls, irn)) {
                ir_node *bl = get_nodes_block(irn);
                set_irn_link(irn, get_irn_link(bl));
                set_irn_link(bl, irn);
@@ -156,7 +156,7 @@ static void insert_all_perms_walker(ir_node *bl, void *data)
                        }
 
                        perm = be_new_Perm(chordal_env->cls, pred_bl, n_projs, in);
-                       be_stat_ev("phi_perm", n_projs);
+                       stat_ev_int("phi_perm", n_projs);
 
                        insert_after = pred_bl;
                        do {
@@ -169,13 +169,11 @@ static void insert_all_perms_walker(ir_node *bl, void *data)
                         * Register allocation is copied from the former phi
                         * arguments to the projs (new phi arguments).
                         */
-                       insert_after = perm;
                        foreach_set(arg_set, perm_proj_t, pp) {
                                ir_node *proj = new_r_Proj(perm, get_irn_mode(pp->arg), pp->pos);
                                pp->proj = proj;
                                assert(arch_get_irn_register(pp->arg));
                                arch_set_irn_register(proj, arch_get_irn_register(pp->arg));
-                               insert_after = proj;
                                DBG((dbg, LEVEL_2, "Copy register assignment %s from %+F to %+F\n", arch_get_irn_register(pp->arg)->name, pp->arg, pp->proj));
                        }
 
@@ -247,7 +245,6 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data)
                        DBG((dbg, LEVEL_1, "  for %+F(%s) -- %+F(%s)\n", phi, phi_reg->name, arg, arg_reg->name));
 
                        if (phi_reg == arg_reg
-                                       || (arg_reg->type & arch_register_type_joker)
                                        || (arg_reg->type & arch_register_type_virtual)) {
                                /* Phi and arg have the same register, so pin and continue */
                                pin_irn(arg, phi_block);