cleanup besched header

[libfirm] / ir / ir / irgopt.c

diff --git a/ir/ir/irgopt.c b/ir/ir/irgopt.c
index 9c3eb8e..097e96f 100644 (file)
--- a/ir/ir/irgopt.c
+++ b/ir/ir/irgopt.c
@@ -71,18 +71,19 @@ static void optimize_in_place_wrapper(ir_node *n, void *env)
  */
 static inline void do_local_optimize(ir_node *n)
 {
+       ir_graph *irg = get_irn_irg(n);
+
        /* Handle graph state */
-       assert(get_irg_phase_state(current_ir_graph) != phase_building);
+       assert(get_irg_phase_state(irg) != phase_building);
 
        if (get_opt_global_cse())
-               set_irg_pinned(current_ir_graph, op_pin_state_floats);
-       set_irg_outs_inconsistent(current_ir_graph);
-       set_irg_doms_inconsistent(current_ir_graph);
-       set_irg_loopinfo_inconsistent(current_ir_graph);
+               set_irg_pinned(irg, op_pin_state_floats);
+       set_irg_outs_inconsistent(irg);
+       set_irg_doms_inconsistent(irg);
+       set_irg_loopinfo_inconsistent(irg);
 
        /* Clean the value_table in irg for the CSE. */
-       del_identities(current_ir_graph->value_table);
-       current_ir_graph->value_table = new_identities();
+       new_identities(irg);
 
        /* walk over the graph */
        irg_walk(n, firm_clear_link, optimize_in_place_wrapper, NULL);
@@ -159,7 +160,7 @@ static void enqueue_users(ir_node *n, pdeq *waitq)
  */
 static void opt_walker(ir_node *n, void *env)
 {
-       pdeq *waitq = env;
+       pdeq *waitq = (pdeq*)env;
        ir_node *optimized;
 
        optimized = optimize_in_place_2(n);
@@ -184,11 +185,10 @@ int optimize_graph_df(ir_graph *irg)
        state = edges_assure(irg);
 
        if (get_opt_global_cse())
-               set_irg_pinned(current_ir_graph, op_pin_state_floats);
+               set_irg_pinned(irg, op_pin_state_floats);
 
        /* Clean the value_table in irg for the CSE. */
-       del_identities(irg->value_table);
-       irg->value_table = new_identities();
+       new_identities(irg);
 
        if (get_irg_dom_state(irg) == dom_consistent)
                irg_block_walk_graph(irg, NULL, kill_dead_blocks, NULL);
@@ -209,7 +209,7 @@ int optimize_graph_df(ir_graph *irg)
 
        /* finish the wait queue */
        while (! pdeq_empty(waitq)) {
-               ir_node *n = pdeq_getl(waitq);
+               ir_node *n = (ir_node*)pdeq_getl(waitq);
                if (! is_Bad(n))
                        opt_walker(n, waitq);
        }