X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyilp_t.h;h=8e9ebda3f82524451702f917c391bf1394d91ba2;hb=712cea35fe399ae20e3a33eb9bf81360b5000cf3;hp=bf016d6db938970b371433157369b008c931473c;hpb=67b9a2ff3da2342b66b7124842ccd098df6fdbae;p=libfirm

diff --git a/ir/be/becopyilp_t.h b/ir/be/becopyilp_t.h
index bf016d6db..8e9ebda3f 100644
--- a/ir/be/becopyilp_t.h
+++ b/ir/be/becopyilp_t.h
@@ -13,16 +13,9 @@
 
 #include "firm_config.h"
 
-#ifndef _WIN32
- #ifndef HAVE_ALLOCA_H
-  #define HAVE_ALLOCA_H 1
- #endif /* HAVE_ALLOC_H */
-#endif /* _WIN32 */
-
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #endif
-
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
 #endif
@@ -117,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
@@ -134,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 /* _BECOPYILP_T_H */
+#endif