beifg: Factorise code to count interference components.

[libfirm] / ir / lower / lower_mux.c

diff --git a/ir/lower/lower_mux.c b/ir/lower/lower_mux.c
index 076d974..c93fb14 100644 (file)
--- a/ir/lower/lower_mux.c
+++ b/ir/lower/lower_mux.c
@@ -1,27 +1,12 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
- *
  * This file is part of libFirm.
- *
- * This file may be distributed and/or modified under the terms of the
- * GNU General Public License version 2 as published by the Free Software
- * Foundation and appearing in the file LICENSE.GPL included in the
- * packaging of this file.
- *
- * Licensees holding valid libFirm Professional Edition licenses may use
- * this file in accordance with the libFirm Commercial License.
- * Agreement provided with the Software.
- *
- * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE.
+ * Copyright (C) 2012 University of Karlsruhe.
  */
 
 /**
  * @file
  * @brief   Replaces Mux nodes with control-flow
  * @author  Olaf Liebe
- * @version $Id$
  */
 #include "config.h"
 
@@ -34,7 +19,6 @@
 #include "irgwalk.h"
 #include "irgmod.h"
 #include "ircons.h"
-#include "irvrfy.h"
 #include "irpass_t.h"
 
 typedef struct walk_env {
@@ -44,7 +28,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))
@@ -85,8 +69,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);
@@ -115,7 +99,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. */
@@ -138,32 +122,30 @@ 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_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_DOMINANCE);
        }
        DEL_ARR_F(env.muxes);
 }
 
-struct pass_t {
+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)
 {
-       struct pass_t *pass = 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) {
-       struct pass_t *pass = XMALLOCZ(struct pass_t);
+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(