X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fopt_manage.c;h=ab9dc08c186d40992d7d83185a10aabaaaa310c3;hb=8c9921a1fc166552f6e416434fd8394a4fc210a3;hp=733c1757f8416e2eaeafd6a84d2d7e8b5d01caaf;hpb=8a98cf06c4fb193ea8025a6dfcdbe161187d143f;p=libfirm

diff --git a/ir/opt/opt_manage.c b/ir/opt/opt_manage.c
index 733c1757f..ab9dc08c1 100644
--- a/ir/opt/opt_manage.c
+++ b/ir/opt/opt_manage.c
@@ -4,7 +4,8 @@
 #include <stdbool.h>
 
 #include "irgraph_t.h"
-
+#include "irprog_t.h"
+#include "irnode.h"
 #include "iroptimize.h"
 #include "irgopt.h"
 #include "irdom.h"
@@ -14,14 +15,6 @@
 #include "irdump.h"
 #include "opt_manage.h"
 
-// TODO some API to enable dumping
-static const bool dump_opts = false;
-
-static void deactivate_entity_usage(ir_graph *irg)
-{
-	set_irg_entity_usage_state(irg, ir_entity_usage_not_computed);
-}
-
 static void nop(ir_graph *irg) {
 	(void)irg;
 }
@@ -32,44 +25,31 @@ void perform_irg_optimization(ir_graph *irg, optdesc_t *opt)
 	ir_graph_state_t required = opt->requirements;
 	const bool dump = get_irp_optimization_dumps();
 
-	/* no bad block requires no unreachable code */
-	if (required & IR_GRAPH_STATE_NO_BAD_BLOCKS)
-		required |= IR_GRAPH_STATE_NO_UNREACHABLE_BLOCKS;
-
-	/** Some workarounds because information is currently duplicated */
-	// FIXME should not be necessary!
-	if (dom_inconsistent == get_irg_dom_state(irg))
-		clear_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_DOMINANCE);
-	if (outs_inconsistent == get_irg_outs_state(irg))
-		clear_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_OUTS);
-	if (loopinfo_inconsistent == get_irg_loopinfo_state(irg))
-		clear_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_LOOPINFO);
-	if (is_irg_state(irg, IR_GRAPH_STATE_BAD_BLOCK))
-		clear_irg_state(irg, IR_GRAPH_STATE_NO_BAD_BLOCKS);
-	if (ir_entity_usage_not_computed == get_irg_entity_usage_state(irg))
-		clear_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_ENTITY_USAGE);
+	/* It does not make sense to require both: */
+	assert (!((required & IR_GRAPH_STATE_ONE_RETURN) && (required & IR_GRAPH_STATE_MANY_RETURNS)));
 
 	/* assure that all requirements for the optimization are fulfilled */
 #define PREPARE(st,func) if (st & (required ^ irg->state)) {func(irg); set_irg_state(irg,st);}
 	PREPARE(IR_GRAPH_STATE_ONE_RETURN,               normalize_one_return)
+	PREPARE(IR_GRAPH_STATE_MANY_RETURNS,             normalize_n_returns)
 	PREPARE(IR_GRAPH_STATE_NO_CRITICAL_EDGES,        remove_critical_cf_edges)
-	PREPARE(IR_GRAPH_STATE_NO_UNREACHABLE_BLOCKS,    remove_unreachable_blocks)
-	PREPARE(IR_GRAPH_STATE_NO_BAD_BLOCKS,            remove_bads)
+	PREPARE(IR_GRAPH_STATE_NO_UNREACHABLE_CODE,      remove_unreachable_code)
+	PREPARE(IR_GRAPH_STATE_NO_BADS,                  remove_bads)
 	PREPARE(IR_GRAPH_STATE_CONSISTENT_DOMINANCE,     assure_doms)
 	PREPARE(IR_GRAPH_STATE_CONSISTENT_POSTDOMINANCE, assure_postdoms)
 	PREPARE(IR_GRAPH_STATE_CONSISTENT_OUT_EDGES,     edges_assure)
 	PREPARE(IR_GRAPH_STATE_CONSISTENT_OUTS,          assure_irg_outs)
-	PREPARE(IR_GRAPH_STATE_CONSISTENT_LOOPINFO,      assure_cf_loop)
+	PREPARE(IR_GRAPH_STATE_CONSISTENT_LOOPINFO,      assure_loopinfo)
 	PREPARE(IR_GRAPH_STATE_CONSISTENT_ENTITY_USAGE,  assure_irg_entity_usage_computed)
 	PREPARE(IR_GRAPH_STATE_VALID_EXTENDED_BLOCKS,    compute_extbb)
 
 	/* now all the requirements for the optimization are fulfilled */
-	if (dump_opts)
+	if (dump)
 		dump_ir_graph(irg, opt->name);
 
 	new_irg_state = opt->optimization(irg);
 
-	if (dump_opts)
+	if (dump)
 		dump_ir_graph(irg, opt->name);
 
 	/* unless the optimization returned that some state is retained,
@@ -78,19 +58,19 @@ void perform_irg_optimization(ir_graph *irg, optdesc_t *opt)
 	 */
 #define INVALIDATE(state,func) if (!(state & new_irg_state)) {clear_irg_state(irg,state); func(irg);}
 	INVALIDATE(IR_GRAPH_STATE_NO_CRITICAL_EDGES,        nop)
-	INVALIDATE(IR_GRAPH_STATE_NO_UNREACHABLE_BLOCKS,    nop)
-	INVALIDATE(IR_GRAPH_STATE_NO_BAD_BLOCKS,            nop)
+	INVALIDATE(IR_GRAPH_STATE_NO_UNREACHABLE_CODE,      nop)
+	INVALIDATE(IR_GRAPH_STATE_NO_BADS,                  nop)
 	INVALIDATE(IR_GRAPH_STATE_ONE_RETURN,               nop)
-	INVALIDATE(IR_GRAPH_STATE_CONSISTENT_DOMINANCE,     set_irg_doms_inconsistent)
-	INVALIDATE(IR_GRAPH_STATE_CONSISTENT_POSTDOMINANCE, set_irg_postdoms_inconsistent)
-	INVALIDATE(IR_GRAPH_STATE_CONSISTENT_OUTS,          set_irg_outs_inconsistent)
+	INVALIDATE(IR_GRAPH_STATE_MANY_RETURNS,             nop)
+	INVALIDATE(IR_GRAPH_STATE_CONSISTENT_DOMINANCE,     nop)
+	INVALIDATE(IR_GRAPH_STATE_CONSISTENT_POSTDOMINANCE, nop)
+	INVALIDATE(IR_GRAPH_STATE_CONSISTENT_OUTS,          nop)
 	INVALIDATE(IR_GRAPH_STATE_CONSISTENT_OUT_EDGES,     edges_deactivate)
-	INVALIDATE(IR_GRAPH_STATE_CONSISTENT_LOOPINFO,      set_irg_loopinfo_inconsistent)
-	INVALIDATE(IR_GRAPH_STATE_CONSISTENT_ENTITY_USAGE,  deactivate_entity_usage)
-	INVALIDATE(IR_GRAPH_STATE_VALID_EXTENDED_BLOCKS,    set_irg_extblk_inconsistent)
+	INVALIDATE(IR_GRAPH_STATE_CONSISTENT_LOOPINFO,      nop)
+	INVALIDATE(IR_GRAPH_STATE_CONSISTENT_ENTITY_USAGE,  nop)
+	INVALIDATE(IR_GRAPH_STATE_VALID_EXTENDED_BLOCKS,    nop)
 
-	if (!(new_irg_state & IR_GRAPH_STATE_BROKEN_FOR_VERIFIER)) {
-		irg_verify(irg, VERIFY_ENFORCE_SSA);
-	}
+	remove_End_Bads_and_doublets(get_irg_end(irg));
 
+	irg_verify(irg, VERIFY_ENFORCE_SSA);
 }