X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyheur2.c;h=dcedd7655c42f39dc16e3023d330e7ce86c870f7;hb=d5629a5184ffe6a9e43f5bd629a09ff2aea6417a;hp=3034d562174e7bf67135ce4dfe99ab20cd044914;hpb=863d31d7a5c8210432fef88b30fc3e8353131538;p=libfirm

diff --git a/ir/be/becopyheur2.c b/ir/be/becopyheur2.c
index 3034d5621..dcedd7655 100644
--- a/ir/be/becopyheur2.c
+++ b/ir/be/becopyheur2.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.
+ */
+
 /**
- * More experiments on coalescing.
- * @author Sebastian Hack
- * @date   14.04.2006
+ * @file
+ * @brief       More experiments on coalescing.
+ * @author      Sebastian Hack
+ * @date        14.04.2006
+ * @version     $Id$
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -33,6 +54,7 @@
 #include "becopyopt.h"
 #include "becopyopt_t.h"
 #include "bechordal_t.h"
+#include "beirg_t.h"
 
 #define DUMP_BEFORE 1
 #define DUMP_AFTER  2
@@ -102,7 +124,7 @@ typedef struct {
 } col_cost_pair_t;
 
 typedef struct {
-	phase_t     ph;
+	ir_phase     ph;
 	copy_opt_t *co;
 	bitset_t   *ignore_regs;
 	co2_irn_t  *touched;
@@ -173,7 +195,7 @@ typedef struct {
 #define get_co2_irn(co2, irn)         ((co2_irn_t *)       phase_get_or_set_irn_data(&co2->ph, irn))
 #define get_co2_cloud_irn(co2, irn)   ((co2_cloud_irn_t *) phase_get_or_set_irn_data(&co2->ph, irn))
 
-static void *co2_irn_init(phase_t *ph, ir_node *irn, void *data)
+static void *co2_irn_init(ir_phase *ph, ir_node *irn, void *data)
 {
 	co2_t *env         = (co2_t *) ph;
 	affinity_node_t *a = get_affinity_info(env->co, irn);
@@ -290,15 +312,15 @@ static void incur_constraint_costs(co2_t *env, ir_node *irn, col_cost_pair_t *co
 
 	req = arch_get_register_req(env->co->aenv, irn, BE_OUT_POS(0));
 
-	if(arch_register_req_is(req, limited)) {
-		unsigned n_regs = env->co->cls->n_regs;
+	if (arch_register_req_is(req, limited)) {
+		unsigned n_regs   = env->co->cls->n_regs;
 		unsigned n_constr = 0;
-		int i;
+		unsigned i;
 
 		n_constr = rbitset_popcnt(req->limited, n_regs);
-		for(i = 0; i < n_regs; ++i) {
-			if(rbitset_is_set(req->limited, i)) {
-				col_costs[i].costs  = add_saturated(col_costs[i].costs, costs / n_constr);
+		for (i = 0; i < n_regs; ++i) {
+			if (rbitset_is_set(req->limited, i)) {
+				col_costs[i].costs = add_saturated(col_costs[i].costs, costs / n_constr);
 			}
 		}
 	}
@@ -1228,11 +1250,11 @@ static be_ifg_dump_dot_cb_t ifg_dot_cb = {
 
 int co_solve_heuristic_new(copy_opt_t *co)
 {
-	char buf[256];
+	char  buf[256];
 	co2_t env;
-	FILE *f;
+	FILE  *f;
 
-	phase_init(&env.ph, "co2", co->cenv->birg->irg, PHASE_DEFAULT_GROWTH, co2_irn_init);
+	phase_init(&env.ph, "co2", co->cenv->birg->irg, PHASE_DEFAULT_GROWTH, co2_irn_init, NULL);
 	env.touched     = NULL;
 	env.visited     = 0;
 	env.co          = co;