some workaround to avoid condeval creating Phibs which not all backends like

[libfirm] / ir / be / bejavacoal.c

diff --git a/ir/be/bejavacoal.c b/ir/be/bejavacoal.c
index 03ccf30..297c9fa 100644 (file)
--- a/ir/be/bejavacoal.c
+++ b/ir/be/bejavacoal.c
@@ -3,10 +3,8 @@
 #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 +18,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 +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)),
@@ -41,21 +42,23 @@ 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 {
        JavaVM *jvm;
        JNIEnv *jni;
 } jni_env_t;
-#endif
 
 /*
 
@@ -108,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;
@@ -207,6 +209,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;
@@ -226,6 +229,7 @@ enum {
        mth_add_int_edge,
        mth_add_aff_edge,
        mth_set_color,
+       //mth_set_debug,
        mth_get_color,
        mth_forbid_color,
        mth_coalesce,
@@ -243,6 +247,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(); */
@@ -356,6 +361,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);
@@ -383,6 +402,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)
@@ -412,6 +436,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");
@@ -433,5 +462,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 */