X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=Makefile;h=3a48f48c46af6dc7b2d3af1c4434d38f62087e2b;hp=ae467327ad2b0efc75375e0ff69e135e9a8bd804;hb=489abe99cb575492b62f51e6ea61aa10f391d3b6;hpb=27227d602d12a4ab3814d1481cebbd01dafb99c9

diff --git a/Makefile b/Makefile
index ae46732..3a48f48 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 \
@@ -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
@@ -213,6 +219,7 @@ runtime.jar: $(runtime_classes:%=build/org/ibex/nestedvm/%.class)
 
 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_darcs_gcclass
 	mkdir -p tmp/pruned
@@ -220,11 +227,12 @@ compact_runtime_compiler.jar: $(java_classes) .manifest $(tasks)/build_darcs_gcc
 	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 \
+		"$(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
@@ -240,7 +248,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 +308,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 +363,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 +389,16 @@ 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
+
 #
 # Speed tests
 #
@@ -466,11 +483,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