remove extended basic block support

[libfirm] / ir / opt / boolopt.c

diff --git a/ir/opt/boolopt.c b/ir/opt/boolopt.c
index 0e5cb3e..204b3c2 100644 (file)
--- a/ir/opt/boolopt.c
+++ b/ir/opt/boolopt.c
@@ -21,7 +21,6 @@
  * @file
  * @brief   boolean condition/control flow optimizations
  * @author  Matthias Braun, Christoph Mallon, Michael Beck
- * @version $Id: cfopt.c 22579 2008-10-07 14:54:04Z beck $
  */
 #include "config.h"
 
@@ -39,6 +38,7 @@
 #include "tv.h"
 #include "irpass.h"
 #include "debug.h"
+#include "opt_manage.h"
 
 /** Describes a pair of relative conditions lo < hi, lo rel_lo x, hi rel_hi x */
 typedef struct cond_pair {
@@ -56,7 +56,7 @@ typedef struct {
        int changed;  /**< Set if the graph was changed. */
 } bool_opt_env_t;
 
-DEBUG_ONLY(static firm_dbg_module_t *dbg);
+DEBUG_ONLY(static firm_dbg_module_t *dbg;)
 
 /**
  * Check if tho given nodes, l and r, represent two compares with
@@ -716,16 +716,14 @@ restart:
        }
 }
 
-void opt_bool(ir_graph *const irg)
+static ir_graph_state_t do_simplify_bool(ir_graph *const irg)
 {
        bool_opt_env_t env;
+       ir_graph_state_t res = 0;
 
        /* register a debug mask */
        FIRM_DBG_REGISTER(dbg, "firm.opt.bool");
 
-       /* works better with one return block only */
-       normalize_one_return(irg);
-
        env.changed = 0;
 
        /* optimize simple Andb and Orb cases */
@@ -737,14 +735,24 @@ void opt_bool(ir_graph *const irg)
        irg_walk_graph(irg, clear_block_infos, collect_phis, NULL);
        irg_block_walk_graph(irg, NULL, find_cf_and_or_walker, &env);
 
-       if (env.changed) {
-               set_irg_outs_inconsistent(irg);
-               set_irg_doms_inconsistent(irg);
-               set_irg_extblk_inconsistent(irg);
-               set_irg_loopinfo_inconsistent(irg);
+       if (! env.changed) {
+               res |= IR_GRAPH_STATE_CONSISTENT_DOMINANCE;
        }
 
        ir_free_resources(irg, IR_RESOURCE_BLOCK_MARK | IR_RESOURCE_PHI_LIST);
+
+       return res;
+}
+
+static optdesc_t opt_simplify_bool = {
+       "bool-simplification",
+       IR_GRAPH_STATE_ONE_RETURN, /* works better with one return block only */
+       do_simplify_bool,
+};
+
+void opt_bool(ir_graph *irg)
+{
+       perform_irg_optimization(irg, &opt_simplify_bool);
 }
 
 /* Creates an ir_graph pass for opt_bool. */