X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=Makefile;h=677899dd264f541aaf786cf0f64c6556117af423;hp=4d5c279f09c21a728de8b4746b01269197a29c36;hb=0cf8e6919a91a0f39c1d6852328b8bd1cf68160b;hpb=078ff4840f2024d159a77080e966c7133517c908 diff --git a/Makefile b/Makefile index 4d5c279..677899d 100644 --- a/Makefile +++ b/Makefile @@ -21,6 +21,8 @@ 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 @@ -34,6 +36,8 @@ 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) --static -Wl,--gc-sections MIPS_STRIP = mips-unknown-elf-strip @@ -56,7 +60,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) @@ -70,9 +76,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/misc/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)" @@ -103,7 +113,14 @@ build/mips2java$(EXE_EXT): $(java_sources) $(java_gen_sources) # # MIPS Binary compilation # -build/%.o: src/%.c $(tasks)/build_gcc + +# 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 $@ $< @@ -111,17 +128,22 @@ 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: %.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 $@ $< + $(MIPS_CXX) $(MIPS_CXXFLAGS) $($(notdir $*)_CXXFLAGS) $(MIPS_LDFLAGS) $($(notdir $*)_LDFLAGS) -o $@ $< -build/%.mips.stripped: build/%.mips +build/%.mips: src/%.pas $(tasks)/build_gpc + @mkdir -p `dirname $@` + $(MIPS_PC) $(MIPS_PCFLAGS) $($(notdir $*)_PCFLAGS) $(MIPS_LDFLAGS) $($(notdir $*)_LDFLAGS) -o $@ $< + +build/%.mips.stripped: build/%.mips $(tasks)/build_linker cp $< $@ $(MIPS_STRIP) -s $@ @@ -151,7 +173,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,6 +195,15 @@ env.sh: Makefile $(tasks)/full_toolchain build/org/ibex/nestedvm/Compiler.class runtime_classes = Runtime Registers UsermodeConstants util/Seekable +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 + runtime.jar: $(runtime_classes:%=build/org/ibex/nestedvm/%.class) cd build && jar cf ../$@ \ $(runtime_classes:%=org/ibex/nestedvm/%.class) \ @@ -196,12 +227,13 @@ compact_runtime_compiler.jar: $(java_classes) .manifest $(tasks)/build_gcclass 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}; \ + $(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!"; \ @@ -211,7 +243,7 @@ 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 @@ -224,6 +256,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 @@ -241,6 +274,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 @@ -253,6 +289,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) $(MIPS_LDFLAGS) -o $@ upstream/download/linpack_bench.f -lc + +linpacktest: build/tests/Linpack.class + $(JAVA) -cp build tests.Linpack + # # Freetype Stuff # @@ -261,7 +305,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 @@ -274,7 +318,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 @@ -290,7 +334,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 $@ @@ -298,17 +342,17 @@ build/tests/DJpeg.mips: $(mips_objects) $(tasks)/build_libjpeg # Busybox # BusyBox_COMPILERFLAGS = -o unixruntime -build/tests/BusyBox.mips: $(mips_objects) $(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 $(classpath) 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 $@ @@ -381,8 +425,15 @@ 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 -doc/ivme04.pdf: doc/ivme04.tex doc/acmconf.cls $(charts:%.dat=%.pdf) - cd doc; pdflatex ivme04.tex && ./pst2pdf && pdflatex ivme04.tex +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