X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbera.c;h=a7584a52c30b451d36ca99f22982fb9aaa8ce411;hb=fef8dc3eff6468d7d65485af8e1ac9884c504e1a;hp=5ab11e943d4ebb14b57aa5bf21f1e6595622c70b;hpb=165e48ff9dc8753e95565ddf6c58b3f128490406;p=libfirm

diff --git a/ir/be/bera.c b/ir/be/bera.c
index 5ab11e943..a7584a52c 100644
--- a/ir/be/bera.c
+++ b/ir/be/bera.c
@@ -1,117 +1,70 @@
+/*
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ */
+
 /**
- * Base routines for register allocation.
- * @author Sebastian Hack
- * @date 22.11.2004
+ * @file
+ * @brief       Base routines for register allocation.
+ * @author      Sebastian Hack
+ * @date        22.11.2004
  */
-#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 "besched_t.h"
+#include "bera.h"
+#include "beutil.h"
+#include "besched.h"
 #include "belive_t.h"
+#include "bemodule.h"
 
-static INLINE int values_interfere_dom(const ir_node *a, const ir_node *b)
-{
-	const ir_node *b1 = get_nodes_block(a);
-	const ir_node *b2 = get_nodes_block(b);
-	int lo_a, lo_b;
-
-	assert(block_dominates(b1, b2));
-
-	/*
-	 * if the two blocks are not equal, a and b can only interfere if a is
-	 * live in at b2.
-	 */
-	if(b1 != b2 && !is_live_in(b2, a))
-		return 0;
-
-	lo_a = is_live_end(b2, a);
-	lo_b = is_live_end(b2, b);
-
-	/*
-	 * If the two blocks are the same and one value is live out and the
-	 * definition of the other is after the definition ov the live out
-	 * value, they interfere.
-	 */
-	if(b1 == b2) {
-		int pos_a = sched_get_time_step(a);
-		int pos_b = sched_get_time_step(b);
-
-		if((pos_a < pos_b && lo_a) || (pos_b < pos_a && lo_b))
-			return 1;
-	}
-
-	/*
-	 * Now it is left to check, if the sequence from the last use of 'b'
-	 * (or the end of the block b2, if b is live out)
-	 * to the def of 'b' contains a use and NOT the def of 'a'. Then they
-	 * also interfere
-	 */
-	{
-		const ir_node *irn;
+/** The list of register allocators */
+static be_module_list_entry_t *register_allocators = NULL;
+static be_ra_t *selected_allocator = NULL;
 
-		/* Initialize the liveness. */
-		int a_live = lo_a;
-		int b_live = lo_b;
-
-		/* Go from the end of block b2 and try to detect the liveness. */
-		sched_foreach_reverse(b2, irn) {
-			int i, n;
-
-			/*
-			 * If the definition of 'a' was found 'a' and 'b' interfere, if
-			 * 'b' is live here.
-			 */
-			if(irn == a)
-				return b_live;
-
-			/* Same goes for 'b'. */
-			if(irn == b)
-				return a_live;
-
-			/* If 'a' is not yet live, search for a use. */
-			if(!a_live) {
-				for(i = 0, n = get_irn_arity(irn); i < n; ++i)
-					if(get_irn_n(irn, i) == a) {
-						a_live = 1;
-						break;
-				}
-			}
-
-			/* Same for 'b' */
-			if(!b_live) {
-				for(i = 0, n = get_irn_arity(irn); i < n; ++i)
-					if(get_irn_n(irn, i) == b) {
-						b_live = 1;
-						break;
-					}
-			}
+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(ir_graph *irg)
+{
+	assert(selected_allocator != NULL);
+	if (selected_allocator != NULL) {
+		selected_allocator->allocate(irg);
 	}
-
-	assert(0 && "You may never reach this place");
-
-	/* This is never reached */
-	return 0;
 }
 
-int values_interfere(const ir_node *a, const ir_node *b)
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_ra)
+void be_init_ra(void)
 {
-	const ir_node *b1 = get_nodes_block(a);
-	const ir_node *b2 = get_nodes_block(b);
+	lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
 
-	if(block_dominates(b1, b2))
-		return values_interfere_dom(a, b);
-	else if(block_dominates(b2, b1))
-		return values_interfere_dom(b, a);
-	else
-		return 0;
+	be_add_module_list_opt(be_grp, "regalloc", "register allocator",
+	                       &register_allocators, (void**) &selected_allocator);
 }