/*
- * Copyright (C) 1995-2007 University of Karlsruhe. All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved.
*
* This file is part of libFirm.
*
* @date 25.05.2005
* @version $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "debug.h"
#include "set.h"
#include "belive_t.h"
#include "benode_t.h"
#include "besched_t.h"
-#include "benodesets.h"
#include "bestatevent.h"
#include "beirg_t.h"
#include "beintlive_t.h"
DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
-#define get_chordal_arch(ce) ((ce)->birg->main_env->arch_env)
-#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_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)
+#define get_reg(irn) arch_get_irn_register(irn)
+#define set_reg(irn, reg) arch_set_irn_register(irn, reg)
static void clear_link(ir_node *irn, void *data) {
(void) data;
* register class by construction.
*/
for(phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) {
- perm_proj_t templ;
- ir_node *arg = get_irn_n(phi, i);
- unsigned hash = nodeset_hash(arg);
+ ir_node *arg = get_irn_n(phi, i);
+ const arch_register_req_t *req = arch_get_register_req_out(arg);
+ unsigned hash;
+ perm_proj_t templ;
- if (arch_irn_is(chordal_env->birg->main_env->arch_env, arg, ignore))
+ if (req->type & arch_register_req_type_ignore)
continue;
+ hash = hash_irn(arg);
templ.arg = arg;
pp = set_find(arg_set, &templ, sizeof(templ), hash);
* Create a new Perm with the arguments just collected
* above in the arg_set and insert it into the schedule.
*/
- in = xmalloc(n_projs * sizeof(in[0]));
+ in = XMALLOCN(ir_node*, n_projs);
for(pp = set_first(arg_set); pp; pp = set_next(arg_set))
in[pp->pos] = pp->arg;
perm = be_new_Perm(chordal_env->cls, irg, pred_bl, n_projs, in);
be_stat_ev("phi_perm", n_projs);
- insert_after = sched_skip(sched_last(pred_bl), 0, sched_skip_cf_predicator, chordal_env->birg->main_env->arch_env);
+ insert_after = sched_skip(sched_last(pred_bl), 0, sched_skip_cf_predicator, NULL);
sched_add_after(insert_after, perm);
/*
pp->proj = proj;
assert(get_reg(pp->arg));
set_reg(proj, get_reg(pp->arg));
-#ifdef SCHEDULE_PROJS
- sched_add_after(insert_after, proj);
-#endif
insert_after = proj;
DBG((dbg, LEVEL_2, "Copy register assignment %s from %+F to %+F\n", get_reg(pp->arg)->name, pp->arg, pp->proj));
}
perm_proj_t templ;
templ.arg = get_irn_n(phi, i);
- pp = set_find(arg_set, &templ, sizeof(templ), nodeset_hash(templ.arg));
+ pp = set_find(arg_set, &templ, sizeof(templ), hash_irn(templ.arg));
/* If not found, it was an interfering argument */
if (pp) {
/* Consider all phis of this block */
for (phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) {
- int i, max;
- ir_node *arg, *phi_block, *arg_block;
- const arch_register_t *phi_reg, *arg_reg;
- const arch_register_class_t *cls;
+ ir_node *phi_block = get_nodes_block(phi);
+ const arch_register_t *phi_reg = get_reg(phi);
+ const arch_register_class_t *cls = phi_reg->reg_class;
+ int max;
+ int i;
assert(is_Phi(phi) && "Can only handle phi-destruction :)");
- phi_block = get_nodes_block(phi);
- phi_reg = get_reg(phi);
- cls = arch_get_irn_reg_class(get_chordal_arch(chordal_env), phi, -1);
-
/* process all arguments of the phi */
for (i = 0, max = get_irn_arity(phi); i < max; ++i) {
- arg = get_irn_n(phi, i);
- arg_block = get_Block_cfgpred_block(phi_block, i);
- arg_reg = get_reg(arg);
+ ir_node *arg = get_irn_n(phi, i);
+ const arch_register_req_t *req = arch_get_register_req_out(arg);
+ const arch_register_t *arg_reg;
+ ir_node *arg_block;
- if (arch_irn_is(chordal_env->birg->main_env->arch_env, arg, ignore))
+ if (req->type & arch_register_req_type_ignore)
continue;
+ arg_block = get_Block_cfgpred_block(phi_block, i);
+ arg_reg = get_reg(arg);
+
assert(arg_reg && "Register must be set while placing perms");
DBG((dbg, LEVEL_1, " for %+F(%s) -- %+F(%s)\n", phi, phi_reg->name, arg, arg_reg->name));
set_irn_n(phi, i, dupl);
set_reg(dupl, phi_reg);
- sched_add_after(sched_skip(sched_last(arg_block), 0, sched_skip_cf_predicator, chordal_env->birg->main_env->arch_env), dupl);
+ sched_add_after(sched_skip(sched_last(arg_block), 0, sched_skip_cf_predicator, NULL), dupl);
pin_irn(dupl, phi_block);
be_liveness_introduce(lv, dupl);
be_liveness_update(lv, arg);
FIRM_DBG_REGISTER(dbg, "ir.be.ssadestr");
be_liveness_invalidate(lv);
- be_liveness_assure_sets(lv);
/* create a map for fast lookup of perms: block --> perm */
irg_walk_graph(irg, clear_link, collect_phis_walker, chordal_env);
}
static void ssa_destruction_check_walker(ir_node *bl, void *data) {
- be_chordal_env_t *chordal_env = data;
ir_node *phi;
int i, max;
+ (void)data;
for (phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) {
const arch_register_t *phi_reg, *arg_reg;
phi_reg = get_reg(phi);
/* iterate over all args of phi */
for (i = 0, max = get_irn_arity(phi); i < max; ++i) {
- ir_node *arg = get_irn_n(phi, i);
+ ir_node *arg = get_irn_n(phi, i);
+ const arch_register_req_t *req = arch_get_register_req_out(arg);
- if (arch_irn_is(chordal_env->birg->main_env->arch_env, arg, ignore))
+ if (req->type & arch_register_req_type_ignore)
continue;
arg_reg = get_reg(arg);
}
void be_ssa_destruction_check(be_chordal_env_t *chordal_env) {
- irg_block_walk_graph(chordal_env->irg, ssa_destruction_check_walker, NULL, chordal_env);
+ irg_block_walk_graph(chordal_env->irg, ssa_destruction_check_walker, NULL, NULL);
}