fix warnings

[libfirm] / ir / opt / code_placement.c

diff --git a/ir/opt/code_placement.c b/ir/opt/code_placement.c
index 2e3e5a6..0d633ca 100644 (file)
--- a/ir/opt/code_placement.c
+++ b/ir/opt/code_placement.c
@@ -23,7 +23,6 @@
  *           often.
  * @author   Christian Schaefer, Goetz Lindenmaier, Sebastian Felis,
  *           Michael Beck
- * @version  $Id$
  *
  * The idea here is to push nodes as deep into the dominance tree as their
  * dependencies allow. After pushing them back up out of as many loops as
@@ -39,6 +38,7 @@
 #include "irouts.h"
 #include "irgopt.h"
 #include "irpass.h"
+#include "opt_manage.h"
 
 static bool is_block_reachable(ir_node *block)
 {
@@ -396,17 +396,12 @@ static void place_late(ir_graph *irg, waitq *worklist)
 }
 
 /* Code Placement. */
-void place_code(ir_graph *irg)
+static ir_graph_state_t do_codeplacement(ir_graph *irg)
 {
        waitq *worklist;
 
-       remove_critical_cf_edges(irg);
-
        /* Handle graph state */
        assert(get_irg_phase_state(irg) != phase_building);
-       assure_irg_outs(irg);
-       assure_doms(irg);
-       assure_cf_loop(irg);
 
        /* Place all floating nodes as early as possible. This guarantees
         a legal code placement. */
@@ -424,6 +419,21 @@ void place_code(ir_graph *irg)
        place_late(irg, worklist);
 
        del_waitq(worklist);
+       return 0;
+}
+
+static optdesc_t opt_codeplacement = {
+       "code-placement",
+       IR_GRAPH_STATE_NO_CRITICAL_EDGES |
+       IR_GRAPH_STATE_CONSISTENT_OUTS |
+       IR_GRAPH_STATE_CONSISTENT_DOMINANCE |
+       IR_GRAPH_STATE_CONSISTENT_LOOPINFO,
+       do_codeplacement,
+};
+
+void place_code(ir_graph *irg)
+{
+       perform_irg_optimization(irg, &opt_codeplacement);
 }
 
 /**
@@ -437,6 +447,26 @@ static void place_code_wrapper(ir_graph *irg)
        set_opt_global_cse(0);
 }
 
+#if 0
+static ir_graph_state_t do_gcse(ir_graph *irg)
+{
+       set_opt_global_cse(1);
+       optimize_graph_df(irg);
+       do_codeplacement(irg);
+       set_opt_global_cse(0);
+       return 0;
+}
+
+static optdesc_t opt_gcse = {
+       "gcse",
+       IR_GRAPH_STATE_NO_CRITICAL_EDGES |
+       IR_GRAPH_STATE_CONSISTENT_OUTS |
+       IR_GRAPH_STATE_CONSISTENT_DOMINANCE |
+       IR_GRAPH_STATE_CONSISTENT_LOOPINFO,
+       do_gcse,
+};
+#endif
+
 ir_graph_pass_t *place_code_pass(const char *name)
 {
        return def_graph_pass(name ? name : "place", place_code_wrapper);