X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyilp_t.h;h=de8925e1e0cd0e5db3d1d33b4a6915fe67da18f3;hb=1d59167bbbeefad84d24f1f752c1715502d37e3e;hp=eb3ba12cb87e9148dbbbcfe14825a308188e0a43;hpb=bb9f2e36362333c6635b89f5258171b06c786608;p=libfirm

diff --git a/ir/be/becopyilp_t.h b/ir/be/becopyilp_t.h
index eb3ba12cb..de8925e1e 100644
--- a/ir/be/becopyilp_t.h
+++ b/ir/be/becopyilp_t.h
@@ -1,20 +1,6 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
- *
  * This file is part of libFirm.
- *
- * This file may be distributed and/or modified under the terms of the
- * GNU General Public License version 2 as published by the Free Software
- * Foundation and appearing in the file LICENSE.GPL included in the
- * packaging of this file.
- *
- * Licensees holding valid libFirm Professional Edition licenses may use
- * this file in accordance with the libFirm Commercial License.
- * Agreement provided with the Software.
- *
- * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE.
+ * Copyright (C) 2012 University of Karlsruhe.
  */
 
 /**
@@ -22,13 +8,11 @@
  * @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_types.h"
-#include "pset.h"
 #include "becopyopt_t.h"
 
 /******************************************************************************
@@ -41,45 +25,19 @@
 
  *****************************************************************************/
 
-typedef struct _coloring_suffix_t coloring_suffix_t;
-
-struct _coloring_suffix_t {
-	coloring_suffix_t *next;
-	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;
+	ir_node      **col_suff;    /**< Coloring suffix. A PEO prefix. */
+	ir_nodeset_t   all_removed; /**< All nodes removed during problem size reduction */
 } size_red_t;
 
-/**
- * Just prepare. Do nothing yet.
- */
-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)
-
-/**
- * Virtually remove all nodes not related to the problem
- * (simplicial AND not adjacent to a equal-color-edge)
- */
-void sr_remove(size_red_t *sr);
-
-/**
- * Virtually reinsert the nodes removed before and color them
- */
-void sr_reinsert(size_red_t *sr);
-
-/**
- * Free all space...
- */
-void free_size_red(size_red_t *sr);
+static inline bool sr_is_removed(size_red_t const *const sr, ir_node const *const irn)
+{
+	return ir_nodeset_contains(&sr->all_removed, irn);
+}
 
 /**
  * TODO: This search is necessary because during the construction of the
@@ -87,8 +45,7 @@ void free_size_red(size_red_t *sr);
  *       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;
+	int i;
 
 	/* search optimization unit for phi */
 	list_for_each_entry(unit_t, curr, &co->units, units)
@@ -115,24 +72,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 */
@@ -147,13 +96,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