Commit 099b1d51 authored by Götz Lindenmaier's avatar Götz Lindenmaier
Browse files

Fixed remaining bugs

[r517]
parent 95af0a8d
......@@ -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 $@
......
......@@ -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.");
......
......@@ -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
......
No preview for this file type
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment