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

diff --git a/ir/be/bejavacoal.c b/ir/be/bejavacoal.c
index 297c9fab4..95b4ea41c 100644
--- a/ir/be/bejavacoal.c
+++ b/ir/be/bejavacoal.c
@@ -1,10 +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
 
-#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>
@@ -17,6 +41,7 @@
 #include <assert.h>
 #include <stdio.h>
 
+#include "xmalloc.h"
 #include "bejavacoal.h"
 #include "irtools.h"
 #include "bemodule.h"
@@ -39,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)
@@ -97,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)
 {
@@ -107,9 +132,11 @@ 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 */
 
 static int start_vm(jni_env_t *env, int argc, char *argv[])
 {
@@ -126,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;
@@ -307,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;
 
@@ -363,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];
@@ -372,7 +402,7 @@ void be_java_coal_set_debug(be_java_coal_t *c, int n, const char *dbg)
 	CHECK(c->env);
 	(*jni)->CallVoidMethod(jni, c->obj, mid, (jint) n, str);
 	CHECK(c->env);
-#endif
+#endif /* if 0 */
 }
 
 void be_java_coal_forbid_color(be_java_coal_t *c, int n, int col)
@@ -407,60 +437,7 @@ 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)
-{
-	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;
-}
+#else /* ! WITH_JVM */
 
 void be_java_coal_start_jvm(void)
 {