X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyilp_t.h;h=8e9ebda3f82524451702f917c391bf1394d91ba2;hb=6e3e499d6c68aee0c6a9ada6a99f16c4f6f8445b;hp=1c903e53300f84f7f69e4004d9c472749341f3c5;hpb=719b0dc8377fc55decc4629bf5e523104a82b76f;p=libfirm

diff --git a/ir/be/becopyilp_t.h b/ir/be/becopyilp_t.h
index 1c903e533..8e9ebda3f 100644
--- a/ir/be/becopyilp_t.h
+++ b/ir/be/becopyilp_t.h
@@ -11,9 +11,8 @@
 #ifndef _BECOPYILP_T_H
 #define _BECOPYILP_T_H
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "firm_config.h"
+
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #endif
@@ -111,12 +110,10 @@ static INLINE int co_ilp_get_costs(copy_opt_t *co, ir_node *root, ir_node *arg)
 
 #include <lpp/lpp.h>
 
-#undef LPP_SOLVE_NET
+#define LPP_SOLVE_NET
 
 #ifdef LPP_SOLVE_NET
 #  include <lpp/lpp_net.h>
-#  define LPP_HOST "i44pc52"
-#  define LPP_SOLVER "cplex"
 #else
 #  include <lpp/lpp_cplex.h>
 #endif
@@ -128,26 +125,25 @@ typedef struct _ilp_env_t ilp_env_t;
 typedef void(*ilp_callback)(ilp_env_t*);
 
 struct _ilp_env_t {
-	firm_dbg_module_t *dbg;
 	const copy_opt_t *co;			/**< the copy opt problem */
 	size_red_t *sr;					/**< problem size reduction. removes simple nodes */
 	lpp_t *lp;						/**< the linear programming problem */
 	void *env;
 	ilp_callback build;
 	ilp_callback apply;
-
 };
 
-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);
 
-lpp_sol_state_t ilp_go(ilp_env_t *ienv, double time_limit);
+lpp_sol_state_t ilp_go(ilp_env_t *ienv);
 
 void free_ilp_env(ilp_env_t *ienv);
 
 
-/******************************************************************************
-
+#define name_cdd(buf, char1, int1, int2) \
+			(snprintf(buf, sizeof(buf), "%c_%d_%d", char1, int1, int2), buf)
 
- *****************************************************************************/
+#define name_cdd_sorted(buf, char1, int1, int2) \
+			name_cdd(buf, char1, MIN(int1, int2), MAX(int1, int2))
 
 #endif