X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=Makefile;h=e2edde72098e8cdf26c06db810c6284bc0384b48;hp=ee8e94117c6c462a61bf1bf520e76a1a88660826;hb=8817b8182ec910e54686e834e4a21efb0ab2fde8;hpb=034a42fa65955289442614ef9914e5474fac62aa diff --git a/Makefile b/Makefile index ee8e941..e2edde7 100644 --- a/Makefile +++ b/Makefile @@ -21,10 +21,12 @@ 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 \ +mips_optflags = -O3 \ -mmemcpy \ -ffunction-sections -fdata-sections \ -falign-functions=512 \ @@ -34,10 +36,10 @@ mips_optflags = -O3 -g \ -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/ibex/nestedvm --static \ - -T $(mips2java_root)/src/org/ibex/nestedvm/linker.ld -Wl,--gc-sections +MIPS_LDFLAGS= $(flags) --static -Wl,--gc-sections MIPS_STRIP = mips-unknown-elf-strip # Java compiler/VM settings @@ -49,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 = @@ -58,7 +65,9 @@ EXE_EXT = ##### java_classes = $(java_sources:src/%.java=build/%.class) -mips_objects = $(mips_sources:%.c=build/org/ibex/nestedvm/%.o) $(mips_asm_sources:%.s=build/org/ibex/nestedvm/%.o) +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) usr = $(mips2java_root)/upstream/install PATH := $(usr)/bin:$(PATH) @@ -67,14 +76,21 @@ 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 -$(tasks)/%: - $(MAKE) -C upstream tasks/$* usr="$(usr)" MIPS_LDFLAGS="$(MIPS_LDFLAGS)" MIPS_CFLAGS="$(flags) $(mips_optflags)" +# 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/$* 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)" @@ -90,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_darcs_classgen + $(JAVAC) -classpath "$(classpath)" -d build $(java_sources) # GCJ Stuff # FIXME: We're cramming more than we need into the binary here @@ -105,25 +118,37 @@ build/mips2java$(EXE_EXT): $(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 $@ @@ -131,14 +156,14 @@ build/%.mips.stripped: build/%.mips 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 @@ -153,7 +178,7 @@ clean: # # env.sh # -env.sh: Makefile $(tasks)/full_toolchain build/org/ibex/nestedvm/Compiler.class +env.sh: Makefile $(tasks)/build_gcc $(tasks)/build_libc build/org/ibex/nestedvm/Compiler.class @rm -f "$@~" @echo 'PATH="$(mips2java_root)/build:$(usr)/bin:$$PATH"; export PATH' >> $@~ @echo 'CC=mips-unknown-elf-gcc; export CC' >> $@~ @@ -165,7 +190,7 @@ env.sh: Makefile $(tasks)/full_toolchain build/org/ibex/nestedvm/Compiler.class @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' >> $@~ @mv "$@~" "$@" @echo "$@ created successfully" @@ -173,23 +198,58 @@ env.sh: Makefile $(tasks)/full_toolchain build/org/ibex/nestedvm/Compiler.class # Runtime.jar # -runtime_util_classes = SeekableData SeekableByteArray SeekableFile SeekableInputStream -runtime_classes = Runtime Registers UsermodeConstants $(runtime_util_classes:%=util/%) -unixruntime_classes = $(runtime_classes) UnixRuntime +runtime_classes = Runtime Registers UsermodeConstants util/Seekable + +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) + cd build && jar cf ../$@ \ + $(runtime_classes:%=org/ibex/nestedvm/%.class) \ + org/ibex/nestedvm/Runtime\$$*.class \ + org/ibex/nestedvm/util/Seekable\$$*.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.1/bcel-5.1.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"; }' -unixruntime.jar: $(unixruntime_classes:%=build/org/ibex/nestedvm/%.class) - cd build && jar cf ../$@ $(unixruntime_classes:%=org/ibex/nestedvm/%*.class) # This is only for Brian to use... don't mess with it -rebuild-constants: $(tasks)/build_newlib +rebuild-constants: $(tasks)/build_libc @mkdir -p `dirname $@` - cat \ - src/org/ibex/nestedvm/syscalls.h \ - $(usr)/mips-unknown-elf/include/sys/{errno.h,unistd.h,syslimits.h} \ - | ( \ + ( \ + 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 ""; \ @@ -197,10 +257,10 @@ rebuild-constants: $(tasks)/build_newlib echo "public interface UsermodeConstants {"; \ 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'; \ + 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 # These are simply here for convenience. They aren't required @@ -210,6 +270,7 @@ rebuild-constants: $(tasks)/build_newlib 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/ibex/nestedvm/Interpreter.class @@ -227,6 +288,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 @@ -238,7 +302,15 @@ Paranoia_CFLAGS = "-Wno-error" 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 # @@ -247,7 +319,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 @@ -260,7 +332,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 @@ -276,7 +348,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 $@ @@ -284,17 +356,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 $@ @@ -302,6 +374,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_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 # @@ -359,9 +468,40 @@ compiletests: $(patsubst %,build/tests/%.class,FTBench MSPackBench DJpeg Test Fr @true -# IVME Paper -doc/nestedvm.ivme04.pdf: doc/nestedvm.ivme04.tex doc/acmconf.cls - cd doc; pdflatex nestedvm.ivme04.tex && ./pst2pdf && pdflatex nestedvm.ivme04.tex +# +# 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 -pdf: doc/nestedvm.ivme04.pdf - open doc/nestedvm.ivme04.pdf +# +# 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