sparc: Add support for Conds where selector is not a Cmp.

[libfirm] / ir / be / becopyilp.c

diff --git a/ir/be/becopyilp.c b/ir/be/becopyilp.c
index 57fdab4..0a788c9 100644 (file)
--- a/ir/be/becopyilp.c
+++ b/ir/be/becopyilp.c
@@ -34,11 +34,11 @@
 #include "bemodule.h"
 #include "error.h"
 
+#include "lpp.h"
+
 #include "lc_opts.h"
 #include "lc_opts_enum.h"
 
-#ifdef WITH_ILP
-
 #define DUMP_ILP 1
 #define DUMP_SOL 2
 
@@ -63,7 +63,7 @@ static const lc_opt_table_entry_t options[] = {
        LC_OPT_LAST
 };
 
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copyilp);
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copyilp)
 void be_init_copyilp(void)
 {
        lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
@@ -139,7 +139,7 @@ void sr_remove(size_red_t *sr)
        while (redo) {
                redo = 0;
                be_ifg_foreach_node(ifg, &iter, irn) {
-                       const arch_register_req_t *req = arch_get_register_req_out(irn);
+                       const arch_register_req_t *req = arch_get_irn_register_req(irn);
 
                        if (!arch_register_req_is(req, limited) && !sr_is_removed(sr, irn) && !co_gs_is_optimizable(sr->co, irn)) {
                                if (sr_is_simplicial(sr, irn)) {
@@ -231,7 +231,7 @@ lpp_sol_state_t ilp_go(ilp_env_t *ienv)
        if (solve_log)
                lpp_set_log(ienv->lp, stdout);
 
-       lpp_solve_net(ienv->lp, options->ilp_server, options->ilp_solver);
+       lpp_solve(ienv->lp, options->ilp_server, 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);
@@ -262,14 +262,6 @@ lpp_sol_state_t ilp_go(ilp_env_t *ienv)
 void free_ilp_env(ilp_env_t *ienv)
 {
        free_size_red(ienv->sr);
-       free_lpp(ienv->lp);
+       lpp_free(ienv->lp);
        free(ienv);
 }
-
-#else /* WITH_ILP */
-
-static inline void only_that_you_can_compile_without_WITH_ILP_defined(void)
-{
-}
-
-#endif /* WITH_ILP */