X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyilp.c;h=31205882d476f4ddb4559d33bf11bb16047b2ea5;hb=c1fdf770d4d000dd5cf22daead32369342c5f5d1;hp=fcd1dba451e1e87685566e302e282945e9fa62a6;hpb=da48a7f7266cfe6274fc4d159d63bba245724222;p=libfirm

diff --git a/ir/be/becopyilp.c b/ir/be/becopyilp.c
index fcd1dba45..31205882d 100644
--- a/ir/be/becopyilp.c
+++ b/ir/be/becopyilp.c
@@ -1,18 +1,41 @@
-/**
- * Author:      Daniel Grund
- * Date:		28.02.2006
- * Copyright:   (c) Universitaet Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+/*
+ * Copyright (C) 1995-2008 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"
-#endif /* HAVE_CONFIG_H */
+#include "config.h" /* HAVE_CONFIG_H */
+
+#include "irtools.h"
+#include "irprintf.h"
 
 #include "bestatevent.h"
 #include "beirg_t.h"
+#include "bemodule.h"
+#include "error.h"
+
+#include "lc_opts.h"
+#include "lc_opts_enum.h"
 
 #ifdef WITH_ILP
 
@@ -22,11 +45,8 @@
 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;
 
-#ifdef WITH_LIBCORE
-#include <libcore/lc_opts.h>
-#include <libcore/lc_opts_enum.h>
 static const lc_opt_enum_mask_items_t dump_items[] = {
 	{ "ilp",   DUMP_ILP },
 	{ "sol",   DUMP_SOL },
@@ -42,7 +62,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)
@@ -57,8 +77,6 @@ void be_init_copyilp(void)
 }
 
 BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copyilp);
-#endif /* WITH_LIBCORE */
-
 
 #include "becopyilp_t.h"
 #include "beifg_t.h"
@@ -75,7 +93,7 @@ BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copyilp);
 
 
 size_red_t *new_size_red(copy_opt_t *co) {
-	size_red_t *res = xmalloc(sizeof(*res));
+	size_red_t *res = XMALLOC(size_red_t);
 
 	res->co = co;
 	res->all_removed = pset_new_ptr_default();
@@ -100,7 +118,6 @@ static INLINE int sr_is_simplicial(size_red_t *sr, const ir_node *ifn) {
 	be_ifg_foreach_neighbour(ifg, iter, ifn, curr)
 		if (!sr_is_removed(sr, curr))
 			all[size++] = curr;
-	be_ifg_neighbours_break(ifg, iter);
 
 	/* check if these form a clique */
 	for (i=0; i<size; ++i)
@@ -121,12 +138,10 @@ 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(irn, -1);
 
-			arch_get_register_req(sr->co->aenv, &req, irn, -1);
-
-			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)) {
+			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));
 
 					cs->irn = irn;
@@ -136,10 +151,9 @@ void sr_remove(size_red_t *sr) {
 					pset_insert_ptr(sr->all_removed, irn);
 
 					redo = 1;
-          	 	}
+				}
 			}
 		}
-		be_ifg_nodes_break(ifg, iter);
 	}
 }
 
@@ -160,9 +174,8 @@ void sr_reinsert(size_red_t *sr) {
 
 		be_ifg_foreach_neighbour(ifg, iter, irn, other) {
 			if (!sr_is_removed(sr, other)) /* only inspect nodes which are in graph right now */
-				bitset_set(used_cols, get_irn_col(sr->co, other));
+				bitset_set(used_cols, get_irn_col(other));
 		}
-		be_ifg_neighbours_break(ifg, iter);
 
 		/* now all bits not set are possible colors */
 		free_col = bitset_next_clear(used_cols, 0);
@@ -191,8 +204,7 @@ void free_size_red(size_red_t *sr) {
 #include <stdio.h>
 
 ilp_env_t *new_ilp_env(copy_opt_t *co, ilp_callback build, ilp_callback apply, void *env) {
-	ilp_env_t *res = xmalloc(sizeof(*res));
-	assert(res);
+	ilp_env_t *res = XMALLOC(ilp_env_t);
 
 	res->co         = co;
 	res->build      = build;
@@ -230,7 +242,15 @@ lpp_sol_state_t ilp_go(ilp_env_t *ienv) {
 	be_stat_ev_dbl("co_ilp_sol_time",   ienv->lp->sol_time);
 
 	if(dump_flags & DUMP_ILP) {
-		FILE *f = be_chordal_open(ienv->co->cenv, "", "-co.ilp");
+		char buf[128];
+		FILE *f;
+
+		ir_snprintf(buf, sizeof(buf), "%F_%s-co.ilp", ienv->co->cenv->irg,
+		            ienv->co->cenv->cls->name);
+		f = fopen(buf, "wt");
+		if(f == NULL) {
+			panic("Couldn't open '%s' for writing", buf);
+		}
 		lpp_dump_plain(ienv->lp, f);
 		fclose(f);
 	}