fixed precedence constraint

[libfirm] / ir / be / becopyilp.c

diff --git a/ir/be/becopyilp.c b/ir/be/becopyilp.c
index 9ef100e..6fa8707 100644 (file)
--- a/ir/be/becopyilp.c
+++ b/ir/be/becopyilp.c
@@ -7,13 +7,21 @@
  * Common stuff used by all ILP fomulations.
  *
  */
-
-#include "bestatevent.h"
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
+#include "irtools.h"
+#include "irprintf.h"
+
+#include "bestatevent.h"
+#include "beirg_t.h"
+#include "bemodule.h"
+#include "error.h"
+
+#include <libcore/lc_opts.h>
+#include <libcore/lc_opts_enum.h>
+
 #ifdef WITH_ILP
 
 #define DUMP_ILP 1
@@ -24,9 +32,6 @@ static int solve_net  = 1;
 static int solve_log  = 0;
 static int dump_flags = 0;
 
-#ifdef WITH_LIBCORE
-#include <libcore/lc_opts.h>
-#include <libcore/lc_opts_enum.h>
 static const lc_opt_enum_mask_items_t dump_items[] = {
        { "ilp",   DUMP_ILP },
        { "sol",   DUMP_SOL },
@@ -45,13 +50,18 @@ static const lc_opt_table_entry_t options[] = {
        { NULL }
 };
 
-void be_co_ilp_register_options(lc_opt_entry_t *grp)
+void be_init_copyilp(void)
 {
-       lc_opt_entry_t *ilp_grp = lc_opt_get_grp(grp, "ilp");
+       lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
+       lc_opt_entry_t *ra_grp = lc_opt_get_grp(be_grp, "ra");
+       lc_opt_entry_t *chordal_grp = lc_opt_get_grp(ra_grp, "chordal");
+       lc_opt_entry_t *co_grp = lc_opt_get_grp(chordal_grp, "co");
+       lc_opt_entry_t *ilp_grp = lc_opt_get_grp(co_grp, "ilp");
+
        lc_opt_add_table(ilp_grp, options);
 }
-#endif
 
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copyilp);
 
 #include "becopyilp_t.h"
 #include "beifg_t.h"
@@ -223,7 +233,15 @@ lpp_sol_state_t ilp_go(ilp_env_t *ienv) {
        be_stat_ev_dbl("co_ilp_sol_time",   ienv->lp->sol_time);
 
        if(dump_flags & DUMP_ILP) {
-               FILE *f = be_chordal_open(ienv->co->cenv, "", "-co.ilp");
+               char buf[128];
+               FILE *f;
+
+               ir_snprintf(buf, sizeof(buf), "%F_%s-co.ilp", ienv->co->cenv->irg,
+                           ienv->co->cenv->cls->name);
+               f = fopen(buf, "wt");
+               if(f == NULL) {
+                       panic("Couldn't open '%s' for writing", buf);
+               }
                lpp_dump_plain(ienv->lp, f);
                fclose(f);
        }