#include "be_t.h"
#include "beutil.h"
#include "bechordal_t.h"
-#include "bearch_t.h"
+#include "bearch.h"
#include "belive_t.h"
-#include "benode_t.h"
-#include "besched_t.h"
+#include "benode.h"
+#include "besched.h"
#include "bestatevent.h"
-#include "beirg_t.h"
+#include "beirg.h"
#include "beintlive_t.h"
DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
#define get_reg(irn) arch_get_irn_register(irn)
#define set_reg(irn, reg) arch_set_irn_register(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)
-
static void clear_link(ir_node *irn, void *data) {
(void) data;
set_irn_link(irn, NULL);
insert_all_perms_env_t *env = data;
be_chordal_env_t *chordal_env = env->chordal_env;
pmap *perm_map = env->perm_map;
- ir_graph *irg = chordal_env->irg;
be_lv_t *lv = chordal_env->birg->lv;
int i, n;
* register class by construction.
*/
for(phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) {
- ir_node *arg = get_irn_n(phi, i);
- unsigned hash = hash_irn(arg);
- perm_proj_t templ;
+ 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(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 one. The only restriction is, that the phi argument
* may not be live in at the current block, since this argument
* interferes with the phi and must thus not be member of a
- * Perm. A copy will be inserted for this argument alter on.
+ * Perm. A copy will be inserted for this argument later on.
*/
if(!pp && !be_is_live_in(lv, bl, arg)) {
templ.pos = 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);
+ perm = be_new_Perm(chordal_env->cls, 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, NULL);
*/
insert_after = perm;
for(pp = set_first(arg_set); pp; pp = set_next(arg_set)) {
- ir_node *proj = new_r_Proj(irg, pred_bl, perm, get_irn_mode(pp->arg), pp->pos);
+ ir_node *proj = new_r_Proj(pred_bl, perm, get_irn_mode(pp->arg), pp->pos);
pp->proj = proj;
assert(get_reg(pp->arg));
set_reg(proj, get_reg(pp->arg));
/* 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(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(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));
- if (values_interfere(chordal_env->birg, phi, arg)) {
+ if (be_values_interfere(lv, phi, arg)) {
/*
Insert a duplicate in arguments block,
make it the new phi arg,
insert it into schedule,
pin it
*/
- ir_node *dupl = be_new_Copy(cls, chordal_env->irg, arg_block, arg);
+ ir_node *dupl = be_new_Copy(cls, arg_block, arg);
/* this is commented out because it will fail in case of unknown float */
#if 0
insert it into schedule,
pin it
*/
- ir_node *perm = get_Proj_pred(arg);
- ir_node *dupl = be_new_Copy(cls, chordal_env->irg, arg_block, arg);
+ ir_node *perm = get_Proj_pred(arg);
+ ir_node *dupl = be_new_Copy(cls, arg_block, arg);
ir_node *ins;
/* this is commented out because it will fail in case of unknown float */
DBG((dbg, LEVEL_1, "Setting regs and placing dupls...\n"));
irg_block_walk_graph(irg, set_regs_or_place_dupls_walker, NULL, chordal_env);
- /* TODO: unfortunaltely updating doesn't work yet. */
+ /* TODO: unfortunately updating doesn't work yet. */
be_liveness_invalidate(lv);
if (chordal_env->opts->dump_flags & BE_CH_DUMP_SSADESTR)
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(arg, ignore))
+ if (req->type & arch_register_req_type_ignore)
continue;
arg_reg = get_reg(arg);
projects / libfirm / blobdiff