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 {
// 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");
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");
+ 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("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();
-
System.out.println("Dumping...");
StringTokenizer st = new StringTokenizer(s[0], ":");
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]);
}
}
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());
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(" ");
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);
}
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]);