X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyilp2.c;h=8054f48ece682bcafa1c1a5cb227a5822d2d6936;hb=dfc341ac6f54b4b0922d605e28333be76f487c68;hp=9e2cf822c04f6a01a938e3ebae726ead766f8f90;hpb=2ac217139bd2e6bf6be43f65ecc4adb7653af9a5;p=libfirm

diff --git a/ir/be/becopyilp2.c b/ir/be/becopyilp2.c
index 9e2cf822c..8054f48ec 100644
--- a/ir/be/becopyilp2.c
+++ b/ir/be/becopyilp2.c
@@ -1,9 +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.
+ *
+ * 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       ILP based copy minimization.
+ * @author      Daniel Grund
+ * @date        28.02.2006
+ * @version     $Id$
  *
  * ILP formalization using G=(V, E, Q):
  *  - 2 class of variables: coloring vars x_ic   and   equal color vars y_ij
@@ -25,14 +44,14 @@
  *
  *		x_nc, y_ij \in N,   w_ij \in R^+
  */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
 #ifdef WITH_ILP
 
-#include <bitset.h>
+#include "bitset.h"
+#include "raw_bitset.h"
 #include "pdeq.h"
 
 #include "irtools.h"
@@ -63,20 +82,20 @@ static void build_coloring_cstr(ilp_env_t *ienv) {
 	be_ifg_foreach_node(ifg, iter, irn)
 		if (!sr_is_removed(ienv->sr, irn)) {
 			int col, cst_idx;
-			arch_register_req_t req;
+			const arch_register_req_t *req;
 			int curr_node_color = get_irn_col(ienv->co, irn);
 			int node_nr = (int)get_irn_node_nr(irn);
 			local_env_t *lenv = ienv->env;
 
 			pmap_insert(lenv->nr_2_irn, INT_TO_PTR(node_nr), irn);
 
-			arch_get_register_req(ienv->co->aenv, &req, irn, -1);
+			req = arch_get_register_req(ienv->co->aenv, irn, -1);
 
 			/* get assignable colors */
-			if (arch_register_req_is(&req, limited))
-				req.limited(req.limited_env, colors);
-			else {
-				arch_register_class_put(req.cls, colors);
+			if (arch_register_req_is(req, limited)) {
+				rbitset_copy_to_bitset(req->limited, colors);
+			} else {
+				arch_register_class_put(req->cls, colors);
 				// bitset_andnot(colors, ienv->co->cenv->ignore_colors);
 			}