fixed oneshot compile bug with array classes

darcs-hash:20040310115132-5007d-25e6ff2bfe79fe1a8d3e4eb7a0e51ee859679b44.gz

diff --git a/Makefile b/Makefile
index a5e0f7a..5e390cf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -97,18 +97,22 @@ plat_java_src_sources     := $(patsubst %,build/java/%.java,$(subst .,/,$(plat_c
 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))
-
-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
 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_sources              += build/java/org/xwt/mips/Compiler.java
+java_sources              += build/java/org/xwt/mips/ELF.java
+java_sources              += build/java/org/xwt/mips/Interpreter.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
+java_sources              += build/java/org/xwt/mips/Errno.java
+java_sources              += build/java/org/xwt/mips/Syscalls.java
+java_sources              += build/java/org/xwt/mips/Unistd.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
 
 build/java/org/xwt/mips/util/%:
        @test -e .install_mips2java || make .install_mips2java
@@ -211,23 +215,22 @@ nat_libjava_files_ += $(shell cd $(libjava_dir) 2>/dev/null; find java/lang -nam
 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)/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         \
-                       $^
+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++) -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 .install_jpeg-6b_$(target) build/$(platform)/builtin.o build/$(platform)/natibex.a
+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 $(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
+       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)
@@ -246,16 +249,19 @@ build/$(platform)/$(target_bin): build/$(platform)/ibex.pruned.jar src/org/ibex/
        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=\"\" \
+               -DPREFIX=\"\"                                                            \
                -Lupstream/install/$(target)/lib -Lupstream/install/lib                  \
                -finhibit-reflection                                                     \
+               -fno-store-check                                                         \
                -w -g                                                                    \
                -Iupstream/jpeg-6b/build-$(target)/                                      \
                -Iupstream/jpeg-6b/src                                                   \
@@ -270,15 +276,16 @@ build/$(platform)/$(target_bin): build/$(platform)/ibex.pruned.jar src/org/ibex/
                -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)/ibex.pruned.jar                                        \
                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
 

diff --git a/src/org/ibex/util/NanoGoat.java b/src/org/ibex/util/NanoGoat.java
index d4f8a81..2b5b772 100644 (file)
--- a/src/org/ibex/util/NanoGoat.java
+++ b/src/org/ibex/util/NanoGoat.java
@@ -56,6 +56,7 @@ public class NanoGoat {
             s = s.trim();
             if (s.length() == 0) continue;
             try {
+                if (s.endsWith("$")) s = s.substring(0, s.length() - 1);
                 if (s.endsWith(".class")) {
                     bcp.visitJavaClass(repo.loadClass(s.substring(0, s.length() - 6)));
                 } else {