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
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)"
@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"
#
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
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" > $@
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_darcs_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.<init>' '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}.'<init>'
+ "$(classpath)" tmp/pruned org.ibex.nestedvm.RuntimeCompiler.main `cat .gcclass_hints`
cd tmp/pruned && jar cfm ../../$@ ../../.manifest .
sizecheck: compact_runtime_compiler.jar
@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
+ntlmauth.jar: build/tests/NtlmAuth.class $(tasks)/build_darcs_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 \
- org.ibex.nestedvm.util.Platform\$$Jdk{11,12,13,14}.'<init>'
+ 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
#
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"
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
#
pdf: doc/ivme04.pdf
open doc/ivme04.pdf
+
+push:
+ if [ "$${HOSTNAME#*.}" = "brianweb.net" ]; then \
+ darcs push charger.brianweb.net:/home/darcs/nestedvm; \
+ fi
+ darcs push /afs/ibex.org/project/nestedvm