X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbejavacoal.c;h=6b44f06cad7e249c71ed52de047aaefbbcf0e1d3;hb=afbbc0b1ccd684c4c24bfd43d0f994123245f39f;hp=3ff5fd5f4ad36c47683adbdd253c02666e02e9e8;hpb=f7c9890c7f7c869f7da0e521487772ad99b18aaf;p=libfirm diff --git a/ir/be/bejavacoal.c b/ir/be/bejavacoal.c index 3ff5fd5f4..6b44f06ca 100644 --- a/ir/be/bejavacoal.c +++ b/ir/be/bejavacoal.c @@ -1,12 +1,34 @@ - +/* + * Copyright (C) 1995-2008 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 -#include -#endif /* WITH_LIBCORE */ +#include "lc_opts.h" +#include "lc_opts_enum.h" #ifdef _WIN32 #include @@ -14,14 +36,17 @@ #include #endif -#define WITH_JVM - #include #include #include #include +#include "xmalloc.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,32 +57,33 @@ 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)), LC_OPT_ENT_STR ("cls", "name of the class providing the factory", cls_name, sizeof(cls_name)), - { NULL } + LC_OPT_LAST }; -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 typedef struct _jni_env_t { JavaVM *jvm; JNIEnv *jni; } jni_env_t; -#endif /* @@ -96,7 +122,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) { @@ -106,11 +132,12 @@ static void *find_jvm_symbol(const char *vmlibpath, const char *sym) static char *locate_jvm_lib(char *path, size_t n) { + (void) path; + (void) n; return NULL; } -#endif +#endif /* _WIN32 */ -#ifdef WITH_JVM static int start_vm(jni_env_t *env, int argc, char *argv[]) { int i; @@ -118,7 +145,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) { @@ -127,7 +153,7 @@ static int start_vm(jni_env_t *env, int argc, char *argv[]) } memset(&args, 0, sizeof(args)); - opts = malloc(argc * sizeof(opts[0])); + opts = XMALLOCN(JavaVMOption, argc); for(i = 0; i < argc; ++i) { opts[i].optionString = argv[i]; opts[i].extraInfo = NULL; @@ -141,7 +167,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 +223,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 +236,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 +256,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 +274,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(); */ @@ -297,7 +326,6 @@ static int jc_call_int(be_java_coal_t *c, int mth_index, ...) be_java_coal_t *be_java_coal_init(const char *graph_name, int n_nodes, int n_regs, int dbg_level) { - be_java_coal_t *c; jni_env_t *env = get_jvm(); JNIEnv *jni = env->jni; jmethodID fact; @@ -305,8 +333,7 @@ be_java_coal_t *be_java_coal_init(const char *graph_name, int n_nodes, int n_reg jstring str; int i; - c = malloc(sizeof(c[0])); - memset(c, 0, sizeof(c[0])); + be_java_coal_t *c = XMALLOCZ(be_java_coal_t); c->env = env; /* Find the class we are are looking for. */ @@ -359,6 +386,23 @@ 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) +{ + (void) c; + (void) n; + (void) 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 /* if 0 */ +} + 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,55 +430,15 @@ int be_java_coal_get_color(be_java_coal_t *c, int n) return jc_call_int(c, mth_get_color, (jint) n); } -#else - -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 be_java_coal_destroy(be_java_coal_t *c) -{ - assert(0 && "use --enable-jvm"); -} - - -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) +void be_java_coal_start_jvm(void) { - assert(0 && "use --enable-jvm"); + get_jvm(); } -void be_java_coal_set_color(be_java_coal_t *c, int n, int col) -{ - assert(0 && "use --enable-jvm"); -} +#else /* ! WITH_JVM */ -void be_java_coal_forbid_color(be_java_coal_t *c, int n, int col) +void be_java_coal_start_jvm(void) { - assert(0 && "use --enable-jvm"); } -void be_java_coal_coalesce(be_java_coal_t *c) -{ - assert(0 && "use --enable-jvm"); -} - -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 /* WITH_JVM */