always remove critical edges before doing code placement

[libfirm] / ir / opt / opt_osr.c

diff --git a/ir/opt/opt_osr.c b/ir/opt/opt_osr.c
index 706cd45..4bf9050 100644 (file)
--- a/ir/opt/opt_osr.c
+++ b/ir/opt/opt_osr.c
@@ -469,6 +469,7 @@ static int replace(ir_node *irn, ir_node *iv, ir_node *rc, iv_env *env) {
        return 0;
 }
 
+#if 0
 /**
  * check if a given node is a mul with 2, 4, 8
  */
@@ -494,6 +495,7 @@ static int is_x86_shift_const(ir_node *mul) {
        }
        return 0;
 }
+#endif
 
 /**
  * Check if an IV represents a counter with constant limits.
@@ -662,11 +664,6 @@ static int check_replace(ir_node *irn, iv_env *env) {
                                if (! check_users_for_reg_pressure(iv, env))
                                        return 0;
                        }
-                       /* check for x86 constants */
-                       if (env->flags & osr_flag_ignore_x86_shift)
-                               if (is_x86_shift_const(irn))
-                                       return 0;
-
                        return replace(irn, iv, rc, env);
                }
                break;
@@ -1000,7 +997,7 @@ static void do_dfs(ir_graph *irg, iv_env *env) {
        ir_node *end = get_irg_end(irg);
        int i, n;
 
-       set_using_irn_visited(irg);
+       ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED);
 
        current_ir_graph = irg;
        inc_irg_visited(irg);
@@ -1017,7 +1014,7 @@ static void do_dfs(ir_graph *irg, iv_env *env) {
                        dfs(ka, env);
        }
 
-       clear_using_irn_visited(irg);
+       ir_free_resources(irg, IR_RESOURCE_IRN_VISITED);
 
        current_ir_graph = rem;
 }
@@ -1115,8 +1112,8 @@ static ir_node *applyOneEdge(ir_node *iv, ir_node *rc, LFTR_edge *e, iv_env *env
                        DB((dbg, LEVEL_4, " + %+F", tv_r));
                        break;
                case iro_Sub:
-                       tv      = tarval_sub(tv_l, tv_r);
-                       tv_init = tarval_sub(tv_init, tv_r);
+                       tv      = tarval_sub(tv_l, tv_r, NULL);
+                       tv_init = tarval_sub(tv_init, tv_r, NULL);
                        DB((dbg, LEVEL_4, " - %+F", tv_r));
                        break;
                default:
@@ -1128,7 +1125,7 @@ static ir_node *applyOneEdge(ir_node *iv, ir_node *rc, LFTR_edge *e, iv_env *env
                        tv = tarval_add(tv, tv_incr);
                } else {
                        assert(pscc->code == iro_Sub);
-                       tv = tarval_sub(tv, tv_incr);
+                       tv = tarval_sub(tv, tv_incr, NULL);
                }
 
                tarval_set_integer_overflow_mode(ovmode);
@@ -1192,7 +1189,7 @@ static void do_lftr(ir_node *cmp, void *ctx) {
        ir_node *iv, *rc;
        ir_node *nleft = NULL, *nright = NULL;
 
-       if (get_irn_op(cmp) != op_Cmp)
+       if (!is_Cmp(cmp))
                return;
 
        left  = get_Cmp_left(cmp);
@@ -1300,7 +1297,8 @@ void opt_osr(ir_graph *irg, unsigned flags) {
 
        if (env.replaced) {
                /* try linear function test replacements */
-               lftr(irg, &env);
+               //lftr(irg, &env); // currently buggy :-(
+               (void) lftr;
 
                set_irg_outs_inconsistent(irg);
                DB((dbg, LEVEL_1, "Replacements: %u + %u (lftr)\n\n", env.replaced, env.lftr_replaced));