#include "belive_t.h"
#include "benode.h"
#include "besched.h"
-#include "bestatevent.h"
+#include "statev_t.h"
#include "beirg.h"
#include "beintlive_t.h"
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);
/* 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;
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;
hash = hash_irn(arg);
templ.arg = arg;
- pp = set_find(perm_proj_t, 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,
*/
if (!pp && !be_is_live_in(lv, bl, arg)) {
templ.pos = n_projs++;
- set_insert(perm_proj_t, arg_set, &templ, sizeof(templ), hash);
+ (void)set_insert(perm_proj_t, arg_set, &templ, sizeof(templ), hash);
}
}
}
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 {
* 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));
}
perm_proj_t templ;
templ.arg = get_irn_n(phi, i);
- pp = set_find(perm_proj_t, 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) {
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);