fixed debug output of unary x87 nodes
[libfirm] / ir / be / becopyilp2.c
index 2d8320c..1df4df3 100644 (file)
 #define DEBUG_LVL 1
 
 typedef struct _local_env_t {
-       firm_dbg_module_t *dbg;
        double time_limit;
        int first_x_var, last_x_var;
        pmap *nr_2_irn;
+       DEBUG_ONLY(firm_dbg_module_t *dbg;)
 } local_env_t;
 
 static void build_coloring_cstr(ilp_env_t *ienv) {
@@ -74,8 +74,10 @@ static void build_coloring_cstr(ilp_env_t *ienv) {
                        /* get assignable colors */
                        if (arch_register_req_is(&req, limited))
                                req.limited(req.limited_env, colors);
-                       else
-                               arch_put_non_ignore_regs(ienv->co->aenv, req.cls, colors);
+                       else {
+                               arch_register_class_put(req.cls, colors);
+                               // bitset_andnot(colors, ienv->co->cenv->ignore_colors);
+                       }
 
                        /* add the coloring constraint */
                        cst_idx = lpp_add_cst(ienv->lp, NULL, lpp_equal, 1.0);
@@ -501,7 +503,7 @@ static void ilp2_apply(ilp_env_t *ienv) {
 #endif
 }
 
-int co_solve_ilp2(copy_opt_t *co, double time_limit) {
+int co_solve_ilp2(copy_opt_t *co) {
        lpp_sol_state_t sol_state;
        ilp_env_t *ienv;
        local_env_t my;
@@ -509,12 +511,11 @@ int co_solve_ilp2(copy_opt_t *co, double time_limit) {
        ASSERT_OU_AVAIL(co); //See build_clique_st
        ASSERT_GS_AVAIL(co);
 
-       my.time_limit  = time_limit;
+       my.time_limit  = 0;
        my.first_x_var = -1;
        my.last_x_var  = -1;
        my.nr_2_irn    = pmap_create();
-       FIRM_DBG_REGISTER(my.dbg, "ir.be.coilp2");
-       firm_dbg_set_mask(my.dbg, DEBUG_LVL);
+       FIRM_DBG_REGISTER(my.dbg, "firm.be.coilp2");
 
        ienv = new_ilp_env(co, ilp2_build, ilp2_apply, &my);