Fix warning in r15953.

[libfirm] / ir / be / becopyilp.c

diff --git a/ir/be/becopyilp.c b/ir/be/becopyilp.c
index 6fa8707..1199df0 100644 (file)
--- a/ir/be/becopyilp.c
+++ b/ir/be/becopyilp.c
@@ -1,11 +1,28 @@
-/**
- * Author:      Daniel Grund
- * Date:               28.02.2006
- * Copyright:   (c) Universitaet Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+/*
+ * 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.
  *
- * Common stuff used by all ILP fomulations.
+ * 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 stuff used by all ILP formulations.
+ * @author      Daniel Grund
+ * @date        28.02.2006
+ * @version     $Id$
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -30,7 +47,7 @@
 static int time_limit = 60;
 static int solve_net  = 1;
 static int solve_log  = 0;
-static int dump_flags = 0;
+static unsigned dump_flags = 0;
 
 static const lc_opt_enum_mask_items_t dump_items[] = {
        { "ilp",   DUMP_ILP },
@@ -47,7 +64,7 @@ static const lc_opt_table_entry_t options[] = {
        LC_OPT_ENT_BOOL     ("net",   "solve over the net", &solve_net),
        LC_OPT_ENT_BOOL     ("log",   "show ilp solving log",              &solve_log),
        LC_OPT_ENT_ENUM_MASK("dump",  "dump flags",             &dump_var),
-       { NULL }
+       LC_OPT_LAST
 };
 
 void be_init_copyilp(void)
@@ -124,11 +141,11 @@ void sr_remove(size_red_t *sr) {
        while (redo) {
                redo = 0;
                be_ifg_foreach_node(ifg, iter, irn) {
-                       arch_register_req_t req;
+                       const arch_register_req_t *req;
 
-                       arch_get_register_req(sr->co->aenv, &req, irn, -1);
+                       req = arch_get_register_req(sr->co->aenv, irn, -1);
 
-                       if (!arch_register_req_is(&req, limited) && !sr_is_removed(sr, irn) && !co_gs_is_optimizable(sr->co, irn)) {
+                       if (!arch_register_req_is(req, limited) && !sr_is_removed(sr, irn) && !co_gs_is_optimizable(sr->co, irn)) {
                        if (sr_is_simplicial(sr, irn)) {
                                        coloring_suffix_t *cs = obstack_alloc(&sr->ob, sizeof(*cs));