X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Flower%2Flower_mux.c;h=0538f8671ce96d4509a39de71fdb90cbc8bb9dcb;hb=b152c943b88744d5e212f86d315a36c7b43ae574;hp=1a676b6a5b758d77d90b57599c61d56eb55db426;hpb=440534ba77a6eeef24c09d6f0efda7a180a6cf80;p=libfirm

diff --git a/ir/lower/lower_mux.c b/ir/lower/lower_mux.c
index 1a676b6a5..0538f8671 100644
--- 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.
  *
@@ -34,7 +34,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 +43,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 +84,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 +114,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 +137,33 @@ 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);
 	}
 	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);
+}