#include <dlfcn.h>
#endif
-
+#include <signal.h>
#include <stdlib.h>
#include <assert.h>
#include <stdio.h>
{ NULL }
};
-void java_coal_register_options(lc_opt_entry_t *grp)
+void be_java_coal_register_options(lc_opt_entry_t *grp)
{
lc_opt_entry_t *jc_grp = lc_opt_get_grp(grp, "jc");
lc_opt_add_table(jc_grp, options);
JavaVM *jvm;
JNIEnv *jni;
} jni_env_t;
-#endif
/*
}
#endif
-#ifdef WITH_JVM
static int start_vm(jni_env_t *env, int argc, char *argv[])
{
int i;
JavaVMInitArgs args;
JavaVMOption *opts;
- int result = 0;
long (JNICALL * create_func)(JavaVM **, void **, void *) = find_jvm_symbol(jvm_lib, "JNI_CreateJavaVM");
if(!create_func) {
ret = create_func(&env->jvm, (void **) &env->jni, &args);
free(opts);
- if(ret == JNI_ERR)
+ if(ret != JNI_OK) {
+ fprintf(stderr, "JNI_CreateJavaVM returned errrocode %ld\n" , ret);
return 0;
+ }
return 1;
}
static int jvm_inited = 0;
static jni_env_t env;
+void (*old_int_handler)(int);
+void (*old_abrt_handler)(int);
-static void jvm_destroy_at_exit(void)
+static void sig_jvm_destroy_at_exit(int signal)
{
if(jvm_inited)
stop_vm(&env);
+
+ switch(signal) {
+ case SIGABRT:
+ old_abrt_handler(signal);
+ break;
+ case SIGINT:
+ old_int_handler(signal);
+ break;
+ default:;
+ }
+}
+
+static void jvm_destroy_at_exit(void)
+{
+ sig_jvm_destroy_at_exit(0);
}
static jni_env_t *get_jvm(void)
snprintf(cp_param, sizeof(cp_param), "-Djava.class.path=%s", jar_file);
args[0] = cp_param;
- start_vm(&env, sizeof(args) / sizeof(args[0]), args);
+ if(!start_vm(&env, sizeof(args) / sizeof(args[0]), args)) {
+ fprintf(stderr, "Couldn't initialize java VM\n");
+ abort();
+ }
jvm_inited = 1;
+ old_int_handler = signal(SIGINT, sig_jvm_destroy_at_exit);
+ old_abrt_handler = signal(SIGABRT, sig_jvm_destroy_at_exit);
atexit(jvm_destroy_at_exit);
}
return &env;
}
+
static void check(jni_env_t *env, const char *file, int line)
{
JNIEnv *jni = env->jni;
(*jni)->ExceptionDescribe(jni);
(*jni)->ExceptionClear(jni);
stop_vm(env);
- exit(1);
+ abort();
}
}
mth_add_int_edge,
mth_add_aff_edge,
mth_set_color,
+ //mth_set_debug,
mth_get_color,
mth_forbid_color,
mth_coalesce,
mth_dump,
+ mth_finish,
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(); */
- { "dump", "(Ljava/lang/String;)V" } /* public void dump(String); */
+ { "dump", "(Ljava/lang/String;)V" }, /* public void dump(String); */
+ { "finish", "()V" } /* public void finish(); */
};
/* public static coalescing.Extern createExtern(java.lang.String, int, int, int); */
"createExtern", "(Ljava/lang/String;III)Lcoalescing/Extern;"
};
-struct _java_coal_t {
+struct _be_java_coal_t {
jni_env_t *env;
jclass cls;
jobject obj;
jmethodID mth_ids[mth_last];
};
-static void jc_call_void(java_coal_t *c, int mth_index, ...)
+static void jc_call_void(be_java_coal_t *c, int mth_index, ...)
{
JNIEnv *jni = c->env->jni;
jmethodID mid = c->mth_ids[mth_index];
va_end(args);
}
-static int jc_call_int(java_coal_t *c, int mth_index, ...)
+static int jc_call_int(be_java_coal_t *c, int mth_index, ...)
{
JNIEnv *jni = c->env->jni;
jmethodID mid = c->mth_ids[mth_index];
return res;
}
-java_coal_t *java_coal_init(const char *graph_name, int n_nodes, int n_regs, int dbg_level)
+be_java_coal_t *be_java_coal_init(const char *graph_name, int n_nodes, int n_regs, int dbg_level)
{
- java_coal_t *c;
+ be_java_coal_t *c;
jni_env_t *env = get_jvm();
JNIEnv *jni = env->jni;
jmethodID fact;
return c;
}
-void java_coal_destroy(java_coal_t *c) {
+void be_java_coal_destroy(be_java_coal_t *c) {
JNIEnv *jni = c->env->jni;
+ jc_call_void(c, mth_finish);
(*jni)->DeleteGlobalRef(jni, c->obj);
free(c);
}
-void java_coal_add_int_edge(java_coal_t *c, int n, int m)
+void be_java_coal_add_int_edge(be_java_coal_t *c, int n, int m)
{
jc_call_void(c, mth_add_int_edge, (jint) n, (jint) m);
}
-void java_coal_add_aff_edge(java_coal_t *c, int n, int m, int weight)
+void be_java_coal_add_aff_edge(be_java_coal_t *c, int n, int m, int weight)
{
jc_call_void(c, mth_add_aff_edge, (jint) n, (jint) m, (jint) weight);
}
-void java_coal_set_color(java_coal_t *c, int n, int col)
+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 java_coal_forbid_color(java_coal_t *c, int n, int 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);
}
-void java_coal_coalesce(java_coal_t *c)
+void be_java_coal_coalesce(be_java_coal_t *c)
{
jc_call_void(c, mth_coalesce);
}
-void java_coal_dump(java_coal_t *c, const char *fn)
+void be_java_coal_dump(be_java_coal_t *c, const char *fn)
{
JNIEnv *jni = c->env->jni;
jmethodID mid = c->mth_ids[mth_dump];
CHECK(c->env);
}
-int java_coal_get_color(java_coal_t *c, int n)
+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
-java_coal_t *java_coal_init(const char *graph_name, int n_nodes, int n_regs, int dbg_level)
+be_java_coal_t *be_java_coal_init(const char *graph_name, int n_nodes, int n_regs, int dbg_level)
{
assert(0 && "use --enable-jvm");
return NULL;
}
-void java_coal_destroy(java_coal_t *c)
+void be_java_coal_destroy(be_java_coal_t *c)
{
assert(0 && "use --enable-jvm");
}
-void java_coal_add_int_edge(java_coal_t *c, int n, int m)
+void be_java_coal_add_int_edge(be_java_coal_t *c, int n, int m)
+{
+ assert(0 && "use --enable-jvm");
+}
+
+void be_java_coal_add_aff_edge(be_java_coal_t *c, int n, int m, int weight)
{
assert(0 && "use --enable-jvm");
}
-void java_coal_add_aff_edge(java_coal_t *c, int n, int m, int weight)
+void be_java_coal_set_color(be_java_coal_t *c, int n, int col)
{
assert(0 && "use --enable-jvm");
}
-void java_coal_set_color(java_coal_t *c, int n, int col)
+void be_java_coal_set_debug(be_java_coal_t *c, int n, const char *dbg)
{
assert(0 && "use --enable-jvm");
}
-void java_coal_forbid_color(java_coal_t *c, int n, int col)
+void be_java_coal_forbid_color(be_java_coal_t *c, int n, int col)
{
assert(0 && "use --enable-jvm");
}
-void java_coal_coalesce(java_coal_t *c)
+void be_java_coal_coalesce(be_java_coal_t *c)
{
assert(0 && "use --enable-jvm");
}
-void java_coal_dump(java_coal_t *c, const char *fn)
+void be_java_coal_dump(be_java_coal_t *c, const char *fn)
{
assert(0 && "use --enable-jvm");
}
-int java_coal_get_color(java_coal_t *c, int n)
+int be_java_coal_get_color(be_java_coal_t *c, int n)
{
assert(0 && "use --enable-jvm");
return -1;
}
+void be_java_coal_start_jvm(void)
+{
+}
+
#endif /* WITH_JVM */
projects / libfirm / blobdiff