slight bugfix

[libfirm] / ir / be / belower.c

diff --git a/ir/be/belower.c b/ir/be/belower.c
index 44080ec..89a6a0d 100644 (file)
--- a/ir/be/belower.c
+++ b/ir/be/belower.c
@@ -36,7 +36,7 @@
 #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 {
@@ -269,8 +269,9 @@ static void lower_perm_node(ir_node *irn, void *walk_env) {
        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;
@@ -365,11 +366,14 @@ static void lower_perm_node(ir_node *irn, void *walk_env) {
                }
                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;
                }
 
@@ -493,10 +497,9 @@ static void lower_perm_node(ir_node *irn, void *walk_env) {
                free(cycle);
        }
 
-
-
        /* remove the perm from schedule */
-       sched_remove(irn);
+       if (! keep_perm)
+               sched_remove(irn);
 }
 
 
@@ -518,20 +521,6 @@ static ir_node *belower_skip_proj(ir_node *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;
@@ -685,7 +674,7 @@ void assure_constraints(be_irg_t *birg) {
                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, */