openrs2
/
jode
0
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

thorough skipping

Browse Source 
git-svn-id: https://svn.code.sf.net/p/jode/code/trunk@346 379699f6-c40d-0410-875b-85095c16579e
stable
jochen 26 years ago
parent 4c7571734f
commit 168465364c
4 changed files with 88 additions and 45 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. 10
      jode/jode/bytecode/AttributeInfo.java
  2. 9
      jode/jode/bytecode/BinaryInfo.java
  3. 40
      jode/jode/decompiler/Opcodes.java
  4. 74
      jode/jode/obfuscator/MethodIdentifier.java

10
jode/jode/bytecode/AttributeInfo.java
Unescape View File

@ -38,8 +38,14 @@ public class AttributeInfo {
name = attrName; name = attrName;
data = new byte[length]; data = new byte[length];
input.readFully(data); input.readFully(data);
} else } else {
input.skip(length); while (length > 0) {
int skipped = (int) input.skip(length);
if (skipped == 0)
throw new EOFException("Can't skip. EOF?");
length -= skipped;
}
}
} }
public String getName() { public String getName() {

9
jode/jode/bytecode/BinaryInfo.java
Unescape View File

@ -51,8 +51,13 @@ public class BinaryInfo {
int count = input.readUnsignedShort(); int count = input.readUnsignedShort();
for (int i=0; i< count; i++) { for (int i=0; i< count; i++) {
input.readUnsignedShort(); // the name index input.readUnsignedShort(); // the name index
int length = input.readInt(); long length = input.readInt();
input.skip(length); while (length > 0) {
long skipped = input.skip(length);
if (skipped == 0)
throw new EOFException("Can't skip. EOF?");
length -= skipped;
}
} }
} }

40
jode/jode/decompiler/Opcodes.java
Unescape View File

@ -113,6 +113,22 @@ public abstract class Opcodes implements jode.bytecode.Opcodes {
return new RetBlock(local); return new RetBlock(local);
} }
/**
* Skips the specified number of bytes in the input stream. This calls
* skip as long until the bytes are all skipped.
* @param is the inputstream to skip.
* @param count the number of bytes to skip.
*/
private final static void skip(InputStream is, long count)
throws IOException {
while (count > 0) {
long skipped = is.skip(count);
if (skipped == 0)
throw new EOFException("Can't skip");
count -= skipped;
}
}
/** /**
* Read an opcode out of a data input stream and determine its size * Read an opcode out of a data input stream and determine its size
* and its successors. * and its successors.
@ -127,10 +143,10 @@ public abstract class Opcodes implements jode.bytecode.Opcodes {
int opcode = stream.readUnsignedByte(); int opcode = stream.readUnsignedByte();
switch (opcode) { switch (opcode) {
case opc_multianewarray: case opc_multianewarray:
stream.skip(3); skip(stream, 3);
return new int[] { 4, addr+4 }; return new int[] { 4, addr+4 };
case opc_invokeinterface: case opc_invokeinterface:
stream.skip(4); skip(stream, 4);
return new int[] { 5, addr+5 }; return new int[] { 5, addr+5 };
case opc_wide: { case opc_wide: {
@ -139,21 +155,21 @@ public abstract class Opcodes implements jode.bytecode.Opcodes {
case opc_fload: case opc_dload: case opc_aload: case opc_fload: case opc_dload: case opc_aload:
case opc_istore: case opc_lstore: case opc_istore: case opc_lstore:
case opc_fstore: case opc_dstore: case opc_astore: case opc_fstore: case opc_dstore: case opc_astore:
stream.skip(2); skip(stream, 2);
return new int[] { 4, addr+4 }; return new int[] { 4, addr+4 };
case opc_iinc: case opc_iinc:
stream.skip(4); skip(stream, 4);
return new int[] { 6, addr+6 }; return new int[] { 6, addr+6 };
case opc_ret: case opc_ret:
stream.skip(2); skip(stream, 2);
return new int[] { 4 }; return new int[] { 4 };
default: default:
throw new ClassFormatError("Invalid wide opcode "+opcode); throw new ClassFormatError("Invalid wide opcode "+opcode);
} }
} }
case opc_ret: case opc_ret:
stream.skip(1); skip(stream, 1);
return new int[] { 2 }; return new int[] { 2 };
case opc_jsr_w: case opc_jsr_w:
@ -166,7 +182,7 @@ public abstract class Opcodes implements jode.bytecode.Opcodes {
case opc_tableswitch: { case opc_tableswitch: {
int length = 3-(addr % 4); int length = 3-(addr % 4);
stream.skip(length); skip(stream, length);
int def = addr + stream.readInt(); int def = addr + stream.readInt();
int low = stream.readInt(); int low = stream.readInt();
int high = stream.readInt(); int high = stream.readInt();
@ -180,7 +196,7 @@ public abstract class Opcodes implements jode.bytecode.Opcodes {
} }
case opc_lookupswitch: { case opc_lookupswitch: {
int length = 3-(addr % 4); int length = 3-(addr % 4);
stream.skip(length); skip(stream, length);
int def = addr + stream.readInt(); int def = addr + stream.readInt();
int npairs = stream.readInt(); int npairs = stream.readInt();
int[] dests = new int[npairs+2]; int[] dests = new int[npairs+2];
@ -212,14 +228,14 @@ public abstract class Opcodes implements jode.bytecode.Opcodes {
case opc_anewarray: case opc_anewarray:
case opc_checkcast: case opc_checkcast:
case opc_instanceof: case opc_instanceof:
stream.skip(2); skip(stream, 2);
return new int[] { 3, addr+3 }; return new int[] { 3, addr+3 };
} }
if (opcode == opc_newarray if (opcode == opc_newarray
|| (opcode >= opc_bipush && opcode <= opc_aload) || (opcode >= opc_bipush && opcode <= opc_aload)
|| (opcode >= opc_istore && opcode <= opc_astore)) { || (opcode >= opc_istore && opcode <= opc_astore)) {
stream.skip(1); skip(stream, 1);
return new int[] { 2, addr+2 }; return new int[] { 2, addr+2 };
} }
@ -475,7 +491,7 @@ public abstract class Opcodes implements jode.bytecode.Opcodes {
ca.getLocalInfo(addr, stream.readUnsignedByte())); ca.getLocalInfo(addr, stream.readUnsignedByte()));
case opc_tableswitch: { case opc_tableswitch: {
int length = 3-(addr % 4); int length = 3-(addr % 4);
stream.skip(length); skip(stream, length);
int def = addr + stream.readInt(); int def = addr + stream.readInt();
int low = stream.readInt(); int low = stream.readInt();
int high = stream.readInt(); int high = stream.readInt();
@ -492,7 +508,7 @@ public abstract class Opcodes implements jode.bytecode.Opcodes {
} }
case opc_lookupswitch: { case opc_lookupswitch: {
int length = 3-(addr % 4); int length = 3-(addr % 4);
stream.skip(length); skip(stream, length);
int def = addr + stream.readInt(); int def = addr + stream.readInt();
int npairs = stream.readInt(); int npairs = stream.readInt();
int[] cases = new int[npairs]; int[] cases = new int[npairs];

74
jode/jode/obfuscator/MethodIdentifier.java
Unescape View File

@ -52,7 +52,7 @@ public class MethodIdentifier extends Identifier implements Opcodes {
if (exceptionsattr != null) if (exceptionsattr != null)
readExceptions(exceptionsattr); readExceptions(exceptionsattr);
} catch (IOException ex) { } catch (IOException ex) {
ex.printStackTrace(); ex.printStackTrace(Obfuscator.err);
} }
} }
@ -63,6 +63,22 @@ public class MethodIdentifier extends Identifier implements Opcodes {
} }
} }
/**
* Skips the specified number of bytes in the input stream. This calls
* skip as long until the bytes are all skipped.
* @param is the inputstream to skip.
* @param count the number of bytes to skip.
*/
private final static void skip(InputStream is, long count)
throws IOException {
while (count > 0) {
long skipped = is.skip(count);
if (skipped == 0)
throw new EOFException("Can't skip.");
count -= skipped;
}
}
/** /**
* Reads the opcodes out of the code info and determine its * Reads the opcodes out of the code info and determine its
* references * references
@ -84,12 +100,12 @@ public class MethodIdentifier extends Identifier implements Opcodes {
case opc_istore: case opc_lstore: case opc_istore: case opc_lstore:
case opc_fstore: case opc_dstore: case opc_astore: case opc_fstore: case opc_dstore: case opc_astore:
case opc_ret: case opc_ret:
stream.skip(2); skip(stream, 2);
addr+=4; addr+=4;
break; break;
case opc_iinc: case opc_iinc:
stream.skip(4); skip(stream, 4);
addr+=6; addr+=6;
break; break;
default: default:
@ -98,7 +114,7 @@ public class MethodIdentifier extends Identifier implements Opcodes {
break; break;
} }
case opc_ret: case opc_ret:
stream.skip(1); skip(stream, 1);
addr+=2; addr+=2;
break; break;
case opc_sipush: case opc_sipush:
@ -108,28 +124,28 @@ public class MethodIdentifier extends Identifier implements Opcodes {
case opc_ifnull: case opc_ifnonnull: case opc_ifnull: case opc_ifnonnull:
case opc_putstatic: case opc_putstatic:
case opc_putfield: case opc_putfield:
stream.skip(2); skip(stream, 2);
addr+=3; addr+=3;
break; break;
case opc_jsr_w: case opc_jsr_w:
case opc_goto_w: case opc_goto_w:
stream.skip(4); skip(stream, 4);
addr+=5; addr+=5;
break; break;
case opc_tableswitch: { case opc_tableswitch: {
int length = 7-(addr % 4); int length = 7-(addr % 4);
stream.skip(length); skip(stream, length);
int low = stream.readInt(); int low = stream.readInt();
int high = stream.readInt(); int high = stream.readInt();
stream.skip(4*(high-low+1)); skip(stream, 4*(high-low+1));
addr += 9 + length + 4*(high-low+1); addr += 9 + length + 4*(high-low+1);
break; break;
} }
case opc_lookupswitch: { case opc_lookupswitch: {
int length = 7-(addr % 4); int length = 7-(addr % 4);
stream.skip(length); skip(stream, length);
int npairs = stream.readInt(); int npairs = stream.readInt();
stream.skip(8*npairs); skip(stream, 8*npairs);
addr += 5 + length + 8*npairs; addr += 5 + length + 8*npairs;
break; break;
} }
@ -166,7 +182,7 @@ public class MethodIdentifier extends Identifier implements Opcodes {
clazz.bundle.reachableIdentifier(clName, false); clazz.bundle.reachableIdentifier(clName, false);
addr += 3; addr += 3;
if (opcode == opc_multianewarray) { if (opcode == opc_multianewarray) {
stream.skip(1); skip(stream, 1);
addr ++; addr ++;
} }
break; break;
@ -184,7 +200,7 @@ public class MethodIdentifier extends Identifier implements Opcodes {
addr += 3; addr += 3;
if (opcode == opc_invokeinterface) { if (opcode == opc_invokeinterface) {
stream.skip(2); skip(stream, 2);
addr += 2; addr += 2;
} }
break; break;
@ -194,10 +210,10 @@ public class MethodIdentifier extends Identifier implements Opcodes {
if (opcode == opc_newarray if (opcode == opc_newarray
|| (opcode >= opc_bipush && opcode <= opc_aload) || (opcode >= opc_bipush && opcode <= opc_aload)
|| (opcode >= opc_istore && opcode <= opc_astore)) { || (opcode >= opc_istore && opcode <= opc_astore)) {
stream.skip(1); skip(stream, 1);
addr += 2; addr += 2;
} else if (opcode >= opc_ifeq && opcode <= opc_jsr) { } else if (opcode >= opc_ifeq && opcode <= opc_jsr) {
stream.skip(2); skip(stream, 2);
addr += 3; addr += 3;
} else if (opcode == opc_xxxunusedxxx } else if (opcode == opc_xxxunusedxxx
|| opcode >= opc_breakpoint) || opcode >= opc_breakpoint)
@ -242,7 +258,7 @@ public class MethodIdentifier extends Identifier implements Opcodes {
try { try {
analyzeCode(); analyzeCode();
} catch (IOException ex) { } catch (IOException ex) {
ex.printStackTrace(); ex.printStackTrace(Obfuscator.err);
System.exit(0); System.exit(0);
} }
} }
@ -557,7 +573,7 @@ public class MethodIdentifier extends Identifier implements Opcodes {
output.writeShort(0); // No Attributes; output.writeShort(0); // No Attributes;
output.close(); output.close();
} catch (IOException ex) { } catch (IOException ex) {
ex.printStackTrace(); ex.printStackTrace(Obfuscator.err);
code = null; code = null;
return; return;
} }
@ -590,12 +606,12 @@ public class MethodIdentifier extends Identifier implements Opcodes {
case opc_istore: case opc_lstore: case opc_istore: case opc_lstore:
case opc_fstore: case opc_dstore: case opc_astore: case opc_fstore: case opc_dstore: case opc_astore:
case opc_ret: case opc_ret:
stream.skip(2); skip(stream, 2);
addr+=4; addr+=4;
break; break;
case opc_iinc: case opc_iinc:
stream.skip(4); skip(stream, 4);
addr+=6; addr+=6;
break; break;
default: default:
@ -605,23 +621,23 @@ public class MethodIdentifier extends Identifier implements Opcodes {
} }
case opc_tableswitch: { case opc_tableswitch: {
int length = 7-(addr % 4); int length = 7-(addr % 4);
stream.skip(length); skip(stream, length);
int low = stream.readInt(); int low = stream.readInt();
int high = stream.readInt(); int high = stream.readInt();
stream.skip(4*(high-low+1)); skip(stream, 4*(high-low+1));
addr += 9 + length + 4*(high-low+1); addr += 9 + length + 4*(high-low+1);
break; break;
} }
case opc_lookupswitch: { case opc_lookupswitch: {
int length = 7-(addr % 4); int length = 7-(addr % 4);
stream.skip(length); skip(stream, length);
int npairs = stream.readInt(); int npairs = stream.readInt();
stream.skip(8*npairs); skip(stream, 8*npairs);
addr += 5 + length + 8*npairs; addr += 5 + length + 8*npairs;
break; break;
} }
case opc_ret: case opc_ret:
stream.skip(1); skip(stream, 1);
addr+=2; addr+=2;
break; break;
case opc_sipush: case opc_sipush:
@ -633,28 +649,28 @@ public class MethodIdentifier extends Identifier implements Opcodes {
case opc_anewarray: case opc_anewarray:
case opc_checkcast: case opc_checkcast:
case opc_instanceof: case opc_instanceof:
stream.skip(2); skip(stream, 2);
addr+=3; addr+=3;
break; break;
case opc_multianewarray: case opc_multianewarray:
stream.skip(3); skip(stream, 3);
addr += 4; addr += 4;
break; break;
case opc_jsr_w: case opc_jsr_w:
case opc_goto_w: case opc_goto_w:
case opc_invokeinterface: case opc_invokeinterface:
stream.skip(4); skip(stream, 4);
addr+=5; addr+=5;
break; break;
default: default:
if (opcode == opc_newarray if (opcode == opc_newarray
|| (opcode >= opc_bipush && opcode <= opc_aload) || (opcode >= opc_bipush && opcode <= opc_aload)
|| (opcode >= opc_istore && opcode <= opc_astore)) { || (opcode >= opc_istore && opcode <= opc_astore)) {
stream.skip(1); skip(stream, 1);
addr += 2; addr += 2;
} else if (opcode >= opc_ifeq && opcode <= opc_jsr } else if (opcode >= opc_ifeq && opcode <= opc_jsr
|| opcode >= opc_getstatic && opcode <= opc_invokestatic) { || opcode >= opc_getstatic && opcode <= opc_invokestatic) {
stream.skip(2); skip(stream, 2);
addr += 3; addr += 3;
} else if (opcode == opc_xxxunusedxxx } else if (opcode == opc_xxxunusedxxx
|| opcode >= opc_breakpoint) || opcode >= opc_breakpoint)
@ -664,7 +680,7 @@ public class MethodIdentifier extends Identifier implements Opcodes {
} }
} }
} catch (IOException ex) { } catch (IOException ex) {
ex.printStackTrace(); ex.printStackTrace(Obfuscator.err);
} }
} }
} }

Write Preview
Loading…
Cancel
Save