fixed a bunch of warnings (and some bugs)

[libfirm] / ir / be / becopyheur2.c

diff --git a/ir/be/becopyheur2.c b/ir/be/becopyheur2.c
index 7f81ef4..a219e5d 100644 (file)
--- 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
@@ -62,7 +84,7 @@ static const lc_opt_table_entry_t options[] = {
        LC_OPT_ENT_INT      ("iter", "iterations for subtree nodes",                           &subtree_iter),
        LC_OPT_ENT_DBL      ("cf",   "factor of constraint importance (between 0.0 and 1.0)",  &constr_factor),
        LC_OPT_ENT_INT      ("max",  "maximum recursion depth",                                &max_depth),
-       { NULL }
+       LC_OPT_ENT_NULL
 };
 
 void be_init_copyheur2(void)
@@ -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,9 +1250,9 @@ 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, NULL);
        env.touched     = NULL;