classpool: copy field members refs from superclass

[mate.git] / Makefile

diff --git a/Makefile b/Makefile
index d82965ede391d5f81659373be083723d7bcefcfc..4346835679378aea58ccd1819c072d1fba3a858a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ O_FILES = $(shell ls Mate/*.o) $(wildcard ffi/*.o)
 PACKAGES_ := bytestring harpy hs-java
 PACKAGES := $(addprefix -package ,$(PACKAGES_))
 
-GHC_OPT := -Wall -O0 -fno-warn-unused-do-bind
+GHC_OPT := -dynamic -Wall -O0 -fno-warn-unused-do-bind
 GHC_LD := -optl-Xlinker -optl-x
 
 
@@ -17,12 +17,31 @@ GHC_LD := -optl-Xlinker -optl-x
 all: mate $(CLASS_FILES)
 
 test: mate $(CLASS_FILES)
-       ./$< tests/Fib.class
+       ./$< tests/Fib | grep mainresult
+       @printf "should be:  0x%08x\n" 0x09de8d6d
+       ./$< tests/Fac | grep mainresult
+       @printf "should be:  0x%08x\n" 0x58980
+       ./$< tests/ArgumentPassing1 | grep mainresult
+       @printf "should be:  0x%08x\n" 0x92
+       @printf "should be:  0x%08x\n" $$(((0 - 0x1337) & 0xffffffff))
+       ./$< tests/DifferentClass1 | grep mainresult
+       @printf "should be:  0x%08x\n" 8
+       @printf "should be:  0x%08x\n" 13
+       ./$< tests/Native1 | egrep -i -e '^printsomething: '
+       ./$< 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
 
 %.class: %.java
        $(JAVAC) $<
 
-mate: Mate.hs ffi/trap.c $(HS_FILES)
+ffi/native.o: ffi/native.c
+       ghc -Wall -O2 -c $< -o $@
+
+mate: Mate.hs ffi/trap.c $(HS_FILES) ffi/native.o
        ghc --make $(GHC_OPT) Mate.hs ffi/trap.c -o $@ $(GHC_LD)
 
 clean: