addapted to bearch interface changes

[libfirm] / ir / be / becopyilp.c

diff --git a/ir/be/becopyilp.c b/ir/be/becopyilp.c
index b219b05..93d329c 100644 (file)
--- a/ir/be/becopyilp.c
+++ b/ir/be/becopyilp.c
@@ -3,6 +3,7 @@
  * Date:               28.02.2006
  * Copyright:   (c) Universitaet Karlsruhe
  * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ * $Id$
  *
  * Common stuff used by all ILP fomulations.
  *
@@ -10,7 +11,7 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif /* HAVE_CONFIG_H */
+#endif
 
 #ifdef WITH_ILP
 
@@ -73,10 +74,9 @@ void sr_remove(size_red_t *sr) {
        void *iter = be_ifg_neighbours_iter_alloca(ifg);
 
        while (redo) {
-               arch_register_req_t req;
                redo = 0;
                be_ifg_foreach_node(ifg, iter, irn) {
-                       if (!sr_is_removed(sr, irn) && !co_is_optimizable(sr->co->aenv, irn, &req) && !co_is_optimizable_arg(sr->co, irn)) {
+                       if (!sr_is_removed(sr, irn) && !co_is_optimizable_root(sr->co, irn) && !co_is_optimizable_arg(sr->co, irn)) {
                        if (sr_is_simplicial(sr, irn)) {
                                        coloring_suffix_t *cs = obstack_alloc(&sr->ob, sizeof(*cs));
 
@@ -137,12 +137,11 @@ void free_size_red(size_red_t *sr) {
 
  *****************************************************************************/
 
-ilp_env_t *new_ilp_env(copy_opt_t *co, firm_dbg_module_t *dbg, ilp_callback build, ilp_callback apply, void *env) {
+ilp_env_t *new_ilp_env(copy_opt_t *co, ilp_callback build, ilp_callback apply, void *env) {
        ilp_env_t *res = malloc(sizeof(*res));
        assert(res);
 
        res->co = co;
-       res->dbg = dbg;
        res->build = build;
        res->apply = apply;
        res->env = env;
@@ -151,13 +150,11 @@ ilp_env_t *new_ilp_env(copy_opt_t *co, firm_dbg_module_t *dbg, ilp_callback buil
        return res;
 }
 
-lpp_sol_state_t ilp_go(ilp_env_t *ienv, double time_limit) {
+lpp_sol_state_t ilp_go(ilp_env_t *ienv) {
        sr_remove(ienv->sr);
 
        ienv->build(ienv);
 
-       lpp_set_time_limit(ienv->lp, time_limit);
-
 #ifdef LPP_SOLVE_NET
        lpp_solve_net(ienv->lp, LPP_HOST, LPP_SOLVER);
 #else