X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbejavacoal.c;h=297c9fab45d58893f66c238e7536921cb651f894;hb=d16d39df6772995a29ecdc8de1904ccb2e523599;hp=b686a7211ba8aa982d5ff2f02ad4d002b26de5ee;hpb=48f893878b07f6e334389ff52abda5cc2adbf179;p=libfirm diff --git a/ir/be/bejavacoal.c b/ir/be/bejavacoal.c index b686a7211..297c9fab4 100644 --- a/ir/be/bejavacoal.c +++ b/ir/be/bejavacoal.c @@ -3,10 +3,8 @@ #include "config.h" #endif -#ifdef WITH_LIBCORE #include #include -#endif /* WITH_LIBCORE */ #ifdef _WIN32 #include @@ -14,16 +12,16 @@ #include #endif - +#include #include #include #include -#ifdef WITH_JVM -#include -#endif - #include "bejavacoal.h" +#include "irtools.h" +#include "bemodule.h" + +#ifdef WITH_JVM /* Path to the jar file. A little OS dependent convenience. */ #ifdef _WIN32 @@ -34,10 +32,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)), @@ -45,19 +42,23 @@ static const lc_opt_table_entry_t options[] = { { NULL } }; -void 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 + typedef struct _jni_env_t { JavaVM *jvm; JNIEnv *jni; } jni_env_t; -#endif /* @@ -110,7 +111,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 +118,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) { @@ -140,8 +139,10 @@ 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_ERR) + if(ret != JNI_OK) { + fprintf(stderr, "JNI_CreateJavaVM returned errrocode %ld\n" , ret); return 0; + } return 1; } @@ -155,11 +156,28 @@ static void stop_vm(jni_env_t *env) 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) @@ -178,14 +196,20 @@ 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; @@ -195,7 +219,7 @@ static void check(jni_env_t *env, const char *file, int line) (*jni)->ExceptionDescribe(jni); (*jni)->ExceptionClear(jni); stop_vm(env); - exit(1); + abort(); } } @@ -205,10 +229,12 @@ enum { 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 }; @@ -221,10 +247,12 @@ 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(); */ - { "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); */ @@ -232,7 +260,7 @@ static const struct _mth_info_t mthi_factory = { "createExtern", "(Ljava/lang/String;III)Lcoalescing/Extern;" }; -struct _java_coal_t { +struct _be_java_coal_t { jni_env_t *env; jclass cls; jobject obj; @@ -240,7 +268,7 @@ struct _java_coal_t { 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]; @@ -253,7 +281,7 @@ static void jc_call_void(java_coal_t *c, int 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]; @@ -269,9 +297,9 @@ static int jc_call_int(java_coal_t *c, int 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; @@ -311,38 +339,53 @@ java_coal_t *java_coal_init(const char *graph_name, int n_nodes, int n_regs, int 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]; @@ -354,58 +397,73 @@ void java_coal_dump(java_coal_t *c, const char *fn) 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 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) { assert(0 && "use --enable-jvm"); } -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) { assert(0 && "use --enable-jvm"); } -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) { assert(0 && "use --enable-jvm"); } -void java_coal_coalesce(java_coal_t *c) +void be_java_coal_forbid_color(be_java_coal_t *c, int n, int col) { assert(0 && "use --enable-jvm"); } -void java_coal_dump(java_coal_t *c, const char *fn) +void be_java_coal_coalesce(be_java_coal_t *c) { assert(0 && "use --enable-jvm"); } -int java_coal_get_color(java_coal_t *c, int n) +void be_java_coal_dump(be_java_coal_t *c, const char *fn) { assert(0 && "use --enable-jvm"); } +int be_java_coal_get_color(be_java_coal_t *c, int n) +{ + assert(0 && "use --enable-jvm"); + return -1; +} -#endif +void be_java_coal_start_jvm(void) +{ +} + +#endif /* WITH_JVM */