X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbera.c;h=a7584a52c30b451d36ca99f22982fb9aaa8ce411;hb=29087feac9466883c278e53eec325d5e3099df1d;hp=29fa1d140c3ed3377ef0c7e720fa550937fb588f;hpb=39f3a8dbd0f00f90b7b12a849d1bf7b9c1329479;p=libfirm

diff --git a/ir/be/bera.c b/ir/be/bera.c
index 29fa1d140..a7584a52c 100644
--- a/ir/be/bera.c
+++ b/ir/be/bera.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -22,141 +22,45 @@
  * @brief       Base routines for register allocation.
  * @author      Sebastian Hack
  * @date        22.11.2004
- * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdlib.h>
 
 #include "pset.h"
-#include "impl.h"
 
 #include "irnode.h"
 #include "irmode.h"
 #include "irdom.h"
 #include "iredges.h"
+#include "irtools.h"
 
 #include "bera.h"
 #include "beutil.h"
-#include "besched_t.h"
+#include "besched.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)
-{
-	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(block_a != block_b) {
-		return block_dominates(block_a, block_b);
-	}
-
-	/*
-	 * Dominance is determined by the time steps of the schedule.
-	 */
-	return value_dominates_intrablock(a, b);
-}
-
-/**
- * Check, if two values interfere.
- * @param a The first value.
- * @param b The second value.
- * @return 1, if a and b interfere, 0 if not.
- */
-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)
+	if (selected_allocator == NULL)
 		selected_allocator = allocator;
 	be_add_module_to_list(&register_allocators, name, allocator);
 }
 
-void be_allocate_registers(be_irg_t *birg)
+void be_allocate_registers(ir_graph *irg)
 {
 	assert(selected_allocator != NULL);
-	if(selected_allocator != NULL) {
-		selected_allocator->allocate(birg);
+	if (selected_allocator != NULL) {
+		selected_allocator->allocate(irg);
 	}
 }
 
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_ra)
 void be_init_ra(void)
 {
 	lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
@@ -164,4 +68,3 @@ void be_init_ra(void)
 	be_add_module_list_opt(be_grp, "regalloc", "register allocator",
 	                       &register_allocators, (void**) &selected_allocator);
 }
-BE_REGISTER_MODULE_CONSTRUCTOR(init_be_ra);