Fix fehler171

[libfirm] / ir / be / becopyopt.h

diff --git a/ir/be/becopyopt.h b/ir/be/becopyopt.h
index 41b422c..6c371ea 100644 (file)
--- a/ir/be/becopyopt.h
+++ b/ir/be/becopyopt.h
@@ -36,6 +36,7 @@
 
 #include "firm_types.h"
 #include "bechordal.h"
+#include "beutil.h"
 
 /**
  * Flags for dumping the IFG.
@@ -54,19 +55,36 @@ enum {
        CO_ALGO_NONE,
        CO_ALGO_HEUR,
        CO_ALGO_HEUR2,
-       CO_ALGO_HEUR3,
        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 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 *);
 
@@ -80,13 +98,6 @@ copy_opt_t *new_copy_opt(be_chordal_env_t *chordal_env, cost_fct_t get_costs);
  */
 void free_copy_opt(copy_opt_t *co);
 
-/**
- * Checks if a node is optimizable, viz. has something to do with coalescing
- * @param arch The architecture environment
- * @param irn  The irn to check
- */
-int co_is_optimizable_root(const copy_opt_t *co, ir_node *irn);
-
 /**
  * Computes the costs of a copy according to loop depth
  * @param co   The copy opt object.
@@ -161,18 +172,6 @@ void co_solve_park_moon(copy_opt_t *co);
  */
 int co_solve_heuristic_new(copy_opt_t *co);
 
-/**
- * Solves the copy minimization problem using another heuristic approach implemented in Java.
- * This function needs a JVM which is started to call the Java module.
- * Uses the GRAPH data structure.
- */
-int co_solve_heuristic_java(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.