X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=mate.git;a=blobdiff_plain;f=Makefile;h=268c1c0c8729e5547826116f9e925c597cc77e99;hp=ceeb809633e338a15e7892e179263a1a1a00d1fd;hb=HEAD;hpb=15833bb85e8b1b82f30024ff7261a208327ceb32

diff --git a/Makefile b/Makefile
index ceeb809..268c1c0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,78 +1,95 @@
 SHELL := bash
 
 JAVAC := javac
-JAVA_FILES := $(wildcard tests/*.java)
+JAVA_FILES := $(wildcard jmate/lang/*.java jmate/io/*.java java/lang/*.java java/io/*.java)
 CLASS_FILES := $(JAVA_FILES:.java=.class)
+TEST_JAVA_FILES := $(wildcard tests/*.java)
+TEST_CLASS_FILES := $(TEST_JAVA_FILES:.java=.test)
 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
+BUILD := build
+B_RELEASE := $(BUILD)/release
+B_STATIC := $(BUILD)/static
+B_DEBUG := $(BUILD)/debug
+PACKAGES_ := bytestring harpy hs-java plugins
 PACKAGES := $(addprefix -package ,$(PACKAGES_))
 
-GHC_OPT := -dynamic -Wall -O0 -fno-warn-unused-do-bind
+
+GHC_CPP := -DARCH_X86
+
+GHC_OPT  = -I. -O0 -Wall -fno-warn-unused-do-bind -fwarn-tabs
+# TODO: define this in cabal... (see cpu package @ hackage)
+# see *.gdb target. also useful for profiling (-p at call)
+GHC_OPT += -rtsopts # -prof -auto-all
+GHC_OPT += $(GHC_CPP)
+
+# dunno anymore? some linker stuff regarding GHCi
 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/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
+.PHONY: all tests clean ghci hlint
+
+all: mate
+
+%: %.class mate
+	./mate $(basename $<)
+
+
+tests: mate $(TEST_JAVA_FILES:.java=.class) $(TEST_CLASS_FILES)
 
+CALLF = $(basename $@).call
+testcase = ./tools/openjdktest.sh "$(1) $(basename $@)"
+%.test: %.class mate
+	@if [ -f $(CALLF) ]; \
+		then $(call testcase,`cat $(CALLF)`); \
+		else $(call testcase, ); fi
+
+COMPILEF = $(basename $@).compile
 %.class: %.java
-	$(JAVAC) $<
+	@if [ -f $(COMPILEF) ]; \
+		then $(SHELL) $(COMPILEF); \
+		else $(JAVAC) $(JAVA_FILES) $<; fi
+	@echo "JAVAC $<"
 
 ffi/native.o: ffi/native.c
 	ghc -Wall -O2 -c $< -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)
+runtime: jmate/lang/MateRuntime.java
+	javac jmate/lang/MateRuntime.java
+	javah  -o rts/mock/jmate_lang_MateRuntime.h jmate.lang.MateRuntime
+	gcc -shared -fPIC -I$(JAVA_HOME)/include rts/mock/jmate_lang_MateRuntime.c -I./rts/mock -o rts/mock/libMateRuntime.so 
+
+GHCCALL = ghc --make $(GHC_OPT) Mate.hs ffi/trap.c -o $@ $(GHC_LD) -outputdir
+mate: Mate.hs ffi/trap.c $(HS_FILES) $(HS_BOOT) ffi/native.o $(CLASS_FILES)
+	@mkdir -p $(B_RELEASE)
+	$(GHCCALL) $(B_RELEASE) -dynamic
+
+mate.static: Mate.hs ffi/trap.c $(HS_FILES) $(HS_BOOT) ffi/native.o $(CLASS_FILES)
+	@mkdir -p $(B_STATIC)
+	$(GHCCALL) $(B_STATIC) -static
+
+%.gdb: %.class mate
+	gdb -x .gdbcmds -q --args mate $(basename $<) +RTS -V0 --install-signal-handlers=no
 
 clean:
-	rm -f {Mate/,}*.hi {Mate/,ffi/,}*.o Mate/*.{hi,o}-boot mate tests/*.class
+	rm -rf $(BUILD) mate mate.static ffi/native.o \
+		tests/*.class Mate/*_stub.* \
+		$(CLASS_FILES) \
+		scratch/*.class
 
-ghci: mate
-	ghci $(PACKAGES) $(O_FILES) Mate.hs $(GHC_LD)
+ghci: mate.static
+	ghci -I. $(PACKAGES) -outputdir $(B_STATIC) Mate.hs $(GHC_CPP)
 
-tags: mate
+tags: mate.static
 	@# @-fforce-recomp, see
 	@# http://stackoverflow.com/questions/7137414/how-do-i-force-interpretation-in-hint
-	ghc -fforce-recomp -e :ctags $(PACKAGES) $(HS_FILES) $(O_FILES) Mate.hs
+	@# @-fobject-code: force to generate native code (necessary for ffi stuff)
+	ghc -I. -fforce-recomp -fobject-code $(PACKAGES) Mate.hs -outputdir $(B_STATIC) -e :ctags $(GHC_CPP)
+
+hlint:
+	hlint Mate.hs Mate/
+
+scratch: mate $(wildcard jmate/lang/*.java) scratch/GCTest.java
+	javac $(wildcard jmate/lang/*.java)
+	javac scratch/GCTest.java
+	./mate scratch.GCTest