X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fbe%2Fbecopyilp_t.h;h=7d817456ce0518966bf897c7c47eaa0d5704c88c;hb=1b4cac3471b02b63e9656cd8c876f067766fe482;hp=484fb0f7046f3913adcc0de828852e6affb13acd;hpb=1ce363f80e6a204d4011f85813362d9bd1d0e7e4;p=libfirm

diff --git a/ir/be/becopyilp_t.h b/ir/be/becopyilp_t.h
index 484fb0f70..7d817456c 100644
--- a/ir/be/becopyilp_t.h
+++ b/ir/be/becopyilp_t.h
@@ -22,12 +22,10 @@
  * @brief       Common stuff used by all ILP formulations.
  * @author      Daniel Grund
  * @date        28.02.2006
- * @version     $Id$
  */
 #ifndef FIRM_BE_BECOPYILP_T_H
 #define FIRM_BE_BECOPYILP_T_H
 
-#include "firm_config.h"
 #include "firm_types.h"
 #include "pset.h"
 #include "becopyopt_t.h"
@@ -42,14 +40,14 @@
 
  *****************************************************************************/
 
-typedef struct _coloring_suffix_t coloring_suffix_t;
+typedef struct coloring_suffix_t coloring_suffix_t;
 
-struct _coloring_suffix_t {
+struct coloring_suffix_t {
 	coloring_suffix_t *next;
 	ir_node           *irn;
 };
 
-typedef struct _size_red_t {
+typedef struct size_red_t {
 	copy_opt_t        *co;
 	pset              *all_removed;   /**< All nodes removed during problem size reduction */
 	coloring_suffix_t *col_suff;      /**< Coloring suffix. Reverse would be a PEO prefix */
@@ -64,7 +62,7 @@ size_red_t *new_size_red(copy_opt_t *co);
 /**
  * Checks if a node has already been removed
  */
-#define sr_is_removed(sr, irn)		pset_find_ptr((sr)->all_removed, irn)
+#define sr_is_removed(sr, irn)   pset_find_ptr((sr)->all_removed, irn)
 
 /**
  * Virtually remove all nodes not related to the problem
@@ -87,9 +85,8 @@ void free_size_red(size_red_t *sr);
  *       units (ou's) args could be merged and weights are accumulated.
  *       Is this necessary?
  */
-static INLINE int co_ilp_get_costs(copy_opt_t *co, ir_node *root, ir_node *arg) {
-	int    i;
-	unit_t *curr;
+static inline int co_ilp_get_costs(copy_opt_t *co, ir_node *root, ir_node *arg) {
+	int i;
 
 	/* search optimization unit for phi */
 	list_for_each_entry(unit_t, curr, &co->units, units)
@@ -116,24 +113,16 @@ static INLINE int co_ilp_get_costs(copy_opt_t *co, ir_node *root, ir_node *arg)
 
  *****************************************************************************/
 
-#ifdef WITH_ILP
-#include <lpp/lpp.h>
-
-#define LPP_SOLVE_NET
-
-#ifdef LPP_SOLVE_NET
-#  include <lpp/lpp_net.h>
-#else
-#  include <lpp/lpp_cplex.h>
-#endif
+#include "lpp.h"
+#include "lpp_net.h"
 
 #define EPSILON 0.00001
 
-typedef struct _ilp_env_t ilp_env_t;
+typedef struct ilp_env_t ilp_env_t;
 
 typedef void(*ilp_callback)(ilp_env_t*);
 
-struct _ilp_env_t {
+struct ilp_env_t {
 	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 */
@@ -148,13 +137,4 @@ 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 /* WITH_ILP */
-
-#endif /* FIRM_BE_BECOPYILP_T_H */
+#endif