import org.apache.bcel.classfile.*;
import org.apache.bcel.util.*;
-// can we drop nio? in natibex.a?
-
public class BytecodePruner {
public static final boolean deleteMethods = false;
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_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");
-
- Method[] meths = getMethods(repo.loadClass("org.ibex.plat.Linux"));
- for(int i=0; i<meths.length; i++) {
- if (meths[i].getName().equals("main"))
- bcp.visitJavaMethod(repo.loadClass("org.ibex.plat.Linux"), meths[i]);
- }
+ // to ensure we get all the stuff that might be called from CNI
+ bcp.loadAllMethods("org.ibex.plat.Linux");
+ bcp.loadAllMethods("org.ibex.plat.X11");
+ bcp.loadAllMethods("org.ibex.plat.GCJ");
+ bcp.loadAllMethods("org.ibex.plat.POSIX");
+ bcp.loadAllMethods("org.ibex.plat.X11$X11Surface");
+ bcp.loadAllMethods("org.ibex.plat.X11$X11PixelBuffer");
+ bcp.loadAllMethods("org.ibex.plat.X11$X11Picture");
+ bcp.loadAllMethods("org.ibex.Surface");
+ bcp.loadAllMethods("org.ibex.Picture");
+ bcp.loadAllMethods("org.ibex.PixelBuffer");
+
+ // primary entry point
+ bcp.loadMethod("org.ibex.plat.Linux.main");
System.out.println();
- // FIXME: insert "the null class" when eliminating?
System.out.println("Dumping...");
-
StringTokenizer st = new StringTokenizer(s[0], ":");
while(st.hasMoreTokens()) {
ZipFile zf = new ZipFile(st.nextToken());
System.out.println(" pruning field " + clazz.getClassName() + "." + fields[i].getName());
cg.removeField(fields[i]);
}
+ /* -- there's really no point to this --
if (!constructed && !fields[i].isStatic()) {
System.out.println(" unconstructed: pruning field " + clazz.getClassName() + "." + fields[i].getName());
- //cg.removeField(fields[i]);
+ cg.removeField(fields[i]);
}
+ */
}
int numMethods = 0;
boolean good = false;
for(int i=0; i<methods.length; i++) {
- if (dest.contains(methods[i]) /*&& (constructed || !methods[i].isStatic())*/) {
+ if (dest.contains(methods[i]) && (constructed || !methods[i].isStatic())) {
if (!methods[i].getName().equals("<clinit>")) good = true;
} else {
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());
+ System.out.println(" pruning " +(constructed?"":"unconstructed")+ " method " +
+ clazz.getClassName() + "." + methods[i].getName());
+ // FIXME: try deleteMethods
if (deleteMethods) { cg.removeMethod(methods[i]); continue; }
MethodGen mg = new MethodGen(methods[i], clazz.getClassName(), newcpg);
mg.removeExceptions();
}
}
}
-
- // FIXME: remove this
- good = true;
if (!good) {
System.out.println("DROPPING " + clazz.getClassName());
+ JavaClass[] ifaces = clazz.getInterfaces();
+ String[] ifacestrings = new String[ifaces.length];
+ for(int i=0; i<ifaces.length; i++) ifacestrings[i] = ifaces[i].getClassName();
+ cg = new ClassGen(clazz.getClassName(),
+ clazz.getSuperClass().getClassName(),
+ clazz.getFileName(),
+ clazz.getAccessFlags(),
+ ifacestrings,
+ newcpg);
} 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");
}
+ new File(outdir + "/" + new File(clazz.getClassName().replace('.', '/')).getParent()).mkdirs();
+ cg.getJavaClass().dump(outdir + "/" + clazz.getClassName().replace('.', '/') + ".class");
}
public JavaClass sig2class(String sig) throws Exception {
if (dest.contains(method)) return;
dest.add(method);
+
+ if (method.isStatic()) loadMethod(jc.getClassName() + ".<clinit>");
+
level += 2;
for(int i=0; i<level; i++) System.out.print(" ");
ConstantPoolGen cpg = new ConstantPoolGen(method.getConstantPool());
Instruction[] instructions = il.getInstructions();
for(int i=0; i<instructions.length; i++){
Instruction instr = instructions[i];
- if (instr instanceof LoadClass) load(((LoadClass)instr).getLoadClassType(cpg));
+ if (instr instanceof LoadClass) {
+ ObjectType ot = (ObjectType)((LoadClass)instr).getLoadClassType(cpg);
+ if (ot != null) loadMethod(ot.getClassName() + ".<clinit>");
+ }
if (instr instanceof CPInstruction) load(((CPInstruction)instr).getType(cpg));
if (instr instanceof TypedInstruction) {
try { load(((TypedInstruction)instr).getType(cpg)); } catch (Exception e) { /* DELIBERATE */ }
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]);
if (method.getExceptionTable() != null) {
}
public void visitJavaField(Field field) throws Exception {
- if (dest.contains(field)) return;
- dest.add(field);
- load(field.getType());
+ if (!dest.contains(field)) dest.add(field);
}
public void visitJavaClass(JavaClass clazz) throws Exception {
dest.add(clazz);
ConstantPoolGen cpg = new ConstantPoolGen(clazz.getConstantPool());
- String name = clazz.getClassName();
System.out.println(clazz.getClassName() + ".class");
JavaClass superclass = clazz.getSuperClass();
- JavaClass[] interfaces = clazz.getAllInterfaces();
for(JavaClass sup = superclass; sup != null; sup = sup.getSuperClass()) {
if (subclasses.get(sup) == null) subclasses.put(sup, new HashSet());
((HashSet)subclasses.get(sup)).add(clazz);
}
+ JavaClass[] interfaces = clazz.getAllInterfaces();
for(int i=0; i<interfaces.length; i++) {
if (subclasses.get(interfaces[i]) == null) subclasses.put(interfaces[i], new HashSet());
((HashSet)subclasses.get(interfaces[i])).add(clazz);
}
- // FIXME
- if (clazz.getClassName().startsWith("org.ibex.")) loadAllMethods(clazz.getClassName());
-
for(JavaClass sup = superclass; sup != null; sup = sup.getSuperClass()) {
visitJavaClass(sup);
remarkMethods(sup, clazz, cpg);
remarkMethods(interfaces[i], clazz, cpg);
}
+ Field[] fields = clazz.getFields();
+ for(int i=0; i<fields.length; i++) {
+ if (!fields[i].isStatic()) visitJavaField(fields[i]);
+ else {
+ Type t = fields[i].getType();
+ if (t instanceof ObjectType) load(t);
+ }
+ }
+
Method[] methods = getMethods(clazz);
for(int i=0; i<methods.length; i++) {
- if (methods[i].getName().equals("<clinit>")) visitJavaMethod(clazz, methods[i]);
+ //if (methods[i].getName().equals("<clinit>")) visitJavaMethod(clazz, methods[i]);
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() + "]");
markMethodInSubclasses(c, m, subclass, cpg);
}
}