X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=Makefile;h=f6b0cf44a8f4d6f246030269ed8a6fdd169af104;hp=3ea8faccf44eb4724977c859a4fc1963c7e1ffe6;hb=2853cc8beff985bc8d34b2982e2ccc7adb578f62;hpb=3eb15f58ca0911489d7d9bdc0ac2c575d27a68d8 diff --git a/Makefile b/Makefile index 3ea8fac..f6b0cf4 100644 --- a/Makefile +++ b/Makefile @@ -1,19 +1,11 @@ +.SECONDARY: + # # What to build # -doc/nestedvm.ivme04.pdf: doc/nestedvm.ivme04.tex doc/acmconf.cls - cd doc; pdflatex nestedvm.ivme04.tex - -pdf: doc/nestedvm.ivme04.pdf - open doc/nestedvm.ivme04.pdf - # Java sources that are part of the compiler/interpreter -java_sources = $(wildcard src/org/xwt/mips/*.java) $(wildcard src/org/xwt/mips/util/*.java) - -# Java sources that are part of the compiler/interpreter that are -# generated from other sources -java_gen_sources = $(patsubst %,build/org/xwt/mips/%.java, UsermodeConstants) +java_sources = $(wildcard src/org/ibex/nestedvm/*.java) $(wildcard src/org/ibex/nestedvm/util/*.java) # C sources that are part of the compiler/interpreter mips_sources = crt0.c support_aux.c @@ -29,26 +21,29 @@ tasks = upstream/tasks flags = -march=mips1 MIPS_CC = mips-unknown-elf-gcc MIPS_CXX = mips-unknown-elf-g++ +MIPS_G77 = mips-unknown-elf-g77 +MIPS_PC = mips-unknown-elf-gpc # Be VERY careful about changing any of these as they can break binary # compatibility and create hard to find bugs -mips_optflags = -O3 -g \ - -fno-rename-registers -freduce-all-givs \ - -fno-peephole -fno-peephole2 -fmove-all-movables -fno-schedule-insns \ - -fno-delayed-branch \ +mips_optflags = -O3 \ -mmemcpy \ -ffunction-sections -fdata-sections \ - -falign-functions=512 + -falign-functions=512 \ + -fno-rename-registers \ + -fno-schedule-insns \ + -fno-delayed-branch \ + -freduce-all-givs MIPS_CFLAGS = $(mips_optflags) $(flags) -I. -Wall -Wno-unused -Werror +MIPS_CXXFLAGS = $(MIPS_CFLAGS) +MIPS_PCFLAGS = $(MIPS_CFLAGS) --big-endian MIPS_LD = mips-unknown-elf-gcc -MIPS_LDFLAGS= \ - $(flags) -L$(build)/org/xwt/mips --static \ - -T $(mips2java_root)/src/org/xwt/mips/linker.ld -Wl,--gc-sections +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 @@ -56,43 +51,48 @@ else JAVAC_NODEBUG_FLAGS = -g:none endif -CLASSPATH = build:upstream/build/bcel/bcel-5.1.jar +CYGWIN = $(findstring CYGWIN,$(shell uname)) +CLASSGEN_PATH = upstream/build/classgen/build +ifneq ($(CYGWIN),) + classpath = $(shell cygpath -wp build:$(CLASSGEN_PATH)) +else + classpath = build:$(CLASSGEN_PATH) +endif GCJ = gcj EXE_EXT = ##### -java_classes = \ - $(java_sources:src/%.java=build/%.class) \ - $(java_gen_sources:%.java=%.class) - -mips_objects = $(mips_sources:%.c=build/org/xwt/mips/%.o) $(mips_asm_sources:%.s=build/org/xwt/mips/%.o) - -.SECONDARY: +java_classes = $(java_sources:src/%.java=build/%.class) +mips_c_objects = $(mips_sources:%.c=build/org/ibex/nestedvm/%.o) +mips_asm_objects = $(mips_asm_sources:%.s=build/org/ibex/nestedvm/%.o) +mips_objects = $(mips_asm_objects) $(mips_c_objects) -PATH := $(mips2java_root)/upstream/install/bin:$(PATH) +usr = $(mips2java_root)/upstream/install +PATH := $(usr)/bin:$(PATH) export PATH # # General Build Stuff # -all: $(java_classes) $(mips_objects) +all: $(java_classes) $(tasks)/build_libc ifdef NATIVE_MIPS2JAVA_COMPILER all: build/mips2java$(EXE_EXT) $(mips_objects) endif +# HACK: Ensure libc is kept up to date when our mips_objects change +$(tasks)/build_libc: $(mips_objects) $(tasks)/build_extraheaders +$(tasks)/build_extraheaders: upstream/misc/extraheaders.sh + $(tasks)/%: - $(MAKE) -C upstream tasks/$* MIPS_LDFLAGS="$(MIPS_LDFLAGS)" MIPS_CFLAGS="$(flags) $(mips_optflags)" + $(MAKE) -C upstream tasks/$* usr="$(usr)" \ + MIPS_CFLAGS="$(filter-out -Werror,$(MIPS_CFLAGS))" \ + MIPS_PCFLAGS="$(filter-out -Werror,$(MIPS_PCFLAGS))" \ + MIPS_LDFLAGS="$(MIPS_LDFLAGS)" upstream_clean_%: - $(MAKE) -C upstream clean_$* - -errno_h = upstream/install/mips-unknown-elf/include/sys/errno.h -$(errno_h): $(tasks)/build_newlib - -unistd_h = upstream/install/mips-unknown-elf/include/sys/unistd.h -$(unistd_h): $(tasks)/build_newlib + $(MAKE) -C upstream clean_$* usr="$(usr)" # # Interpreter/Compiler/Runtime Java Compilation @@ -100,71 +100,70 @@ $(unistd_h): $(tasks)/build_newlib # This works around a gcj -C bug ifeq ($(firstword $(JAVAC)),gcj) -build/org/xwt/mips/util/.Dummy.class: +build/org/ibex/nestedvm/util/.Dummy.class: mkdir -p `dirname $@` touch $@ -$(java_classes): build/org/xwt/mips/util/.Dummy.class +$(java_classes): build/org/ibex/nestedvm/util/.Dummy.class endif -$(java_classes): $(tasks)/unpack_bcel $(java_sources) $(java_gen_sources) - $(JAVAC) -classpath $(CLASSPATH) -d build $(java_sources) $(java_gen_sources) - -build/org/xwt/mips/UsermodeConstants.java: src/org/xwt/mips/syscalls.h $(errno_h) $(unistd_h) - @mkdir -p `dirname $@` - cat $^ |\ - (FILE=org.xwt.mips.UsermodeConstants;\ - C="`echo $$FILE | sed 's/.*\.\([^\.]*\)$$/\1/;'`";\ - P="`echo $$FILE | sed -n 's/\(.*\)\..*/\1/p;'`";\ - [ -n "$$P" ] && echo "package $$P;";\ - echo "public interface $$C {";\ - tr '\t' ' ' | sed -n ';\ - s/ */ /g;\ - s/ *\# *define \([A-Z_][A-Za-z0-9_]*\) \([0-9][0-9x]*\)/ public static final int \1 = \2;/p';\ - echo "}") > $@ - +$(java_classes): $(java_sources) $(tasks)/build_darcs_classgen + $(JAVAC) -classpath "$(classpath)" -d build $(java_sources) +# GCJ Stuff # FIXME: We're cramming more than we need into the binary here build/mips2java$(EXE_EXT): $(java_sources) $(java_gen_sources) @mkdir -p `dirname $@` - $(GCJ) -s -o $@ --main=org.xwt.mips.Compiler $(java_sources) $(java_gen_sources) + $(GCJ) -s -o $@ --main=org.ibex.nestedvm.Compiler $(java_sources) $(java_gen_sources) # # MIPS Binary compilation # -build/%.o: src/%.c $(tasks)/full_toolchain + +# The nestedvm support library is special, it doesn't a full libc +$(mips_c_objects): build/%.o: src/%.c $(tasks)/build_gcc $(tasks)/build_newlib $(tasks)/build_extraheaders + @mkdir -p `dirname $@` + $(MIPS_CC) $(MIPS_CFLAGS) -c -o $@ $< + +# Everything else needs a full libc +build/%.o: src/%.c $(tasks)/build_gcc $(tasks)/build_libc @mkdir -p `dirname $@` $(MIPS_CC) $(MIPS_CFLAGS) $($(notdir $*)_CFLAGS) -c -o $@ $< -build/%.o: src/%.s $(tasks)/full_toolchain +build/%.o: src/%.s $(tasks)/build_gcc @mkdir -p `dirname $@` $(MIPS_CC) -x assembler-with-cpp -c -o $@ $< -%.s: %.c $(tasks)/full_toolchain +tmp/%.s: src/%.c $(tasks)/build_gcc + @mkdir -p `dirname $@` $(MIPS_CC) $(MIPS_CFLAGS) $($(notdir $*)_CFLAGS) -c -S -o $@ $< -build/%.mips: build/%.o $(mips_objects) +build/%.mips: build/%.o $(tasks)/build_gcc $(tasks)/build_libc $(MIPS_LD) -o $@ $< $(MIPS_LDFLAGS) $($(notdir $*)_LDFLAGS) -build/%.mips: src/%.cc $(tasks)/full_toolchain $(mips_objects) +build/%.mips: src/%.cc $(tasks)/build_gcc_step2 $(tasks)/build_libc + @mkdir -p `dirname $@` + $(MIPS_CXX) $(MIPS_CXXFLAGS) $($(notdir $*)_CXXFLAGS) $(MIPS_LDFLAGS) $($(notdir $*)_LDFLAGS) -o $@ $< + +build/%.mips: src/%.pas $(tasks)/build_gpc @mkdir -p `dirname $@` - $(MIPS_CXX) $(MIPS_CFLAGS) $($(notdir $*)_CFLAGS) $(MIPS_LDFLAGS) $($(notdir $*)_LDFLAGS) -o $@ $< + $(MIPS_PC) $(MIPS_PCFLAGS) $($(notdir $*)_PCFLAGS) $(MIPS_LDFLAGS) $($(notdir $*)_LDFLAGS) -o $@ $< -build/%.mips.stripped: build/%.mips +build/%.mips.stripped: build/%.mips $(tasks)/build_linker cp $< $@ $(MIPS_STRIP) -s $@ # MIPS Compiler generated class compilation ifdef DO_JAVASOURCE -build/%.java: build/%.mips build/org/xwt/mips/JavaSourceCompiler.class $(tasks)/unpack_bcel - $(JAVA) -cp $(CLASSPATH) org.xwt.mips.Compiler -outformat javasource $(compiler_flags) $($(notdir $*)_COMPILERFLAGS) $(subst /,.,$*) $< > build/$*.java +build/%.java: build/%.mips build/org/ibex/nestedvm/JavaSourceCompiler.class + $(JAVA) -cp "$(classpath)" org.ibex.nestedvm.Compiler -outformat javasource $(compiler_flags) $($(notdir $*)_COMPILERFLAGS) $(subst /,.,$*) $< > build/$*.java -build/%.class: build/%.java build/org/xwt/mips/Runtime.class +build/%.class: build/%.java build/org/ibex/nestedvm/Runtime.class $(JAVAC) $(JAVAC_NODEBUG_FLAGS) -classpath build -d build $< else -build/%.class: build/%.mips build/org/xwt/mips/ClassFileCompiler.class $(tasks)/unpack_bcel - $(JAVA) -cp $(CLASSPATH) org.xwt.mips.Compiler -outformat class -outfile $@ $(compiler_flags) $($(notdir $*)_COMPILERFLAGS) $(subst /,.,$*) $< +build/%.class: build/%.mips build/org/ibex/nestedvm/ClassFileCompiler.class + $(JAVA) -cp "$(classpath)" org.ibex.nestedvm.Compiler -outformat class -d build $(compiler_flags) $($(notdir $*)_COMPILERFLAGS) $(subst /,.,$*) $< endif @@ -174,23 +173,25 @@ build/%.class: src/%.java $(JAVAC) -classpath build -d build $< clean: - rm -rf build/tests build/org/xwt/mips *.jar build/mips2java$(EXE_EXT) + rm -rf build/tests build/org/ibex/nestedvm *.jar build/mips2java$(EXE_EXT) # # env.sh # -env.sh: Makefile $(tasks)/full_toolchain build/org/xwt/mips/Compiler.class $(tasks)/unpack_bcel +env.sh: Makefile $(tasks)/build_gcc $(tasks)/build_libc build/org/ibex/nestedvm/Compiler.class @rm -f "$@~" - @echo 'PATH="$(mips2java_root)/build:$(mips2java_root)/upstream/install/bin:$$PATH"; export PATH' >> $@~ + @echo 'PATH="$(mips2java_root)/build:$(usr)/bin:$$PATH"; export PATH' >> $@~ @echo 'CC=mips-unknown-elf-gcc; export CC' >> $@~ @echo 'CXX=mips-unknown-elf-g++; export CXX' >> $@~ @echo 'AS=mips-unknown-elf-as; export AS' >> $@~ - @echo 'LD=mips-unknown-elf-ar; export LD' >> $@~ + @echo 'AR=mips-unknown-elf-ar; export AR' >> $@~ + @echo 'LD=mips-unknown-elf-ld; export LD' >> $@~ @echo 'RANLIB=mips-unknown-elf-ranlib; export RANLIB' >> $@~ @echo 'CFLAGS="$(mips_optflags)"; export CFLAGS' >> $@~ @echo 'CXXFLAGS="$(mips_optflags)"; export CXXFLAGS' >> $@~ @echo 'LDFLAGS="$(MIPS_LDFLAGS)"; export LDFLAGS' >> $@~ - @echo 'CLASSPATH=$(mips2java_root)/build:$(mips2java_root)/upstream/build/bcel/bcel-5.1.jar:.; export CLASSPATH' >> $@~ + @echo 'CLASSPATH=$(mips2java_root)/build:$(mips2java_root)/upstream/build/classgen/build:.; export CLASSPATH' >> $@~ + @chmod a+x "$@~" @mv "$@~" "$@" @echo "$@ created successfully" @@ -198,17 +199,78 @@ env.sh: Makefile $(tasks)/full_toolchain build/org/xwt/mips/Compiler.class $(tas # Runtime.jar # -runtime_util_classes = SeekableData SeekableByteArray SeekableFile SeekableInputStream -runtime_classes = Runtime Registers UsermodeConstants $(runtime_util_classes:%=util/%) -unixruntime_classes = $(runtime_classes) UnixRuntime - -runtime.jar: $(runtime_classes:%=build/org/xwt/mips/%.class) - cd build && jar cf ../$@ $(runtime_classes:%=org/xwt/mips/%*.class) - -unixruntime.jar: $(unixruntime_classes:%=build/org/xwt/mips/%.class) - cd build && jar cf ../$@ $(unixruntime_classes:%=org/xwt/mips/%*.class) - - +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 + cp upstream/build/tex/TeX.class build + cd build && jar cfm ../$@ ../.manifest \ + $(runtime_classes:%=org/ibex/nestedvm/%.class) \ + org/ibex/nestedvm/Runtime\$$*.class \ + org/ibex/nestedvm/util/Seekable\$$*.class + +runtime.jar: $(runtime_classes:%=build/org/ibex/nestedvm/%.class) + cd build && jar cf ../$@ \ + $(runtime_classes:%=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" > $@ + +nestedvm.jar: $(java_classes) .manifest + cd build && jar cfm ../$@ ../.manifest $(java_classes:build/%.class=%*.class) + cd $(CLASSGEN_PATH) && jar uf $(mips2java_root)/$@ . + +.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.2/bcel-5.2.jar \ + com.brian_web.gcclass.GCClass \ + "$(classpath)" tmp/pruned org.ibex.nestedvm.RuntimeCompiler.main `cat .gcclass_hints` + cd tmp/pruned && jar cfm ../../$@ ../../.manifest . + +sizecheck: compact_runtime_compiler.jar + @for c in `find tmp/pruned -name '*.class'|fgrep -v '$$'`; do \ + for f in `echo $$c|sed 's,\.class$$,,;'`*.class; do gzip -c $$f; done | wc -c | tr -d '\n'; \ + echo -e "\t`echo $$c | sed 's,tmp/pruned/org/ibex,,;s,\.class$$,,;s,/,.,g;'`"; \ + done | sort -rn | awk '{ sum += $$1; print } END { print sum,"Total"; }' + + +# This is only for Brian to use... don't mess with it +rebuild-constants: $(tasks)/build_libc + @mkdir -p `dirname $@` + ( \ + cat \ + src/org/ibex/nestedvm/syscalls.h \ + $(usr)/mips-unknown-elf/include/nestedvm/socket.h \ + $(usr)/mips-unknown-elf/include/sys/{errno.h,unistd.h,syslimits.h,sysctl.h}; \ + $(MIPS_CC) -E -dM $(usr)/mips-unknown-elf/include/sys/fcntl.h | awk '$$2 ~ /^[OF]_/ { print; }'; \ + ) | ( \ + echo "// THIS FILE IS AUTOGENERATED! DO NOT EDIT!"; \ + echo "// run \"make rebuild-constants\" if it needs to be updated"; \ + echo ""; \ + echo "package org.ibex.nestedvm;"; \ + echo "public interface UsermodeConstants {"; \ + tr '\t' ' ' | sed -n ' \ + s/ */ /g; \ + s/ *# *define \([A-Z_][A-Za-z0-9_]*\) \([0-9][0-9a-fA-Fx]*\)/ public static final int \1 = \2;/p'; \ + echo "}"; \ + ) > src/org/ibex/nestedvm/UsermodeConstants.java # # Tests @@ -216,13 +278,14 @@ unixruntime.jar: $(unixruntime_classes:%=build/org/xwt/mips/%.class) # to build or run mips2java # -build/tests/Env.class: build/org/xwt/mips/Runtime.class build/org/xwt/mips/Interpreter.class +build/tests/Env.class: build/org/ibex/nestedvm/Runtime.class build/org/ibex/nestedvm/Interpreter.class # Generic Hello Worldish test +test_COMPILERFLAGS = -o unixruntime test: build/tests/Test.class $(JAVA) -cp build tests.Test "arg 1" "arg 2" "arg 3" -inttest: build/tests/Test.mips build/org/xwt/mips/Interpreter.class - $(JAVA) -cp build org.xwt.mips.Interpreter build/tests/Test.mips "arg 1" "arg 2" "arg 3" +inttest: build/tests/Test.mips build/org/ibex/nestedvm/Interpreter.class + $(JAVA) -cp build org.ibex.nestedvm.Interpreter build/tests/Test.mips "arg 1" "arg 2" "arg 3" cxxtest: build/tests/CXXTest.class $(JAVA) -cp build tests.CXXTest @@ -236,6 +299,9 @@ build/tests/FDTest.class: build/tests/Test.class fdtest: build/tests/FDTest.class $(JAVA) -cp build tests.FDTest +# Pascal Test +pascaltest: build/tests/PascalHello.class + $(JAVA) -cp build tests.PascalHello # Simple Simple_LDFLAGS = -nostdlib @@ -248,6 +314,14 @@ Paranoia_LDFLAGS = -lm paranoiatest: build/tests/Paranoia.class $(JAVA) -cp build tests.Paranoia +# Linpack +build/tests/Linpack.mips: $(tasks)/download_linpack $(tasks)/build_gcc_step2 + mkdir -p `dirname "$@"` + $(MIPS_G77) $(MIPS_CFLAGS) $(Linpack_CFLAGS) $(MIPS_LDFLAGS) -o $@ upstream/download/linpack_bench.f -lc + +linpacktest: build/tests/Linpack.class + $(JAVA) -cp build tests.Linpack + # # Freetype Stuff # @@ -256,7 +330,7 @@ FreeType_LDFLAGS = -Lupstream/build/freetype/objs -lfreetype FreeTypeDemoHelper_CFLAGS = $(FreeType_CFLAGS) FreeTypeDemoHelper_LDFLAGS = $(FreeType_LDFLAGS) -build/tests/FreeTypeDemoHelper.o: $(mips_objects) $(tasks)/build_freetype +build/tests/FreeTypeDemoHelper.o: $(tasks)/build_freetype build/tests/FreeTypeDemoHelper.mips: build/tests/FreeTypeDemo.class: build/tests/FreeTypeDemoHelper.class @@ -269,7 +343,7 @@ build/tests/FTBench.o: $(tasks)/build_freetype # MSPackHelper_CFLAGS = -Iupstream/build/libmspack/mspack MSPackHelper_LDFLAGS = -Lupstream/build/libmspack/mspack -lmspack -build/tests/MSPackHelper.o: $(mips_objects) $(tasks)/build_libmspack +build/tests/MSPackHelper.o: $(tasks)/build_libmspack build/tests/MSPack.class: build/tests/MSPackHelper.class MSPackBench_CFLAGS = -Iupstream/build/libmspack/mspack @@ -285,7 +359,7 @@ build/tests/Echo.class: build/tests/EchoHelper.class # Libjpeg # DJpeg_COMPILERFLAGS = -o onepage,pagesize=8m -build/tests/DJpeg.mips: $(mips_objects) $(tasks)/build_libjpeg +build/tests/DJpeg.mips: $(tasks)/build_libjpeg @mkdir -p `dirname $@` cp upstream/build/libjpeg/djpeg $@ @@ -293,17 +367,17 @@ build/tests/DJpeg.mips: $(mips_objects) $(tasks)/build_libjpeg # Busybox # BusyBox_COMPILERFLAGS = -o unixruntime -build/tests/BusyBox.mips: $(mips_object) $(tasks)/build_busybox +build/tests/BusyBox.mips: $(tasks)/build_busybox @mkdir -p `dirname $@` cp upstream/build/busybox/busybox $@ busyboxtest: build/tests/BusyBox.class - $(JAVA) -cp build tests.BusyBox ash + $(JAVA) -Dnestedvm.busyboxhack=true -cp "$(classpath)" tests.BusyBox ash # # Boehm GC # -build/tests/GCTest.mips: $(mips_objects) $(tasks)/build_boehmgc +build/tests/GCTest.mips: $(tasks)/build_boehmgc @mkdir -p `dirname $@` cp upstream/build/boehmgc/gctest $@ @@ -311,20 +385,69 @@ boehmgctest: build/tests/Env.class build/tests/GCTest.class $(JAVA) -cp build tests.Env GC_PRINT_STATS=1 tests.GCTest +# TeX + +Tangle_COMPILERFLAGS = -o unixruntime + +build/tests/Tangle.mips: $(tasks)/build_tex_tangle + @mkdir -p `dirname $@` + cp upstream/build/tex/tangle.mips $@ + + +TeX_COMPILERFLAGS = -o unixruntime +build/tests/TeX.mips: $(tasks)/build_tex + @mkdir -p `dirname $@` + cp upstream/build/tex/tex.mips $@ + +NtlmAuth_COMPILERFLAGS = -o unixruntime +build/tests/NtlmAuth.mips: $(tasks)/build_samba + mkdir -p `dirname $@` + cp upstream/build/samba/source/bin/ntlm_auth $@ + +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 .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 `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 # -build/tests/SpeedTest.class: build/org/xwt/mips/Runtime.class +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" @echo "e90f6b915aee2fc0d2eb9fc60ace6203 tmp/thebride_1280.tga" | md5sum -c && echo "MD5 is OK" +djpegspeedtest: build/tests/SpeedTest.class build/tests/DJpeg.class tmp/thebride_1280.jpg + @echo "Running DJpeg test..." + @$(JAVA) -cp build tests.SpeedTest tests.DJpeg 8 -targa -outfile tmp/thebride_1280.tga tmp/thebride_1280.jpg + +mspackspeedtest: build/tests/SpeedTest.class build/tests/MSPackBench.class + @if [ -e tmp/mspack/comic32.exe ]; then \ + echo "Running MSPackBench test..."; \ + cd tmp/mspack && $(JAVA) -cp ../../build tests.SpeedTest tests.MSPackBench 20 *32.exe; \ + else \ + echo "Run \"make check\" to get the MS True Type fonts for the MSPackBench test"; \ + fi + speedtest: build/tests/SpeedTest.class build/tests/DJpeg.class build/tests/FTBench.class tmp/thebride_1280.jpg build/tests/MSPackBench.class @echo "Running DJpeg test..." @$(JAVA) -cp build tests.SpeedTest tests.DJpeg 10 -targa -outfile tmp/thebride_1280.tga tmp/thebride_1280.jpg @@ -334,15 +457,15 @@ speedtest: build/tests/SpeedTest.class build/tests/DJpeg.class build/tests/FTBen else \ echo "Run \"make check\" to get Arial.TTF for the FTBench test"; \ fi - @if [ -e tmp/mspack/comic32.exe ]; then \ + @if false && [ -e tmp/mspack/comic32.exe ]; then \ echo "Running MSPackBench test..."; \ cd tmp/mspack && $(JAVA) -cp ../../build tests.SpeedTest tests.MSPackBench 10 *32.exe; \ else \ echo "Run \"make check\" to get the MS True Type fonts for the MSPackBench test"; \ fi -intspeed: build/tests/DJpeg.mips build/org/xwt/mips/Interpreter.class tmp/thebride_1280.jpg - time $(JAVA) -cp build org.xwt.mips.Interpreter build/tests/DJpeg.mips -targa -outfile tmp/thebride_1280.tga tmp/thebride_1280.jpg +intspeed: build/tests/DJpeg.mips build/org/ibex/nestedvm/Interpreter.class tmp/thebride_1280.jpg + time $(JAVA) -cp build org.ibex.nestedvm.Interpreter build/tests/DJpeg.mips -targa -outfile tmp/thebride_1280.tga tmp/thebride_1280.jpg @echo "e90f6b915aee2fc0d2eb9fc60ace6203 tmp/thebride_1280.tga" | md5sum -c && echo "MD5 is OK" # @@ -355,3 +478,47 @@ check: $(patsubst %,build/tests/%.class, FTBench MSPackBench DJpeg GCTest) tmp/t compiletests: $(patsubst %,build/tests/%.class,FTBench MSPackBench DJpeg Test FreeTypeDemoHelper MSPackHelper EchoHelper BusyBox GCTest Fork) @true + +# +# Darcs stuff +# + +commit: + @if [ -d _darcs ]; then darcs push; \ + else echo "You need darcs to commit"; false; \ + fi + +update: + @if [ -d _darcs ]; then darcs pull; \ + else wget -nH -rl 16 -N -X _darcs http://nestedvm.darcs.brianweb.net; \ + fi + +# +# Paper stuff +# +charts := $(shell find doc/charts -name \*.dat) + +# IVME Paper +doc/charts/%.pdf: doc/charts/%.dat doc/charts/%.gnuplot + cd doc/charts; gnuplot $*.gnuplot + cd doc/charts; chmod +x boxfill.pl; ./boxfill.pl -g -o unfilled.eps $*.eps + cd doc/charts; ps2pdf $*.eps + +doc/ivme04.pdf: doc/ivme04.tex doc/acmconf.cls $(charts:%.dat=%.pdf) build/tests/TeX.class + cp upstream/build/tex/tex.pool upstream/build/tex/texinputs/tex.pool + cd upstream/build/tex/texinputs && echo '\latex.ltx' | java -cp $(mips2java_root)/build:$(mips2java_root)/$(CLASSGEN_PATH) tests.TeX + cd upstream/build/tex/texinputs && ln -fs ../../../../doc/* .; rm -f ivme04.aux; touch ivme04.aux; touch ivme04.bbl + cd upstream/build/tex/texinputs && echo '\&latex \input ivme04.tex' | java -cp $(mips2java_root)/build:$(mips2java_root)/$(CLASSGEN_PATH) tests.TeX + cd upstream/build/tex/texinputs && bibtex ivme04 + cd upstream/build/tex/texinputs && echo '\&latex \input ivme04.tex' | java -cp $(mips2java_root)/build:$(mips2java_root)/$(CLASSGEN_PATH) tests.TeX + cd upstream/build/tex/texinputs && dvipdf ivme04.dvi + #cp upstream/build/tex/texinputs/ivme04.pdf $@ + +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