disable experimental code for now

[libfirm] / ir / be / bera.h

diff --git a/ir/be/bera.h b/ir/be/bera.h
index 0664a6b..71ee792 100644 (file)
--- a/ir/be/bera.h
+++ b/ir/be/bera.h
@@ -9,20 +9,21 @@
 
 #include "firm_config.h"
 
-#ifdef WITH_LIBCORE
-#include <libcore/lc_opts.h>
 #include <libcore/lc_timing.h>
-#endif
 
 #include "firm_types.h"
 
 #include "be.h"
+#include "belive.h"
+#include "beirg.h"
+#include "bemodule.h"
 
 typedef struct {
        lc_timer_t *t_prolog;      /**< timer for prolog */
        lc_timer_t *t_epilog;      /**< timer for epilog */
        lc_timer_t *t_live;        /**< timer for liveness calculation */
        lc_timer_t *t_spill;       /**< timer for spilling */
+       lc_timer_t *t_spillslots;  /**< spillslot coalescing */
        lc_timer_t *t_color;       /**< timer for graph coloring */
        lc_timer_t *t_ifg;         /**< timer for building interference graph */
        lc_timer_t *t_copymin;     /**< timer for copy minimization */
@@ -31,22 +32,27 @@ typedef struct {
        lc_timer_t *t_other;       /**< timer for remaining stuff */
 } be_ra_timer_t;
 
-typedef struct {
-#ifdef WITH_LIBCORE
-       void (*register_options)(lc_opt_entry_t *grp);
-#endif
-       be_ra_timer_t *(*allocate)(const be_irg_t *bi);
+extern be_ra_timer_t *global_ra_timer;
+
+typedef struct be_ra_t {
+       void (*allocate)(be_irg_t *bi);   /**< allocate registers on a graph */
 } be_ra_t;
 
+void be_register_allocator(const char *name, be_ra_t *allocator);
 
+/**
+ * Do register allocation with currently selected register allocator
+ */
+void be_allocate_registers(be_irg_t *birg);
 
 /**
  * Check, if two values interfere.
+ * @param lv Liveness information.
  * @param a The first value.
  * @param b The second value.
  * @return 1, if @p a and @p b interfere, 0 if not.
  */
-int values_interfere(const ir_node *a, const ir_node *b);
+int values_interfere(const be_lv_t *lv, const ir_node *a, const ir_node *b);
 
 /**
  * Check, if a value dominates the other one.