add correct compare functions for be nodes

[libfirm] / ir / be / bera.c

diff --git a/ir/be/bera.c b/ir/be/bera.c
index 3525d7f..29fa1d1 100644 (file)
--- a/ir/be/bera.c
+++ b/ir/be/bera.c
@@ -1,7 +1,28 @@
+/*
+ * Copyright (C) 1995-2007 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
+ * @version     $Id$
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -15,6 +36,7 @@
 #include "irnode.h"
 #include "irmode.h"
 #include "irdom.h"
+#include "iredges.h"
 
 #include "bera.h"
 #include "beutil.h"
@@ -22,7 +44,10 @@
 #include "belive_t.h"
 #include "bemodule.h"
 
-static sched_timestep_t get_time_step(const ir_node *irn)
+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;
@@ -30,29 +55,31 @@ static sched_timestep_t get_time_step(const ir_node *irn)
        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 = get_time_step(a);
-               sched_timestep_t bs = get_time_step(b);
-               res = as <= bs;
-       }
-
-       return res;
+       return value_dominates_intrablock(a, b);
 }
 
 /**
@@ -122,6 +149,14 @@ void be_register_allocator(const char *name, be_ra_t *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");