irgmod: Pass the new inputs to turn_into_tuple() instead of initialising them with...

[libfirm] / ir / be / bechordal_common.c

diff --git a/ir/be/bechordal_common.c b/ir/be/bechordal_common.c
index 64f668f..d9bea04 100644 (file)
--- a/ir/be/bechordal_common.c
+++ b/ir/be/bechordal_common.c
@@ -128,12 +128,10 @@ void create_borders(ir_node *block, void *env_ptr)
         * Make final uses of all values live out of the block.
         * They are necessary to build up real intervals.
         */
-       be_lv_foreach(lv, block, be_lv_state_end, irn) {
-               if (arch_irn_consider_in_reg_alloc(env->cls, irn)) {
-                       DBG((dbg, LEVEL_3, "\tMaking live: %+F/%d\n", irn, get_irn_idx(irn)));
-                       bitset_set(live, get_irn_idx(irn));
-                       border_use(irn, step, 0);
-               }
+       be_lv_foreach_cls(lv, block, be_lv_state_end, env->cls, irn) {
+               DB((dbg, LEVEL_3, "\tMaking live: %+F/%d\n", irn, get_irn_idx(irn)));
+               bitset_set(live, get_irn_idx(irn));
+               border_use(irn, step, 0);
        }
        ++step;
 
@@ -142,57 +140,35 @@ void create_borders(ir_node *block, void *env_ptr)
         * relevant for the interval borders.
         */
        sched_foreach_reverse(block, irn) {
-               DBG((dbg, LEVEL_1, "\tinsn: %+F, pressure: %d\n", irn, pressure));
-               DBG((dbg, LEVEL_2, "\tlive: %B\n", live));
-
-               if (get_irn_mode(irn) == mode_T) {
-                       foreach_out_edge(irn, edge) {
-                               ir_node *proj = get_edge_src_irn(edge);
-
-                               /*
-                                * If the node defines some value, which can put into a
-                                * register of the current class, make a border for it.
-                                */
-                               if (arch_irn_consider_in_reg_alloc(env->cls, proj)) {
-                                       int nr = get_irn_idx(proj);
-
-                                       bitset_clear(live, nr);
-                                       border_def(proj, step, 1);
-                               }
-                       }
-               } else {
+               DB((dbg, LEVEL_1, "\tinsn: %+F, pressure: %d\n", irn, pressure));
+               DB((dbg, LEVEL_2, "\tlive: %B\n", live));
+
+               be_foreach_definition(irn, env->cls, def, req,
                        /*
                         * If the node defines some value, which can put into a
                         * register of the current class, make a border for it.
                         */
-                       if (arch_irn_consider_in_reg_alloc(env->cls, irn)) {
-                               int nr = get_irn_idx(irn);
-
-                               bitset_clear(live, nr);
-                               border_def(irn, step, 1);
-                       }
-               }
+                       unsigned idx = get_irn_idx(def);
+                       bitset_clear(live, idx);
+                       border_def(def, step, 1);
+               );
 
                /*
                 * If the node is no phi node we can examine the uses.
                 */
                if (!is_Phi(irn)) {
-                       for (int i = 0, n = get_irn_arity(irn); i < n; ++i) {
-                               ir_node *op = get_irn_n(irn, i);
-
-                               if (arch_irn_consider_in_reg_alloc(env->cls, op)) {
-                                       int nr = get_irn_idx(op);
-                                       const char *msg = "-";
-
-                                       if (!bitset_is_set(live, nr)) {
-                                               border_use(op, step, 1);
-                                               bitset_set(live, nr);
-                                               msg = "X";
-                                       }
-
-                                       DBG((dbg, LEVEL_4, "\t\t%s pos: %d, use: %+F\n", msg, i, op));
+                       be_foreach_use(irn, env->cls, in_req_, op, op_req_,
+                               unsigned idx = get_irn_idx(op);
+                               const char *msg = "-";
+
+                               if (!bitset_is_set(live, idx)) {
+                                       border_use(op, step, 1);
+                                       bitset_set(live, idx);
+                                       msg = "X";
                                }
-                       }
+
+                               DB((dbg, LEVEL_4, "\t\t%s pos: %d, use: %+F\n", msg, i_, op));
+                       );
                }
                ++step;
        }