From: aclement Date: Tue, 14 Feb 2006 13:32:07 +0000 (+0000) Subject: optimization: rather than continuously constructing new arrays from the linked lists... X-Git-Tag: POST_MEMORY_CHANGES~83 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=34d6d63fdc7780258fe57d8e50ce9bc4a424583d;p=aspectj.git optimization: rather than continuously constructing new arrays from the linked lists of instructions, we create one array and use it multiple times in MethodGen. --- diff --git a/bcel-builder/src/org/aspectj/apache/bcel/generic/InstructionList.java b/bcel-builder/src/org/aspectj/apache/bcel/generic/InstructionList.java index 1020165f5..55cfc95db 100644 --- a/bcel-builder/src/org/aspectj/apache/bcel/generic/InstructionList.java +++ b/bcel-builder/src/org/aspectj/apache/bcel/generic/InstructionList.java @@ -75,7 +75,7 @@ import java.util.ArrayList; * A list is finally dumped to a byte code array with getByteCode. * - * @version $Id: InstructionList.java,v 1.2 2004/11/19 16:45:19 aclement Exp $ + * @version $Id: InstructionList.java,v 1.3 2006/02/14 13:32:07 aclement Exp $ * @author M. Dahm * @see Instruction * @see InstructionHandle @@ -133,22 +133,17 @@ public class InstructionList implements Serializable { * @return target position's instruction handle if available */ public static InstructionHandle findHandle(InstructionHandle[] ihs, - int[] pos, int count, - int target) { + int[] pos, int count,int target) { int l=0, r = count - 1; - /* Do a binary search since the pos array is orderd. - */ + // Do a binary search since the pos array is ordered + int i,j; do { - int i = (l + r) / 2; - int j = pos[i]; - - if(j == target) // target found - return ihs[i]; - else if(target < j) // else constrain search area - r = i - 1; - else // target > j - l = i + 1; + i = (l + r) / 2; + j = pos[i]; + if (j == target) return ihs[i]; // found it + else if (target < j) r=i-1; // else constrain search area + else l=i+1; // target > j } while(l <= r); return null; @@ -166,6 +161,14 @@ public class InstructionList implements Serializable { InstructionHandle[] ihs = getInstructionHandles(); return findHandle(ihs, byte_positions, length, pos); } + + public InstructionHandle[] getInstructionsAsArray() { + return getInstructionHandles(); + } + + public InstructionHandle findHandle(int pos,InstructionHandle[] instructionArray) { + return findHandle(instructionArray,byte_positions,length,pos); + } /** * Initialize instruction list from byte array. diff --git a/bcel-builder/src/org/aspectj/apache/bcel/generic/MethodGen.java b/bcel-builder/src/org/aspectj/apache/bcel/generic/MethodGen.java index 9f874362f..96b2b0f90 100644 --- a/bcel-builder/src/org/aspectj/apache/bcel/generic/MethodGen.java +++ b/bcel-builder/src/org/aspectj/apache/bcel/generic/MethodGen.java @@ -86,7 +86,7 @@ import org.aspectj.apache.bcel.generic.annotation.AnnotationGen; * use the `removeNOPs' method to get rid off them. * The resulting method object can be obtained via the `getMethod()' method. * - * @version $Id: MethodGen.java,v 1.5 2005/09/28 20:10:19 acolyer Exp $ + * @version $Id: MethodGen.java,v 1.6 2006/02/14 13:32:07 aclement Exp $ * @author M. Dahm * @author Patrick C. Beard [setMaxStack()] * @see InstructionList @@ -196,107 +196,111 @@ public class MethodGen extends FieldGenOrMethodGen { * @param class_name class name containing this method * @param cp constant pool */ + public MethodGen(Method m, String class_name, ConstantPoolGen cp) { - this(m.getAccessFlags(), Type.getReturnType(m.getSignature()), - Type.getArgumentTypes(m.getSignature()), null /* may be overridden anyway */, - m.getName(), class_name, - ((m.getAccessFlags() & (Constants.ACC_ABSTRACT | Constants.ACC_NATIVE)) == 0)? - new InstructionList(m.getCode().getCode()) : null, - cp); + + this( + m.getAccessFlags(), + Type.getReturnType(m.getSignature()), + Type.getArgumentTypes(m.getSignature()), + null /* may be overridden anyway */, + m.getName(), + class_name, + ((m.getAccessFlags() & (Constants.ACC_ABSTRACT | Constants.ACC_NATIVE)) == 0)? new InstructionList(m.getCode().getCode()) : null, + cp); Attribute[] attributes = m.getAttributes(); - for(int i=0; i < attributes.length; i++) { + for (int i=0; i < attributes.length; i++) { Attribute a = attributes[i]; - if(a instanceof Code) { - Code c = (Code)a; - setMaxStack(c.getMaxStack()); - setMaxLocals(c.getMaxLocals()); + if (a instanceof Code) { + Code c = (Code)a; + setMaxStack(c.getMaxStack()); + setMaxLocals(c.getMaxLocals()); - CodeException[] ces = c.getExceptionTable(); + CodeException[] ces = c.getExceptionTable(); - if(ces != null) { - for(int j=0; j < ces.length; j++) { - CodeException ce = ces[j]; - int type = ce.getCatchType(); - ObjectType c_type = null; - - if(type > 0) { - String cen = m.getConstantPool().getConstantString(type, Constants.CONSTANT_Class); - c_type = new ObjectType(cen); - } - - int end_pc = ce.getEndPC(); - int length = m.getCode().getCode().length; - - InstructionHandle end; - - if(length == end_pc) { // May happen, because end_pc is exclusive - end = il.getEnd(); - } else { - end = il.findHandle(end_pc); - end = end.getPrev(); // Make it inclusive - } - - addExceptionHandler(il.findHandle(ce.getStartPC()), end, - il.findHandle(ce.getHandlerPC()), c_type); - } - } - - Attribute[] c_attributes = c.getAttributes(); - for(int j=0; j < c_attributes.length; j++) { - a = c_attributes[j]; - - if(a instanceof LineNumberTable) { - LineNumber[] ln = ((LineNumberTable)a).getLineNumberTable(); + InstructionHandle[] arrayOfInstructions = il.getInstructionsAsArray(); + + // process the exception table + // - + if (ces != null) { + for (int j = 0; j < ces.length; j++) { + CodeException ce = ces[j]; + int type = ce.getCatchType(); + ObjectType c_type = null; + + if (type > 0) { + String cen = m.getConstantPool().getConstantString( type, Constants.CONSTANT_Class); + c_type = new ObjectType(cen); + } + + int end_pc = ce.getEndPC(); + int length = m.getCode().getCode().length; + + InstructionHandle end; + + if (length == end_pc) { // May happen, because end_pc is exclusive + end = il.getEnd(); + } else { + end = il.findHandle(end_pc, arrayOfInstructions);// il.findHandle(end_pc); + end = end.getPrev(); // Make it inclusive + } + + addExceptionHandler( + il.findHandle(ce.getStartPC(),arrayOfInstructions), + end, + il.findHandle(ce.getHandlerPC(),arrayOfInstructions), + c_type); + } + } - for(int k=0; k < ln.length; k++) { - LineNumber l = ln[k]; - addLineNumber(il.findHandle(l.getStartPC()), l.getLineNumber()); - } - } else if(a instanceof LocalVariableTable) { - LocalVariable[] lv = ((LocalVariableTable)a).getLocalVariableTable(); - - removeLocalVariables(); - - for(int k=0; k < lv.length; k++) { - LocalVariable l = lv[k]; - InstructionHandle start = il.findHandle(l.getStartPC()); - InstructionHandle end = il.findHandle(l.getStartPC() + l.getLength()); - // AMC, this actually gives us the first instruction AFTER the range, - // so move back one... (findHandle can't cope with mid-instruction indices) - if (end != null) end = end.getPrev(); - - // Repair malformed handles - if(null == start) { - start = il.getStart(); - } - - if(null == end) { - end = il.getEnd(); - } - - addLocalVariable(l.getName(), Type.getType(l.getSignature()), - l.getIndex(), start, end); - } - } else - addCodeAttribute(a); - } - } else if(a instanceof ExceptionTable) { - String[] names = ((ExceptionTable)a).getExceptionNames(); - for(int j=0; j < names.length; j++) - addException(names[j]); - } else if (a instanceof RuntimeAnnotations) { - RuntimeAnnotations runtimeAnnotations = (RuntimeAnnotations)a; - List l = runtimeAnnotations.getAnnotations(); - for (Iterator it = l.iterator(); it.hasNext();) { - Annotation element = (Annotation) it.next(); - addAnnotation(new AnnotationGen(element,cp,false)); + Attribute[] codeAttrs = c.getAttributes(); + for (int j = 0; j < codeAttrs.length; j++) { + a = codeAttrs[j]; + + if (a instanceof LineNumberTable) { + LineNumber[] ln = ((LineNumberTable) a).getLineNumberTable(); + + for (int k = 0; k < ln.length; k++) { + LineNumber l = ln[k]; + addLineNumber(il.findHandle(l.getStartPC(),arrayOfInstructions), + l.getLineNumber()); + } + } else if (a instanceof LocalVariableTable) { + LocalVariable[] lv = ((LocalVariableTable) a).getLocalVariableTable(); + + removeLocalVariables(); + + for (int k = 0; k < lv.length; k++) { + LocalVariable l = lv[k]; + InstructionHandle start = il.findHandle(l.getStartPC(), arrayOfInstructions); + InstructionHandle end = il.findHandle(l.getStartPC() + l.getLength(), arrayOfInstructions); + // AMC, this actually gives us the first instruction AFTER the range, + // so move back one... (findHandle can't cope with mid-instruction indices) + if (end != null) end = end.getPrev(); + // Repair malformed handles + if (null == start) start = il.getStart(); + if (null == end) end = il.getEnd(); + + addLocalVariable(l.getName(), Type.getType(l.getSignature()), l.getIndex(), start, end); + } + } else addCodeAttribute(a); + } + } else if (a instanceof ExceptionTable) { + String[] names = ((ExceptionTable) a).getExceptionNames(); + for (int j = 0; j < names.length; j++) addException(names[j]); + } else if (a instanceof RuntimeAnnotations) { + RuntimeAnnotations runtimeAnnotations = (RuntimeAnnotations) a; + List l = runtimeAnnotations.getAnnotations(); + for (Iterator it = l.iterator(); it.hasNext();) { + Annotation element = (Annotation) it.next(); + addAnnotation(new AnnotationGen(element, cp, false)); + } + } else { + addAttribute(a); } - } else { - addAttribute(a); - } - } + } } /** @@ -315,21 +319,13 @@ public class MethodGen extends FieldGenOrMethodGen { InstructionHandle start, InstructionHandle end) { byte t = type.getType(); - - if(t != Constants.T_ADDRESS) { + if (t != Constants.T_ADDRESS) { int add = type.getSize(); - - if(slot + add > max_locals) - max_locals = slot + add; - + if (slot + add > max_locals) max_locals = slot + add; LocalVariableGen l = new LocalVariableGen(slot, name, type, start, end); int i; - - if((i = variable_vec.indexOf(l)) >= 0) // Overwrite if necessary - variable_vec.set(i, l); - else - variable_vec.add(l); - + if ((i = variable_vec.indexOf(l)) >= 0) variable_vec.set(i, l); // Overwrite if necessary + else variable_vec.add(l); return l; } else { throw new IllegalArgumentException("Can not use " + type + diff --git a/lib/bcel/bcel-src.zip b/lib/bcel/bcel-src.zip index b0b3ec3e0..04ce8fdb4 100644 Binary files a/lib/bcel/bcel-src.zip and b/lib/bcel/bcel-src.zip differ diff --git a/lib/bcel/bcel.jar b/lib/bcel/bcel.jar index d87a5d056..0c0ac35e1 100644 Binary files a/lib/bcel/bcel.jar and b/lib/bcel/bcel.jar differ