becopyopt: Inline the thin wrapper nodes_interfere(), so we do not need to fetch...

[libfirm] / ir / be / bessadestr.c

diff --git a/ir/be/bessadestr.c b/ir/be/bessadestr.c
index 8af7c48..bdd38d5 100644 (file)
--- a/ir/be/bessadestr.c
+++ b/ir/be/bessadestr.c
@@ -1,20 +1,6 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
- *
  * This file is part of libFirm.
- *
- * This file may be distributed and/or modified under the terms of the
- * GNU General Public License version 2 as published by the Free Software
- * Foundation and appearing in the file LICENSE.GPL included in the
- * packaging of this file.
- *
- * Licensees holding valid libFirm Professional Edition licenses may use
- * this file in accordance with the libFirm Commercial License.
- * Agreement provided with the Software.
- *
- * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE.
+ * Copyright (C) 2012 University of Karlsruhe.
  */
 
 /**
@@ -48,6 +34,7 @@
 #include "statev_t.h"
 #include "beirg.h"
 #include "beintlive_t.h"
+#include "bespillutil.h"
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
@@ -66,7 +53,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) && has_reg_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);
@@ -112,7 +99,7 @@ static void insert_all_perms_walker(ir_node *bl, void *data)
 
        /* Look at all predecessors of the phi block */
        for (i = 0, n = get_irn_arity(bl); i < n; ++i) {
-               ir_node *phi, *perm, *insert_after, **in;
+               ir_node *phi, *perm, **in;
                set *arg_set     = new_set(cmp_perm_proj, chordal_env->cls->n_regs);
                ir_node *pred_bl = get_Block_cfgpred_block(bl, i);
                int n_projs      = 0;
@@ -158,11 +145,8 @@ static void insert_all_perms_walker(ir_node *bl, void *data)
                        perm = be_new_Perm(chordal_env->cls, pred_bl, n_projs, in);
                        stat_ev_int("phi_perm", n_projs);
 
-                       insert_after = pred_bl;
-                       do {
-                               insert_after = sched_prev(insert_after);
-                       } while (is_cfop(insert_after));
-                       sched_add_after(insert_after, perm);
+                       ir_node *const schedpoint = be_get_end_of_block_insertion_point(pred_bl);
+                       sched_add_before(schedpoint, perm);
 
                        /*
                         * Make the Projs for the Perm and insert into schedule.
@@ -245,7 +229,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);
@@ -254,8 +237,6 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data)
                        }
 
                        if (be_values_interfere(lv, phi, arg)) {
-                               ir_node *schedpoint;
-
                                /*
                                        Insert a duplicate in arguments block,
                                        make it the new phi arg,
@@ -267,11 +248,8 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data)
 
                                set_irn_n(phi, i, dupl);
                                arch_set_irn_register(dupl, phi_reg);
-                               schedpoint = arg_block;
-                               do {
-                                       schedpoint = sched_prev(schedpoint);
-                               } while (is_cfop(schedpoint));
-                               sched_add_after(schedpoint, dupl);
+                               ir_node *const schedpoint = be_get_end_of_block_insertion_point(arg_block);
+                               sched_add_before(schedpoint, dupl);
                                pin_irn(dupl, phi_block);
                                be_liveness_introduce(lv, dupl);
                                be_liveness_update(lv, arg);
@@ -320,14 +298,10 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data)
                                */
                                ir_node *perm = get_Proj_pred(arg);
                                ir_node *dupl = be_new_Copy(arg_block, arg);
-                               ir_node *ins;
 
                                set_irn_n(phi, i, dupl);
                                arch_set_irn_register(dupl, phi_reg);
-                               /* 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);
+                               sched_add_after(perm, dupl);
                                pin_irn(dupl, phi_block);
                                be_liveness_introduce(lv, dupl);
                                be_liveness_update(lv, arg);
@@ -389,8 +363,7 @@ static void ssa_destruction_check_walker(ir_node *bl, void *data)
                for (i = 0, max = get_irn_arity(phi); i < max; ++i) {
                        ir_node                   *arg = get_irn_n(phi, i);
                        const arch_register_req_t *req = arch_get_irn_register_req(arg);
-
-                       if (req->type & arch_register_req_type_ignore)
+                       if (arch_register_req_is(req, ignore))
                                continue;
 
                        arg_reg = arch_get_irn_register(arg);