X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbejavacoal.c;h=6b44f06cad7e249c71ed52de047aaefbbcf0e1d3;hb=afbbc0b1ccd684c4c24bfd43d0f994123245f39f;hp=2633d3705302aa053d4b03400a44e1c44dbbbe91;hpb=e885f504c9e7ab65a17968745884cabd3d14bf4b;p=libfirm

diff --git a/ir/be/bejavacoal.c b/ir/be/bejavacoal.c
index 2633d3705..6b44f06ca 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"
@@ -152,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;
@@ -325,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;
@@ -333,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. */
@@ -438,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)
 {
 }