From 7ba2f9c635af6dad02cbf707aec4a2a7181f5f51 Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 9 Mar 2004 04:48:09 +0000 Subject: [PATCH] native builds are fixed darcs-hash:20040309044809-5007d-974cb3b557a5cc751571e5a3e0629f6cb2cdb6da.gz --- Makefile | 53 +++++++++++++++++++-------------------- src/org/ibex/util/NanoGoat.java | 25 +++++++++--------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/Makefile b/Makefile index 2347c91..3d823cb 100644 --- a/Makefile +++ b/Makefile @@ -95,7 +95,7 @@ plat_classes_Darwin := org.ibex.plat.Darwin org.ibex.plat.OpenGL $(plat_classes bleh:; @echo $(plat_classes_$(platform)) java_src_sources := $(patsubst %,src/%.java,$(subst .,/,$(plat_classes_$(platform)))) -java_src_sources += $(shell find src -name '*.java' | grep -v Preprocessor | grep -v plat | grep -v NanoGoat) +java_src_sources += $(shell find src -name '*.java' | grep -v Preprocessor | grep -v /plat/) java_sources := $(patsubst src/%.java, build/java/%.java, $(java_src_sources)) java_sources += build/java/org/xwt/mips/Errno.java java_sources += build/java/org/xwt/mips/Unistd.java @@ -163,7 +163,7 @@ else build/class/%.class: build/java/%.java @echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m" mkdir -p $(@D) - $(gcj) -C $< -d build/class + $(gcj) -I$(bcel_jar) -C -O0 $< -d build/class endif build/JVM/ibex.jar: build/res/builtin.jar build/class/org/ibex/translators/MIPSApps.class @@ -199,7 +199,7 @@ build/$(platform)/org/ibex/plat/$(platform).cc.o: src/org/ibex/plat/$(platform). mkdir -p `dirname $@` $(g++) -c $< -o $@ -libjava_dir := upstream/gcc-3.3/build-$(target)/$(target)/libjava +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/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 @@ -208,50 +208,49 @@ nat_libjava_files_ += $(shell cd $(libjava_dir) 2>/dev/null; find java/lang -nam 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) +build/$(platform)/natibex.a: $(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; \ $(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)/$@ + $^ 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) +build/$(platform)/ibex.pruned.jar: .compile .install_jpeg-6b_$(target) build/$(platform)/builtin.o build/$(platform)/natibex.a @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 \ - `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 $(bcel_jar):build/class org.ibex.util.NanoGoat build/$(platform)/ibex.jar `cat .natcalls-$(platform)` + cd build/class; jar uf ../$(platform)/ibex.jar $(patsubst build/java/%.java,%*.class,$(java_sources)) gnu/regexp/* + nm build/$(platform)/natibex.a |\ + grep _ZN | c++filt --format java | grep " U " | sed 's_\.class\$$_.class_' | sed 's_ * U __' | sed 's_(.*__' \ + | java -cp $(bcel_jar):build/class org.ibex.util.NanoGoat build/$(platform)/ibex.jar + mkdir tmp; cd tmp; fastjar xvf ../build/$(platform)/ibex.jar.pruned; 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 $@ ifneq ($(target_bin_extension),jar) -build/$(platform)/$(target_bin): build/$(platform)/ibex.pruned.jar .natcalls-$(platform) - - @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) \ +build/$(platform)/$(target_bin): build/$(platform)/ibex.pruned.jar build/$(platform)/natibex.a build/$(platform)/org/ibex/plat/$(platform).cc.o build/$(platform)/builtin.o + + @echo -e "\n\033[1mlinking .jar -> $(target_bin).phat\033[0m" +# PATH=upstream/install/bin:$$PATH $(gcj) +# -Os -w + cd build/$(platform); $(shell pwd)/upstream/install/bin/$(target)-gcj \ + -fCLASSPATH=$(shell pwd)/upstream/install/share/java/libgcj-3.3.jar \ + -c java/lang/Class.class + 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 \ -Lupstream/install/$(target)/lib -Lupstream/install/lib \ - -Os -w \ - `find build/$(platform) -name \*.o` \ + -w \ + build/$(platform)/org/ibex/plat/$(platform).cc.o \ + build/$(platform)/ibex.pruned.jar \ build/$(platform)/natibex.a \ + build/$(platform)/builtin.o \ upstream/jpeg-6b/build-$(target)/libjpeg.a \ $(link_flags) \ $(libjava_dir)/../boehm-gc/.libs/libgcjgc.a \ - -o $@.phat + build/$(platform)/Class.o \ + -lz -o $@.phat @echo; ls -l $@.phat @echo -e "\n\033[1mstripping $(target_bin).phat -> $(target_bin)\033[0m" diff --git a/src/org/ibex/util/NanoGoat.java b/src/org/ibex/util/NanoGoat.java index 7f1a50e..ab0e361 100644 --- a/src/org/ibex/util/NanoGoat.java +++ b/src/org/ibex/util/NanoGoat.java @@ -46,27 +46,28 @@ public class NanoGoat { if (meths[i].getName().equals(methodname)) visitJavaMethod(repo.loadClass(classname), meths[i]); } - public static void main(String[] s) throws Exception { + public static void main(String[] args) throws Exception { int start = 1; - repo = SyntheticRepository.getInstance(new ClassPath(s[0])); + repo = SyntheticRepository.getInstance(new ClassPath(args[0])); NanoGoat bcp = new NanoGoat(); - for(int i=start; i