irn classify is now a mask

[libfirm] / ir / be / bessadestr.c

diff --git a/ir/be/bessadestr.c b/ir/be/bessadestr.c
index 6d59eca..4ef0fae 100644 (file)
--- a/ir/be/bessadestr.c
+++ b/ir/be/bessadestr.c
@@ -35,7 +35,7 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 #define get_reg(irn) arch_get_irn_register(get_chordal_arch(chordal_env), irn)
 #define set_reg(irn, reg) arch_set_irn_register(get_chordal_arch(chordal_env), irn, reg)
 
-#define is_Perm(irn)            (arch_irn_classify(arch_env, irn) == arch_irn_class_perm)
+#define is_Perm(irn)            (arch_irn_class_is(arch_env, irn, perm))
 #define get_reg_cls(irn)        (arch_get_irn_reg_class(arch_env, irn, -1))
 #define is_curr_reg_class(irn)  (get_reg_cls(p) == chordal_env->cls)
 
@@ -121,7 +121,7 @@ static void insert_all_perms_walker(ir_node *bl, void *data) {
                         * interferes with the phi and must thus not be member of a
                         * Perm. A copy will be inserted for this argument alter on.
                         */
-                       if(!pp && !is_live_in(bl, arg)) {
+                       if(!pp && !be_is_live_in(chordal_env->lv, bl, arg)) {
                                templ.pos = n_projs++;
                                set_insert(arg_set, &templ, sizeof(templ), hash);
                        }
@@ -215,7 +215,7 @@ 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(values_interfere(phi, arg)) {
+                       if(values_interfere(chordal_env->lv, phi, arg)) {
                                /*
                                        Insert a duplicate in arguments block,
                                        make it the new phi arg,
@@ -224,6 +224,9 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) {
                                        pin it
                                */
                                ir_node *dupl  = be_new_Copy(cls, chordal_env->irg, arg_block, arg);
+
+                               /* this is commented out because it will fail in case of unknown float */
+#if 0
                                ir_mode *m_phi = get_irn_mode(phi), *m_dupl = get_irn_mode(dupl);
 
                                /*
@@ -233,6 +236,7 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) {
                                assert(((mode_is_int(m_phi) && mode_is_int(m_dupl)) ||
                                        (mode_is_float(m_phi) && mode_is_float(m_dupl))) &&
                                        (get_mode_size_bits(m_phi) == get_mode_size_bits(m_dupl)));
+#endif /* if 0 */
 
                                set_irn_n(phi, i, dupl);
                                set_reg(dupl, phi_reg);
@@ -287,8 +291,11 @@ static void        set_regs_or_place_dupls_walker(ir_node *bl, void *data) {
                                        pin it
                                */
                                ir_node *perm     = get_Proj_pred(arg);
-                               ir_node *orig_val = get_irn_n(perm, get_Proj_proj(arg));
-                               ir_node *dupl     = be_new_Copy(cls, chordal_env->irg, arg_block, orig_val);
+                               ir_node *dupl     = be_new_Copy(cls, chordal_env->irg, arg_block, arg);
+                               ir_node *ins;
+
+                               /* this is commented out because it will fail in case of unknown float */
+#if 0
                                ir_mode *m_phi    = get_irn_mode(phi);
                                ir_mode *m_dupl   = get_irn_mode(dupl);
 
@@ -299,10 +306,13 @@ static void       set_regs_or_place_dupls_walker(ir_node *bl, void *data) {
                                assert(((mode_is_int(m_phi) && mode_is_int(m_dupl)) ||
                                        (mode_is_float(m_phi) && mode_is_float(m_dupl))) &&
                                        (get_mode_size_bits(m_phi) == get_mode_size_bits(m_dupl)));
+#endif /* if 0 */
 
                                set_irn_n(phi, i, dupl);
                                set_reg(dupl, phi_reg);
-                               sched_add_before(perm, dupl);
+                               /* skip the Perm's Projs and insert the copies behind. */
+                               for(ins = sched_next(perm); is_Proj(ins); ins = sched_next(ins));
+                               sched_add_before(ins, dupl);
                                pin_irn(dupl, phi_block);
                                DBG((dbg, LEVEL_1, "      arg is pinned: insert %+F(%s)\n", dupl, get_reg(dupl)->name));
                        } else {
@@ -334,7 +344,7 @@ void be_ssa_destruction(be_chordal_env_t *chordal_env) {
        if (chordal_env->opts->dump_flags & BE_CH_DUMP_SSADESTR)
                be_dump(irg, "-ssa_destr_perms_placed", dump_ir_block_graph_sched);
 
-       be_liveness(irg);
+       be_liveness_recompute(chordal_env->lv);
 
        DBG((dbg, LEVEL_1, "Setting regs and placing dupls...\n"));
        irg_block_walk_graph(irg, set_regs_or_place_dupls_walker, NULL, chordal_env);