X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyopt.h;h=6646e5d01f228d619d13b2c52c02bd8765b738e0;hb=438580abed840c55e82a03b47daeacfe2da8040f;hp=6ef7863cbe5443ef9b9c62442ef05b293cab8ae4;hpb=b3e096e705a221fb596f6a324904e67518ea05c0;p=libfirm

diff --git a/ir/be/becopyopt.h b/ir/be/becopyopt.h
index 6ef7863cb..6646e5d01 100644
--- a/ir/be/becopyopt.h
+++ b/ir/be/becopyopt.h
@@ -57,19 +57,32 @@ enum {
 	CO_ALGO_HEUR2,
 	CO_ALGO_HEUR4,
 	CO_ALGO_ILP,
-#ifdef FIRM_KAPS
 	CO_ALGO_PBQP,
-#endif
 	CO_ALGO_LAST
 };
 
-/** The driver for copy minimization. */
-void co_driver(be_chordal_env_t *cenv);
-
-typedef struct _copy_opt_t copy_opt_t;
+typedef struct copy_opt_t copy_opt_t;
 
 typedef int(*cost_fct_t)(const copy_opt_t *, ir_node *, ir_node *, int);
 
+typedef struct {
+	int (*copyopt)(copy_opt_t *co); /**< function ptr to run copyopt */
+	int        can_improve_existing;
+} co_algo_info;
+
+
+/**
+ * Register a new copy optimization algorithm.
+ *
+ * @param name     the name of the copy optimazation algorithm,
+ *                 used to select it
+ * @param copyopt  a copy optimazation entry
+ */
+void be_register_copyopt(const char *name, co_algo_info *copyopt);
+
+/** The driver for copy minimization. */
+void co_driver(be_chordal_env_t *cenv);
+
 /** A coalescing algorithm. */
 typedef int (co_algo_t)(copy_opt_t *);
 
@@ -86,15 +99,15 @@ void free_copy_opt(copy_opt_t *co);
 /**
  * Computes the costs of a copy according to loop depth
  * @param co   The copy opt object.
- * @param pos	the argument position of arg in the root arguments
- * @return Must be >= 0 in all cases.
+ * @param pos  the argument position of arg in the root arguments
+ * @return     Must be >= 0 in all cases.
  */
 int co_get_costs_loop_depth(const copy_opt_t *co, ir_node *root, ir_node* arg, int pos);
 
 /**
  * Computes the costs of a copy according to execution frequency
  * @param co   The copy opt object.
- * @param pos	the argument position of arg in the root arguments
+ * @param pos  the argument position of arg in the root arguments
  * @return Must be >= 0 in all cases.
  */
 int co_get_costs_exec_freq(const copy_opt_t *co, ir_node *root, ir_node* arg, int pos);
@@ -106,6 +119,22 @@ int co_get_costs_exec_freq(const copy_opt_t *co, ir_node *root, ir_node* arg, in
  */
 int co_get_costs_all_one(const copy_opt_t *co, ir_node *root, ir_node* arg, int pos);
 
+#ifdef _MSC_VER
+typedef          __int64 long64;
+typedef unsigned __int64 ulong64;
+
+#define LL_FMT   "i64"
+#define ULL_FMT  "ui64"
+
+#else
+typedef          long long long64;
+typedef unsigned long long ulong64;
+
+#define LL_FMT   "ll"
+#define ULL_FMT  "llu"
+
+#endif
+
 /**
  * Statistics over a copy optimization module.
  */
@@ -157,11 +186,6 @@ void co_solve_park_moon(copy_opt_t *co);
  */
 int co_solve_heuristic_new(copy_opt_t *co);
 
-/**
- * This is the pure C implementation of co_solve_heuristic_java().
- */
-int co_solve_heuristic_mst(copy_opt_t *co);
-
 /**
  * Returns the maximal costs possible, i.e. the costs if all
  * pairs would be assigned different registers.
@@ -226,13 +250,6 @@ void co_build_graph_structure(copy_opt_t *co);
  */
 void co_free_graph_structure(copy_opt_t *co);
 
-/**
- * Solves the problem using mixed integer programming
- * @returns 1 iff solution state was optimal
- * NYI
- */
-int co_solve_ilp1(copy_opt_t *co, double time_limit);
-
 /**
  * Solves the problem using mixed integer programming
  * @returns 1 iff solution state was optimal
@@ -241,12 +258,10 @@ int co_solve_ilp1(copy_opt_t *co, double time_limit);
  */
 int co_solve_ilp2(copy_opt_t *co);
 
-int co_solve_heuristic_pbqp(copy_opt_t *co);
-
 /**
  * Checks if a node is optimizable, viz has something to do with coalescing.
  * Uses the GRAPH data structure
  */
 int co_gs_is_optimizable(copy_opt_t *co, ir_node *irn);
 
-#endif /* FIRM_BE_BECOPYOPT_H */
+#endif