#include "bechordal_t.h"
#include "besched_t.h"
#include "bestat.h"
+#include "benodesets.h"
#include "irgmod.h"
#include "iredges_t.h"
#endif
#undef is_Perm
-#define is_Perm(arch_env, irn) (arch_irn_classify(arch_env, irn) == arch_irn_class_perm)
+#define is_Perm(arch_env, irn) (arch_irn_class_is(arch_env, irn, perm))
/* associates op with it's copy and CopyKeep */
typedef struct {
const arch_register_class_t *reg_class;
const arch_env_t *arch_env;
lower_env_t *env = walk_env;
- int real_size = 0;
- int n, i, pn, do_copy, j, n_ops;
+ int real_size = 0;
+ int keep_perm = 0;
+ int n, i, pn, do_copy, j, n_ops;
reg_pair_t *pairs;
const ir_edge_t *edge;
perm_cycle_t *cycle;
}
DB((mod, LEVEL_1, "\n"));
- /* We don't need to do anything if we have a Perm with two
+ /*
+ We don't need to do anything if we have a Perm with two
elements which represents a cycle, because those nodes
- already represent exchange nodes */
+ already represent exchange nodes
+ */
if (n == 2 && cycle->type == PERM_CYCLE) {
free(cycle);
+ keep_perm = 1;
continue;
}
free(cycle);
}
-
-
/* remove the perm from schedule */
- sched_remove(irn);
+ if (! keep_perm)
+ sched_remove(irn);
}
return irn;
}
-static void fix_in(ir_node *irn, ir_node *old, ir_node *nw) {
- int i, n;
-
- irn = belower_skip_proj(irn);
- n = get_irn_arity(irn);
-
- for (i = 0; i < n; i++) {
- if (get_irn_n(irn, i) == old) {
- set_irn_n(irn, i, nw);
- break;
- }
- }
-}
-
static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different, constraint_env_t *env) {
be_irg_t *birg = env->birg;
pset *op_set = env->op_set;
/* insert the other different and it's copies into the set */
key.op = other_different;
key.copies = NULL;
- entry = pset_find(op_set, &key, HASH_PTR(other_different));
+ entry = pset_find(op_set, &key, nodeset_hash(other_different));
if (! entry) {
entry = obstack_alloc(&env->obst, sizeof(*entry));
if (be_is_CopyKeep(keep))
pset_insert_ptr(entry->copies, keep);
- pset_insert(op_set, entry, HASH_PTR(other_different));
+ pset_insert(op_set, entry, nodeset_hash(other_different));
DBG((mod, LEVEL_1, "created %+F for %+F to assure should_be_different\n", keep, irn));
}
DB((mod, LEVEL_1, "\n"));
/* introduce the copies for the operand and it's copies */
- be_ssa_constr(dom, n, nodes);
+ be_ssa_constr(dom, NULL, n, nodes);
/* Could be that not all CopyKeeps are really needed, */