openrs2
/
pack200
1
0
Fork 0
Code Issues 2 Pull Requests Releases Activity

Pack200 - Fix for minor bug found when working in java 6 branch

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/harmony/enhanced/java/trunk@1002189 13f79535-47bb-0310-9956-ffa450edef68
master
Sian January 14 years ago
parent 76c07f36e5
commit bfb16e3dc4
1 changed files with 4 additions and 3 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 7
      src/main/java/org/apache/harmony/pack200/BcBands.java

7
src/main/java/org/apache/harmony/pack200/BcBands.java
Unescape View File

@ -438,14 +438,13 @@ public class BcBands extends BandSet {
bcLabelRelativeOffsets.add(byteCodeOffset); bcLabelRelativeOffsets.add(byteCodeOffset);
} }
int padding = (byteCodeOffset + 1) % 4 == 0 ? 0 : 4 - ((byteCodeOffset + 1) % 4); int padding = (byteCodeOffset + 1) % 4 == 0 ? 0 : 4 - ((byteCodeOffset + 1) % 4);
byteCodeOffset += padding + 8 + 8 * keys.length; byteCodeOffset += 1 + padding + 8 + 8 * keys.length;
updateRenumbering(); updateRenumbering();
} }
public void visitMethodInsn(int opcode, String owner, String name, public void visitMethodInsn(int opcode, String owner, String name,
String desc) { String desc) {
byteCodeOffset += 3; byteCodeOffset += 3;
updateRenumbering();
switch (opcode) { switch (opcode) {
case 182: // invokevirtual case 182: // invokevirtual
case 183: // invokespecial case 183: // invokespecial
@ -495,11 +494,13 @@ public class BcBands extends BandSet {
bcCodes.add(opcode); bcCodes.add(opcode);
break; break;
case 185: // invokeinterface case 185: // invokeinterface
byteCodeOffset += 2;
CPMethodOrField cpIMethod = cpBands.getCPIMethod(owner, name, desc); CPMethodOrField cpIMethod = cpBands.getCPIMethod(owner, name, desc);
bcIMethodRef.add(cpIMethod); bcIMethodRef.add(cpIMethod);
bcCodes.add(INVOKEINTERFACE); bcCodes.add(INVOKEINTERFACE);
break; break;
} }
updateRenumbering();
} }
public void visitMultiANewArrayInsn(String desc, int dimensions) { public void visitMultiANewArrayInsn(String desc, int dimensions) {
@ -522,7 +523,7 @@ public class BcBands extends BandSet {
bcLabel.add(labels[i]); bcLabel.add(labels[i]);
bcLabelRelativeOffsets.add(byteCodeOffset); bcLabelRelativeOffsets.add(byteCodeOffset);
} }
int padding = (byteCodeOffset + 1) % 4 == 0 ? 0 : 4 - ((byteCodeOffset + 1) % 4); int padding = byteCodeOffset % 4 == 0 ? 0 : 4 - (byteCodeOffset % 4);
byteCodeOffset+= (padding + 12 + 4 * labels.length); byteCodeOffset+= (padding + 12 + 4 * labels.length);
updateRenumbering(); updateRenumbering();
} }

Write Preview
Loading…
Cancel
Save