X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=Makefile;h=7c7692b919d7abaead1953f1ba9424d18fc92706;hp=d0b20c4bb6264a556b5a45227eb9795cd2c6ca38;hb=031222f07c4ac6549cfdcb0667114ba5476bbbaf;hpb=65756df49f23a57914cc71f4929373ac62682345 diff --git a/Makefile b/Makefile index d0b20c4..7c7692b 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ MIPS_LDFLAGS= $(flags) --static -Wl,--gc-sections MIPS_STRIP = mips-unknown-elf-strip # Java compiler/VM settings -JAVAC = javac +JAVAC = javac -source 1.3 -target 1.3 JAVA = java ifeq ($(firstword $(JAVAC)),gcj) JAVAC_NODEBUG_FLAGS = -g0 @@ -90,7 +90,7 @@ $(tasks)/%: MIPS_CFLAGS="$(filter-out -Werror,$(MIPS_CFLAGS))" \ MIPS_PCFLAGS="$(filter-out -Werror,$(MIPS_PCFLAGS))" \ MIPS_LDFLAGS="$(MIPS_LDFLAGS)" - + upstream_clean_%: $(MAKE) -C upstream clean_$* usr="$(usr)" @@ -106,7 +106,7 @@ build/org/ibex/nestedvm/util/.Dummy.class: $(java_classes): build/org/ibex/nestedvm/util/.Dummy.class endif -$(java_classes): $(java_sources) $(tasks)/build_darcs_classgen +$(java_classes): $(java_sources) $(tasks)/build_git_classgen $(JAVAC) -classpath "$(classpath)" -d build $(java_sources) # GCJ Stuff @@ -191,6 +191,7 @@ env.sh: Makefile $(tasks)/build_gcc $(tasks)/build_libc build/org/ibex/nestedvm/ @echo 'CXXFLAGS="$(mips_optflags)"; export CXXFLAGS' >> $@~ @echo 'LDFLAGS="$(MIPS_LDFLAGS)"; export LDFLAGS' >> $@~ @echo 'CLASSPATH=$(mips2java_root)/build:$(mips2java_root)/upstream/build/classgen/build:.; export CLASSPATH' >> $@~ + @chmod a+x "$@~" @mv "$@~" "$@" @echo "$@ created successfully" @@ -199,6 +200,7 @@ env.sh: Makefile $(tasks)/build_gcc $(tasks)/build_libc build/org/ibex/nestedvm/ # runtime_classes = Runtime Registers UsermodeConstants util/Seekable +unix_runtime_classes = $(runtime_classes) UnixRuntime util/Platform util/InodeCache tex.jar: $(mips_objects) $(runtime_classes:%=build/org/ibex/nestedvm/%.class) build/tests/TeX.class echo -e "Manifest-Version: 1.0\nMain-Class: Tex\n" > .manifest @@ -214,6 +216,15 @@ runtime.jar: $(runtime_classes:%=build/org/ibex/nestedvm/%.class) org/ibex/nestedvm/Runtime\$$*.class \ org/ibex/nestedvm/util/Seekable\$$*.class +unix_runtime.jar: $(unix_runtime_classes:%=build/org/ibex/nestedvm/%.class) + cd build && jar cf ../$@ \ + $(unix_runtime_classes:%=org/ibex/nestedvm/%.class) \ + org/ibex/nestedvm/Runtime\$$*.class \ + org/ibex/nestedvm/util/Seekable\$$*.class \ + org/ibex/nestedvm/UnixRuntime\$$*.class \ + org/ibex/nestedvm/util/Platform\$$*.class \ + org/ibex/nestedvm/util/Sort*.class + .manifest: printf "Manifest-Version: 1.0\nMain-Class: org.ibex.nestedvm.RuntimeCompiler\n" > $@ @@ -221,18 +232,16 @@ nestedvm.jar: $(java_classes) .manifest cd build && jar cfm ../$@ ../.manifest $(java_classes:build/%.class=%*.class) cd $(CLASSGEN_PATH) && jar uf $(mips2java_root)/$@ . -compact_runtime_compiler.jar: $(java_classes) .manifest $(tasks)/build_darcs_gcclass +.gcclass_hints: $(java_sources) + sed -n 's/.*GCCLASS_HINT: \([^ ]*\) \([^ ]*\).*/hint:\1:\2/p' $(java_sources) > $@ + +compact_runtime_compiler.jar: $(java_classes) .manifest $(tasks)/build_git_gcclass .gcclass_hints mkdir -p tmp/pruned rm -rf tmp/pruned/* - java -cp \ - upstream/build/gcclass/build:upstream/build/gcclass/upstream/bcel-5.1/bcel-5.1.jar \ + $(JAVA) -cp \ + upstream/build/gcclass/build:upstream/build/gcclass/upstream/bcel-5.2/bcel-5.2.jar \ com.brian_web.gcclass.GCClass \ - "$(classpath)" tmp/pruned \ - org.ibex.nestedvm.RuntimeCompiler.main 'org.ibex.nestedvm.Runtime.decodeData' \ - 'org.ibex.nestedvm.UnixRuntime.' 'org.ibex.nestedvm.Runtime.initPages' \ - 'org.ibex.nestedvm.Runtime.clearPages' 'org.ibex.nestedvm.Runtime.syscall' \ - 'org.ibex.nestedvm.Runtime$$CPUState.dup' \ - org.ibex.nestedvm.util.Platform\$$Jdk{11,12,13,14}.'' + "$(classpath)" tmp/pruned org.ibex.nestedvm.RuntimeCompiler.main `cat .gcclass_hints` cd tmp/pruned && jar cfm ../../$@ ../../.manifest . sizecheck: compact_runtime_compiler.jar @@ -399,19 +408,20 @@ ntlmtest: build/tests/NtlmAuth.class @test -e smb.conf || cp upstream/build/samba/examples/smb.conf.default smb.conf $(JAVA) -cp "$(classpath)" tests.NtlmAuth --username=brian --password=test --diagnostics -d 5 -ntlmauth.jar: build/tests/NtlmAuth.class $(tasks)/build_darcs_gcclass +ntlmauth.jar: build/tests/NtlmAuth.class $(tasks)/build_git_gcclass .gcclass_hints mkdir -p tmp/pruned rm -rf tmp/pruned/* java -cp \ upstream/build/gcclass/build:upstream/build/gcclass/upstream/bcel-5.1/bcel-5.1.jar \ - com.brian_web.gcclass.GCClass \ - "$(classpath)" tmp/pruned \ - tests.NtlmAuth.main \ - $(patsubst %,org.ibex.nestedvm.util.Platform\$$Jdk%.'', 11 12 13 14) + com.brian_web.gcclass.GCClass "$(classpath)" tmp/pruned tests.NtlmAuth.main `cat .gcclass_hints` printf "Manifest-Version: 1.0\nMain-Class: tests.NtlmAuth\n" > .manifest.ntlm cd tmp/pruned && jar cfm ../../$@ ../../.manifest.ntlm . rm -f .manifest.ntlm +gmptest: $(tasks)/build_gmp + cd upstream/build/gmp && \ + make check TESTS_ENVIRONMENT="java -cp \"$(classpath)\" org.ibex.nestedvm.RuntimeCompiler" + # # Speed tests # @@ -420,7 +430,7 @@ build/tests/SpeedTest.class: build/org/ibex/nestedvm/Runtime.class tmp/thebride_1280.jpg: @mkdir -p tmp - cd tmp && wget http://www.kill-bill.com/images/wallpaper/thebride_1280.jpg + cd tmp && curl -O http://www.brianweb.net/misc/thebride_1280.jpg oldspeedtest: build/tests/DJpeg.class tmp/thebride_1280.jpg bash -c "time $(JAVA) -cp build tests.DJpeg -targa -outfile tmp/thebride_1280.tga tmp/thebride_1280.jpg" @@ -480,7 +490,7 @@ commit: update: @if [ -d _darcs ]; then darcs pull; \ - else wget -nH -rl 16 -N -X _darcs http://nestedvm.darcs.brianweb.net; \ + else echo "you must have darcs installed in order to acquire the rest of the software" \ fi # @@ -506,3 +516,12 @@ doc/ivme04.pdf: doc/ivme04.tex doc/acmconf.cls $(charts:%.dat=%.pdf) build/tests pdf: doc/ivme04.pdf open doc/ivme04.pdf + +push: + git push /afs/megacz.com/web/org/ibex/nestedvm/ master + +snapshot: + git archive --prefix=nestedvm-`date +%Y-%m-%d`/ HEAD | \ + gzip -c > \ + /afs/megacz.com/web/org/ibex/nestedvm/dist/nestedvm-`date +%Y-%m-%d`.tgz + @echo url is http://nestedvm.ibex.org/dist/dist/nestedvm-`date +%Y-%m-%d`.tgz