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

diff --git a/ir/be/bera.c b/ir/be/bera.c
index ff3ae55b2..a7584a52c 100644
--- a/ir/be/bera.c
+++ b/ir/be/bera.c
@@ -1,99 +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 "bera.h"
 #include "beutil.h"
-#include "besched_t.h"
+#include "besched.h"
 #include "belive_t.h"
+#include "bemodule.h"
 
-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);
-
-  /*
-   * 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;
-  }
+/** The list of register allocators */
+static be_module_list_entry_t *register_allocators = NULL;
+static be_ra_t *selected_allocator = NULL;
 
-  return res;
+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);
 }
 
-/**
- * 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 ir_node *a, const ir_node *b)
+void be_allocate_registers(ir_graph *irg)
 {
-  int a2b = value_dominates(a, b);
-  int b2a = value_dominates(b, a);
-
-  /*
-   * 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 either a dmoninates b or vice versa
-   * check if there is usage which is dominated by b.
-   *
-   * remind, that if a and b are in a dom relation, a always dominates b
-   * here due to the if above.
-   */
-  if(a2b + b2a) {
-    const ir_edge_t *edge;
-
-    /* Look at all usages of a */
-    foreach_out_edge(a, edge) {
-      const ir_node *user = edge->src;
-
-      /*
-       * If the user is a phi we must check the last instruction in the
-       * corresponding phi predecessor block since the phi is not a
-       * proper user.
-       */
-      if(is_Phi(user)) {
-        ir_node *phi_block = get_nodes_block(user);
-        user = sched_last(get_Block_cfgpred_block(phi_block, edge->pos));
-      }
-
-      /* If b dominates a user of a, we can safely return 1 here. */
-      if(value_dominates(b, user))
-        return 1;
-    }
+	assert(selected_allocator != NULL);
+	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");
 
-  return 0;
+	be_add_module_list_opt(be_grp, "regalloc", "register allocator",
+	                       &register_allocators, (void**) &selected_allocator);
 }