X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyilp_t.h;h=1dcd6f344e7a6db8818601821d5ce523f8008e67;hb=5474a1c188c9d59eea2c915515980cd9cbab58d8;hp=9f9e62b8f4d16a20237d71658da7b391d5561117;hpb=4d5c3365a58cba59993045a9e08e686d8ae079a7;p=libfirm

diff --git a/ir/be/becopyilp_t.h b/ir/be/becopyilp_t.h
index 9f9e62b8f..1dcd6f344 100644
--- a/ir/be/becopyilp_t.h
+++ b/ir/be/becopyilp_t.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -18,24 +18,17 @@
  */
 
 /**
- * Author:      Daniel Grund
- * Date:		28.02.2006
- * Copyright:   (c) Universitaet Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
- *
- * Common stuff used by all ILP fomulations.
- *
+ * @file
+ * @brief       Common stuff used by all ILP formulations.
+ * @author      Daniel Grund
+ * @date        28.02.2006
  */
+#ifndef FIRM_BE_BECOPYILP_T_H
+#define FIRM_BE_BECOPYILP_T_H
 
-#ifndef _BECOPYILP_T_H
-#define _BECOPYILP_T_H
-
-#include "firm_config.h"
-
-#include "irnode_t.h"
+#include "firm_types.h"
 #include "pset.h"
 #include "becopyopt_t.h"
-#include "xmalloc.h"
 
 /******************************************************************************
     _____ _                        _            _   _
@@ -47,18 +40,18 @@
 
  *****************************************************************************/
 
-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;
+	ir_node           *irn;
 };
 
-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 */
-	struct obstack ob;
+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 */
+	struct obstack    ob;
 } size_red_t;
 
 /**
@@ -69,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
@@ -92,15 +85,15 @@ 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;
+static inline int co_ilp_get_costs(copy_opt_t *co, ir_node *root, ir_node *arg) {
+	int    i;
 	unit_t *curr;
 
 	/* search optimization unit for phi */
 	list_for_each_entry(unit_t, curr, &co->units, units)
 		if (curr->nodes[0] == root) {
 
-			for (i=1; i<curr->node_count; ++i)
+			for (i = 1; i < curr->node_count; ++i)
 				if (curr->nodes[i] == arg)
 					return curr->costs[i];
 
@@ -121,30 +114,22 @@ 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 {
-	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;
+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 */
+	void             *env;
+	ilp_callback     build;
+	ilp_callback     apply;
 };
 
 ilp_env_t *new_ilp_env(copy_opt_t *co, ilp_callback build, ilp_callback apply, void *env);
@@ -153,13 +138,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