From: Götz Lindenmaier <goetz@ipd.info.uni-karlsruhe.de>
Date: Fri, 8 Nov 2002 09:06:16 +0000 (+0000)
Subject: Fixed remaining bugs
X-Git-Url: http://nsz.repo.hu/git/?a=commitdiff_plain;h=099b1d513c106077593d0a7e8197d5adb2e61a8e;p=libfirm

Fixed remaining bugs

[r517]
---

diff --git a/firmjni/Makefile.in b/firmjni/Makefile.in
index c4d7a9f11..0e5f8d9e8 100644
--- a/firmjni/Makefile.in
+++ b/firmjni/Makefile.in
@@ -11,6 +11,9 @@ subdir = firmjni
 # static initializer.
 LIBNAME = libfirmjni.so
 
+# The name of the package containing the Firm JNI
+PACKAGENAME = firmjni
+
 # where to put libfirmjni.so
 libdir = @libdir@
 # where to put the directory firmjni containing the generated
@@ -51,7 +54,7 @@ classfiles: $(CLASSFILES)
 	javac $<
 
 %.h:	%.class
-	javah $(<:.class=)
+	javah -classpath $(topdir) -o $(<:.class=.h) $(PACKAGENAME).$(<:.class=)
 
 %.o:	%.c %.h
 	gcc $(CPPFLAGS) -c $< -o $@
diff --git a/firmjni/testprograms/Empty.java b/firmjni/testprograms/Empty.java
index 927601e2d..a3a1474b5 100644
--- a/firmjni/testprograms/Empty.java
+++ b/firmjni/testprograms/Empty.java
@@ -59,16 +59,9 @@ class Empty {
 	 * it is not matured.
 	 * Generate the return node into this region. The Return node is needed to
 	 * return at least the memory. */
-	//ir_node *in[0]; /* this is the array containing the return parameters */
 	int []in  = new int[0];
 	int x = Ircons.newReturn (Ircons.getStore(), in.length, in);
 
-	/* Test enumerators */
-	if (Irnode.getIrnModecode(x) != Irmode.irm_X)
-	    System.out.println(" wrong modecode");
-	else
-	    System.out.println(" proper modecode Execution.");
-
 	/* Now we generated all instructions for this block and all its predecessor
 	 * blocks so we can mature it.  (There are not too much.) */
 	Ircons.matureBlock (Irgraph.getIrgCurrentBlock(irg));
@@ -80,7 +73,7 @@ class Empty {
 	Ircons.matureBlock (Irgraph.getIrgEndBlock(irg));
 
 	/* Verify the graph.  Finds some very bad errors in the graph. */
-	//irg_vrfy(irg);
+	Irvrfy.irgVrfy(irg);
 	Ircons.finalizeCons (irg);
 
 	System.out.println("Done building the graph.  Dumping it.");
diff --git a/firmjni/testprograms/Makefile.in b/firmjni/testprograms/Makefile.in
index be05ec7e6..9c4d622e9 100644
--- a/firmjni/testprograms/Makefile.in
+++ b/firmjni/testprograms/Makefile.in
@@ -10,6 +10,7 @@ srcdir = @srcdir@
 topdir = ..
 subdir = testprograms
 
+SOURCEPATH = @top_srcdir@/firmjni/testprograms/
 
 SOURCES := Makefile.in \
 	Empty.java
@@ -26,11 +27,11 @@ all: 	empty
 
 # bad hack ;-(
 empty:
-	javac -classpath $(MYCLASSPATH) -d . @top_srcdir@/firmjni/testprograms/Empty.java
+	javac -classpath $(MYCLASSPATH) -d . $(SOURCEPATH)Empty.java
 
 
 run:	empty
-	java -cp $(MYCLASSPATH) Empty
+	java -cp $(MYCLASSPATH) -Djava.library.path=$(topdir) Empty
 
 clean:
 	-rm *.class
diff --git a/tools/crecoder.jar b/tools/crecoder.jar
index d74d66ab7..aae8de604 100644
Binary files a/tools/crecoder.jar and b/tools/crecoder.jar differ