X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyheur3.c;h=d8de8b2af31a424df10d1fff5678fe5c9876217c;hb=e7ba741cdd9599ce05d7989bff60a1c6137ee0b5;hp=62320ae2b86053bc662eff5c196e6a7527b44b36;hpb=6d170fc34b915029f6c84d9be6861a6fd3726e04;p=libfirm

diff --git a/ir/be/becopyheur3.c b/ir/be/becopyheur3.c
index 62320ae2b..d8de8b2af 100644
--- a/ir/be/becopyheur3.c
+++ b/ir/be/becopyheur3.c
@@ -1,18 +1,35 @@
+/*
+ * 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   25.07.2006
+ * @file
+ * @brief       More experiments on coalescing with Java implementation.
+ * @author      Sebastian Hack
+ * @date        25.07.2006
+ * @version     $Id$
  */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#ifdef WITH_LIBCORE
 #include <libcore/lc_opts.h>
 #include <libcore/lc_opts_enum.h>
-#endif /* WITH_LIBCORE */
 
 #include <stdlib.h>
 #include <limits.h>
@@ -24,13 +41,14 @@
 #include "debug.h"
 #include "bitfiddle.h"
 #include "bitset.h"
+#include "raw_bitset.h"
 
-#include "irphase_t.h"
 #include "irgraph_t.h"
 #include "irnode_t.h"
 #include "irprintf.h"
 #include "irtools.h"
 
+#include "bemodule.h"
 #include "beabi.h"
 #include "benode_t.h"
 #include "becopyopt.h"
@@ -45,10 +63,9 @@
 #define DUMP_AFTER  2
 #define DUMP_ALL    2 * DUMP_AFTER - 1
 
-static int dump_flags = 0;
-static int dbg_level  = 0;
+static unsigned dump_flags = 0;
+static int      dbg_level  = 0;
 
-#ifdef WITH_LIBCORE
 static const lc_opt_enum_mask_items_t dump_items[] = {
 	{ "before",  DUMP_BEFORE },
 	{ "after",   DUMP_AFTER  },
@@ -61,35 +78,39 @@ static lc_opt_enum_mask_var_t dump_var = {
 };
 
 static const lc_opt_table_entry_t options[] = {
-	LC_OPT_ENT_ENUM_MASK("dump", "dump ifg before, after or after each cloud",  &dump_var),
+	LC_OPT_ENT_ENUM_MASK("dump", "dump ifg cloud",                              &dump_var),
 	LC_OPT_ENT_INT      ("dbg",  "debug level for the Java coalescer",          &dbg_level),
-	{ NULL }
+	LC_OPT_LAST
 };
 
-void be_co3_register_options(lc_opt_entry_t *grp)
+void be_init_copyheur3(void)
 {
-	lc_opt_entry_t *co3_grp = lc_opt_get_grp(grp, "co3");
+	lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
+	lc_opt_entry_t *ra_grp = lc_opt_get_grp(be_grp, "ra");
+	lc_opt_entry_t *chordal_grp = lc_opt_get_grp(ra_grp, "chordal");
+	lc_opt_entry_t *co3_grp = lc_opt_get_grp(chordal_grp, "co3");
+
 	lc_opt_add_table(co3_grp, options);
 }
-#endif
 
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copyheur3);
 
 static void set_admissible_regs(be_java_coal_t *coal, copy_opt_t *co, ir_node *irn, int t_idx, int *col_map)
 {
-	unsigned i;
-	arch_register_req_t req;
-	unsigned n_regs = co->cls->n_regs;
+	const arch_register_req_t *req;
+
+	req = arch_get_register_req(co->aenv, irn, BE_OUT_POS(0));
 
 	// ir_printf("%+F\n", irn);
-	arch_get_register_req(co->aenv, &req, irn, BE_OUT_POS(0));
-	if(arch_register_req_is(&req, limited)) {
-		bitset_t *adm = bitset_alloca(n_regs);
-		req.limited(req.limited_env, adm);
-		for(i = 0; i < n_regs; ++i)
-			if(!bitset_is_set(adm, i) && col_map[i] >= 0) {
-				// printf("\tforbidding color: %d\n", i);
+	if(arch_register_req_is(req, limited)) {
+		unsigned i;
+		unsigned n_regs = co->cls->n_regs;
+
+		for(i = 0; i < n_regs; ++i) {
+			if(!rbitset_is_set(req->limited, i) && col_map[i] >= 0) {
 				be_java_coal_forbid_color(coal, t_idx, col_map[i]);
 			}
+		}
 	}
 }
 
@@ -127,8 +148,8 @@ int co_solve_heuristic_java(copy_opt_t *co)
 		}
 	}
 
-	node_map     = malloc((get_irg_last_idx(co->irg) + 1) * sizeof(node_map[0]));
-	inv_node_map = malloc((get_irg_last_idx(co->irg) + 1) * sizeof(inv_node_map[0]));
+	node_map     = xmalloc((get_irg_last_idx(co->irg) + 1) * sizeof(node_map[0]));
+	inv_node_map = xmalloc((get_irg_last_idx(co->irg) + 1) * sizeof(inv_node_map[0]));
 
 	curr_idx = 0;
 	be_ifg_foreach_node(ifg, nodes_it, n) {