From c28ed126fbc51fb5794bb367f51a8755dc20140e Mon Sep 17 00:00:00 2001 From: adam Date: Sat, 21 Feb 2004 21:45:10 +0000 Subject: [PATCH] it works!!!! darcs-hash:20040221214510-5007d-873a1978193a0ca8a5a53c8dadeb3a08d9c104d1.gz --- Makefile | 157 +++++++++++++++---------- Makefile.upstream | 5 +- src/org/ibex/HTTP.java | 2 +- src/org/ibex/Ibex.java | 1 + src/org/ibex/Main.java | 3 +- src/org/ibex/Template.java | 13 +++ src/org/ibex/XMLRPC.java | 8 +- src/org/ibex/plat/GCJ.java | 14 ++- src/org/ibex/plat/X11.cc | 5 +- src/org/ibex/util/BytecodePruner.java | 205 +++++++++++++++++++++------------ src/org/ibex/util/Log.java | 6 +- 11 files changed, 269 insertions(+), 150 deletions(-) diff --git a/Makefile b/Makefile index 671af44..560042d 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 @@ -64,7 +64,7 @@ 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 compile make build/$(platform)/$(target_bin) link_flags="$(link_flags)" platform=$(platform) include Makefile.upstream @@ -142,13 +142,13 @@ compile: .jikes .install_mips2java @make -s $(java_sources:build/java/%.java=build/class/%.class) .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 -# cd build/java; for A in `find . -name \*.java`; do mkdir -p ../class/`dirname $$A`; done -# @./.jikes -Xlint:deprecation $(java_sources) -# touch .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 + 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 @echo -e "\n\033[1marchiving .class -> .jar: build/JVM/ibex.jar\033[0m" @@ -203,14 +203,31 @@ build/$(platform)/$(platform).ar: $(nonplat_java_sources:build/java/%.java=build 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 build/$(platform)/builtin.o build/$(platform)/org/ibex/plat/$(platform).cc.o +build/$(platform)/$(target_bin): .compile build/$(platform)/builtin.o build/$(platform)/org/ibex/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a @echo -e "\n\033[1mlinking .o -> $(target_bin)\033[0m" - find upstream/gcc-3.3/build-i686-pc-linux-gnu/i686-pc-linux-gnu/libjava/ \ - -name nat\*.o -or \( -name \*.o -not -name '*[A-Z]*' \) -exec nm {} \; |\ - grep _ZN | c++filt --format java | grep " U " | sed 's_\.class\$$_.class_' | sed 's_ * U __' | sed 's_(.*__' \ - > .natcalls - make $(java_sources) + 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 + +# drop gnu regexp library? + cd upstream/gcc-3.3/build-$(target)/$(target)/libjava;\ + cat $(shell pwd)/.natbins | grep -v shs | grep -v SHS |xargs nm |\ + grep _ZN | c++filt --format java | grep " U " | sed 's_\.class\$$_.class_' | sed 's_ * U __' | sed 's_(.*__' \ + > $(shell pwd)/.natcalls + +# make $(java_sources) rm -rf build/pruned; mkdir -p build/pruned +# rm -rf build/pruned; cd build; ln -s class 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 cd build/class; \ @@ -225,75 +242,90 @@ build/$(platform)/$(target_bin): upstream/jpeg-6b/build-$(target)/libjpeg.a buil -o build/pruned \ `cat .natcalls` - rm -rf build/pruned/org/ibex/js/*; cp build/java/org/ibex/js/* build/pruned/org/ibex/js/ +# rm -rf build/pruned/org/ibex/js/*; cp build/java/org/ibex/js/* build/pruned/org/ibex/js/ - rm build/pruned/java/lang/System.class + rm -f build/pruned/java/lang/System.* cp upstream/gcc-3.3/src/libjava/java/lang/System.java build/pruned/java/lang/ - rm build/pruned/gnu/gcj/runtime/FirstThread*.class - cp upstream/gcc-3.3/src/libjava/gnu/gcj/runtime/FirstThread.java build/pruned/gnu/gcj/runtime/ +# rm build/pruned/gnu/gcj/runtime/FirstThread*.* +# cp upstream/gcc-3.3/src/libjava/gnu/gcj/runtime/FirstThread.java build/pruned/gnu/gcj/runtime/ rm build/pruned/org/ibex/plat/GCJ*.class cp build/java/org/ibex/plat/GCJ.java build/pruned/org/ibex/plat/ + rm -rf build/Linux/java + rm -rf build/Linux/gnu/gcj + rm -rf build/Linux/gnu/java + rm -rf build/Linux/gnu/classpath + cp upstream/gcc-3.3/build-$(target)/$(target)/libjava/java/lang/Object.class build/pruned/java/lang/ - find build/pruned/gnu/java/locale/ -name 'LocaleInformation_*' -not -name 'LocaleInformation_en.class' -not -name 'LocaleInformation_en_US.class' -exec rm {} \; +# find build/pruned/gnu/java/locale/ -name 'LocaleInformation_*' -not -name 'LocaleInformation_en.class' -not -name 'LocaleInformation_en_US.class' -exec rm {} \; # cd build/pruned; fastjar cvf ../../tmp.jar . -# java -jar lib/jarg.jar -verbose -verboseufm -normlv -normsf -normsy -normin \ -# -normex -nornc -nornf -nornm -nobco tmp.jar -# cd build/pruned; fastjar xvf ../../tmp.jar +# java -jar lib/jarg.jar -verbose -verbosern -verboseufm -normlv -normsf -normsy -normin \ +# -nornc -nornf -nornm \ +# -normex -nobco tmp.jar +# cd build/pruned; rm -rf *; fastjar xvf ../../tmp_s.jar -# try oneshot compile/link -# --redefine-sym to merge errorthrowers? or do this in C++? -# --rename-section to try to merge Utf8 sections? +# -fnew-ra \ +# -ffunction-sections \ +# -fdata-sections \ +# -fomit-frame-pointer \ +# -fno-force-mem \ +# -fno-force-addr \ +# -fbranch-probabilities \ +# -fno-schedule-insns \ +# -fno-optimize-sibling-calls \ +# -fno-if-conversion \ +# -fno-thread-jumps \ +# -foptimize-static-class-initialization \ +# -fno-store-check \ +# -fno-bounds-check \ +# -fmerge-all-constants \ +# -fno-inline-functions \ +# -finline-limit=1 \ cd build/pruned; \ for A in `find . -name \*.class -or -name \*.java`; do \ echo compiling $$A....; \ ../../upstream/install/bin/$(target)-gcj \ - -fdata-sections -ffunction-sections -w -c -Os \ - -fCLASSPATH=../../build/$(platform)/ibex.jar $$A && \ + -w -c -Os \ + -fCLASSPATH=../../build/$(platform)/ibex.jar \ + $$A && \ (mkdir -p ../../build/$(platform)/`dirname $$A`; mv *.o ../../build/$(platform)/`dirname $$A`); \ done + +# rm -rf build/Linux/java/security build/Linux/gnu/java/security build/Linux/java/util/jar build/Linux/java/io/Object* +# rm -rf build/pruned/java/security build/pruned/gnu/java/security build/pruned/java/util/jar build/pruned/java/io/Object* + rm -f build/$(platform)/ibex.a + cd upstream/gcc-3.3/build-$(target)/$(target)/libjava; \ $(shell pwd)/upstream/install/$(target)/bin/ar cq \ $(shell pwd)/build/$(platform)/ibex.a \ - boehm.o defineclass.o exception.o \ - posix-threads.o posix.o prims.o resolve.o \ - `find . -name nat\*.o | grep -v JIS` \ - `find . -name \*.o -not -name '*[A-Z]*'` \ - `find $(shell pwd)/build/$(platform) -name \*.o` - PATH=upstream/install/bin:$$PATH upstream/install/bin/$(target)-gcj \ - --main=org.ibex.plat.$(platform) \ - -Lupstream/install/$(target)/lib \ - -Lupstream/install/lib \ - -ffunction-sections -fdata-sections -Os -w -fCLASSPATH=build/$(platform)/ibex.jar \ - build/$(platform)/ibex.a \ - upstream/jpeg-6b/build-$(target)/libjpeg.a \ - $(link_flags) \ + `find $(shell pwd)/build/$(platform) -name \*.o` \ + `cat $(shell pwd)/.natbins` +# --relax,-O2,--no-whole-archive, + PATH=upstream/install/bin:$$PATH upstream/install/bin/$(target)-gcj \ + -Wl,--no-gc-sections,--noinhibit-exec,-rpath,upstream/install/$(target)/lib \ + -Wl,-nostdlib,--eh-frame-hdr,-m,elf_i386,-dynamic-linker,/lib/ld-linux.so.2 \ + --main=org.ibex.plat.$(platform) \ + -Lupstream/install/$(target)/lib \ + -Lupstream/install/lib \ + -Os -w \ + build/$(platform)/ibex.a \ + upstream/jpeg-6b/build-$(target)/libjpeg.a \ + $(link_flags) \ upstream/gcc-3.3/build-$(target)/$(target)/boehm-gc/.libs/libgcjgc.a \ - -lz -ldl -lffi \ - -Wl,--noinhibit-exec,--gc-sections \ + -lz -ldl -lgcc -lm -lpthread -ldl -lgcc -lc -lgcc \ + upstream/install/bin/../lib/gcc-lib/i686-pc-linux-gnu/3.3/crtend.o \ + upstream/install/bin/../lib/gcc-lib/i686-pc-linux-gnu/3.3/../../../../i686-pc-linux-gnu/lib/crtn.o \ -o $@ - -# linker -# --no-whole-archive,--relax,-O,2 -# -# -fomit-frame-pointer \ -# -fno-force-mem \ -# -fno-force-addr \ -# -fno-inline-functions \ -# -fnew-ra \ -# -fbranch-probabilities \ -# -finline-limit=1 \ -# -fno-schedule-insns \ -# -fno-optimize-sibling-calls \ -# -fno-if-conversion \ -# -fno-thread-jumps \ -# -fno-hosted \ +# 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 ### Builtin Resources ############################################################################## @@ -306,7 +338,8 @@ build/res/fonts/vera: .download_vera-1.10 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/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" @(echo "unsigned int builtin_length = "; \ diff --git a/Makefile.upstream b/Makefile.upstream index c93b9a2..5d43a96 100644 --- a/Makefile.upstream +++ b/Makefile.upstream @@ -61,7 +61,7 @@ endif ifneq ($(shell uname),$(platform)) configure_gcc-3.3 += --with-headers=$(shell pwd)/upstream/install/$(target)/include endif -configure_gcc-3.3 += --enable-languages=c,c++,java --enable-gc-type=boehm --disable-jvmpi +configure_gcc-3.3 += --enable-languages=c,c++,java --enable-gc-type=boehm --disable-jvmpi --without-libffi configure_gcc-3.3 += --with-ld=$(shell pwd)/upstream/install/bin/$(target)-ld configure_gcc-3.3 += --with-as=$(shell pwd)/upstream/install/bin/$(target)-as ifneq ($(platform),Darwin) @@ -72,8 +72,7 @@ configure_gcc-3.3 += --disable-shared --enable-static configure_binutils-2.13.2.1 += --disable-shared --enable-static configure_gcc-3.3_powerpc-apple-darwin += --enable-threads=posix --disable-hash-synchronization --disable-multilib configure_gcc-3.3_i686-pc-mingw32 += --enable-threads=win32 --enable-hash-synchronization -configure_gcc-3.3_i686-pc-linux-gnu += --enable-threads=posix --disable-hash-synchronization -#configure_gcc-3.3_i686-pc-linux-gnu += --enable-threads=posix --enable-hash-synchronization +configure_gcc-3.3_i686-pc-linux-gnu += --enable-threads=posix --enable-hash-synchronization configure_gcc-3.3_sparc-sun-solaris2.7 += --enable-threads=posix --disable-hash-synchronization --disable-multilib configure_WindowMaker-0.80.2_$(target) += --prefix=$(shell pwd)/upstream/install/$(target) diff --git a/src/org/ibex/HTTP.java b/src/org/ibex/HTTP.java index a8389b1..2aed806 100644 --- a/src/org/ibex/HTTP.java +++ b/src/org/ibex/HTTP.java @@ -356,7 +356,7 @@ public class HTTP { PrintWriter pw = new PrintWriter(new OutputStreamWriter(originalUrl.equals("stdio:") ? System.out : sock.getOutputStream())); if (content != null) { - pw.print("POST " + path + " HTTP/1.1\r\n"); + pw.print("POST " + path + " HTTP/1.0\r\n"); // FIXME chunked encoding int contentLength = content.substring(0, 2).equals("\r\n") ? content.length() - 2 : (content.length() - content.indexOf("\r\n\r\n") - 4); diff --git a/src/org/ibex/Ibex.java b/src/org/ibex/Ibex.java index 61b51a8..0aea062 100644 --- a/src/org/ibex/Ibex.java +++ b/src/org/ibex/Ibex.java @@ -357,6 +357,7 @@ public final class Ibex extends JS.Cloneable { public JSScope getStatic() { try { // FIXME background? + System.out.println("parentkey.t == " + parentkey + ".t"); if (t == null) t = Template.buildTemplate(parentkey + ".t", parent.get(parentkey + ".t"), ibex); return t.staticScope; diff --git a/src/org/ibex/Main.java b/src/org/ibex/Main.java index bfc2abd..267f706 100644 --- a/src/org/ibex/Main.java +++ b/src/org/ibex/Main.java @@ -58,7 +58,8 @@ public class Main { else if (opt.equals("info")) Log.level = Log.INFO; else if (opt.equals("warn")) Log.level = Log.WARN; else if (opt.equals("error")) Log.level = Log.ERROR; - else if (opt.equals("error")) Log.level = Log.SILENT; + else if (opt.equals("silent")) Log.level = Log.SILENT; + else if (opt.equals("rpc")) Log.rpc = true; else Log.file(opt); } } diff --git a/src/org/ibex/Template.java b/src/org/ibex/Template.java index 2ef5e1b..28ff215 100644 --- a/src/org/ibex/Template.java +++ b/src/org/ibex/Template.java @@ -155,18 +155,31 @@ public class Template { String initial_uri = ""; public TemplateHelper(String sourceName, Object s, Ibex ibex) throws XML.Exn, IOException, JSExn { + System.out.println("1"); this.sourceName = sourceName; + System.out.println("2"); this.ibex = ibex; + System.out.println("3"); InputStream is = Stream.getInputStream(s); + System.out.println("4"); Ibex.Blessing b = Ibex.Blessing.getBlessing(s).parent; + System.out.println("5"); + /* while(b != null) { if(b.parentkey != null) initial_uri = b.parentkey + (initial_uri.equals("") ? "" : "." + initial_uri); b = b.parent; } + */ + initial_uri = ""; + System.out.println("6"); parse(new InputStreamReader(is)); + System.out.println("7"); JS staticScript = parseScript(static_content, static_content_start); + System.out.println("8"); t.staticScope = new PerInstantiationScope(null, ibex, null, null); + System.out.println("9"); if (staticScript != null) JS.cloneWithNewParentScope(staticScript, t.staticScope).call(null, null, null, null, 0); + System.out.println("10"); } private JS parseScript(StringBuffer content, int content_start) throws IOException { diff --git a/src/org/ibex/XMLRPC.java b/src/org/ibex/XMLRPC.java index 195e3cf..607d34e 100644 --- a/src/org/ibex/XMLRPC.java +++ b/src/org/ibex/XMLRPC.java @@ -171,9 +171,9 @@ class XMLRPC extends JS { content.append("\r\n"); content.append("\n"); content.append(" \n"); - content.append(" "); + content.append(" "); content.append(method); - content.append("\n"); + content.append("\n"); content.append(" \n"); for(int i=0; i\n"); @@ -319,11 +319,11 @@ class XMLRPC extends JS { final void call(final JS.UnpauseCallback callback, final JSArray args) { try { - if (Log.verbose) Log.info(this, "call to " + url + " : " + method); + if (Log.rpc) Log.info(this, "call to " + url + " : " + method); if (tracker == null) tracker = new Hash(); if (objects == null) objects = new Vec(); String request = buildRequest(args); - if (Log.verbose) Log.info(this, "send:\n" + request); + if (Log.rpc) Log.info(this, "send:\n" + request); InputStream is = http.POST("text/xml", request); BufferedReader br = new BufferedReader(new InputStreamReader(is)); try { diff --git a/src/org/ibex/plat/GCJ.java b/src/org/ibex/plat/GCJ.java index 183c573..fa8ac9a 100644 --- a/src/org/ibex/plat/GCJ.java +++ b/src/org/ibex/plat/GCJ.java @@ -4,6 +4,8 @@ package org.ibex.plat; import org.ibex.*; import org.ibex.util.*; import java.io.*; +import java.security.*; +import java.security.cert.*; /** common superclass for all platforms that use GCJ to compile a native binary */ public abstract class GCJ extends Platform { @@ -17,10 +19,18 @@ public abstract class GCJ extends Platform { public static Object c5 = new gnu.gcj.convert.Input_8859_1(); public static Object c6 = new gnu.java.locale.LocaleInformation(); public static Object c7 = new gnu.gcj.convert.Output_ASCII(); - public static Object c8 = new gnu.java.locale.Calendar_en(); - public static Object c9 = new gnu.java.locale.Calendar_en_US(); + //public static Object c8 = new gnu.java.locale.Calendar_en(); + //public static Object c9 = new gnu.java.locale.Calendar_en_US(); public static Object c10 = new gnu.gcj.protocol.http.Handler(); public static Object c11 = new gnu.gcj.protocol.jar.Handler(); + public static Object c12 = new java.security.cert.Certificate("foo") { + public byte[] getEncoded() throws CertificateEncodingException { return null; } + public void verify(PublicKey key) { } + public void verify(PublicKey key, String sigProvider) { } + public String toString() { return "foocert"; } + public PublicKey getPublicKey() { return null; } + }; + protected native InputStream _getBuiltinInputStream(); diff --git a/src/org/ibex/plat/X11.cc b/src/org/ibex/plat/X11.cc index 62672d7..004d2a3 100644 --- a/src/org/ibex/plat/X11.cc +++ b/src/org/ibex/plat/X11.cc @@ -769,8 +769,9 @@ void org::ibex::plat::X11::natInit() { org::ibex::util::Log::info(this->getClass(), JvNewStringLatin1(buf)); } -#include "WINGs/WINGs.h" +//#include "WINGs/WINGs.h" jstring org::ibex::plat::X11::_fileDialog(jstring suggestedFileName, jboolean write) { +#ifdef asfasdfasf int argc = 1; char* argv[2]; argv[0] = "Ibex"; @@ -793,6 +794,8 @@ jstring org::ibex::plat::X11::_fileDialog(jstring suggestedFileName, jboolean wr if (WMRunModalFilePanelForDirectory(oPanel, NULL, buf, /*title*/ NULL, NULL) != True) return NULL; return JvNewStringLatin1(WMGetFilePanelFileName(oPanel)); } +#endif + return NULL; } diff --git a/src/org/ibex/util/BytecodePruner.java b/src/org/ibex/util/BytecodePruner.java index f5dea9d..459bcca 100644 --- a/src/org/ibex/util/BytecodePruner.java +++ b/src/org/ibex/util/BytecodePruner.java @@ -18,10 +18,17 @@ import org.apache.bcel.util.*; // - if a method is reachable, all the methods it overrides are reachable +// try eliminating instance methods/fields if no ctor is reachable... +// distinguish between overloaded forms of a given method +// slim down the set of loadAllMethod() classes +// field pruning? + // FIXME: nonstatic method invocation or field access implies that object will be constructed (ie hint) public class BytecodePruner { + public static final boolean deleteMethods = false; + // FIXME public static SyntheticRepository repo = null; @@ -31,14 +38,14 @@ public class BytecodePruner { public void loadAllMethods(String classname) throws Exception { visitJavaClass(repo.loadClass(classname)); - Method[] meths = repo.loadClass(classname).getMethods(); + Method[] meths = getMethods(repo.loadClass(classname)); for(int i=0; i")) good = true; } else { - if (methods[i].getCode() != null) { + if (methods[i].getCode() == null) { + System.out.println(" empty codeblock: " + clazz.getClassName() + "." + methods[i].getName()); + } else { System.out.println(" pruning " + clazz.getClassName() + "." + methods[i].getName()); - MethodGen mg = new MethodGen(methods[i], clazz.getClassName(), newcpg); - mg.removeExceptions(); - InstructionList il = new InstructionList(); - mg.setInstructionList(il); - - InstructionHandle ih_0 = il.append(factory.createNew("java.lang.UnsatisfiedLinkError")); - il.append(InstructionConstants.DUP); - il.append(factory.createInvoke("java.lang.UnsatisfiedLinkError", - "", Type.VOID, Type.NO_ARGS, Constants.INVOKESPECIAL)); - il.append(InstructionConstants.ATHROW); - - mg.setMaxStack(); - mg.setMaxLocals(); - mg.removeExceptions(); - mg.removeLocalVariables(); - mg.removeExceptionHandlers(); - mg.removeLineNumbers(); - - cg.replaceMethod(methods[i], mg.getMethod()); - il.dispose(); + if (!deleteMethods) { + MethodGen mg = new MethodGen(methods[i], clazz.getClassName(), newcpg); + mg.removeExceptions(); + InstructionList il = new InstructionList(); + mg.setInstructionList(il); + + InstructionHandle ih_0 = il.append(factory.createNew("java.lang.UnsatisfiedLinkError")); + il.append(InstructionConstants.DUP); + il.append(factory.createInvoke("java.lang.UnsatisfiedLinkError", + "", Type.VOID, Type.NO_ARGS, Constants.INVOKESPECIAL)); + il.append(InstructionConstants.ATHROW); + + mg.setMaxStack(); + mg.setMaxLocals(); + mg.removeExceptions(); + mg.removeLocalVariables(); + mg.removeExceptionHandlers(); + mg.removeLineNumbers(); + + cg.replaceMethod(methods[i], mg.getMethod()); + il.dispose(); + } else { + cg.removeMethod(methods[i]); + } } } if ((clazz.getClassName().startsWith("gnu.java.locale.LocaleInformation") && @@ -200,15 +225,25 @@ public class BytecodePruner { !clazz.getClassName().endsWith("LocaleInformation") && !clazz.getClassName().endsWith("LocaleInformation_en_US")) || + ((clazz.getClassName().startsWith("gnu.gcj.convert.Input_") || + clazz.getClassName().startsWith("gnu.gcj.convert.Output_")) && + !(clazz.getClassName().endsWith("ASCII") || + clazz.getClassName().endsWith("UTF8") || + clazz.getClassName().endsWith("iconv") || + clazz.getClassName().endsWith("8859_1"))) + || (!good && !clazz.isInterface() && !clazz.isAbstract() && + !clazz.getClassName().startsWith("java.io.") && + !clazz.getClassName().startsWith("java.lang.") && + !clazz.getClassName().startsWith("gnu.") && !clazz.getClassName().endsWith("Error") && !clazz.getClassName().endsWith("Exception") && !clazz.getClassName().endsWith("Permission"))) { - System.out.println("DROPPING " + clazz.getClassName()); - return; + //System.out.println("DROPPING " + clazz.getClassName()); + //return; } new File(outdir + "/" + new File(clazz.getClassName().replace('.', '/')).getParent()).mkdirs(); System.out.println("dumping " + clazz.getClassName()); @@ -248,8 +283,7 @@ public class BytecodePruner { // hashtable of hashsets public static Hashtable subclasses = new Hashtable(); - public String getMethodSignature(Method m) throws Exception { - ConstantPoolGen cpg = new ConstantPoolGen(m.getConstantPool()); + public String getMethodSignature(Method m, ConstantPoolGen cpg) throws Exception { return m.getName() + m.getSignature(); } @@ -259,16 +293,21 @@ public class BytecodePruner { for(int j=0; j")) visitJavaMethod(clazz, methods[i]); + Method[] methods = getMethods(clazz); + for(int i=0; i")) visitJavaMethod(clazz, methods[i]); + + // only if ctor reachable (?) if (methods[i].getName().equals("equals")) visitJavaMethod(clazz, methods[i]); if (methods[i].getName().equals("hashCode")) visitJavaMethod(clazz, methods[i]); if (methods[i].getName().equals("finalize")) visitJavaMethod(clazz, methods[i]); if (methods[i].getName().equals("clone")) visitJavaMethod(clazz, methods[i]); if (methods[i].getName().equals("toString")) visitJavaMethod(clazz, methods[i]); } - for(int i=0; i