bescripts: Copy all common node attributes into the constructor variants.

[libfirm] / ir / be / bessadestr.c

diff --git a/ir/be/bessadestr.c b/ir/be/bessadestr.c
index 86ed4ec..8d6d860 100644 (file)
--- a/ir/be/bessadestr.c
+++ b/ir/be/bessadestr.c
@@ -45,9 +45,10 @@
 #include "belive_t.h"
 #include "benode.h"
 #include "besched.h"
-#include "bestatevent.h"
+#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 +67,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);
@@ -112,8 +113,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;
-               perm_proj_t *pp;
+               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;
@@ -130,7 +130,7 @@ static void insert_all_perms_walker(ir_node *bl, void *data)
 
                        hash = hash_irn(arg);
                        templ.arg  = arg;
-                       pp         = (perm_proj_t*)set_find(arg_set, &templ, sizeof(templ), hash);
+                       perm_proj_t *const pp = set_find(perm_proj_t, arg_set, &templ, sizeof(templ), hash);
 
                        /*
                         * If a proj_perm_t entry has not been made in the argument set,
@@ -141,7 +141,7 @@ static void insert_all_perms_walker(ir_node *bl, void *data)
                         */
                        if (!pp && !be_is_live_in(lv, bl, arg)) {
                                templ.pos = n_projs++;
-                               set_insert(arg_set, &templ, sizeof(templ), hash);
+                               (void)set_insert(perm_proj_t, arg_set, &templ, sizeof(templ), hash);
                        }
                }
 
@@ -152,31 +152,26 @@ static void insert_all_perms_walker(ir_node *bl, void *data)
                         * above in the arg_set and insert it into the schedule.
                         */
                        in = XMALLOCN(ir_node*, n_projs);
-                       foreach_set(arg_set, perm_proj_t*, pp) {
+                       foreach_set(arg_set, perm_proj_t, pp) {
                                in[pp->pos] = pp->arg;
                        }
 
                        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 {
-                               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.
                         * 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) {
+                       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));
                        }
 
@@ -188,7 +183,7 @@ static void insert_all_perms_walker(ir_node *bl, void *data)
                                perm_proj_t templ;
 
                                templ.arg = get_irn_n(phi, i);
-                               pp        = (perm_proj_t*)set_find(arg_set, &templ, sizeof(templ), hash_irn(templ.arg));
+                               perm_proj_t *const pp = set_find(perm_proj_t, arg_set, &templ, sizeof(templ), hash_irn(templ.arg));
 
                                /* If not found, it was an interfering argument */
                                if (pp) {
@@ -248,7 +243,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);
@@ -257,8 +251,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,
@@ -270,11 +262,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);
@@ -323,14 +312,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);
@@ -392,8 +377,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);