make firm compilable with a c++ compiler

[libfirm] / ir / ana / rta.c

diff --git a/ir/ana/rta.c b/ir/ana/rta.c
index 0c935d0..3cfb2c9 100644 (file)
--- a/ir/ana/rta.c
+++ b/ir/ana/rta.c
@@ -38,7 +38,7 @@
 #include "pset_new.h"
 #include "irgwalk.h"
 #include "irgmod.h"
-#include "irvrfy.h"
+#include "irverify.h"
 #include "irprintf.h"
 #include "debug.h"
 #include "error.h"
@@ -129,7 +129,7 @@ static bool add_implementing_graphs(ir_entity *method)
 static void rta_act(ir_node *node, void *env)
 {
        bool *change = (bool*)env;
-       ir_opcode op = get_irn_opcode(node);
+       unsigned op = get_irn_opcode(node);
 
        if (iro_Call == op) {         /* CALL */
                ir_entity *ent = NULL;
@@ -188,11 +188,6 @@ static int rta_fill_incremental(void)
        int  i;
        int  n_runs = 0;
        bool rerun  = true;
-#ifdef INTERPROCEDURAL_VIEW
-       int  old_ip_view = get_interprocedural_view();
-
-       set_interprocedural_view(0);     /* save this for later */
-#endif
 
        /* init_tables has added main_irg to _live_graphs */
 
@@ -221,12 +216,12 @@ static int rta_fill_incremental(void)
                DB((dbg, LEVEL_2, "RTA: RUN %i\n", n_runs));
 
                /* collect what we have found previously */
-               foreach_pset_new(live_graphs, graph, iter) {
+               foreach_pset_new(live_graphs, ir_graph*, graph, iter) {
                        pset_new_insert(_live_graphs, graph);
                }
 
                rerun = false;
-               foreach_pset_new(live_graphs, graph, iter) {
+               foreach_pset_new(live_graphs, ir_graph*, graph, iter) {
                        DB((dbg, LEVEL_2, "RTA: RUN %i: considering graph of %+F\n", n_runs, graph));
                        rerun |= rta_fill_graph(graph);
                }
@@ -235,10 +230,6 @@ static int rta_fill_incremental(void)
                ++n_runs;
        }
 
-#ifdef INTERPROCEDURAL_VIEW
-       set_interprocedural_view(old_ip_view); /* cover up our traces */
-#endif
-
        return n_runs;
 }
 
@@ -322,9 +313,9 @@ void rta_init(void)
        {
                int i;
                for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
-                       irg_vrfy(get_irp_irg(i));
+                       irg_verify(get_irp_irg(i), 0);
                }
-               tr_vrfy();
+               tr_verify();
        }
 # endif /* defined DEBUG_libfirm */
 
@@ -341,9 +332,9 @@ void rta_init(void)
                int i;
 
                for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
-                       irg_vrfy(get_irp_irg(i));
+                       irg_verify(get_irp_irg(i), 0);
                }
-               tr_vrfy();
+               tr_verify();
        }
 # endif /* defined DEBUG_libfirm */
 }
@@ -396,7 +387,7 @@ void rta_delete_dead_graphs(void)
        /* Hmm, probably we need to run this only if dead_irgs is non-NULL */
        type_walk(make_entity_to_description, NULL, NULL);
        for (irg = dead_irgs; irg != NULL; irg = next_irg) {
-               next_irg = get_irg_link(irg);
+               next_irg = (ir_graph*) get_irg_link(irg);
                remove_irp_irg(irg);
        }
 
@@ -411,9 +402,9 @@ void rta_cleanup(void)
 # ifdef DEBUG_libfirm
        int i;
        for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
-               irg_vrfy(get_irp_irg(i));
+               irg_verify(get_irp_irg(i), 0);
        }
-       tr_vrfy();
+       tr_verify();
 # endif /* defined DEBUG_libfirm */
 
        if (_live_classes != NULL) {