X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=Makefile;h=e539ef63e57b3c1e871a67aefd7f1227a0156d99;hp=a26319b75f1e00a5a8990c4426bee720305f43f2;hb=437397dbd57fbfc6656c49f1aff377da37484bb6;hpb=b4cee44bea4853f5c0f7cb3b331aecb84ef3aa3e diff --git a/Makefile b/Makefile index a26319b..e539ef6 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 +CYGWIN = $(findstring CYGWIN,$(shell uname)) CLASSGEN_PATH = upstream/build/classgen/build -classpath = build:$(CLASSGEN_PATH) +ifneq ($(CYGWIN),) + classpath = $(shell cygpath -wp build:$(CLASSGEN_PATH)) +else + classpath = build:$(CLASSGEN_PATH) +endif GCJ = gcj EXE_EXT = @@ -71,13 +76,14 @@ 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) upstream/misc/extraheaders.sh +$(tasks)/build_libc: $(mips_objects) $(tasks)/build_extraheaders +$(tasks)/build_extraheaders: upstream/misc/extraheaders.sh $(tasks)/%: $(MAKE) -C upstream tasks/$* usr="$(usr)" \ @@ -101,7 +107,7 @@ $(java_classes): build/org/ibex/nestedvm/util/.Dummy.class endif $(java_classes): $(java_sources) $(tasks)/build_darcs_classgen - $(JAVAC) -classpath $(classpath) -d build $(java_sources) + $(JAVAC) -classpath "$(classpath)" -d build $(java_sources) # GCJ Stuff # FIXME: We're cramming more than we need into the binary here @@ -127,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 $@ $< @@ -150,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 @@ -193,6 +199,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 @@ -208,23 +215,33 @@ 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 + cd upstream/build/classgen/build && jar -uf ../../../../$@ \ + org/ibex/classgen/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 +compact_runtime_compiler.jar: $(java_classes) .manifest $(tasks)/build_darcs_gcclass .gcclass_hints mkdir -p tmp/pruned rm -rf tmp/pruned/* - java -cp \ + $(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 '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' + "$(classpath)" tmp/pruned org.ibex.nestedvm.RuntimeCompiler.main `cat .gcclass_hints` cd tmp/pruned && jar cfm ../../$@ ../../.manifest . sizecheck: compact_runtime_compiler.jar @@ -240,7 +257,7 @@ rebuild-constants: $(tasks)/build_libc ( \ 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; }'; \ ) | ( \ @@ -300,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 @@ -355,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 @@ -381,7 +398,30 @@ 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 # @@ -439,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 wget -nH -rl 16 -N -X _darcs http://nestedvm.darcs.brianweb.net; \ + fi + +# +# Paper stuff +# charts := $(shell find doc/charts -name \*.dat) # IVME Paper @@ -449,11 +506,13 @@ doc/charts/%.pdf: doc/charts/%.dat doc/charts/%.gnuplot 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 $(build) tests.TeX + 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 $(build) tests.TeX + 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 $@ + #cp upstream/build/tex/texinputs/ivme04.pdf $@ pdf: doc/ivme04.pdf open doc/ivme04.pdf