import org.apache.bcel.classfile.*;
import org.apache.bcel.util.*;
-// Field pruning
+// can we drop nio? in natibex.a?
+
public class BytecodePruner {
public static final boolean deleteMethods = false;
-
- // FIXME
public static SyntheticRepository repo = null;
-
public static HashSet dest = new HashSet();
-
public static String outdir = ".";
+ public static Hashtable subclasses = new Hashtable();
+ public static int level = 0;
+
+ public BytecodePruner() { }
public void loadAllMethods(String classname) throws Exception {
visitJavaClass(repo.loadClass(classname));
public void loadMethod(String classAndMethodName) throws Exception {
String classname = classAndMethodName.substring(0, classAndMethodName.lastIndexOf('.'));
String methodname = classAndMethodName.substring(classAndMethodName.lastIndexOf('.') + 1);
+ if (classname.endsWith("." + methodname)) methodname = "<init>";
visitJavaClass(repo.loadClass(classname));
Method[] meths = getMethods(repo.loadClass(classname));
for(int i=0; i<meths.length; i++)
} else {
JavaClass cl = repo.loadClass(s[i].substring(0, s[i].lastIndexOf('.')));;
bcp.visitJavaClass(cl);
- Method[] meths = getMethods(cl);
- for(int j=0; j<meths.length; j++) {
- if (meths[j].getName().equals(s[i].substring(s[i].lastIndexOf('.') + 1)))
- bcp.visitJavaMethod(cl, meths[j]);
- }
+ bcp.loadMethod(s[i]);
}
} catch (Exception e) {
System.out.println("WARNING: couldn't load class for " + s[i]);
// 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.loadAllMethods("java.lang.ThreadDeath");
bcp.loadAllMethods("java.util.Hashtable$HashIterator");
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.convert.Input_UTF8"); // retrieved via reflection
+ bcp.loadAllMethods("gnu.gcj.convert.Output_UTF8"); // retrieved via reflection
+
bcp.loadAllMethods("gnu.gcj.protocol.http.Handler");
bcp.loadAllMethods("gnu.gcj.protocol.file.Handler");
bcp.loadAllMethods("gnu.gcj.protocol.core.Handler");
bcp.loadAllMethods("gnu.gcj.protocol.jar.Handler");
- bcp.loadAllMethods("gnu.gcj.convert.Input_UTF8"); // retrieved via reflection
- bcp.loadAllMethods("gnu.gcj.convert.Output_UTF8"); // retrieved via reflection
bcp.loadAllMethods("gnu.gcj.convert.Input_8859_1"); // retrieved via reflection
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.loadAllMethods("gnu.gcj.convert.Input_ASCII"); // retrieved via reflection
+ bcp.loadAllMethods("gnu.gcj.convert.Output_ASCII"); // retrieved via reflection
+
+
bcp.loadAllMethods("java.util.Date");
bcp.loadAllMethods("java.text.DateFormat");
bcp.loadAllMethods("java.text.NumberFormat");
bcp.visitJavaMethod(repo.loadClass("org.ibex.plat.Linux"), meths[i]);
}
System.out.println();
+
+ // FIXME: insert "the null class" when eliminating?
System.out.println("Dumping...");
StringTokenizer st = new StringTokenizer(s[0], ":");
}
}
- public BytecodePruner() { }
-
public static void dump(JavaClass clazz) throws Exception {
if (!dest.contains(clazz)) return;
cg.setMinor(0);
cg.setConstantPool(newcpg);
+ boolean constructed = false;
+ Method[] methods = getMethods(clazz);
+ for(int i=0; i<methods.length; i++)
+ if (dest.contains(methods[i]) && methods[i].getName().equals("<init>"))
+ constructed = true;
+
// 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++)
+ for(int i=0; i<fields.length; i++) {
if (!dest.contains(fields[i]) && fields[i].isStatic()) {
System.out.println(" pruning field " + clazz.getClassName() + "." + fields[i].getName());
cg.removeField(fields[i]);
}
+ if (!constructed && !fields[i].isStatic()) {
+ System.out.println(" unconstructed: pruning field " + clazz.getClassName() + "." + fields[i].getName());
+ //cg.removeField(fields[i]);
+ }
+ }
- Method[] methods = getMethods(clazz);
int numMethods = 0;
boolean good = false;
for(int i=0; i<methods.length; i++) {
- if (dest.contains(methods[i]) ||
- clazz.getClassName().startsWith("java.io.FileDescriptor")
- || clazz.getClassName().startsWith("gnu.gcj.runtime.")
- || clazz.getClassName().startsWith("java.lang.")
- ) {
+ if (dest.contains(methods[i]) /*&& (constructed || !methods[i].isStatic())*/) {
if (!methods[i].getName().equals("<clinit>")) good = true;
} else {
if (methods[i].getCode() == null) {
}
}
- new File(outdir + "/" + new File(clazz.getClassName().replace('.', '/')).getParent()).mkdirs();
- System.out.println("dumping " + clazz.getClassName());
- cg.getJavaClass().dump(outdir + "/" + clazz.getClassName().replace('.', '/') + ".class");
+ // FIXME: remove this
+ good = true;
+
+ if (!good) {
+ System.out.println("DROPPING " + clazz.getClassName());
+ } else {
+ new File(outdir + "/" + new File(clazz.getClassName().replace('.', '/')).getParent()).mkdirs();
+ System.out.println("dumping " + clazz.getClassName());
+ cg.getJavaClass().dump(outdir + "/" + clazz.getClassName().replace('.', '/') + ".class");
+ }
}
public JavaClass sig2class(String sig) throws Exception {
load(((ObjectType)t).getClassName());
}
- // hashtable of hashsets
- public static Hashtable subclasses = new Hashtable();
-
- public String getMethodSignature(Method m, ConstantPoolGen cpg) throws Exception {
- return m.getName() + m.getSignature();
- }
-
+ public String getMethodSignature(Method m, ConstantPoolGen cpg) throws Exception { return m.getName() + m.getSignature(); }
public String getMethodSignature(InvokeInstruction ii, ConstantPoolGen cpg) throws Exception {
String sig = "";
Type[] argtypes = ii.getArgumentTypes(cpg);
return ii.getMethodName(cpg) + "(" + sig + ")" + ii.getReturnType(cpg).getSignature();
}
- 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;
- /*
- // 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");
- */
-
+ // gcj bug; gcj can't compile this method from a .class file input; I have no idea why
+ if (jc.getClassName().equals("java.lang.System") && method.getName().equals("runFinalizersOnExit")) return;
+
+ if (dest.contains(method)) return;
dest.add(method);
level += 2;
for(int i=0; i<level; i++) System.out.print(" ");
InvokeInstruction ii = (InvokeInstruction)instr;
String ii_sig = getMethodSignature(ii, cpg);
JavaClass c = sig2class(ii.getLoadClassType(cpg).getSignature());
+
+ // FIXME: removable?
load(ii.getReturnType(cpg));
+
load(ii.getType(cpg));
Method[] meths = getMethods(c);
boolean good = false;
}
}
level -= 2;
+
+ // FIXME: move this to the top
+
+ // FIXME: removable?
load(method.getReturnType());
Type[] argtypes = method.getArgumentTypes();
for(int i=0; i<argtypes.length; i++) load(argtypes[i]);
((HashSet)subclasses.get(interfaces[i])).add(clazz);
}
- if (clazz.getClassName().startsWith("org.ibex."))
- loadAllMethods(clazz.getClassName());
+ // FIXME
+ if (clazz.getClassName().startsWith("org.ibex.")) loadAllMethods(clazz.getClassName());
for(JavaClass sup = superclass; sup != null; sup = sup.getSuperClass()) {
visitJavaClass(sup);
remarkMethods(interfaces[i], clazz, cpg);
}
- 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<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]);
if (methods[i].getName().equals("finalize")) visitJavaMethod(clazz, methods[i]);
for(int i=0; i<subclasses.length; i++) {
JavaClass subclass = (JavaClass)subclasses[i];
if (subclass == c) continue;
- for(int j=0; j<level; j++) System.out.print(" ");
- System.out.println(" [subclass " + subclass.getClassName() + "]");
+ //for(int j=0; j<level; j++) System.out.print(" ");
+ //System.out.println(" [subclass " + subclass.getClassName() + "]");
markMethodInSubclasses(c, m, subclass, cpg);
}
}
projects / org.ibex.core.git / blobdiff