X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbera.c;h=36276690b82887129d04e81375e193fa64220c88;hb=80a6158fdd766f42ee6c508a773bc114ff1b61f3;hp=7055ec69dd8445cd2522a9a47e0e3e1f7bab1020;hpb=88ad2af117564fcfda8b052a0bef41241fdcac1a;p=libfirm

diff --git a/ir/be/bera.c b/ir/be/bera.c
index 7055ec69d..36276690b 100644
--- 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,43 @@
 #include "irmode.h"
 #include "irdom.h"
 
+#include "bera.h"
 #include "beutil.h"
 #include "besched_t.h"
 #include "belive_t.h"
+#include "bemodule.h"
+
+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)
 {
-  int res = 0;
+	int res = 0;
 	const ir_node *ba = get_block(a);
 	const ir_node *bb = 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);
-
-  /*
-   * 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;
+	/*
+	 * 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);
+
+	/*
+	 * Dominance is determined by the time steps of the schedule.
+	 */
+	} else {
+		sched_timestep_t as = get_time_step(a);
+		sched_timestep_t bs = get_time_step(b);
+		res = as <= bs;
+	}
+
+	return res;
 }
 
 /**
@@ -49,52 +61,80 @@ 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);
+
+	/* If there is no dominance relation, they do not interfere. */
+	if((a2b | b2a) > 0) {
+		const ir_edge_t *edge;
+		ir_node *bb;
+
+		/*
+		 * Adjust a and b so, that a dominates b if
+		 * a dominates b or vice versa.
+		 */
+		if(b2a) {
+			const ir_node *t = a;
+			a = b;
+			b = t;
+		}
+
+		bb = get_nodes_block(b);
+
+		/*
+		 * If a is live end in b's block it is
+		 * live at b's definition (a dominates b)
+		 */
+		if(be_is_live_end(lv, bb, a))
+			return 1;
+
+		/*
+		 * Look at all usages of a.
+		 * 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.
+		 * 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 = 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)
 {
-  int a2b = value_dominates(a, b);
-  int b2a = value_dominates(b, a);
-
-  /* If there is no dominance relation, they do not interfere. */
-  if(a2b + b2a > 0) {
-    const ir_edge_t *edge;
-    ir_node *ba = get_nodes_block(a);
-    ir_node *bb = get_nodes_block(b);
-
-    /*
-     * Adjust a and b so, that a dominates b if
-     * a dominates b or vice versa.
-     */
-    if(b2a) {
-      const ir_node *t = a;
-      a = b;
-      b = t;
-    }
-
-    /*
-     * 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))
-      return 1;
-
-    /*
-     * Look at all usages of a.
-     * 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.
-     * 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)
-          && value_dominates(b, user))
-        return 1;
-      }
-    }
-  }
-
-  return 0;
+	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);