X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Futil%2FBytecodePruner.java;h=f9a3b644721c252fe45a3e76f7f822bc3df08e0a;hb=c8f04834582049dce7f80507a1b2b6c6210d5c3f;hp=eb162ff40f39c7deb2ad0ee65539e91362c262c3;hpb=0f015aed3b9062a628fb55c673755dfba82e5c61;p=org.ibex.core.git

diff --git a/src/org/ibex/util/BytecodePruner.java b/src/org/ibex/util/BytecodePruner.java
index eb162ff..f9a3b64 100644
--- a/src/org/ibex/util/BytecodePruner.java
+++ b/src/org/ibex/util/BytecodePruner.java
@@ -22,7 +22,8 @@ public class BytecodePruner {
     public void loadAllMethods(String classname) throws Exception {
         visitJavaClass(repo.loadClass(classname));
         Method[] meths = getMethods(repo.loadClass(classname));
-        for(int i=0; i<meths.length; i++) visitJavaMethod(repo.loadClass(classname), meths[i]);
+        for(int i=0; i<meths.length; i++)
+            visitJavaMethod(repo.loadClass(classname), meths[i]);
     }
 
     public void loadField(String classAndMethodName) throws Exception {
@@ -74,8 +75,8 @@ public class BytecodePruner {
         // we call start(), but the VM calls run()...
         bcp.loadMethod("java.lang.Thread.run");
         bcp.loadAllMethods("java.lang.SecurityContext");
-        bcp.visitJavaClass(repo.loadClass("java.awt.AWTPermission"));
-        bcp.visitJavaClass(repo.loadClass("gnu.classpath.Configuration"));
+        //bcp.visitJavaClass(repo.loadClass("java.awt.AWTPermission"));
+        //bcp.visitJavaClass(repo.loadClass("gnu.classpath.Configuration"));
         bcp.loadAllMethods("java.lang.ThreadDeath");
 
         bcp.loadAllMethods("java.util.Hashtable$HashIterator");
@@ -83,7 +84,10 @@ public class BytecodePruner {
         bcp.visitJavaClass(repo.loadClass("gnu.gcj.runtime.FinalizerThread"));
         bcp.visitJavaClass(repo.loadClass("gnu.gcj.runtime.FirstThread"));
 
-        /*
+        bcp.loadMethod("java.lang.Thread.run");                // we call start(), but the VM calls run()...
+        bcp.loadMethod("java.lang.ref.Reference.enqueue");     // the GC calls this directly
+        bcp.loadAllMethods("gnu.gcj.runtime.StringBuffer");    // the compiler emits calls directly to this class
+
         bcp.loadAllMethods("gnu.gcj.protocol.http.Handler");
         bcp.loadAllMethods("gnu.gcj.protocol.file.Handler");
         bcp.loadAllMethods("gnu.gcj.protocol.core.Handler");
@@ -94,26 +98,7 @@ public class BytecodePruner {
         bcp.loadAllMethods("gnu.gcj.convert.Output_8859_1");   // retrieved via reflection
         bcp.loadAllMethods("gnu.gcj.convert.Input_ASCII");    // retrieved via reflection
         bcp.loadAllMethods("gnu.gcj.convert.Output_ASCII");   // retrieved via reflection
-        bcp.loadMethod("java.lang.Thread.run");                // we call start(), but the VM calls run()...
-        bcp.loadMethod("java.lang.ref.Reference.enqueue");     // the GC calls this directly
-        bcp.loadAllMethods("gnu.gcj.runtime.StringBuffer");    // the compiler emits calls directly to this class
-        */
-        // often called from native subclasses....
-
-        bcp.loadAllMethods("org.ibex.Surface");
-        bcp.loadAllMethods("org.ibex.Template$TemplateHelper$1");
-        bcp.loadAllMethods("org.ibex.Surface$DoubleBufferedSurface");
-        bcp.loadAllMethods("org.ibex.Surface$3");
-        bcp.loadAllMethods("org.ibex.Surface$2");
-        bcp.loadAllMethods("org.ibex.Picture");
-        bcp.loadAllMethods("org.ibex.PixelBuffer");
-        bcp.loadAllMethods("org.ibex.Platform");
-        bcp.loadAllMethods("org.ibex.Scheduler");
-        bcp.loadAllMethods("org.ibex.plat.X11");
-        bcp.loadAllMethods("org.ibex.plat.X11$X11Picture");
-        bcp.loadAllMethods("org.ibex.plat.X11$X11PixelBuffer");
-        bcp.loadAllMethods("org.ibex.plat.X11$X11Surface");
-        bcp.loadAllMethods("org.ibex.XMLRPC");
+        
         bcp.loadAllMethods("java.util.Date");
         bcp.loadAllMethods("java.text.DateFormat");
         bcp.loadAllMethods("java.text.NumberFormat");
@@ -124,7 +109,6 @@ public class BytecodePruner {
                 bcp.visitJavaMethod(repo.loadClass("org.ibex.plat.Linux"), meths[i]);
         }
         System.out.println();
-
         System.out.println("Dumping...");
 
         StringTokenizer st = new StringTokenizer(s[0], ":");
@@ -152,10 +136,13 @@ public class BytecodePruner {
         cg.setMajor(46);
         cg.setMinor(0);
         cg.setConstantPool(newcpg);
+
+        // we can only prune static fields (to avoid altering object layout, which is hardcoded into
+        // CNI code), but that's okay since instance fields don't contribute to binary size
         Field[] fields = clazz.getFields();
         for(int i=0; i<fields.length; i++)
-            if (!dest.contains(fields[i]) && false) { 
-                System.out.println("  pruning " + clazz.getClassName() + "." + fields[i].getName());
+            if (!dest.contains(fields[i]) && fields[i].isStatic()) { 
+                System.out.println("  pruning field " + clazz.getClassName() + "." + fields[i].getName());
                 cg.removeField(fields[i]);
             }
 
@@ -225,7 +212,6 @@ public class BytecodePruner {
     }
     public void load(Type t) throws Exception {
         if (t == null) return;
-        //String sig = t.getSignature();
         if (t instanceof ArrayType) load(((ArrayType)t).getElementType());
         if (!(t instanceof ObjectType)) return;
         load(((ObjectType)t).getClassName());
@@ -248,14 +234,20 @@ public class BytecodePruner {
     public static int level = 0;
     public void visitJavaMethod(JavaClass jc, Method method) throws Exception {
         visitJavaClass(jc);
+        /*
         if (jc.getClassName().equals("java.util.Date") && method.getName().equals("readObject")) return;
+        */
         if (jc.getClassName().indexOf("SharedLib") != -1) return;
         if (jc.getClassName().indexOf("Datagram") != -1) return;
         if (dest.contains(method)) return;
 
-        // gcj bug; gcj can't compile this method from a .class file input
-        //if (jc.getClassName().equals("java.lang.System") && method.getName().equals("runFinalizersOnExit")) return;
-
+        /*
+        // HACK (okay?)
+        // not inferrable: CNI call to abstract method
+        if (jc.getClassName().equals("java.util.TimeZone") && method.getName().equals("getDefaultTimeZoneId"))
+            loadMethod("java.util.SimpleTimeZone.useDaylightTime");
+        */
+        
         dest.add(method);
         level += 2;
         for(int i=0; i<level; i++) System.out.print(" ");
@@ -270,6 +262,24 @@ public class BytecodePruner {
             Instruction instr = instructions[i];
             if (instr instanceof LoadClass) load(((LoadClass)instr).getLoadClassType(cpg));
             if (instr instanceof CPInstruction) load(((CPInstruction)instr).getType(cpg));
+            if (instr instanceof TypedInstruction) {
+                try { load(((TypedInstruction)instr).getType(cpg)); } catch (Exception e) { /* DELIBERATE */ }
+            }
+            if (instr instanceof NEW) {
+                for(int j=0; j<level; j++) System.out.print(" ");
+                loadMethod(((NEW)instr).getLoadClassType(cpg).getClassName() + ".<init>");
+            }
+            if (instr instanceof org.apache.bcel.generic.FieldOrMethod)
+                load(((org.apache.bcel.generic.FieldOrMethod)instr).getClassType(cpg));
+            if (instr instanceof org.apache.bcel.generic.FieldInstruction) {
+                load(((org.apache.bcel.generic.FieldInstruction)instr).getFieldType(cpg));
+                load(((org.apache.bcel.generic.FieldInstruction)instr).getType(cpg));
+                String fieldName = ((org.apache.bcel.generic.FieldInstruction)instr).getFieldName(cpg);
+                JavaClass jc2 = repo.loadClass(((ObjectType)((org.apache.bcel.generic.FieldInstruction)instr).
+                                                getLoadClassType(cpg)).getClassName());
+                Field[] fields = jc2.getFields();
+                for(int j=0; j<fields.length; j++) if (fields[j].getName().equals(fieldName)) visitJavaField(fields[j]);
+            }
             if (instr instanceof InvokeInstruction) {
                 InvokeInstruction ii = (InvokeInstruction)instr;
                 String ii_sig = getMethodSignature(ii, cpg);
@@ -336,11 +346,14 @@ public class BytecodePruner {
         }
 
         Field[] fields = clazz.getFields();
+        for(int i=0; i<fields.length; i++) {
+            if (!fields[i].isStatic())
+                visitJavaField(fields[i]);
+        }
+
         Method[] methods = getMethods(clazz);
-        for(int i=0; i<fields.length; i++) visitJavaField(fields[i]);
         for(int i=0; i<methods.length; i++) {
             if (methods[i].getName().equals("<clinit>")) 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]);