X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile;h=72f68df2759b8a022cdf0cffe3c814550bbf96a3;hp=2cd421aafba9842fbf01e637a305a890a8db305a;hb=eb69dc64717856f2e0f1471f4fcab998329627a2;hpb=1f304fb8ca7855489be50173de3b9a3d13c2515a

diff --git a/Makefile b/Makefile
index 2cd421a..72f68df 100644
--- a/Makefile
+++ b/Makefile
@@ -1,39 +1,45 @@
-#############################################################################
+############################################################################# 
 #
 # The Ibex Makefile
 #
 
+#  auto directory creation with %/%: %?
+
+ifeq ($(platform),)
+# default
+platform := Java2
+endif
+
 target_Darwin := powerpc-apple-darwin
 target_Win32  := i686-pc-mingw32
 target_Solaris := sparc-sun-solaris2.7
 target_Linux := i686-pc-linux-gnu
 target := $(target_$(platform))
 
-all:         JVM Linux Win32 Darwin Solaris
+all:         Java2 Linux Win32 Darwin Solaris
 
-clean:      ; rm -rf build
+clean:      ; rm -rf build; rm .preprocessor
 dist-clean:
-	rm -rf .jikes .configure* .install* build .compile .build*
+	rm -rf .configure* .install* build .compile .build*
 	find upstream -name config.cache -exec rm {} \;
-	test -e upstream/mips && make -C upstream/mips clean
+	test -e upstream/nestedvm && make -C upstream/nestedvm clean
+	rm .install_nestedvm
+
+libwing_Linux := -Lupstream/install/i686-pc-linux-gnu/lib/
+libwing_Linux +=   upstream/install/i686-pc-linux-gnu/lib/libWINGs.a
+libwing_Linux +=   upstream/install/i686-pc-linux-gnu/lib/libwraster.a
 
-JVM:        build/JVM/ibex.jar
-Linux:    ; make gcj platform=Linux   link_flags="-lX11 -lXext"
-Solaris:  ; make gcj platform=Solaris link_flags="-lX11 -lXext -lpthread"
+libwing_Solaris := -Lupstream/install/sparc-sun-solaris2.7/lib/
+libwing_Solaris +=   upstream/install/sparc-sun-solaris2.7/lib/libWINGs.a
+libwing_Solaris +=   upstream/install/sparc-sun-solaris2.7/lib/libwraster.a
+
+Java2:        build/Java2/ibex.jar
+JVM:; make Java2
+Linux:    ; make gcj platform=Linux   link_flags="$(libwing_Linux) -lXpm -lX11 -lXext"
+Solaris:  ; make gcj platform=Solaris link_flags="$(libwing_Solaris) -lXpm -lX11 -lXext -lpthread"
 Win32:    ; make gcj platform=Win32   link_flags="-Wl,--subsystem,windows -lcomdlg32"
 Darwin:   ; make gcj platform=Darwin  link_flags="$(darwin_linker_flags)"
 
-foo: .compile
-	rm -rf build/class/*
-	make oldcompile
-	make .install_jode-1.1.1_java target=java
-	cd build; jar xvf ../upstream/install/share/java/libgcj-3.3.jar java/lang/Object.class
-	java -cp upstream/java-getopt-1.0.9:upstream/jode-1.1.1/build-java jode.obfuscator.Main jode.conf
-	cd out; jar xvf ../upstream/install/share/java/libgcj-3.3.jar java/lang/
-	cd build/class; tar cf - org/ | tar -C ../../out -xvf -
-	cd out ; rm -rf gnu/java/awt gnu/java/beans gnu/java/rmi java/rmi java/beans java/awt java/sql
-	for A in `find out -name \*.class`; do cd `dirname $$A`; $(shell pwd)/$(gcj) -c `basename $$A` -fCLASSPATH=$(shell pwd)/out; cd $(shell pwd); done
-
 darwin_libdir       := upstream/install/powerpc-apple-darwin/lib
 darwin_linker_flags := -Wl,-dylib_file,/usr/lib/libSystem.B.dylib:$(darwin_libdir)/libSystem.B.dylib
 darwin_linker_flags += -Wl,-dylib_file,/usr/lib/system/libmathCommon.A.dylib:$(darwin_libdir)/libmathCommon.A.dylib
@@ -47,100 +53,129 @@ darwin_linker_flags += build/Darwin/org/ibex/plat/OpenGL.java.o build/Darwin/org
 
 target_bin_extension_$(platform) := $(shell echo $(platform) | tr A-Z a-z)
 target_bin_extension_Win32       := exe
-target_bin_extension_JVM         := jar
+target_bin_extension_Java2       := jar
 target_bin_extension             := $(target_bin_extension_$(platform))
 target_bin                       := ibex.$(target_bin_extension)
 
-jikes_flags        := -nowarn
-gcc_optimizations  := -O2
+javac   := javac -classpath upstream/bcel-5.1/src/bcel-5.1.jar:build/class -d build/class/ -sourcepath build/java/:upstream/mips:upstream/mips/build:src
+gcc_optimizations  := -Os
 #gcc_optimizations  := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls
 #gcc_optimizations  += -finline-functions -funroll-loops -ffunction-sections -fdata-sections
-
-gcc_flags          := -nostdinc $(gcc_optimizations) -Ibuild/h -Iupstream/jpeg-6b/src -Iupstream/jpeg-6b/build-$(target)
+gcc_flags          := -nostdinc $(gcc_optimizations) -Ibuild/h -Iupstream/jpeg-6b/src -Iupstream/jpeg-6b/build-$(target) -g
 gcc_flags          += -Iupstream/install/lib/gcc-lib/$(target)/3.3/include -Iupstream/install/$(target)/include
+gcc_flags          += -ffunction-sections -fdata-sections -fno-omit-frame-pointer
 gcj                := upstream/install/bin/$(target)-gcj $(gcc_flags) -fCLASSPATH=build/java
+gcj                += -fassume-compiled -fmerge-all-constants -finhibit-reflection
+gcj                += -foptimize-static-class-initialization -feliminate-dwarf2-dups -w
 gcjh               := $(shell pwd)/upstream/install/bin/$(shell test -e upstream/install/bin/$(target)-gcjh && echo $(target)-)gcjh
 g++                := upstream/install/bin/$(target)-gcj $(gcc_flags) -Iupstream/install/include -Wno-multichar
 gcc                := upstream/install/bin/$(target)-gcc $(gcc_flags)
 jar                := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
 
-gcj: .install_gcc-3.3_$(target); make build/$(platform)/$(target_bin) link_flags="$(link_flags)" platform=$(platform)
+gcj: .install_gcc-3.3_$(target)
+	make build/$(platform)/$(target_bin) link_flags="$(link_flags)" platform=$(platform)
 
 include Makefile.upstream
 
-java_sources              := $(patsubst src/%.java,     build/java/%.java, $(shell find src -name '*.java' | grep -v Preprocessor))
-java_sources              += build/java/org/xwt/mips/Errno.java
-java_sources              += build/java/org/xwt/mips/Unistd.java
-java_sources              += build/java/org/xwt/mips/Syscalls.java
-java_sources              += build/java/org/xwt/mips/Registers.java
-java_sources              += build/java/org/xwt/mips/Runtime.java
-java_sources              += build/java/org/xwt/mips/UnixRuntime.java
+# find the superclasses of a platform class
+#superclass_%:
+#	@if [ "$*" = "org.ibex.plat.Darwin" ]; then echo org.ibex.plat.OpenGL; fi
+#	@echo $*
+#	@grep -s extends src/$(subst .,/,$*).java | sed s_.\*extends\ __ | head -n 1 | sed s_\ .\*__ |\
+#		xargs --replace make -s superclass_org.ibex.plat.{}
+
+plat_classes_AWT     := org.ibex.plat.AWT
+plat_classes_Java2   := org.ibex.plat.Java2 org.ibex.plat.JVM $(plat_classes_AWT)
+plat_classes_GCJ     := org.ibex.plat.GCJ
+plat_classes_Win32   := org.ibex.plat.Win32 $(plat_classes_GCJ)
+plat_classes_POSIX   := org.ibex.plat.POSIX $(plat_classes_GCJ)
+plat_classes_X11     := org.ibex.plat.X11 $(plat_classes_POSIX)
+plat_classes_Linux   := org.ibex.plat.Linux $(plat_classes_X11)
+plat_classes_Solaris := org.ibex.plat.Solaris $(plat_classes_X11)
+plat_classes_Darwin  := org.ibex.plat.Darwin org.ibex.plat.OpenGL $(plat_classes_POSIX)
+
+plat_java_src_sources     := $(patsubst %,build/java/%.java,$(subst .,/,$(plat_classes_$(platform))))
+java_src_sources          := $(shell find src -name '*.java' | grep -v Preprocessor | grep -v /plat/)
+java_src_sources          += $(plat_java_src_sources)
+java_sources              := $(patsubst src/%.java,     build/java/%.java, $(java_src_sources))
+
+# FIXME ugly
 java_sources              += build/java/org/xwt/mips/util/SeekableByteArray.java
 java_sources              += build/java/org/xwt/mips/util/SeekableData.java
 java_sources              += build/java/org/xwt/mips/util/SeekableFile.java
 java_sources              += build/java/org/xwt/mips/util/SeekableInputStream.java
-
-build/java/org/xwt/mips/util/%:
-	@test -e .install_mips2java || make .install_mips2java
-	@echo linking $@
-	@mkdir -p $(@D)
-	@cd $(@D); ln -sf ../../../../../../upstream/mips/org/xwt/mips/util/$*
-build/java/org/xwt/mips/%:
-	@test -e .install_mips2java || make .install_mips2java
-	@echo linking $@
-	@mkdir -p $(@D)
-	@test -e upstream/mips/build/org/xwt/mips/$* && (cd $(@D); \
-		ln -sf ../../../../../upstream/mips/build/org/xwt/mips/$*); true
-	@test -e upstream/mips/org/xwt/mips/$* && (cd $(@D); \
-		ln -sf ../../../../../upstream/mips/org/xwt/mips/$*); true
+java_sources              += build/java/org/xwt/mips/Registers.java
+java_sources              += build/java/org/xwt/mips/Runtime.java
+java_sources              += build/java/org/xwt/mips/UsermodeConstants.java
+
+java_classes              := $(java_sources:build/java/%.java=build/class/%.class)
+java_classes              += build/class/gnu/regexp/CharUnit.class build/class/gnu/regexp/IntPair.class
+
+### Java Source Files ##############################################################################
+
+build/java/gnu/regexp: .download_gnu.regexp-1.1.4
+	mkdir -p $(@D); cd $(@D); ln -sf ../../../upstream/gnu.regexp-1.1.4/src/src/gnu/regexp
+build/java/org/xwt/mips: .download_nestedvm
+	mkdir -p $(@D); cd $(@D); ln -sf ../../../../upstream/nestedvm/src/org/xwt/mips
+build/java/org/ibex/crypto: .download_org.ibex.crypto
+	mkdir -p $(@D); cd $(@D); ln -sf ../../../../upstream/org.ibex.crypto/src/org/ibex/crypto
+	mkdir -p build/java/org/ibex/net;
+	cd build/java/org/ibex/net; ln -sf ../../../../../upstream/org.ibex.crypto/src/org/ibex/net/SSL.java
+	cd build/java/org/ibex/net; ln -sf ../../../../../upstream/org.ibex.crypto/src/org/ibex/net/ssl
+
+ifeq ($(platform),Java2)
+.preprocessor: build/java/gnu/regexp src/org/ibex/util/Preprocessor.java src/org/ibex/util/Vec.java build/java/org/xwt/mips build/java/org/ibex/crypto
+
+	@mkdir -p build/class/org/ibex/util build/class/gnu/regexp
+	$(javac) src/org/ibex/util/Preprocessor.java src/org/ibex/util/Vec.java build/java/gnu/regexp/*.java  -d build/class
+	@touch $@
+else
+.preprocessor: build/java/gnu/regexp src/org/ibex/util/Preprocessor.java src/org/ibex/util/Vec.java build/java/org/xwt/mips build/java/org/ibex/crypto
+	@mkdir -p build/class/org/ibex/util build/class/gnu/regexp
+	$(gcj) -Isrc -C src/org/ibex/util/Preprocessor.java src/org/ibex/util/Vec.java build/java/gnu/regexp/*.java  -d build/class
+	@touch $@
+endif
+build/cc/%.cc:     src/%.c    ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
+build/res/%:       src/%      ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
+build/java/org/ibex/%.java: src/org/ibex/%.java .preprocessor
+	@echo -e "\n\033[1mpreprocessing      .java -> .java:  $<\033[0m"
+	mkdir -p `dirname $@`; java -cp build/class:build/java org.ibex.util.Preprocessor < $^ > $@
+build/java/%.java: src/%.java ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
 
 
 ### Java Class Files ##############################################################################
 
-build/class/org/xwt/translators/MIPSApps.class: build/mips/mipsapps.mips .jikes
-	mkdir -p build/java/org/xwt/translators
-	@echo -e "\n\033[1mtranslating        .mips -> .java:  $<\033[0m"
-	(echo -e 'package org.xwt.translators;\n';                           \
-	 java -Xint -cp upstream/mips/build org.xwt.mips.Compiler MIPSApps build/mips/mipsapps.mips) \
-	 | sed 's,//.*$$,,;'| tr -d '\n' > build/java/org/xwt/translators/MIPSApps.java
-	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
-	./.jikes -g:none build/java/org/xwt/translators/MIPSApps.java
+build/class/org/ibex/util/MIPSApps.class: build/mips/mipsapps.mips .install_nestedvm 
+	mkdir -p build/java/org/ibex/util
+	@echo -e "\n\033[1mtranslating        .mips -> .class:  $<\033[0m"
+	java -cp upstream/nestedvm/build:upstream/nestedvm/upstream/build/bcel-5.1/bcel-5.1.jar \
+		org.xwt.mips.Compiler org.ibex.util.MIPSApps $< -outfile $@
+#-o onepage,pagesize=8m
 
-build/java/org/ibex/%.java: src/org/ibex/%.java
-	make build/class/org/ibex/util/Preprocessor.class
-	@echo -e "\n\033[1mpreprocessing      .java -> .java:  $<\033[0m"
-	mkdir -p `dirname $@`; java -cp build/class org.ibex.util.Preprocessor < $< > $@
-
-build/java/%.java: src/%.java ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
-build/cc/%.cc:     src/%.c    ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
-build/res/%:       src/%      ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
+compile: .compile
+.compile: .download_nestedvm .download_bcel-5.1 $(java_sources) $(java_classes); touch $@
 
-build/class/org/ibex/util/Preprocessor.class: src/org/ibex/util/Preprocessor.java .jikes
+ifeq ($(platform),Java2)
+build/class/%.class: build/java/%.java .preprocessor
 	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
-	mkdir -p build/class/org/ibex/util/
-	./.jikes $<
-
-oldcompile:; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar:upstream/mips/build javac -target 1.1 -d build/class `find build/java/ -name \*.java`
-compile: .compile
-.compile: $(java_sources) .jikes .install_mips2java
-	@echo -e "\n\033[1mcompiling          .java -> .class: src/**/*.java\033[0m"
-	@rm -f $(java_sources:build/java/%.java=build/class/%.class)
 	mkdir -p build/class
-	echo @./.jikes $(java_sources)
-	@./.jikes $(java_sources)
-	touch .compile
-
-build/JVM/ibex.jar: .compile build/res/builtin.jar build/class/org/xwt/translators/MIPSApps.class
-	@echo -e "\n\033[1marchiving         .class -> .jar:   build/JVM/ibex.jar\033[0m"
-	mkdir -p build/JVM
-	echo -e "Manifest-Version: 1.0\nMain-Class: org.ibex.Main\n" > build/JVM/.manifest
+	@$(javac) $< -d build/class
+else
+build/class/%.class: build/java/%.java
+	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
+	mkdir -p $(@D)
+	$(gcj) -I$(bcel_jar) -C -O0 $< -d build/class
+endif
+
+build/Java2/ibex.jar: .compile build/res/builtin.jar build/class/org/ibex/util/MIPSApps.class
+	@echo -e "\n\033[1marchiving         .class -> .jar:   build/Java2/ibex.jar\033[0m"
+	mkdir -p build/Java2
+	echo -e "Manifest-Version: 1.0\nMain-Class: org.ibex.core.Main\n" > build/Java2/.manifest
 	cd build/class/org/ibex; ln -sf ../../../res/builtin.jar
-	cd build/class; $(jar) cfm ../JVM/ibex.jar ../JVM/.manifest \
-		`find . \! -type d` \
-		$(patsubst %,../../upstream/mips/build/org/xwt/mips/%*.class, Runtime Registers Syscalls Errno)
+	cd build/class; $(jar) cfm ../Java2/ibex.jar ../Java2/.manifest `find . -name \*.class -or -name \*.jar`
 
 
-### GCJH Headers ##############################################################################
+### Headers ##################################################################################
 
 java_headers          := $(java_sources:build/java/%.java=build/h/%.h) 
 build/h/edu/stanford/ejalbert/BrowserLauncher.h:; mkdir -p $(@D); touch $@
@@ -154,53 +189,116 @@ build/h/%.h: build/class/%.class .compile
 ### Native Code ##############################################################################
 
 # a hack since we've disabled gcj's awt implementation
-build/$(platform)/org/ibex/plat/Java2.java.o: ; touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@;
-build/$(platform)/org/ibex/plat/AWT.java.o:   ; touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@;
-
-build/$(platform)/org/xwt/translators/MIPSApps.java.o: build/class/org/xwt/translators/MIPSApps.class
-	@echo -e "\n\033[1mcompiling         .class -> .o:     $<\033[0m"
-	mkdir -p `dirname $@`
-	$(gcj) -Os -c $< -o $@
-
-build/$(platform)/%.java.o: build/java/%.java
-	@echo -e "\n\033[1mcompiling          .java -> .o:     $<\033[0m"
-	mkdir -p `dirname $@`
-	$(gcj) -c $< -o $@
+build/$(platform)/org/ibex/plat/Linux.cc.o: .install_WindowMaker-0.80.2_$(target) 
+build/$(platform)/org/ibex/plat/Solaris.cc.o: .install_WindowMaker-0.80.2_$(target) 
+
+libjava_dir := $(shell pwd)/upstream/gcc-3.3/build-$(target)/$(target)/libjava
+nat_libjava_files_ := boehm.o exception.o posix-threads.o posix.o prims.o resolve.o java/net/natInetAddress.o
+nat_libjava_files_ += java/net/natPlainSocketImpl.o java/util/zip/nat*.o gnu/gcj/runtime/natFirstThread.o
+nat_libjava_files_ += gnu/gcj/runtime/natNameFinder.o gnu/gcj/runtime/natStackTrace.o gnu/gcj/runtime/natSharedLibLoader.o
+nat_libjava_files_ += gnu/gcj/runtime/natStringBuffer.o gnu/gcj/runtime/natVMClassLoader.o gnu/gcj/runtime/natFinalizerThread.o
+nat_libjava_files_ += $(shell cd $(libjava_dir) 2>/dev/null; find java/lang -name \*.o -not -name '*[A-Z]*' 2>/dev/null)
+nat_libjava_files_ += $(shell cd $(libjava_dir) 2>/dev/null; find java/lang -name nat\*.o 2>/dev/null)
+nat_libjava_files := $(nat_libjava_files_:%=$(libjava_dir)/%)
+nat_libjava_files += $(libjava_dir)/java/io/natFile.o $(libjava_dir)/java/io/natFileDescriptor.o
 
 build/$(platform)/org/ibex/plat/$(platform).cc.o: src/org/ibex/plat/$(platform).cc src/org/ibex/plat/*.cc .configure_jpeg-6b_$(target)
 	@make $(java_headers)
 	@echo -e "\n\033[1mcompiling            .cc -> .o:     $<\033[0m"
 	mkdir -p `dirname $@`
-	$(g++) -c $< -o $@
-
-nonplat_java_sources := $(filter-out build/java/org/ibex/plat/$(platform).java,$(java_sources))
-build/$(platform)/$(platform).ar: $(nonplat_java_sources:build/java/%.java=build/$(platform)/%.java.o)
-	@echo -e "\n\033[1marchiving             .o -> .a\033[0m"
-	mkdir -p build/$(platform)
-	rm -f $@
-	upstream/install/$(target)/bin/ar rc $@ $^
-	upstream/install/$(target)/bin/ranlib $@
-
-upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target)
-build/$(platform)/$(target_bin): build/$(platform)/org/ibex/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/$(platform).ar build/$(platform)/org/ibex/plat/$(platform).java.o
-	@echo -e "\n\033[1mlinking               .o -> $(target_bin)\033[0m"
-	mkdir -p build/$(platform)
-	PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.ibex.Main -o $@ -Lupstream/install/$(target)/lib $^ $(link_flags)
-
+	$(g++) -Iupstream/gcc-3.3/build-$(target)/$(target)/libjava -c $< -o $@
+
+
+bcel_jar := upstream/bcel-5.1/src/bcel-5.1.jar
+build/$(platform)/ibex.pruned.jar: .compile $(java_classes) .install_jpeg-6b_$(target) build/$(platform)/builtin.o build/$(platform)/org/ibex/plat/$(platform).cc.o
+	@echo -e "\n\033[1mpruning              .jar -> .jar\033[0m"
+	cp upstream/install/share/java/libgcj-3.3.jar build/$(platform)/ibex.jar
+	cd build/class; jar uf ../$(platform)/ibex.jar $(java_classes:build/class/%.class=%*.class)
+	(nm $(nat_libjava_files) build/$(platform)/org/ibex/plat/$(platform).cc.o; echo org.ibex.plat.$(platform).main) |\
+		grep _ZN | c++filt --format java | grep " U " | sed 's_ * U __' | sed 's_(.*__' \
+		| java -cp $(bcel_jar):build/class org.ibex.util.NanoGoat build/$(platform)/ibex.jar | tee nanogoat.log
+	mkdir tmp; cd tmp; fastjar xvf ../build/$(platform)/ibex.jar.pruned; rm gnu/gcj/runtime/FirstThread*; cp ../build/class/org/ibex/plat/GCJ* org/ibex/plat/; cp -r ../build/class/org/xwt/mips/* org/xwt/mips/; mkdir -p $(shell pwd)/build/$(platform)/java/lang; mv java/lang/Class.class $(shell pwd)/build/$(platform)/java/lang; fastjar cvf ../build/$(platform)/ibex.jar.pruned .; cd ..; rm -rf tmp
+	mv build/$(platform)/ibex.jar.pruned $@
+
+ifeq ($(platform),Win32)
+filedes := $(shell pwd)/upstream/gcc-3.3/src/libjava/java/io/natFileWin32.cc
+filedes += $(shell pwd)/upstream/gcc-3.3/src/libjava/java/io/natFileDescriptorWin32.cc
+else
+filedes := $(shell pwd)/upstream/gcc-3.3/src/libjava/java/io/natFilePosix.cc
+filedes += $(shell pwd)/upstream/gcc-3.3/src/libjava/java/io/natFileDescriptorPosix.cc
+endif
+
+ifneq ($(target_bin_extension),jar)
+build/$(platform)/$(target_bin): build/$(platform)/ibex.pruned.jar src/org/ibex/plat/*.cc build/$(platform)/builtin.o $(java_headers)
+
+	@echo -e "\n\033[1mlinking              .jar -> $(target_bin).phat\033[0m"
+# -Os
+	cd build/$(platform); $(shell pwd)/upstream/install/bin/$(target)-gcj        \
+		-fCLASSPATH=$(shell pwd)/upstream/install/share/java/libgcj-3.3.jar  \
+		-finhibit-reflection                                                 \
+		-fno-store-check                                                     \
+		-c java/lang/Class.class
+	cd upstream/gcc-3.3/src/libjava/java/lang;\
+		ln -sf ../../../../build-$(target)/$(target)/libjava/java/lang/natConcreteProcess.cc
+# we need -fno-store-check since we can't dynamically resolve references to array classes
+	PATH=upstream/install/bin:$$PATH upstream/install/bin/$(target)-gcj              \
+		-Wl,-O2,--relax,--gc-sections,--noinhibit-exec,--no-whole-archive        \
+		--main=org.ibex.plat.$(platform)                                         \
+		-Dfile.encoding=UTF8                                                     \
+		-DPREFIX=\"\"                                                            \
+		-Lupstream/install/$(target)/lib -Lupstream/install/lib                  \
+		-finhibit-reflection                                                     \
+		-fno-store-check                                                         \
+		-w -g                                                                    \
+		-Iupstream/jpeg-6b/build-$(target)/                                      \
+		-Iupstream/jpeg-6b/src                                                   \
+		-Ibuild/h                                                                \
+		-Iupstream/gcc-3.3/src/gcc \
+		-Iupstream/gcc-3.3/build-i686-pc-linux-gnu/i686-pc-linux-gnu/boehm-gc/    \
+		-Iupstream/gcc-3.3/build-i686-pc-linux-gnu/i686-pc-linux-gnu/boehm-gc/include    \
+		-Iupstream/gcc-3.3/src/boehm-gc                                           \
+		-Iupstream/gcc-3.3/src/boehm-gc/include                                       \
+		-Iupstream/gcc-3.3/build-i686-pc-linux-gnu/i686-pc-linux-gnu/libjava/    \
+		-Iupstream/gcc-3.3/build-i686-pc-linux-gnu/i686-pc-linux-gnu/libjava/include    \
+		-Iupstream/gcc-3.3/src/libjava                                           \
+		-Iupstream/gcc-3.3/src/libjava/include                                       \
+		-Ufile \
+		build/$(platform)/ibex.pruned.jar                                        \
+		src/org/ibex/plat/$(platform).cc                                         \
+		$(nat_libjava_files_:%.o=$(shell pwd)/upstream/gcc-3.3/src/libjava/%.c*) \
+		$(filedes) \
+		build/$(platform)/builtin.o                                              \
+		upstream/jpeg-6b/build-$(target)/libjpeg.a                               \
+		$(link_flags)                                                            \
+		$(libjava_dir)/../boehm-gc/.libs/libgcjgc.a                              \
+		build/$(platform)/Class.o                                                \
+		$(libjava_dir)/gnu/gcj/runtime/FirstThread.o \
+		-lz -o $@.phat
+	@echo; ls -l $@.phat
+
+	@echo -e "\n\033[1mstripping              $(target_bin).phat -> $(target_bin)\033[0m"
+	strip $@.phat -o $@
+	@echo; ls -l $@.phat
+
+	@echo -e "\n\033[1mcompressing              $(target_bin) -> $(target_bin)\033[0m"
+	upx-ucl-beta $@
+	@echo; ls -l $@.phat
+endif
 
 ### Builtin Resources ##############################################################################
 
-builtin_src := $(shell find src/org/ibex/builtin -name '*.*' \! -name '*.xcf')
+builtin_src := $(shell find src/org/ibex/core/builtin -name '*.*' \! -name '*.xcf')
 build/res/fonts/vera: .download_vera-1.10
 	mkdir -p build/res/fonts/vera
-	cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/Vera.ttf
-	cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraMono.ttf
-	cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraSe.ttf
+	cd build/res/fonts/vera; ln -fs ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/Vera.ttf
+	cd build/res/fonts/vera; ln -fs ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraMono.ttf
+	cd build/res/fonts/vera; ln -fs ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraSe.ttf
 build/res/builtin.jar: $(builtin_src:src/%=build/res/%) build/res/fonts/vera
 	@echo -e "\n\033[1mzipping            res/* -> .jar: builtin.jar\033[0m"
-	cd build/res; $(jar) cf builtin.jar $(^:build/res/%=%)
+	cd build/res; $(jar) cf builtin.jar org/ibex/core/builtin/scar.png fonts
 build/$(platform)/builtin.o: build/res/builtin.jar
 	@echo -e "\n\033[1mwrapping            .jar -> .o: resources.o\033[0m"
+	@mkdir -p $(@D)
 	@(echo "unsigned int builtin_length = ";                                \
 		(wc -c build/res/builtin.jar | sed "s_build.*__");              \
 		echo \;;                                                        \
@@ -209,8 +307,7 @@ build/$(platform)/builtin.o: build/res/builtin.jar
 		echo "};") > .builtin.c
 	$(gcc) -c .builtin.c -o build/$(platform)/builtin.o
 
-
-build/mips/%.c.o: src/%.c .download_libmspack-20030726
+build/mips/%.c.o: src/%.c .download_libmspack-20030726 .install_nestedvm
 	make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf
 	make .install_libmspack-20030726_mips-unknown-elf target=mips-unknown-elf
 	mkdir -p $(@D)
@@ -220,7 +317,7 @@ build/mips/%.c.o: src/%.c .download_libmspack-20030726
 		-Iupstream/libmspack-20030726/src/mspack \
 		-c -o $@ $<
 
-build/mips/mipsapps.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips/org/xwt/translators/MSPack.c.o build/mips/org/xwt/translators/main.c.o 
+build/mips/mipsapps.mips: build/mips/org/ibex/graphics/Freetype.c.o build/mips/org/ibex/util/MSPack.c.o
 	make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf
 	make .install_libmspack-20030726_mips-unknown-elf target=mips-unknown-elf
 	@echo -e "\n\033[1mlinking               .o -> .mips:  $@\033[0m"
@@ -228,8 +325,8 @@ build/mips/mipsapps.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips
 	upstream/install/bin/mips-unknown-elf-gcc \
 		--static \
 		-march=mips1 \
-		-T upstream/mips/org/xwt/mips/linker.ld \
-		-L upstream/mips/build/org/xwt/mips/ \
+		-T upstream/nestedvm/src/org/xwt/mips/linker.ld \
+		-L upstream/nestedvm/build/org/xwt/mips/ \
 		-L upstream/freetype-2.1.4/src/objs \
 		-L upstream/libmspack-20030726/build-mips-unknown-elf/ \
 		-o $@ \
@@ -242,9 +339,9 @@ build/mips/mipsapps.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips
 ### Maintainer ######################################################################################
 
 current_build         := $(shell cat next.build)
-strip_$(platform) := upstream/install/$(target)/bin/strip build/$(platform)/$(target_bin) -o 
-strip_JVM       := cp build/$(platform)/$(target_bin)
-install-dist:;     $(strip_$(platform)) /var/www/master.dist.ibex.org/ibex-$(current_build).$(target_bin_extension).unsigned
+strip_$(platform)     := upstream/install/$(target)/bin/strip build/$(platform)/$(target_bin) -o 
+strip_Java2             := cp build/$(platform)/$(target_bin)
+install-dist:;     $(strip_$(platform)) /var/www/org/xwt/dist/master/ibex-$(current_build).$(target_bin_extension).unsigned
 dist: compile
 	(echo -n 0000; (echo "10k16o16i"; cat next.build | tr a-z A-Z; echo "1+f") | dc) | tail --bytes=5 > next.build-
 	mv next.build- next.build
@@ -254,8 +351,24 @@ dist: compile
 	make install-dist platform=Linux
 	make install-dist platform=Solaris
 	make install-dist platform=Darwin
-	make install-dist platform=JVM
+	make install-dist platform=Java2
 	echo -e "\n\n\n*** DONE ******************************************"
 
 propose-patch:
-	darcs push -s -A $(USER)@xwt.org -T patches@xwt.org
+	@darcs send --edit-description -o .darcspatch -T patches@xwt.org http://core.ibex.org/
+	@(echo "To: patches@xwt.org";\
+	 SUB=`grep -A10000 New.patches .darcspatch | grep '^\\[' | cut -b 2- | tr \\\n , | sed s_,_,\ _g | sed "s_, *\\$$__"`;\
+	 echo "Subject: $$SUB";\
+	 echo;\
+	 cat .darcspatch) | /usr/sbin/sendmail -bm -f $(USER)@xwt.org patches@xwt.org;
+	@rm .darcspatch 
+
+commit: propose-patch
+	darcs push --and-apply xwt@xwt.org:/var/www/org/ibex/core/
+
+doc/%.pdf: build/class/org/ibex/util/XML.class build/class/org/ibex/util/Doc.class doc/%.xml
+	cd $(@D); java -cp ../../build/class org.ibex.util.Doc slides < `basename $*`.xml > `basename $*`.tex
+	cd $(@D); pdflatex `basename $*`.tex
+	open doc/$*.pdf
+
+