allow character mode constants

[libfirm] / ir / be / bera.c

diff --git a/ir/be/bera.c b/ir/be/bera.c
index 9a1bb75..e453262 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,33 +16,48 @@
 #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 INLINE
+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_intrablock(const ir_node *a, const ir_node *b)
+{
+       sched_timestep_t as = get_time_step(a);
+       sched_timestep_t bs = get_time_step(b);
+
+       return as <= bs;
+}
 
 int value_dominates(const ir_node *a, const ir_node *b)
 {
-       int res = 0;
-       const ir_node *ba = get_block(a);
-       const ir_node *bb = get_block(b);
+       const ir_node *block_a = get_block(a);
+       const ir_node *block_b = get_block(b);
 
        /*
         * a and b are not in the same block,
         * so dominance is determined by the dominance of the blocks.
         */
-       if(ba != bb) {
-               res = block_dominates(ba, bb);
+       if(block_a != block_b) {
+               return block_dominates(block_a, block_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);
-               res = as <= bs;
-       }
-
-       return res;
+       return value_dominates_intrablock(a, b);
 }
 
 /**
@@ -90,10 +107,39 @@ int values_interfere(const be_lv_t *lv, const ir_node *a, const ir_node *b)
                 * performed.
                 */
                foreach_out_edge(a, edge) {
-                       const ir_node *user = edge->src;
+                       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;
+       }
+
+       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);