invokevirtual: get the actual class at run-time

[mate.git] / Makefile

diff --git a/Makefile b/Makefile
index f3a53a4c4f9e2121ac641af2df9217324d4a18fa..335313767b402dc43dd49d18818183e062534b3c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ JAVAC := javac
 JAVA_FILES := $(wildcard tests/*.java)
 CLASS_FILES := $(JAVA_FILES:.java=.class)
 HS_FILES := $(wildcard Mate/*.hs)
+HS_BOOT := $(wildcard Mate/*.hs-boot)
 O_FILES = $(shell ls Mate/*.o) $(wildcard ffi/*.o)
 PACKAGES_ := bytestring harpy hs-java
 PACKAGES := $(addprefix -package ,$(PACKAGES_))
@@ -17,17 +18,46 @@ GHC_LD := -optl-Xlinker -optl-x
 all: mate $(CLASS_FILES)
 
 test: mate $(CLASS_FILES)
-       ./$< tests/Fib.class | grep mainresult
-       @printf "should be:  0x%08x\n" 0x09de8d6d
-       ./$< tests/Fac.class | grep mainresult
-       @printf "should be:  0x%08x\n" 0x58980
-       ./$< tests/ArgumentPassing1.class | grep mainresult
-       @printf "should be:  0x%08x\n" 0x92
-       @printf "should be:  0x%08x\n" $$(((0 - 0x1337) & 0xffffffff))
-       ./$< tests/DifferentClass1.class | grep mainresult
-       @printf "should be:  0x%08x\n" 8
-       @printf "should be:  0x%08x\n" 13
-       ./$< tests/Native1.class | egrep -i -e '^printsomething: '
+       ./$< tests/Fib | grep mainresult
+       @printf "should be:  0x%08x\n" 0x2ac2
+       ./$< tests/Fac | grep mainresult
+       @printf "should be:  0x%08x\n" 0x63e1a
+       ./$< tests/ArgumentPassing1 | grep mainresult
+       @printf "should be:  0x%08x 0x%08x\n" 0x92 $$(((0 - 0x1337) & 0xffffffff))
+       ./$< tests/DifferentClass1 | grep mainresult
+       @printf "should be:  0x%08x 0x%08x\n" 8 13
+       ./$< tests/Native1 | egrep -i -e '^printsomething: '
+       @printf "should be:  woot 0x%08x 0x%08x woot 0x%08x\n" 0x1337 0x1338 0x15a5
+       ./$< tests/Static1 | grep mainresult
+       @printf "should be:  0x%08x\n" 0x33
+       ./$< tests/Static2 | grep mainresult
+       @printf "should be:  0x%08x\n" 0x55
+       ./$< tests/Static3 | grep mainresult
+       @printf "should be:  0x%08x\n" 0x6dd
+       ./$< tests/Static4 | grep mainresult
+       @printf "should be:  0x%08x 0x%08x\n" 0x33 0x77
+       ./$< tests/Static5 | grep mainresult
+       @printf "should be:  0x%08x 0x%08x\n" 0x33 0x33
+       ./$< tests/Static6 | grep mainresult
+       @printf "should be:  0x%08x\n" 0x33
+       ./$< tests/Static7 | grep mainresult
+       @printf "should be:  0x%08x\n" $$((0x1337 + 0x555))
+       ./$< tests/Static8 | grep mainresult
+       @printf "should be:  0x%08x 0x%08x\n" 0x33 $$((0x1337 + 0x555))
+       ./$< tests/CallConv1 | grep mainresult
+       @printf "should be:  0x%08x\n" 0x1337
+       ./$< tests/CallConv2 | grep mainresult
+       @printf "should be:  0x%08x\n" 0x1337
+       ./$< tests/CallConv3 | grep mainresult
+       @printf "should be:  0x%08x 0x%08x 0x%08x 0x%08x\n" 0x1000 0x300 0x30 0x7
+       ./$< tests/Instance1 | grep mainresult
+       @printf "should be:  0x%08x 0x%08x\n" 0x55 0x11
+       ./$< tests/Instance2 | grep mainresult
+       @printf "should be:  0x%08x 0x%08x\n" 0x198 0x22
+       ./$< tests/Instance3 | grep mainresult
+       @printf "should be:  0x%08x 0x%08x\n" 0x33 0x44
+       ./$< tests/Instance4 | grep mainresult
+       @printf "should be:  0x%08x 0x%08x\n" 0x1337 0x1337
 
 %.class: %.java
        $(JAVAC) $<
@@ -35,11 +65,11 @@ test: mate $(CLASS_FILES)
 ffi/native.o: ffi/native.c
        ghc -Wall -O2 -c $< -o $@
 
-mate: Mate.hs ffi/trap.c $(HS_FILES) ffi/native.o
+mate: Mate.hs ffi/trap.c $(HS_FILES) $(HS_BOOT) ffi/native.o
        ghc --make $(GHC_OPT) Mate.hs ffi/trap.c -o $@ $(GHC_LD)
 
 clean:
-       rm -f {Mate/,}*.hi {Mate/,ffi/,}*.o mate tests/*.class
+       rm -f {Mate/,}*.hi {Mate/,ffi/,}*.o Mate/*.{hi,o}-boot mate tests/*.class
 
 ghci: mate
        ghci $(PACKAGES) $(O_FILES) Mate.hs $(GHC_LD)