X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile;h=91d179a2ee0b50254467ee7de3810ba6645c901d;hp=fc6429883e505e6eec4630cccb09cf64ca3770a4;hb=a41252ba1e0f5dd90100aa2064c011268809c038;hpb=a6c4f7b784acf2269c33188982b0d479cc11a0f4

diff --git a/Makefile b/Makefile
index fc64298..91d179a 100644
--- a/Makefile
+++ b/Makefile
@@ -19,9 +19,9 @@ dist-clean:
 	find upstream -name config.cache -exec rm {} \;
 	test -e upstream/mips && make -C upstream/mips clean
 
-#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
+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
 
 libwing_Solaris := -Lupstream/install/sparc-sun-solaris2.7/lib/
 libwing_Solaris +=   upstream/install/sparc-sun-solaris2.7/lib/libWINGs.a
@@ -51,20 +51,21 @@ target_bin_extension             := $(target_bin_extension_$(platform))
 target_bin                       := ibex.$(target_bin_extension)
 
 jikes_flags        := -nowarn
-gcc_optimizations  := -O2
+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) -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 compile
 	make build/$(platform)/$(target_bin) link_flags="$(link_flags)" platform=$(platform)
 
 include Makefile.upstream
@@ -80,6 +81,7 @@ 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
+java_classes              := $(java_sources:build/java/%.java=build/class/%.class)
 
 build/java/org/xwt/mips/util/%:
 	@test -e .install_mips2java || make .install_mips2java
@@ -97,6 +99,20 @@ build/java/org/xwt/mips/%:
 		ln -sf ../../../../../upstream/mips/org/xwt/mips/$*); true
 
 
+### Java Source Files ##############################################################################
+
+.preprocessor: src/org/ibex/util/Preprocessor.java src/org/ibex/util/Vec.java src/gnu/regexp/*.java
+	@mkdir -p build/class/org/ibex/util build/class/gnu/regexp
+	$(gcj) -Isrc -C $^ -d build/class
+	@touch $@
+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 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/ibex/translators/MIPSApps.class: build/mips/mipsapps.mips .jikes
@@ -108,49 +124,14 @@ build/class/org/ibex/translators/MIPSApps.class: build/mips/mipsapps.mips .jikes
 	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
 	./.jikes -g:none build/java/org/ibex/translators/MIPSApps.java
 
-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'`/$< $@
-
-gnu_regexp_jfiles  := $(patsubst src/%.java, build/java/%.java, $(shell find src/gnu/regexp -name \*.java))
-gnu_regexp  := $(patsubst src/%.java, build/class/%.class, $(shell find src/gnu/regexp -name \*.java))
-
-build/class/gnu/regexp/%.class: build/java/gnu/regexp/%.java $(gnu_regexp_jfiles) .jikes
-	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
-	mkdir -p build/class/org/ibex/util/
-	./.jikes $<
-
-build/class/org/ibex/util/Preprocessor.class: src/org/ibex/util/Preprocessor.java $(gnu_regexp) .jikes
-	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
-	mkdir -p build/class/org/ibex/util/
-	./.jikes src/org/ibex/util/Vec.java
-	./.jikes $<
-
-build/class/%.class: build/java/%.java $(java_sources) .jikes
+compile: .compile
+.compile: .install_mips2java .download_bcel-5.1 $(java_sources) $(java_classes); touch $@
+build/class/%.class: build/java/%.java
 	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
 	mkdir -p $(@D)
-	./.jikes $<
-
-oldcompile:; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar:upstream/mips/build javac -target 1.1 -source 1.2 -d build/class `find build/java/ -name \*.java`
-
-compile: .jikes .install_mips2java
-	@make -s $(java_sources:build/java/%.java=build/class/%.class)
-.compile: compile
+	$(gcj) -I$(bcel_jar) -C $< -d build/class
 
-.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
-	cd build/java; for A in `find . -name \*.java`; do mkdir -p ../class/`dirname $$A`; done
-	@./.jikes $(java_sources)
-	touch .compile
-
-build/JVM/ibex.jar: .compile build/res/builtin.jar build/class/org/ibex/translators/MIPSApps.class
+build/JVM/ibex.jar: build/res/builtin.jar build/class/org/ibex/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
@@ -160,7 +141,7 @@ build/JVM/ibex.jar: .compile build/res/builtin.jar build/class/org/ibex/translat
 		$(patsubst %,../../upstream/mips/build/org/xwt/mips/%*.class, Runtime Registers Syscalls Errno)
 
 
-### GCJH Headers ##############################################################################
+### Headers ##################################################################################
 
 java_headers          := $(java_sources:build/java/%.java=build/h/%.h) 
 build/h/edu/stanford/ejalbert/BrowserLauncher.h:; mkdir -p $(@D); touch $@
@@ -174,15 +155,6 @@ 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)/%.java.o: build/class/%.class
-	@echo -e "\n\033[1mcompiling          .java -> .o:     $<\033[0m"
-	mkdir -p `dirname $@`
-	$(gcj) -fCLASSPATH=build/pruned -c $< -o $@
-
-# FIXME detect subclasses of X11
 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) 
 
@@ -192,129 +164,67 @@ build/$(platform)/org/ibex/plat/$(platform).cc.o: src/org/ibex/plat/$(platform).
 	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)
-
-# note: binaries appear in a different order in the dependency line vs the link line
-build/$(platform)/$(target_bin): upstream/jpeg-6b/build-$(target)/libjpeg.a 
-	@echo -e "\n\033[1mlinking               .o -> $(target_bin)\033[0m"
-	rm -rf build/$(platform)/*
-	make build/$(platform)/org/ibex/plat/$(platform).cc.o
-	make build/$(platform)/builtin.o
-
+libjava_dir := 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/io/natFile*.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)/%)
+
+.natcalls-$(platform): $(nat_libjava_files)
+	@echo -e "\n\033[1mdetecting CNI calls...\033[0m"
+	rm -f build/$(platform)/natibex.a
 	cd upstream/gcc-3.3/build-$(target)/$(target)/libjava;           \
-			(find . -name nat\*.o | grep -v JIS;              \
-			echo boehm.o;\
-			echo defineclass.o;\
-			echo exception.o;\
-			echo posix-threads.o;\
-			echo posix.o;\
-			echo prims.o;\
-			echo jni.o;\
-			echo resolve.o;\
-			echo libltdl/ltdl.o;\
-			find java gnu -name \*.o -not -name '*[A-Z]*';         \
-			) > $(shell pwd)/.natbins
-
-
-	cd upstream/gcc-3.3/build-$(target)/$(target)/libjava;\
-	(cat $(shell pwd)/.natbins; echo $(shell pwd)/build/$(platform)/org/ibex/plat/$(platform).cc.o) |\
-		grep -v shs | grep -v SHS |xargs nm |\
+		$(shell pwd)/upstream/install/$(target)/bin/ar cq        \
+			$(shell pwd)/build/$(platform)/natibex.a         \
+			$<
+	nm build/$(platform)/natibex.a |\
 		grep _ZN | c++filt --format java | grep " U " | sed 's_\.class\$$_.class_' | sed 's_ * U __' | sed 's_(.*__' \
-		> $(shell pwd)/.natcalls
+		> $(shell pwd)/$@
 
-	rm -rf build/pruned; mkdir -p build/pruned
-	javac -classpath lib/bcel-5.1.jar:build/class -d build/class src/org/ibex/util/BytecodePruner.java
-	rm -f build/$(platform)/ibex.jar
+bcel_jar := upstream/bcel-5.1/src/bcel-5.1.jar
+build/$(platform)/ibex.pruned.jar: .compile .install_jpeg-6b_$(target) build/$(platform)/builtin.o .natcalls-$(platform)
+	@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; \
-		fastjar cf ../$(platform)/ibex.jar \
+		jar uf ../$(platform)/ibex.jar \
 			`find . -name \*.class | grep -v ibex/plat/` \
 			org/ibex/plat/$(platform)*.class \
 			org/ibex/plat/X11*.class \
 			org/ibex/plat/GCJ*.class \
 			org/ibex/plat/POSIX*.class
-	java -cp lib/bcel-5.1.jar:build/class org.ibex.util.BytecodePruner \
-		build/$(platform)/ibex.jar:upstream/install/share/java/libgcj-3.3.jar \
-		-o build/pruned \
-		`cat .natcalls`
-
-	rm build/pruned/org/ibex/plat/GCJ*.class
-	cp build/java/org/ibex/plat/GCJ.java build/pruned/org/ibex/plat/
-	cp upstream/gcc-3.3/build-$(target)/$(target)/libjava/java/lang/Object.class build/pruned/java/lang/
-
-	rm -f build/pruned/java/lang/System*.*
-	cp upstream/gcc-3.3/src/libjava/java/lang/System.java build/pruned/java/lang/
-
-	cd build/pruned;                                                  \
-		for A in `find gnu/gcj java/lang java/net -name \*.class -or -name \*.java`; do    \
-			echo compiling $$A....;                           \
-			../../upstream/install/bin/$(target)-gcj          \
-				-w -c -Os \
-				-fCLASSPATH=../../build/$(platform)/ibex.jar \
-				$$A &&                     \
-				(mkdir -p ../../build/$(platform)/`dirname $$A`; mv *.o ../../build/$(platform)/`dirname $$A`); \
-		done
-
-#				-fassume-compiled          \
-	cd build/pruned; rm -rf gnu/gcj java/lang java/net
-	cd build/pruned;                                                  \
-		for A in `find . -name \*.class -or -name \*.java`; do    \
-			echo compiling $$A....;                           \
-			../../upstream/install/bin/$(target)-gcj          \
-				-w -c -Os \
-				-fCLASSPATH=../../build/$(platform)/ibex.jar \
-				$$A &&                     \
-				(mkdir -p ../../build/$(platform)/`dirname $$A`; mv *.o ../../build/$(platform)/`dirname $$A`); \
-		done
-#				-fassume-compiled          \
-#				-finhibit-reflection          \
-#				-fnew-ra \
-#				-ffunction-sections \
-#				-fdata-sections \
-#				-fomit-frame-pointer \
-#				-fno-force-mem \
-#				-fno-force-addr \
-#				-fmerge-all-constants \
-
-	rm -f build/$(platform)/ibex.a
+	java -cp $(bcel_jar):build/class org.ibex.util.NanoGoat build/$(platform)/ibex.jar `cat .natcalls-$(platform)`
+	mv build/$(platform)/ibex.jar.pruned $@
 
-	cd upstream/gcc-3.3/build-$(target)/$(target)/libjava;           \
-		$(shell pwd)/upstream/install/$(target)/bin/ar cq        \
-			$(shell pwd)/build/$(platform)/ibex.a            \
-			`find $(shell pwd)/build/$(platform) -name \*.o`
+build/$(platform)/$(target_bin): build/$(platform)/ibex.pruned.jar .natcalls-$(platform)
 
-	rm -f build/$(platform)/natibex.a
-	cd upstream/gcc-3.3/build-$(target)/$(target)/libjava;           \
-		$(shell pwd)/upstream/install/$(target)/bin/ar cq        \
-			$(shell pwd)/build/$(platform)/natibex.a         \
-			`cat $(shell pwd)/.natbins`
-	PATH=upstream/install/bin:$$PATH upstream/install/bin/$(target)-gcj          \
-		-Wl,-O2,--relax,--gc-sections,--noinhibit-exec                       \
+	@echo -e "\n\033[1mcompiling              .jar -> .o\033[0m"
+	$(gcj) -c --bootclasspath=build/$(platform)/ibex.jar -d build/$(platform) build/$(platform)/ibex.pruned.jar
+
+	@echo -e "\n\033[1mlinking              .o -> $(target_bin).phat\033[0m"
+	PATH=upstream/install/bin:$$PATH $(gcj)	\
+		-Wl,-O2,--relax,--gc-sections,--noinhibit-exec,--no-whole-archive    \
 		--main=org.ibex.plat.$(platform)                                     \
 		-Dfile.encoding=UTF8                                                 \
-		-Lupstream/install/$(target)/lib                                     \
-		-Lupstream/install/lib                                               \
+		-Lupstream/install/$(target)/lib -Lupstream/install/lib              \
 		-Os -w                                                               \
-		-Wl,--whole-archive                                                  \
-		build/$(platform)/ibex.a                                             \
-		-Wl,--no-whole-archive,--gc-sections                                 \
+		`find build/$(platform) -name \*.o`                                  \
 		build/$(platform)/natibex.a                                          \
 		upstream/jpeg-6b/build-$(target)/libjpeg.a                           \
 		$(link_flags)                                                        \
-		upstream/gcc-3.3/build-$(target)/$(target)/boehm-gc/.libs/libgcjgc.a \
-		-lz -ldl                                                             \
-		-o $@
-#	strip build/Linux/ibex.linux
-#	ls -l build/Linux/ibex.linux
-#	upx-ucl-beta --best build/Linux/ibex.linux
-#	ls -l build/Linux/ibex.linux
+		$(libjava_dir)/../boehm-gc/.libs/libgcjgc.a                          \
+		-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
 
 
 ### Builtin Resources ##############################################################################
@@ -328,9 +238,9 @@ build/res/fonts/vera: .download_vera-1.10
 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 org/ibex/builtin/scar.png
-#	cd build/res; $(jar) cf builtin.jar $(^:build/res/%=%)
 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 \;;                                                        \
@@ -339,7 +249,6 @@ 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
 	make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf
 	make .install_libmspack-20030726_mips-unknown-elf target=mips-unknown-elf
@@ -372,8 +281,8 @@ build/mips/mipsapps.mips: build/mips/org/ibex/translators/Freetype.c.o build/mip
 ### 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)
+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/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-