X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbejavacoal.c;h=95b4ea41c490eb73a06305ff33e378e707147cac;hb=dd4cd761ab637d4488c7e29f49843b1b02366acf;hp=a1ecb1fb248c785f35e7fdca8706edca44640229;hpb=39f3a8dbd0f00f90b7b12a849d1bf7b9c1329479;p=libfirm

diff --git a/ir/be/bejavacoal.c b/ir/be/bejavacoal.c
index a1ecb1fb2..95b4ea41c 100644
--- 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 = xmalloc(argc * sizeof(opts[0]));
 	for(i = 0; i < argc; ++i) {
 		opts[i].optionString = argv[i];
 		opts[i].extraInfo    = NULL;
@@ -331,7 +334,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]));
+	c = xmalloc(sizeof(c[0]));
 	memset(c, 0, sizeof(c[0]));
 	c->env = env;
 
@@ -387,6 +390,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 +439,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)
 {
 }