X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_common.c;h=0bffe0225e30e6ddbda86789043c67ba4222d494;hb=78bac126e7f9ca55761ab892ebfa9c19a4a65fcf;hp=249f1b34534c6009c3f8c8c9a0640c36cf61d9e2;hpb=c5efabfad5b5fc7e9687d5d2fad490350e71a905;p=libfirm

diff --git a/ir/be/bechordal_common.c b/ir/be/bechordal_common.c
index 249f1b345..0bffe0225 100644
--- a/ir/be/bechordal_common.c
+++ b/ir/be/bechordal_common.c
@@ -1,11 +1,33 @@
 /*
- * bechordal_common.c
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
- *  Created on: Nov 11, 2009
- *      Author: bersch
+ * 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.
  */
 
+/**
+ * @file
+ * @brief       Common functions for chordal register allocation.
+ * @author      Sebastian Hack
+ * @date        08.12.2004
+ * @version     $Id: bechordal.c 26750 2009-11-27 09:37:43Z bersch $
+ */
 #include "config.h"
+
+#include "bechordal_common.h"
+
 #include "debug.h"
 
 #include "iredges.h"
@@ -26,32 +48,13 @@
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
 /* Make a fourcc for border checking. */
-#define BORDER_FOURCC				FOURCC('B', 'O', 'R', 'D')
+#define BORDER_FOURCC   FOURCC('B', 'O', 'R', 'D')
 
-
-/**
- * Check, if an irn is of the register class currently under processing.
- * @param env The chordal environment.
- * @param irn The node.
- * @return 1, if the node is of that register class, 0 if not.
- */
-inline int has_reg_class(const be_chordal_env_t *env, const ir_node *irn)
+int has_reg_class(const be_chordal_env_t *env, const ir_node *irn)
 {
 	return arch_irn_consider_in_reg_alloc(env->cls, irn);
 }
 
-/**
- * Add an interval border to the list of a block's list
- * of interval border.
- * @note You always have to create the use before the def.
- * @param env The environment.
- * @param head The list head to enqueue the borders.
- * @param irn The node (value) the border belongs to.
- * @param pressure The pressure at this point in time.
- * @param step A time step for the border.
- * @param is_def Is the border a use or a def.
- * @return The created border.
- */
 static inline border_t *border_add(be_chordal_env_t *env, struct list_head *head,
 			ir_node *irn, unsigned step, unsigned pressure,
 			unsigned is_def, unsigned is_real)
@@ -83,7 +86,7 @@ static inline border_t *border_add(be_chordal_env_t *env, struct list_head *head
 		 * the def node (see the code above). It was placed into the
 		 * link field of the irn, so we can get it there.
 		 */
-		b = get_irn_link(irn);
+		b = (border_t*)get_irn_link(irn);
 
 		DEBUG_ONLY(assert(b && b->magic == BORDER_FOURCC && "Illegal border encountered"));
 	}
@@ -100,13 +103,7 @@ static inline border_t *border_add(be_chordal_env_t *env, struct list_head *head
 	return b;
 }
 
-/**
- * Annotate the register pressure to the nodes and compute
- * the liveness intervals.
- * @param block The block to do it for.
- * @param env_ptr The environment.
- */
-void pressure(ir_node *block, void *env_ptr)
+void create_borders(ir_node *block, void *env_ptr)
 {
 /* Convenience macro for a def */
 #define border_def(irn, step, real) \
@@ -116,13 +113,13 @@ void pressure(ir_node *block, void *env_ptr)
 #define border_use(irn, step, real) \
 	border_add(env, head, irn, step, ++pressure, 0, real)
 
-	be_chordal_env_t *env             = env_ptr;
+	be_chordal_env_t *env             = (be_chordal_env_t*)env_ptr;
 	bitset_t *live                    = bitset_malloc(get_irg_last_idx(env->irg));
 	ir_node *irn;
-	be_lv_t *lv                       = env->birg->lv;
+	be_lv_t *lv                       = be_get_irg_liveness(env->irg);
 
 	int i, n;
-	bitset_pos_t elm;
+	size_t elm;
 	unsigned step = 0;
 	unsigned pressure = 0;
 	struct list_head *head;
@@ -225,9 +222,9 @@ be_insn_t *chordal_scan_insn(be_chordal_env_t *env, ir_node *irn)
 {
 	be_insn_env_t ie;
 
-	ie.ignore_colors = env->ignore_colors;
-	ie.obst          = env->obst;
-	ie.cls           = env->cls;
+	ie.allocatable_regs = env->allocatable_regs;
+	ie.obst             = env->obst;
+	ie.cls              = env->cls;
 	return be_scan_insn(&ie, irn);
 }
 
@@ -257,7 +254,7 @@ ir_node *pre_process_constraints(be_chordal_env_t *env, be_insn_t **the_insn)
 	 * Make the Perm, recompute liveness and re-scan the insn since the
 	 * in operands are now the Projs of the Perm.
 	 */
-	perm = insert_Perm_after(env->birg, env->cls, sched_prev(insn->irn));
+	perm = insert_Perm_after(env->irg, env->cls, sched_prev(insn->irn));
 
 	/* Registers are propagated by insert_Perm_after(). Clean them here! */
 	if (perm == NULL)
@@ -296,9 +293,8 @@ ir_node *pre_process_constraints(be_chordal_env_t *env, be_insn_t **the_insn)
 	return perm;
 }
 
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_chordal_common);
 void be_init_chordal_common(void)
 {
 	FIRM_DBG_REGISTER(dbg, "firm.be.chordal_common");
 }
-
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_chordal_common);