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

diff --git a/ir/be/becopyopt.h b/ir/be/becopyopt.h
index 6c371ea48..6646e5d01 100644
--- a/ir/be/becopyopt.h
+++ b/ir/be/becopyopt.h
@@ -57,13 +57,11 @@ enum {
 	CO_ALGO_HEUR2,
 	CO_ALGO_HEUR4,
 	CO_ALGO_ILP,
-#ifdef FIRM_KAPS
 	CO_ALGO_PBQP,
-#endif
 	CO_ALGO_LAST
 };
 
-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);
 
@@ -101,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);
@@ -121,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.
  */
@@ -236,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
@@ -257,4 +264,4 @@ int co_solve_ilp2(copy_opt_t *co);
  */
 int co_gs_is_optimizable(copy_opt_t *co, ir_node *irn);
 
-#endif /* FIRM_BE_BECOPYOPT_H */
+#endif