fixed precedence constraint

[libfirm] / ir / be / bera.c

diff --git a/ir/be/bera.c b/ir/be/bera.c
index 8eb9979..fe36642 100644 (file)
--- a/ir/be/bera.c
+++ b/ir/be/bera.c
@@ -7,6 +7,8 @@
 #include "config.h"
 #endif
 
+#include <stdlib.h>
+
 #include "pset.h"
 #include "impl.h"
 
@@ -14,9 +16,21 @@
 #include "irmode.h"
 #include "irdom.h"
 
+#include "bera.h"
 #include "beutil.h"
 #include "besched_t.h"
 #include "belive_t.h"
+#include "bemodule.h"
+
+be_ra_timer_t *global_ra_timer = NULL;
+
+static sched_timestep_t get_time_step(const ir_node *irn)
+{
+       if(is_Phi(irn))
+               return 0;
+
+       return sched_get_time_step(irn);
+}
 
 int value_dominates(const ir_node *a, const ir_node *b)
 {
@@ -35,8 +49,8 @@ int value_dominates(const ir_node *a, const ir_node *b)
         * Dominance is determined by the time steps of the schedule.
         */
        } else {
-               sched_timestep_t as = sched_get_time_step(a);
-               sched_timestep_t bs = sched_get_time_step(b);
+               sched_timestep_t as = get_time_step(a);
+               sched_timestep_t bs = get_time_step(b);
                res = as <= bs;
        }
 
@@ -49,7 +63,7 @@ int value_dominates(const ir_node *a, const ir_node *b)
  * @param b The second value.
  * @return 1, if a and 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)
 {
        int a2b = value_dominates(a, b);
        int b2a = value_dominates(b, a);
@@ -75,7 +89,7 @@ int values_interfere(const ir_node *a, const ir_node *b)
                 * If a is live end in b's block it is
                 * live at b's definition (a dominates b)
                 */
-               if(is_live_end(bb, a))
+               if(be_is_live_end(lv, bb, a))
                        return 1;
 
                /*
@@ -83,22 +97,46 @@ int values_interfere(const ir_node *a, const ir_node *b)
                 * If there's one usage of a in the block of b, then
                 * we check, if this use is dominated by b, if that's true
                 * a and b interfere. Note that b must strictly dominate the user,
-                        * since if b is the last user of in the block, b and a do not
-                        * interfere.
+                * since if b is the last user of in the block, b and a do not
+                * interfere.
                 * Uses of a not in b's block can be disobeyed, because the
                 * check for a being live at the end of b's block is already
                 * performed.
                 */
                foreach_out_edge(a, edge) {
-                       const ir_node *user = edge->src;
-                       if(get_nodes_block(user) == bb
-                           && !is_Phi(user)
-                               && b != user
-                               && value_dominates(b, user)) {
+                       const ir_node *user = get_edge_src_irn(edge);
+                       if(get_nodes_block(user) == bb && !is_Phi(user) && b != user && value_dominates(b, user))
                                return 1;
-                       }
                }
-       }
+       }
 
        return 0;
 }
+
+/** The list of register allocators */
+static be_module_list_entry_t *register_allocators = NULL;
+static be_ra_t *selected_allocator = NULL;
+
+void be_register_allocator(const char *name, be_ra_t *allocator)
+{
+       if(selected_allocator == NULL)
+               selected_allocator = allocator;
+       be_add_module_to_list(&register_allocators, name, allocator);
+}
+
+void be_allocate_registers(be_irg_t *birg)
+{
+       assert(selected_allocator != NULL);
+       if(selected_allocator != NULL) {
+               selected_allocator->allocate(birg);
+       }
+}
+
+void be_init_ra(void)
+{
+       lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
+
+       be_add_module_list_opt(be_grp, "regalloc", "register allocator",
+                              &register_allocators, (void**) &selected_allocator);
+}
+BE_REGISTER_MODULE_CONSTRUCTOR(init_be_ra);