X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=Makefile;h=2d7ca4307e441e3bc0588de5dd6b80b25d5389f9;hp=ee8e94117c6c462a61bf1bf520e76a1a88660826;hb=b5d34fe07cc9d3d94d01b0ba92273c7aac4bba86;hpb=034a42fa65955289442614ef9914e5474fac62aa diff --git a/Makefile b/Makefile index ee8e941..2d7ca43 100644 --- a/Makefile +++ b/Makefile @@ -21,6 +21,7 @@ tasks = upstream/tasks flags = -march=mips1 MIPS_CC = mips-unknown-elf-gcc MIPS_CXX = mips-unknown-elf-g++ +MIPS_G77 = mips-unknown-elf-g77 # Be VERY careful about changing any of these as they can break binary # compatibility and create hard to find bugs @@ -35,9 +36,7 @@ mips_optflags = -O3 -g \ MIPS_CFLAGS = $(mips_optflags) $(flags) -I. -Wall -Wno-unused -Werror 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 @@ -58,7 +57,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) @@ -72,9 +73,13 @@ 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)/%: $(MAKE) -C upstream tasks/$* usr="$(usr)" MIPS_LDFLAGS="$(MIPS_LDFLAGS)" MIPS_CFLAGS="$(flags) $(mips_optflags)" + upstream_clean_%: $(MAKE) -C upstream clean_$* usr="$(usr)" @@ -107,23 +112,29 @@ build/mips2java$(EXE_EXT): $(java_sources) $(java_gen_sources) # build/%.o: src/%.c $(tasks)/full_toolchain @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 @mkdir -p `dirname $@` $(MIPS_CC) -x assembler-with-cpp -c -o $@ $< -%.s: %.c $(tasks)/full_toolchain +tmp/%.s: %.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_CFLAGS) $($(notdir $*)_CFLAGS) $(MIPS_LDFLAGS) $($(notdir $*)_LDFLAGS) -o $@ $< -build/%.mips.stripped: build/%.mips +build/%.mips.stripped: build/%.mips $(tasks)/build_linker cp $< $@ $(MIPS_STRIP) -s $@ @@ -153,7 +164,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' >> $@~ @@ -173,23 +184,49 @@ 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 -runtime.jar: $(runtime_classes:%=build/org/ibex/nestedvm/%.class) - cd build && jar cf ../$@ $(runtime_classes:%=org/ibex/nestedvm/%*.class) +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 + 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 -unixruntime.jar: $(unixruntime_classes:%=build/org/ibex/nestedvm/%.class) - cd build && jar cf ../$@ $(unixruntime_classes:%=org/ibex/nestedvm/%*.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 + +.manifest: + echo -ne "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) + +compact_runtime_compiler.jar: $(java_classes) .manifest $(tasks)/build_gcclass + 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' + cd tmp/pruned && jar cfm ../../$@ ../../.manifest . # 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-uknown-elf/include/nestedvm/sockets.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 +234,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 +247,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 @@ -247,7 +285,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 +298,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 +314,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 +322,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 $@ @@ -359,9 +397,23 @@ 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 +charts := $(shell find doc/charts -name \*.dat) -pdf: doc/nestedvm.ivme04.pdf - open doc/nestedvm.ivme04.pdf +# 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 + +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 + 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 + +pdf: doc/ivme04.pdf + open doc/ivme04.pdf