X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=Makefile;h=7c7692b919d7abaead1953f1ba9424d18fc92706;hp=20ca8bf61dd0b4593d3761d5923698f6f0dc5f2d;hb=031222f07c4ac6549cfdcb0667114ba5476bbbaf;hpb=f811f364cc38f2ca8af249c3f645debe04992480 diff --git a/Makefile b/Makefile index 20ca8bf..7c7692b 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ 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 \ +mips_optflags = -O3 \ -mmemcpy \ -ffunction-sections -fdata-sections \ -falign-functions=512 \ @@ -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 @@ -51,8 +51,13 @@ else JAVAC_NODEBUG_FLAGS = -g:none endif -bcel_jar = upstream/build/bcel-5.1/bcel-5.1.jar -classpath = build:$(bcel_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 = @@ -71,17 +76,20 @@ 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_object) upstream/patches/newlib-extraheaders.sh +$(tasks)/build_libc: $(mips_objects) $(tasks)/build_extraheaders +$(tasks)/build_extraheaders: upstream/misc/extraheaders.sh $(tasks)/%: - $(MAKE) -C upstream tasks/$* usr="$(usr)" 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_$* usr="$(usr)" @@ -98,11 +106,8 @@ build/org/ibex/nestedvm/util/.Dummy.class: $(java_classes): build/org/ibex/nestedvm/util/.Dummy.class endif -$(java_classes): $(java_sources) $(bcel_jar) - $(JAVAC) -classpath $(classpath) -d build $(java_sources) - -$(bcel_jar): upstream/tasks/extract_bcel - @true +$(java_classes): $(java_sources) $(tasks)/build_git_classgen + $(JAVAC) -classpath "$(classpath)" -d build $(java_sources) # GCJ Stuff # FIXME: We're cramming more than we need into the binary here @@ -128,7 +133,7 @@ build/%.o: src/%.s $(tasks)/build_gcc @mkdir -p `dirname $@` $(MIPS_CC) -x assembler-with-cpp -c -o $@ $< -tmp/%.s: %.c $(tasks)/build_gcc +tmp/%.s: src/%.c $(tasks)/build_gcc @mkdir -p `dirname $@` $(MIPS_CC) $(MIPS_CFLAGS) $($(notdir $*)_CFLAGS) -c -S -o $@ $< @@ -151,14 +156,14 @@ build/%.mips.stripped: build/%.mips $(tasks)/build_linker ifdef DO_JAVASOURCE 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 + $(JAVA) -cp "$(classpath)" org.ibex.nestedvm.Compiler -outformat javasource $(compiler_flags) $($(notdir $*)_COMPILERFLAGS) $(subst /,.,$*) $< > build/$*.java 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/ibex/nestedvm/ClassFileCompiler.class - $(JAVA) -cp $(classpath) org.ibex.nestedvm.Compiler -outformat class -outfile $@ $(compiler_flags) $($(notdir $*)_COMPILERFLAGS) $(subst /,.,$*) $< + $(JAVA) -cp "$(classpath)" org.ibex.nestedvm.Compiler -outformat class -d build $(compiler_flags) $($(notdir $*)_COMPILERFLAGS) $(subst /,.,$*) $< endif @@ -185,7 +190,8 @@ env.sh: Makefile $(tasks)/build_gcc $(tasks)/build_libc build/org/ibex/nestedvm/ @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)/$(bcel_jar):.; export CLASSPATH' >> $@~ + @echo 'CLASSPATH=$(mips2java_root)/build:$(mips2java_root)/upstream/build/classgen/build:.; export CLASSPATH' >> $@~ + @chmod a+x "$@~" @mv "$@~" "$@" @echo "$@ created successfully" @@ -194,15 +200,15 @@ 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) upstream/tasks/build_tex - echo -e "Manifest-Version: 1.0\nMain-Class: TeX\n" > .manifest +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 \ - TeX.class \ $(runtime_classes:%=org/ibex/nestedvm/%.class) \ - org/ibex/nestedvm/*.class \ - org/ibex/nestedvm/util/*.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 ../$@ \ @@ -210,29 +216,48 @@ 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: - echo -ne "Manifest-Version: 1.0\nMain-Class: org.ibex.nestedvm.RuntimeCompiler\n" > $@ + 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)/$@ . -compact_runtime_compiler.jar: $(java_classes) .manifest $(tasks)/build_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 - java -cp upstream/build/gcclass/build:$(bcel_jar) com.brian_web.gcclass.GCClass \ - build 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' + 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-uknown-elf/include/nestedvm/sockets.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; }'; \ ) | ( \ @@ -292,7 +317,7 @@ paranoiatest: build/tests/Paranoia.class # Linpack build/tests/Linpack.mips: $(tasks)/download_linpack $(tasks)/build_gcc_step2 mkdir -p `dirname "$@"` - $(MIPS_G77) $(MIPS_CFLAGS) $(MIPS_LDFLAGS) -o $@ upstream/download/linpack_bench.f -lc + $(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 @@ -347,7 +372,7 @@ build/tests/BusyBox.mips: $(tasks)/build_busybox cp upstream/build/busybox/busybox $@ busyboxtest: build/tests/BusyBox.class - $(JAVA) -Dnestedvm.busyboxhack=true -cp $(classpath) tests.BusyBox ash + $(JAVA) -Dnestedvm.busyboxhack=true -cp "$(classpath)" tests.BusyBox ash # # Boehm GC @@ -360,6 +385,43 @@ 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_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 `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 # @@ -368,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" @@ -417,6 +479,23 @@ compiletests: $(patsubst %,build/tests/%.class,FTBench MSPackBench DJpeg Test Fr @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 echo "you must have darcs installed in order to acquire the rest of the software" \ + fi + +# +# Paper stuff +# charts := $(shell find doc/charts -name \*.dat) # IVME Paper @@ -425,15 +504,24 @@ doc/charts/%.pdf: doc/charts/%.dat doc/charts/%.gnuplot cd doc/charts; chmod +x boxfill.pl; ./boxfill.pl -g -o unfilled.eps $*.eps cd doc/charts; ps2pdf $*.eps -tex := java -cp $(usr)/../../build:.. TeX - -#tex := java -cp $(usr)/../../build:.. org.ibex.nestedvm.Interpreter ../tex.mips -doc/ivme04.pdf: doc/ivme04.tex doc/acmconf.cls $(charts:%.dat=%.pdf) tex.jar upstream/tasks/extract_texinputs +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' | $(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' | $(tex) - cd upstream/build/tex/texinputs; dvipdf ivme04.dvi + 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: + 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