X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbejavacoal.c;h=3ef97dbb5a7e000d67a5244edac91c57d9d965ac;hb=80a6158fdd766f42ee6c508a773bc114ff1b61f3;hp=3ff5fd5f4ad36c47683adbdd253c02666e02e9e8;hpb=f7c9890c7f7c869f7da0e521487772ad99b18aaf;p=libfirm

diff --git a/ir/be/bejavacoal.c b/ir/be/bejavacoal.c
index 3ff5fd5f4..3ef97dbb5 100644
--- a/ir/be/bejavacoal.c
+++ b/ir/be/bejavacoal.c
@@ -14,14 +14,16 @@
 #include <dlfcn.h>
 #endif
 
-#define WITH_JVM
-
 #include <signal.h>
 #include <stdlib.h>
 #include <assert.h>
 #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
@@ -32,7 +34,7 @@ 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
@@ -43,21 +45,24 @@ 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);
+#endif /* WITH_LIBCORE */
+
 #include <jni.h>
 
 typedef struct _jni_env_t {
 	JavaVM *jvm;
 	JNIEnv *jni;
 } jni_env_t;
-#endif
 
 /*
 
@@ -110,7 +115,6 @@ static char *locate_jvm_lib(char *path, size_t n)
 }
 #endif
 
-#ifdef WITH_JVM
 static int start_vm(jni_env_t *env, int argc, char *argv[])
 {
 	int i;
@@ -118,7 +122,6 @@ static int start_vm(jni_env_t *env, int argc, char *argv[])
 	JavaVMInitArgs args;
 	JavaVMOption *opts;
 
-	int result = 0;
 	long (JNICALL * create_func)(JavaVM **, void **, void *) = find_jvm_symbol(jvm_lib, "JNI_CreateJavaVM");
 
 	if(!create_func) {
@@ -141,7 +144,7 @@ static int start_vm(jni_env_t *env, int argc, char *argv[])
 	ret = create_func(&env->jvm, (void **) &env->jni, &args);
 	free(opts);
 	if(ret != JNI_OK) {
-		fprintf(stderr, "JNI_CreateJavaVM returned errrocode %d\n" , ret);
+		fprintf(stderr, "JNI_CreateJavaVM returned errrocode %ld\n" , ret);
 		return 0;
 	}
 
@@ -197,7 +200,7 @@ static jni_env_t *get_jvm(void)
 
 		snprintf(cp_param, sizeof(cp_param), "-Djava.class.path=%s", jar_file);
 		args[0] = cp_param;
-		if(!start_vm(&env, sizeof(args) / sizeof(args[0], args), args)) {
+		if(!start_vm(&env, sizeof(args) / sizeof(args[0]), args)) {
 			fprintf(stderr, "Couldn't initialize java VM\n");
 			abort();
 		}
@@ -210,6 +213,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;
@@ -229,6 +233,7 @@ enum {
 	mth_add_int_edge,
 	mth_add_aff_edge,
 	mth_set_color,
+	//mth_set_debug,
 	mth_get_color,
 	mth_forbid_color,
 	mth_coalesce,
@@ -246,6 +251,7 @@ static const struct _mth_info_t mthis[mth_last] = {
 	{ "addIntEdge",  "(II)V"                   }, /* public void addIntEdge(int, int); */
 	{ "addAffEdge",  "(III)V"                  }, /* public void addAffEdge(int, int, int); */
 	{ "setColor",    "(II)V"                   }, /* public void setColor(int, int); */
+	//{ "setDebug",    "(ILjava/lang/String;)V"  }, /* public void setDebug(int, String); */
 	{ "getColor",    "(I)I"                    }, /* public int getColor(int); */
 	{ "forbidColor", "(II)V"                   }, /* public void forbidColor(int, int); */
 	{ "coalesce",    "()V"                     }, /* public void coalesce(); */
@@ -359,6 +365,20 @@ void be_java_coal_set_color(be_java_coal_t *c, int n, int col)
 	jc_call_void(c, mth_set_color, (jint) n, (jint) col);
 }
 
+void be_java_coal_set_debug(be_java_coal_t *c, int n, const char *dbg)
+{
+#if 0
+	JNIEnv *jni   = c->env->jni;
+	jmethodID mid = c->mth_ids[mth_set_debug];
+	jstring str;
+
+	str = (*jni)->NewStringUTF(jni, dbg);
+	CHECK(c->env);
+	(*jni)->CallVoidMethod(jni, c->obj, mid, (jint) n, str);
+	CHECK(c->env);
+#endif
+}
+
 void be_java_coal_forbid_color(be_java_coal_t *c, int n, int col)
 {
 	jc_call_void(c, mth_forbid_color, (jint) n, (jint) col);
@@ -386,6 +406,11 @@ int be_java_coal_get_color(be_java_coal_t *c, int n)
 	return jc_call_int(c, mth_get_color, (jint) n);
 }
 
+void be_java_coal_start_jvm(void)
+{
+	get_jvm();
+}
+
 #else
 
 be_java_coal_t *be_java_coal_init(const char *graph_name, int n_nodes, int n_regs, int dbg_level)
@@ -415,6 +440,11 @@ void be_java_coal_set_color(be_java_coal_t *c, int n, int col)
 	assert(0 && "use --enable-jvm");
 }
 
+void be_java_coal_set_debug(be_java_coal_t *c, int n, const char *dbg)
+{
+	assert(0 && "use --enable-jvm");
+}
+
 void be_java_coal_forbid_color(be_java_coal_t *c, int n, int col)
 {
 	assert(0 && "use --enable-jvm");
@@ -436,5 +466,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 */