Do not emit cld in the CopyB prologue. The ABI mandates that DF is cleared, so do...

[libfirm] / ir / be / bejavacoal.c

diff --git a/ir/be/bejavacoal.c b/ir/be/bejavacoal.c
index a1ecb1f..6b44f06 100644 (file)
--- a/ir/be/bejavacoal.c
+++ b/ir/be/bejavacoal.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -27,8 +27,8 @@
 #include "config.h"
 #endif
 
-#include <libcore/lc_opts.h>
-#include <libcore/lc_opts_enum.h>
+#include "lc_opts.h"
+#include "lc_opts_enum.h"
 
 #ifdef _WIN32
 #include <windows.h>
@@ -41,6 +41,7 @@
 #include <assert.h>
 #include <stdio.h>
 
+#include "xmalloc.h"
 #include "bejavacoal.h"
 #include "irtools.h"
 #include "bemodule.h"
@@ -63,7 +64,7 @@ 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_init_javacoal(void)
@@ -131,6 +132,8 @@ 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 /* _WIN32 */
@@ -150,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;
@@ -323,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;
@@ -331,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. */
@@ -387,6 +388,9 @@ void be_java_coal_set_color(be_java_coal_t *c, int n, int 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];
@@ -433,59 +437,6 @@ void be_java_coal_start_jvm(void)
 
 #else /* ! WITH_JVM */
 
-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)
-{
-       assert(0 && "use --enable-jvm");
-}
-
-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");
-}
-
-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;
-}
-
 void be_java_coal_start_jvm(void)
 {
 }