X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbejavacoal.c;h=a1ecb1fb248c785f35e7fdca8706edca44640229;hb=9276447aec4972df060349e162f583c4898dfec8;hp=d1a17e379b82e44d35239362865efd351ca77702;hpb=b71eb461afcc67cf09b606d42db1125b03e001e6;p=libfirm

diff --git a/ir/be/bejavacoal.c b/ir/be/bejavacoal.c
index d1a17e379..a1ecb1fb2 100644
--- a/ir/be/bejavacoal.c
+++ b/ir/be/bejavacoal.c
@@ -1,12 +1,34 @@
-
+/*
+ * 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       Interface for external Java coalescer.
+ * @author      Sebastian Hack
+ * @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 */
 
 #ifdef _WIN32
 #include <windows.h>
@@ -20,6 +42,10 @@
 #include <stdio.h>
 
 #include "bejavacoal.h"
+#include "irtools.h"
+#include "bemodule.h"
+
+#ifdef WITH_JVM
 
 /* Path to the jar file. A little OS dependent convenience. */
 #ifdef _WIN32
@@ -30,10 +56,9 @@ static char jar_file[512] = "/ben/hack/public/coal.jar";
 
 static char cls_name[256] = "coalescing/mst/safe/Algo";
 
-/* Name of teh JVM dll/so */
+/* Name of the JVM dll/so */
 static char jvm_lib[512] = { 0 };
 
-#ifdef WITH_LIBCORE
 static const lc_opt_table_entry_t options[] = {
 	LC_OPT_ENT_STR      ("jvm",  "absolute path to jvm dll",                    jvm_lib, sizeof(jvm_lib)),
 	LC_OPT_ENT_STR      ("jar",  "jar file of the coalescer",                   jar_file, sizeof(jar_file)),
@@ -41,14 +66,17 @@ static const lc_opt_table_entry_t options[] = {
 	{ NULL }
 };
 
-void be_java_coal_register_options(lc_opt_entry_t *grp)
+void be_init_javacoal(void)
 {
-	lc_opt_entry_t *jc_grp = lc_opt_get_grp(grp, "jc");
+	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 *jc_grp = lc_opt_get_grp(chordal_grp, "jc");
 	lc_opt_add_table(jc_grp, options);
 }
-#endif
 
-#ifdef WITH_JVM
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_javacoal);
+
 #include <jni.h>
 
 typedef struct _jni_env_t {
@@ -93,7 +121,7 @@ static char *locate_jvm_lib(char *path, size_t path_len)
 	return path;
 }
 
-#else
+#else /* ! _WIN32 */
 /* Unix version */
 static void *find_jvm_symbol(const char *vmlibpath, const char *sym)
 {
@@ -105,7 +133,7 @@ static char *locate_jvm_lib(char *path, size_t n)
 {
 	return NULL;
 }
-#endif
+#endif /* _WIN32 */
 
 static int start_vm(jni_env_t *env, int argc, char *argv[])
 {
@@ -205,6 +233,7 @@ static jni_env_t *get_jvm(void)
 	return &env;
 }
 
+
 static void check(jni_env_t *env, const char *file, int line)
 {
 	JNIEnv *jni = env->jni;
@@ -367,7 +396,7 @@ void be_java_coal_set_debug(be_java_coal_t *c, int n, const char *dbg)
 	CHECK(c->env);
 	(*jni)->CallVoidMethod(jni, c->obj, mid, (jint) n, str);
 	CHECK(c->env);
-#endif
+#endif /* if 0 */
 }
 
 void be_java_coal_forbid_color(be_java_coal_t *c, int n, int col)
@@ -397,7 +426,12 @@ int be_java_coal_get_color(be_java_coal_t *c, int n)
 	return jc_call_int(c, mth_get_color, (jint) n);
 }
 
-#else
+void be_java_coal_start_jvm(void)
+{
+	get_jvm();
+}
+
+#else /* ! WITH_JVM */
 
 be_java_coal_t *be_java_coal_init(const char *graph_name, int n_nodes, int n_regs, int dbg_level)
 {
@@ -452,5 +486,8 @@ int be_java_coal_get_color(be_java_coal_t *c, int n)
 	return -1;
 }
 
+void be_java_coal_start_jvm(void)
+{
+}
 
 #endif /* WITH_JVM */