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 =
endif
# HACK: Ensure libc is kept up to date when our mips_objects change
-$(tasks)/build_libc: $(mips_object) upstream/misc/extraheaders.sh
+$(tasks)/build_libc: $(mips_objects) upstream/misc/extraheaders.sh
$(tasks)/%:
$(MAKE) -C upstream tasks/$* usr="$(usr)" \
$(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
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
@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"
org/ibex/nestedvm/util/Seekable\$$*.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
+compact_runtime_compiler.jar: $(java_classes) .manifest $(tasks)/build_darcs_gcclass
mkdir -p tmp/pruned
- java -cp upstream/build/gcclass/build:$(bcel_jar) com.brian_web.gcclass.GCClass \
- build 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 'org.ibex.nestedvm.Runtime.decodeData' \
'org.ibex.nestedvm.UnixRuntime.<init>' 'org.ibex.nestedvm.Runtime.initPages' \
'org.ibex.nestedvm.Runtime.clearPages' 'org.ibex.nestedvm.Runtime.syscall' \
- 'org.ibex.nestedvm.Runtime$$CPUState.dup'
+ 'org.ibex.nestedvm.Runtime$$CPUState.dup' \
+ org.ibex.nestedvm.util.Platform\$$Jdk{11,12,13,14}.'<init>'
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; }'; \
) | ( \
# 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
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
@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
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