# 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 \
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
#
# 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)" \
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)"
@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 $@ $<
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 'CXXFLAGS="$(mips_optflags)"; export CXXFLAGS' >> $@~
@echo 'LDFLAGS="$(MIPS_LDFLAGS)"; export LDFLAGS' >> $@~
@echo 'CLASSPATH=$(mips2java_root)/build:$(mips2java_root)/upstream/build/classgen/build:.; export CLASSPATH' >> $@~
+ @chmod a+x "$@~"
@mv "$@~" "$@"
@echo "$@ created successfully"
#
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
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 \
+ org/ibex/nestedvm/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 \
- upstream/build/gcclass/build:upstream/build/gcclass/upstream/bcel-5.1/bcel-5.1.jar \
+ $(JAVA) -cp \
+ upstream/build/gcclass/build:upstream/build/gcclass/upstream/bcel-5.2/bcel-5.2.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'
+ "$(classpath)" tmp/pruned org.ibex.nestedvm.RuntimeCompiler.main `cat .gcclass_hints`
cd tmp/pruned && jar cfm ../../$@ ../../.manifest .
sizecheck: compact_runtime_compiler.jar
( \
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; }'; \
) | ( \
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
#
tmp/thebride_1280.jpg:
@mkdir -p tmp
- cd tmp && wget http://www.kill-bill.com/images/wallpaper/thebride_1280.jpg
+ cd tmp && curl -O http://www.brianweb.net/misc/thebride_1280.jpg
oldspeedtest: build/tests/DJpeg.class tmp/thebride_1280.jpg
bash -c "time $(JAVA) -cp build tests.DJpeg -targa -outfile tmp/thebride_1280.tga tmp/thebride_1280.jpg"
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
+
+push:
+ if [ "$${HOSTNAME#*.}" = "brianweb.net" ]; then \
+ darcs push charger.brianweb.net:/home/darcs/nestedvm; \
+ fi
+ darcs push /afs/ibex.org/project/nestedvm
projects / nestedvm.git / blobdiff