X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Flower%2Flower_mux.c;h=5bf06de184a168899586ed04069ffc6e76042add;hb=8057f671ea7f286a27e40bfe1aa45d85e0990cbe;hp=b9654429990203a2150e961ebb443137d1d4c68b;hpb=32ea6ea0320f551448bb66e534e3351977464d42;p=libfirm

diff --git a/ir/lower/lower_mux.c b/ir/lower/lower_mux.c
index b96544299..5bf06de18 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.
  *
@@ -21,7 +21,6 @@
  * @file
  * @brief   Replaces Mux nodes with control-flow
  * @author  Olaf Liebe
- * @version $Id$
  */
 #include "config.h"
 
@@ -34,7 +33,6 @@
 #include "irgwalk.h"
 #include "irgmod.h"
 #include "ircons.h"
-#include "irvrfy.h"
 #include "irpass_t.h"
 
 typedef struct walk_env {
@@ -44,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))
@@ -85,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);
@@ -115,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. */
@@ -138,25 +136,22 @@ 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;
@@ -164,7 +159,7 @@ static int pass_wrapper(ir_graph *irg, void *context)
 
 ir_graph_pass_t *lower_mux_pass(const char *name, lower_mux_callback *cb_func)
 {
-	struct pass_t *pass = XMALLOCZ(struct pass_t);
+	pass_t *pass = XMALLOCZ(pass_t);
 
 	pass->cb_func = cb_func;
 	return def_graph_pass_constructor(