disable experimental code for now

[libfirm] / ir / be / bespillremat.c

diff --git a/ir/be/bespillremat.c b/ir/be/bespillremat.c
index b4bfb77..b35ae8e 100644 (file)
--- a/ir/be/bespillremat.c
+++ b/ir/be/bespillremat.c
@@ -39,8 +39,6 @@
 #include <lpp/mps.h>
 #include <lpp/lpp_net.h>
 #include <lpp/lpp_cplex.h>
-//#include <lc_pset.h>
-//#include <libcore/lc_bitset.h>
 
 #include "be_t.h"
 #include "belive_t.h"
@@ -58,10 +56,8 @@
 
 #include "bechordal_t.h"
 
-#ifdef WITH_LIBCORE
 #include <libcore/lc_opts.h>
 #include <libcore/lc_opts_enum.h>
-#endif /* WITH_LIBCORE */
 
 #define DUMP_PROBLEM       1
 #define DUMP_MPS           2
@@ -81,14 +77,14 @@
 #define REMATS_NOINVERSE   2
 #define REMATS_ALL         3
 
-static int opt_dump_flags   = 0;
+static unsigned opt_dump_flags = 0;
 static int opt_log = 0;
-static int opt_keep_alive   = 0;
+static unsigned opt_keep_alive = 0;
 static int opt_goodwin = 1;
 static int opt_memcopies = 1;
 static int opt_memoperands = 1;
 static int opt_verify = VERIFY_MEMINTERF;
-static int opt_remats = REMATS_ALL;
+static unsigned opt_remats = REMATS_ALL;
 static int opt_repair_schedule = 0;
 static int opt_no_enlarge_liveness = 0;
 static int opt_remat_while_live = 1;
@@ -99,7 +95,6 @@ static double opt_cost_spill =  15.0;
 static double opt_cost_remat =  1.0;
 
 
-#ifdef WITH_LIBCORE
 static const lc_opt_enum_mask_items_t dump_items[] = {
        { "problem",  DUMP_PROBLEM  },
        { "mps",      DUMP_MPS      },
@@ -158,9 +153,6 @@ static const lc_opt_table_entry_t options[] = {
        { NULL }
 };
 
-#endif
-
-
 //#define EXECFREQ_LOOPDEPH   /* compute execution frequency from loop depth only */
 //#define SCHEDULE_PHIM   /* insert phim nodes into schedule */
 
@@ -1917,7 +1909,7 @@ luke_blockwalker(ir_node * bb, void * data)
                pset       *used;
                pset       *remat_defs;
                keyval_t   *keyval;
-               ilp_cst_t   one_memoperand;
+               ilp_cst_t   one_memoperand = -1;
 
                /* iterate only until first phi */
                if(is_Phi(irn))
@@ -4119,9 +4111,9 @@ dump_phi_class(spill_ilp_t *si, ir_node **phiclass, const char * file)
     }
 
     set_foreach(si->interferences, interference) {
-        const ir_node  *a  = interference->a;
-        const ir_node  *b  = interference->b;
-        if (get_phi_class(si->pc, a) == phiclass) {
+        const ir_node *a = interference->a;
+        const ir_node *b = interference->b;
+        if (get_phi_class(si->pc, (ir_node *)a) == phiclass) {
             ir_fprintf(f, "  %F%N -> %F%N [color=red,dir=none,style=bold]\n", a, a, b, b);
         }
     }
@@ -4335,7 +4327,7 @@ verify_phiclasses(spill_ilp_t * si)
 {
        /* analyze phi classes */
        phi_class_free(si->pc);
-       si->pc = phi_class_new_from_irg(si->birg->irg);
+       si->pc = phi_class_new_from_irg(si->birg->irg, 0);
 
        DBG((si->dbg, LEVEL_2, "\t calling memory interference checker\n"));
        irg_block_walk_graph(si->birg->irg, luke_meminterferencechecker, NULL, si);
@@ -4425,7 +4417,7 @@ be_spill_remat(be_irg_t *birg, const arch_register_class_t *cls)
        DBG((si.dbg, LEVEL_2, "\t blockwalker\n"));
        irg_block_walk_graph(irg, luke_blockwalker, NULL, &si);
 
-       si.pc = phi_class_new_from_irg(birg->irg);
+       si.pc = phi_class_new_from_irg(birg->irg, 0);
        if (opt_memcopies) {
                DBG((si.dbg, LEVEL_2, "\t memcopyhandler\n"));
                memcopyhandler(&si);