codegen: fix bug in calling conv

[mate.git] / Makefile

diff --git a/Makefile b/Makefile
index 350162140fe924a6b8c0951fe69d81adde416fa8..9e1a9b4eeff6db789c3ef842c2dc379a22488518 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,24 +4,56 @@ JAVAC := javac
 JAVA_FILES := $(wildcard tests/*.java)
 CLASS_FILES := $(JAVA_FILES:.java=.class)
 HS_FILES := $(wildcard Mate/*.hs)
+O_FILES = $(shell ls Mate/*.o) $(wildcard ffi/*.o)
+PACKAGES_ := bytestring harpy hs-java
+PACKAGES := $(addprefix -package ,$(PACKAGES_))
 
-GHC_OPT := -Wall -O2 -fno-warn-unused-do-bind
+GHC_OPT := -dynamic -Wall -O0 -fno-warn-unused-do-bind
+GHC_LD := -optl-Xlinker -optl-x
+
+
+.PHONY: all test clean ghci
 
 all: mate $(CLASS_FILES)
 
 test: mate $(CLASS_FILES)
-       ./$<
+       ./$< 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/CallConv1 | grep mainresult
+       @printf "should be:  0x%08x\n" 0x1337
+       ./$< tests/CallConv2 | grep mainresult
+       @printf "should be:  0x%08x\n" 0x1337
 
 %.class: %.java
        $(JAVAC) $<
 
-trap.o mate: Mate.hs trap.c $(HS_FILES)
-       ghc --make $(GHC_OPT) Mate.hs trap.c -o mate
+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:
-       rm -f {Mate/,}*.hi {Mate/,}*.o mate tests/*.class
+       rm -f {Mate/,}*.hi {Mate/,ffi/,}*.o mate tests/*.class
+
+ghci: mate
+       ghci $(PACKAGES) $(O_FILES) Mate.hs $(GHC_LD)
 
-tags: Mate.hs $(HS_FILES) trap.o
+tags: mate
        @# @-fforce-recomp, see
        @# http://stackoverflow.com/questions/7137414/how-do-i-force-interpretation-in-hint
-       ghc -fforce-recomp -e :ctags $^
+       ghc -fforce-recomp -e :ctags $(PACKAGES) $(HS_FILES) $(O_FILES) Mate.hs