remove deprecated support for bitfield masking

[libfirm] / ir / lower / lower_mux.c

diff --git a/ir/lower/lower_mux.c b/ir/lower/lower_mux.c
index 1a676b6..40221fb 100644 (file)
--- a/ir/lower/lower_mux.c
+++ b/ir/lower/lower_mux.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -21,7 +21,6 @@
  * @file
  * @brief   Replaces Mux nodes with control-flow
  * @author  Olaf Liebe
- * @version $Id$
  */
 #include "config.h"
 
@@ -34,7 +33,7 @@
 #include "irgwalk.h"
 #include "irgmod.h"
 #include "ircons.h"
-#include "irvrfy.h"
+#include "irpass_t.h"
 
 typedef struct walk_env {
        lower_mux_callback *cb_func;
@@ -43,7 +42,7 @@ typedef struct walk_env {
 
 static void find_mux_nodes(ir_node *mux, void *ctx)
 {
-       walk_env_t *env = ctx;
+       walk_env_t *env = (walk_env_t*)ctx;
 
        /* Skip non-mux nodes. */
        if (!is_Mux(mux))
@@ -84,8 +83,8 @@ static void lower_mux_node(ir_node* mux)
         * block in-between, so that the phi can be used to select the result
         * value from the old mux node in the lower block. */
        cond        = new_r_Cond(upper_block, get_Mux_sel(mux));
-       trueProj    = new_r_Proj(upper_block, cond, mode_X, pn_Cond_true);
-       falseProj   = new_r_Proj(upper_block, cond, mode_X, pn_Cond_false);
+       trueProj    = new_r_Proj(cond, mode_X, pn_Cond_true);
+       falseProj   = new_r_Proj(cond, mode_X, pn_Cond_false);
        falseBlock  = new_r_Block(irg, 1, &falseProj);
        mux_jmps[0] = trueProj;
        mux_jmps[1] = new_r_Jmp(falseBlock);
@@ -114,7 +113,7 @@ static void lower_mux_node(ir_node* mux)
 
 void lower_mux(ir_graph *irg, lower_mux_callback *cb_func)
 {
-       int        i, n_muxes;
+       size_t     i, n_muxes;
        walk_env_t env;
 
        /* Scan the graph for mux nodes to lower. */
@@ -137,10 +136,32 @@ void lower_mux(ir_graph *irg, lower_mux_callback *cb_func)
                /* Cleanup, verify the graph. */
                ir_free_resources(irg, resources);
 
-               set_irg_outs_inconsistent(irg);
-               set_irg_doms_inconsistent(irg);
-               set_irg_extblk_inconsistent(irg);
-               set_irg_loopinfo_inconsistent(irg);
+               clear_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_DOMINANCE);
        }
        DEL_ARR_F(env.muxes);
 }
+
+typedef struct pass_t {
+       ir_graph_pass_t    pass;
+       lower_mux_callback *cb_func;
+} pass_t;
+
+/**
+ * Wrapper to run ir_lower_mux() as an ir_graph pass
+ */
+static int pass_wrapper(ir_graph *irg, void *context)
+{
+       pass_t *pass = (pass_t*)context;
+
+       lower_mux(irg, pass->cb_func);
+       return 0;
+}
+
+ir_graph_pass_t *lower_mux_pass(const char *name, lower_mux_callback *cb_func)
+{
+       pass_t *pass = XMALLOCZ(pass_t);
+
+       pass->cb_func = cb_func;
+       return def_graph_pass_constructor(
+               &pass->pass, name ? name : "lower_mux", pass_wrapper);
+}