bescripts: Copy all common node attributes into the constructor variants.

[libfirm] / ir / be / becopyilp.c

diff --git a/ir/be/becopyilp.c b/ir/be/becopyilp.c
index b03ed5a..340d97d 100644 (file)
--- a/ir/be/becopyilp.c
+++ b/ir/be/becopyilp.c
@@ -27,11 +27,11 @@
 
 #include <stdbool.h>
 
+#include "be_t.h"
 #include "irtools.h"
 #include "irprintf.h"
 
-#include "bestatevent.h"
-#include "beirg.h"
+#include "statev_t.h"
 #include "bemodule.h"
 #include "error.h"
 
@@ -168,13 +168,11 @@ void sr_reinsert(size_red_t *sr)
        ir_graph *irg        = sr->co->irg;
        be_ifg_t *ifg        = sr->co->cenv->ifg;
        unsigned  n_regs     = arch_register_class_n_regs(sr->co->cls);
-       unsigned *possible_cols;
-       unsigned *allocatable_cols;
 
-       rbitset_alloca(allocatable_cols, n_regs);
+       unsigned *const allocatable_cols = rbitset_alloca(n_regs);
        be_set_allocatable_regs(irg, sr->co->cls, allocatable_cols);
 
-       rbitset_alloca(possible_cols, n_regs);
+       unsigned *const possible_cols = rbitset_alloca(n_regs);
        neighbours_iter_t iter;
 
        /* color the removed nodes in right order */
@@ -254,8 +252,7 @@ ilp_env_t *new_ilp_env(copy_opt_t *co, ilp_callback build, ilp_callback apply, v
 
 lpp_sol_state_t ilp_go(ilp_env_t *ienv)
 {
-       ir_graph     *irg     = ienv->co->irg;
-       be_options_t *options = be_get_irg_options(irg);
+       ir_graph *irg = ienv->co->irg;
 
        sr_remove(ienv->sr);
 
@@ -279,12 +276,12 @@ lpp_sol_state_t ilp_go(ilp_env_t *ienv)
        if (solve_log)
                lpp_set_log(ienv->lp, stdout);
 
-       lpp_solve(ienv->lp, options->ilp_server, options->ilp_solver);
+       lpp_solve(ienv->lp, be_options.ilp_server, be_options.ilp_solver);
 
-       //be_stat_ev_dbl("co_ilp_objval",     ienv->lp->objval);
-       //be_stat_ev_dbl("co_ilp_best_bound", ienv->lp->best_bound);
-       be_stat_ev    ("co_ilp_iter",       lpp_get_iter_cnt(ienv->lp));
-       be_stat_ev_dbl("co_ilp_sol_time",   lpp_get_sol_time(ienv->lp));
+       //stat_ev_dbl("co_ilp_objval",     ienv->lp->objval);
+       //stat_ev_dbl("co_ilp_best_bound", ienv->lp->best_bound);
+       stat_ev_int("co_ilp_iter",       lpp_get_iter_cnt(ienv->lp));
+       stat_ev_dbl("co_ilp_sol_time",   lpp_get_sol_time(ienv->lp));
 
        ienv->apply(ienv);