diff --git a/src/main/java/info/sigterm/deob/attributes/code/ALoad.java b/src/main/java/info/sigterm/deob/attributes/code/ALoad.java deleted file mode 100644 index 32511b5d30..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/ALoad.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class ALoad extends Instruction -{ - int index; - - ALoad(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - index = is.readByte(); - length += 1; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/ANewArray.java b/src/main/java/info/sigterm/deob/attributes/code/ANewArray.java deleted file mode 100644 index 35c7f64d06..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/ANewArray.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class ANewArray extends Instruction -{ - private int index; - - ANewArray(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - index = is.readUnsignedShort(); - length += 2; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/AStore.java b/src/main/java/info/sigterm/deob/attributes/code/AStore.java deleted file mode 100644 index a97eb368be..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/AStore.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class AStore extends Instruction -{ - int index; - - AStore(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - index = is.readByte(); - length += 1; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/BiPush.java b/src/main/java/info/sigterm/deob/attributes/code/BiPush.java deleted file mode 100644 index 656688febe..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/BiPush.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class BiPush extends Instruction -{ - byte b; - - BiPush(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - b = is.readByte(); - length += 1; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/Branch.java b/src/main/java/info/sigterm/deob/attributes/code/Branch.java deleted file mode 100644 index b49974c951..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/Branch.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class Branch extends Instruction -{ - short offset; - - Branch(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - offset = is.readShort(); - length += 2; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/CheckCast.java b/src/main/java/info/sigterm/deob/attributes/code/CheckCast.java deleted file mode 100644 index 6ed3b3bef2..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/CheckCast.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class CheckCast extends Instruction -{ - private int index; - - CheckCast(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - index = is.readUnsignedShort(); - length += 2; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/DLoad.java b/src/main/java/info/sigterm/deob/attributes/code/DLoad.java deleted file mode 100644 index 1a1ad1ba0d..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/DLoad.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class DLoad extends Instruction -{ - private int index; - - DLoad(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - index = is.readByte(); - length += 1; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/DStore.java b/src/main/java/info/sigterm/deob/attributes/code/DStore.java deleted file mode 100644 index ec91abf9a7..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/DStore.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class DStore extends Instruction -{ - int index; - - DStore(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - index = is.readByte(); - length += 1; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/Exception.java b/src/main/java/info/sigterm/deob/attributes/code/Exception.java index d59672397c..6d9c2f9b69 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/Exception.java +++ b/src/main/java/info/sigterm/deob/attributes/code/Exception.java @@ -12,7 +12,7 @@ class Exception private int handlerPc; private int catchType; - Exception(Exceptions exceptions) throws IOException + public Exception(Exceptions exceptions) throws IOException { this.exceptions = exceptions; diff --git a/src/main/java/info/sigterm/deob/attributes/code/FLoad.java b/src/main/java/info/sigterm/deob/attributes/code/FLoad.java deleted file mode 100644 index d86cbad48f..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/FLoad.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class FLoad extends Instruction -{ - private int index; - - FLoad(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - index = is.readByte(); - length += 1; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/FStore.java b/src/main/java/info/sigterm/deob/attributes/code/FStore.java deleted file mode 100644 index 951dd41261..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/FStore.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class FStore extends Instruction -{ - int index; - - FStore(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - index = is.readByte(); - length += 1; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/GetField.java b/src/main/java/info/sigterm/deob/attributes/code/GetField.java deleted file mode 100644 index 2ce8f8772a..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/GetField.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class GetField extends Instruction -{ - private int index; - - GetField(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - index = is.readUnsignedShort(); - length += 2; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/GetStatic.java b/src/main/java/info/sigterm/deob/attributes/code/GetStatic.java deleted file mode 100644 index 4e202b3c82..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/GetStatic.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class GetStatic extends Instruction -{ - private int index; - - GetStatic(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - index = is.readUnsignedShort(); - length += 2; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/GotoW.java b/src/main/java/info/sigterm/deob/attributes/code/GotoW.java deleted file mode 100644 index 70d45406c1..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/GotoW.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class GotoW extends Instruction -{ - private int offset; - - GotoW(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - offset = is.readInt(); - length += 4; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/IInc.java b/src/main/java/info/sigterm/deob/attributes/code/IInc.java deleted file mode 100644 index 97278bb08c..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/IInc.java +++ /dev/null @@ -1,21 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class IInc extends Instruction -{ - byte index; - byte inc; - - IInc(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - index = is.readByte(); - inc = is.readByte(); - length += 2; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/ILoad.java b/src/main/java/info/sigterm/deob/attributes/code/ILoad.java deleted file mode 100644 index 3c999f1e59..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/ILoad.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class ILoad extends Instruction -{ - int index; - - ILoad(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - index = is.readByte(); - length += 1; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/IStore.java b/src/main/java/info/sigterm/deob/attributes/code/IStore.java deleted file mode 100644 index 4753b1c368..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/IStore.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class IStore extends Instruction -{ - int index; - - IStore(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - index = is.readByte(); - length += 1; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/IfNonNull.java b/src/main/java/info/sigterm/deob/attributes/code/IfNonNull.java deleted file mode 100644 index ff440ce7b9..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/IfNonNull.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class IfNonNull extends Instruction -{ - private int index; - - IfNonNull(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - index = is.readUnsignedShort(); - length += 2; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/IfNull.java b/src/main/java/info/sigterm/deob/attributes/code/IfNull.java deleted file mode 100644 index c6be8e8fbc..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/IfNull.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class IfNull extends Instruction -{ - private int index; - - IfNull(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - index = is.readUnsignedShort(); - length += 2; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/InstanceOf.java b/src/main/java/info/sigterm/deob/attributes/code/InstanceOf.java deleted file mode 100644 index 89c16c374b..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/InstanceOf.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class InstanceOf extends Instruction -{ - private int index; - - InstanceOf(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - index = is.readUnsignedShort(); - length += 2; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/InstructionType.java b/src/main/java/info/sigterm/deob/attributes/code/InstructionType.java index 343307a40c..58fe7aa145 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/InstructionType.java +++ b/src/main/java/info/sigterm/deob/attributes/code/InstructionType.java @@ -1,5 +1,45 @@ package info.sigterm.deob.attributes.code; +import info.sigterm.deob.attributes.code.instructions.ALoad; +import info.sigterm.deob.attributes.code.instructions.ANewArray; +import info.sigterm.deob.attributes.code.instructions.AStore; +import info.sigterm.deob.attributes.code.instructions.BiPush; +import info.sigterm.deob.attributes.code.instructions.Branch; +import info.sigterm.deob.attributes.code.instructions.CheckCast; +import info.sigterm.deob.attributes.code.instructions.DLoad; +import info.sigterm.deob.attributes.code.instructions.DStore; +import info.sigterm.deob.attributes.code.instructions.FLoad; +import info.sigterm.deob.attributes.code.instructions.FStore; +import info.sigterm.deob.attributes.code.instructions.GetField; +import info.sigterm.deob.attributes.code.instructions.GetStatic; +import info.sigterm.deob.attributes.code.instructions.GotoW; +import info.sigterm.deob.attributes.code.instructions.IInc; +import info.sigterm.deob.attributes.code.instructions.ILoad; +import info.sigterm.deob.attributes.code.instructions.IStore; +import info.sigterm.deob.attributes.code.instructions.IfNonNull; +import info.sigterm.deob.attributes.code.instructions.IfNull; +import info.sigterm.deob.attributes.code.instructions.InstanceOf; +import info.sigterm.deob.attributes.code.instructions.InvokeInterface; +import info.sigterm.deob.attributes.code.instructions.InvokeSpecial; +import info.sigterm.deob.attributes.code.instructions.InvokeStatic; +import info.sigterm.deob.attributes.code.instructions.InvokeVirtual; +import info.sigterm.deob.attributes.code.instructions.JSR_W; +import info.sigterm.deob.attributes.code.instructions.LDC; +import info.sigterm.deob.attributes.code.instructions.LDC2_W; +import info.sigterm.deob.attributes.code.instructions.LDC_W; +import info.sigterm.deob.attributes.code.instructions.LLoad; +import info.sigterm.deob.attributes.code.instructions.LStore; +import info.sigterm.deob.attributes.code.instructions.LookupSwitch; +import info.sigterm.deob.attributes.code.instructions.MultiANewArray; +import info.sigterm.deob.attributes.code.instructions.New; +import info.sigterm.deob.attributes.code.instructions.NewArray; +import info.sigterm.deob.attributes.code.instructions.PutField; +import info.sigterm.deob.attributes.code.instructions.PutStatic; +import info.sigterm.deob.attributes.code.instructions.Ret; +import info.sigterm.deob.attributes.code.instructions.SiPush; +import info.sigterm.deob.attributes.code.instructions.TableSwitch; +import info.sigterm.deob.attributes.code.instructions.Wide; + public enum InstructionType { NOP(0x00, "nop", Instruction.class), diff --git a/src/main/java/info/sigterm/deob/attributes/code/Instructions.java b/src/main/java/info/sigterm/deob/attributes/code/Instructions.java index b5be55489a..17ed7cb8cf 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/Instructions.java +++ b/src/main/java/info/sigterm/deob/attributes/code/Instructions.java @@ -37,7 +37,6 @@ public class Instructions } catch (java.lang.Exception ex) { - System.out.println(type); throw new IOException(ex); } } diff --git a/src/main/java/info/sigterm/deob/attributes/code/InvokeInterface.java b/src/main/java/info/sigterm/deob/attributes/code/InvokeInterface.java deleted file mode 100644 index b261a75781..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/InvokeInterface.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class InvokeInterface extends Instruction -{ - private int index; - - InvokeInterface(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - index = is.readUnsignedShort(); - length += 2; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/InvokeStatic.java b/src/main/java/info/sigterm/deob/attributes/code/InvokeStatic.java deleted file mode 100644 index 80059a888a..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/InvokeStatic.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class InvokeStatic extends Instruction -{ - private int index; - - InvokeStatic(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - index = is.readUnsignedShort(); - length += 2; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/InvokeVirtual.java b/src/main/java/info/sigterm/deob/attributes/code/InvokeVirtual.java deleted file mode 100644 index d1a06d63d5..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/InvokeVirtual.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class InvokeVirtual extends Instruction -{ - private int index; - - InvokeVirtual(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - index = is.readUnsignedShort(); - length += 2; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/JSR_W.java b/src/main/java/info/sigterm/deob/attributes/code/JSR_W.java deleted file mode 100644 index 28097e4923..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/JSR_W.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class JSR_W extends Instruction -{ - private int offset; - - JSR_W(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - offset = is.readInt(); - length += 4; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/LDC.java b/src/main/java/info/sigterm/deob/attributes/code/LDC.java deleted file mode 100644 index 79c4e4588b..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/LDC.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class LDC extends Instruction -{ - int index; - - LDC(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - index = is.readByte(); - length += 1; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/LDC2_W.java b/src/main/java/info/sigterm/deob/attributes/code/LDC2_W.java deleted file mode 100644 index 0be79fd7c0..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/LDC2_W.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class LDC2_W extends Instruction -{ - int index; - - LDC2_W(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - index = is.readUnsignedShort(); - length += 2; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/LDC_W.java b/src/main/java/info/sigterm/deob/attributes/code/LDC_W.java deleted file mode 100644 index 7e78b9e6b3..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/LDC_W.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class LDC_W extends Instruction -{ - int index; - - LDC_W(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - index = is.readUnsignedShort(); - length += 2; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/LLoad.java b/src/main/java/info/sigterm/deob/attributes/code/LLoad.java deleted file mode 100644 index 5118d5fc65..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/LLoad.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class LLoad extends Instruction -{ - int index; - - LLoad(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - index = is.readByte(); - length += 1; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/LStore.java b/src/main/java/info/sigterm/deob/attributes/code/LStore.java deleted file mode 100644 index b5e83e9257..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/LStore.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class LStore extends Instruction -{ - int index; - - LStore(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - index = is.readByte(); - length += 1; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/New.java b/src/main/java/info/sigterm/deob/attributes/code/New.java deleted file mode 100644 index f4eb111057..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/New.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class New extends Instruction -{ - private int index; - - New(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - index = is.readUnsignedShort(); - length += 2; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/NewArray.java b/src/main/java/info/sigterm/deob/attributes/code/NewArray.java deleted file mode 100644 index dff3297c5f..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/NewArray.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class NewArray extends Instruction -{ - private int type; - - NewArray(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - this.type = is.readUnsignedByte(); - length += 1; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/PutField.java b/src/main/java/info/sigterm/deob/attributes/code/PutField.java deleted file mode 100644 index c726f91259..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/PutField.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class PutField extends Instruction -{ - private int index; - - PutField(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - index = is.readUnsignedShort(); - length += 2; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/PutStatic.java b/src/main/java/info/sigterm/deob/attributes/code/PutStatic.java deleted file mode 100644 index 9f7c0e1e9d..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/PutStatic.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class PutStatic extends Instruction -{ - private int index; - - PutStatic(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - index = is.readUnsignedShort(); - length += 2; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/Ret.java b/src/main/java/info/sigterm/deob/attributes/code/Ret.java deleted file mode 100644 index 2edeab4845..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/Ret.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class Ret extends Instruction -{ - int index; - - Ret(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - index = is.readByte(); - length += 1; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/SiPush.java b/src/main/java/info/sigterm/deob/attributes/code/SiPush.java deleted file mode 100644 index d8aaab9c6c..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/SiPush.java +++ /dev/null @@ -1,19 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import java.io.DataInputStream; -import java.io.IOException; - -public class SiPush extends Instruction -{ - short s; - - SiPush(Instructions instructions, InstructionType type, int pc) throws IOException - { - super(instructions, type, pc); - - DataInputStream is = instructions.getCode().getAttributes().getStream(); - s = is.readShort(); - length += 2; - } - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/ALoad.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/ALoad.java new file mode 100644 index 0000000000..0bdb2e0888 --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/ALoad.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class ALoad extends Instruction +{ + private int index; + + public ALoad(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + index = is.readByte(); + length += 1; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/ANewArray.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/ANewArray.java new file mode 100644 index 0000000000..20eab331d5 --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/ANewArray.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class ANewArray extends Instruction +{ + private int index; + + public ANewArray(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + index = is.readUnsignedShort(); + length += 2; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/AStore.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/AStore.java new file mode 100644 index 0000000000..74b5ffd344 --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/AStore.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class AStore extends Instruction +{ + private int index; + + public AStore(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + index = is.readByte(); + length += 1; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/BiPush.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/BiPush.java new file mode 100644 index 0000000000..af5afa2488 --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/BiPush.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class BiPush extends Instruction +{ + private byte b; + + public BiPush(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + b = is.readByte(); + length += 1; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/Branch.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/Branch.java new file mode 100644 index 0000000000..e85d291ee3 --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/Branch.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class Branch extends Instruction +{ + private short offset; + + public Branch(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + offset = is.readShort(); + length += 2; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/CheckCast.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/CheckCast.java new file mode 100644 index 0000000000..f78caf54f4 --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/CheckCast.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class CheckCast extends Instruction +{ + private int index; + + public CheckCast(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + index = is.readUnsignedShort(); + length += 2; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/DLoad.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/DLoad.java new file mode 100644 index 0000000000..0f0bdf6a29 --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/DLoad.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class DLoad extends Instruction +{ + private int index; + + public DLoad(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + index = is.readByte(); + length += 1; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/DStore.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/DStore.java new file mode 100644 index 0000000000..0c333c128f --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/DStore.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class DStore extends Instruction +{ + private int index; + + public DStore(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + index = is.readByte(); + length += 1; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/FLoad.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/FLoad.java new file mode 100644 index 0000000000..6f69167073 --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/FLoad.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class FLoad extends Instruction +{ + private int index; + + public FLoad(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + index = is.readByte(); + length += 1; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/FStore.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/FStore.java new file mode 100644 index 0000000000..7a2af51b65 --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/FStore.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class FStore extends Instruction +{ + private int index; + + public FStore(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + index = is.readByte(); + length += 1; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/GetField.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/GetField.java new file mode 100644 index 0000000000..73f756c814 --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/GetField.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class GetField extends Instruction +{ + private int index; + + public GetField(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + index = is.readUnsignedShort(); + length += 2; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/GetStatic.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/GetStatic.java new file mode 100644 index 0000000000..e0db5d1d65 --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/GetStatic.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class GetStatic extends Instruction +{ + private int index; + + public GetStatic(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + index = is.readUnsignedShort(); + length += 2; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/GotoW.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/GotoW.java new file mode 100644 index 0000000000..f7a81722e3 --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/GotoW.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class GotoW extends Instruction +{ + private int offset; + + public GotoW(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + offset = is.readInt(); + length += 4; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/IInc.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/IInc.java new file mode 100644 index 0000000000..6d0a0ffbdc --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/IInc.java @@ -0,0 +1,25 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class IInc extends Instruction +{ + private byte index; + private byte inc; + + public IInc(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + index = is.readByte(); + inc = is.readByte(); + length += 2; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/ILoad.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/ILoad.java new file mode 100644 index 0000000000..d1cf321c0d --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/ILoad.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class ILoad extends Instruction +{ + private int index; + + public ILoad(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + index = is.readByte(); + length += 1; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/IStore.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/IStore.java new file mode 100644 index 0000000000..be4785533b --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/IStore.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class IStore extends Instruction +{ + private int index; + + public IStore(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + index = is.readByte(); + length += 1; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/IfNonNull.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/IfNonNull.java new file mode 100644 index 0000000000..70b0ae88ad --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/IfNonNull.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class IfNonNull extends Instruction +{ + private int index; + + public IfNonNull(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + index = is.readUnsignedShort(); + length += 2; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/IfNull.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/IfNull.java new file mode 100644 index 0000000000..61ffb4a6dc --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/IfNull.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class IfNull extends Instruction +{ + private int index; + + public IfNull(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + index = is.readUnsignedShort(); + length += 2; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/InstanceOf.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/InstanceOf.java new file mode 100644 index 0000000000..3d416fa64d --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/InstanceOf.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class InstanceOf extends Instruction +{ + private int index; + + public InstanceOf(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + index = is.readUnsignedShort(); + length += 2; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeInterface.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeInterface.java new file mode 100644 index 0000000000..871444edec --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeInterface.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class InvokeInterface extends Instruction +{ + private int index; + + public InvokeInterface(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + index = is.readUnsignedShort(); + length += 2; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/InvokeSpecial.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeSpecial.java similarity index 63% rename from src/main/java/info/sigterm/deob/attributes/code/InvokeSpecial.java rename to src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeSpecial.java index a1ec9ec2c3..a3c8a3e873 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/InvokeSpecial.java +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeSpecial.java @@ -1,4 +1,8 @@ -package info.sigterm.deob.attributes.code; +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; import java.io.DataInputStream; import java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeStatic.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeStatic.java new file mode 100644 index 0000000000..0e0f1b4ca9 --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeStatic.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class InvokeStatic extends Instruction +{ + private int index; + + public InvokeStatic(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + index = is.readUnsignedShort(); + length += 2; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeVirtual.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeVirtual.java new file mode 100644 index 0000000000..d7be48945c --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeVirtual.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class InvokeVirtual extends Instruction +{ + private int index; + + public InvokeVirtual(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + index = is.readUnsignedShort(); + length += 2; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/JSR_W.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/JSR_W.java new file mode 100644 index 0000000000..ddcbc8748b --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/JSR_W.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class JSR_W extends Instruction +{ + private int offset; + + public JSR_W(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + offset = is.readInt(); + length += 4; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LDC.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/LDC.java new file mode 100644 index 0000000000..9fef408e58 --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/LDC.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class LDC extends Instruction +{ + private int index; + + public LDC(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + index = is.readByte(); + length += 1; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LDC2_W.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/LDC2_W.java new file mode 100644 index 0000000000..052726c2f0 --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/LDC2_W.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class LDC2_W extends Instruction +{ + private int index; + + public LDC2_W(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + index = is.readUnsignedShort(); + length += 2; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LDC_W.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/LDC_W.java new file mode 100644 index 0000000000..52f2a1252f --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/LDC_W.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class LDC_W extends Instruction +{ + private int index; + + public LDC_W(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + index = is.readUnsignedShort(); + length += 2; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LLoad.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/LLoad.java new file mode 100644 index 0000000000..344a92f1ea --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/LLoad.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class LLoad extends Instruction +{ + private int index; + + public LLoad(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + index = is.readByte(); + length += 1; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LStore.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/LStore.java new file mode 100644 index 0000000000..ca905d41c1 --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/LStore.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class LStore extends Instruction +{ + private int index; + + public LStore(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + index = is.readByte(); + length += 1; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/LookupSwitch.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/LookupSwitch.java similarity index 67% rename from src/main/java/info/sigterm/deob/attributes/code/LookupSwitch.java rename to src/main/java/info/sigterm/deob/attributes/code/instructions/LookupSwitch.java index 547b12987e..0706be36f7 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/LookupSwitch.java +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/LookupSwitch.java @@ -1,4 +1,8 @@ -package info.sigterm.deob.attributes.code; +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; import java.io.DataInputStream; import java.io.IOException; @@ -9,7 +13,7 @@ public class LookupSwitch extends Instruction private int[] match; private int[] branch; - LookupSwitch(Instructions instructions, InstructionType type, int pc) throws IOException + public LookupSwitch(Instructions instructions, InstructionType type, int pc) throws IOException { super(instructions, type, pc); diff --git a/src/main/java/info/sigterm/deob/attributes/code/MultiANewArray.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/MultiANewArray.java similarity index 52% rename from src/main/java/info/sigterm/deob/attributes/code/MultiANewArray.java rename to src/main/java/info/sigterm/deob/attributes/code/instructions/MultiANewArray.java index 03250e342c..a56d23a799 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/MultiANewArray.java +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/MultiANewArray.java @@ -1,4 +1,8 @@ -package info.sigterm.deob.attributes.code; +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; import java.io.DataInputStream; import java.io.IOException; @@ -8,7 +12,7 @@ public class MultiANewArray extends Instruction private int index; private int dimensions; - MultiANewArray(Instructions instructions, InstructionType type, int pc) throws IOException + public MultiANewArray(Instructions instructions, InstructionType type, int pc) throws IOException { super(instructions, type, pc); diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/New.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/New.java new file mode 100644 index 0000000000..a277d23e43 --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/New.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class New extends Instruction +{ + private int index; + + public New(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + index = is.readUnsignedShort(); + length += 2; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/NewArray.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/NewArray.java new file mode 100644 index 0000000000..b231c3d3db --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/NewArray.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class NewArray extends Instruction +{ + private int type; + + public NewArray(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + this.type = is.readUnsignedByte(); + length += 1; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/PutField.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/PutField.java new file mode 100644 index 0000000000..90818b5da9 --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/PutField.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class PutField extends Instruction +{ + private int index; + + public PutField(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + index = is.readUnsignedShort(); + length += 2; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/PutStatic.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/PutStatic.java new file mode 100644 index 0000000000..d2700378b8 --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/PutStatic.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class PutStatic extends Instruction +{ + private int index; + + public PutStatic(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + index = is.readUnsignedShort(); + length += 2; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/Ret.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/Ret.java new file mode 100644 index 0000000000..cef22a4836 --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/Ret.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class Ret extends Instruction +{ + private int index; + + public Ret(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + index = is.readByte(); + length += 1; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/SiPush.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/SiPush.java new file mode 100644 index 0000000000..4a90d8448e --- /dev/null +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/SiPush.java @@ -0,0 +1,23 @@ +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; + +import java.io.DataInputStream; +import java.io.IOException; + +public class SiPush extends Instruction +{ + private short s; + + public SiPush(Instructions instructions, InstructionType type, int pc) throws IOException + { + super(instructions, type, pc); + + DataInputStream is = instructions.getCode().getAttributes().getStream(); + s = is.readShort(); + length += 2; + } + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/TableSwitch.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/TableSwitch.java similarity index 66% rename from src/main/java/info/sigterm/deob/attributes/code/TableSwitch.java rename to src/main/java/info/sigterm/deob/attributes/code/instructions/TableSwitch.java index 3ea09c65a2..04fafd3b28 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/TableSwitch.java +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/TableSwitch.java @@ -1,4 +1,8 @@ -package info.sigterm.deob.attributes.code; +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; import java.io.DataInputStream; import java.io.IOException; @@ -8,7 +12,7 @@ public class TableSwitch extends Instruction private int def; private int[] jumps; - TableSwitch(Instructions instructions, InstructionType type, int pc) throws IOException + public TableSwitch(Instructions instructions, InstructionType type, int pc) throws IOException { super(instructions, type, pc); diff --git a/src/main/java/info/sigterm/deob/attributes/code/Wide.java b/src/main/java/info/sigterm/deob/attributes/code/instructions/Wide.java similarity index 64% rename from src/main/java/info/sigterm/deob/attributes/code/Wide.java rename to src/main/java/info/sigterm/deob/attributes/code/instructions/Wide.java index d89cfa89f5..cfc4a95e38 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/Wide.java +++ b/src/main/java/info/sigterm/deob/attributes/code/instructions/Wide.java @@ -1,4 +1,8 @@ -package info.sigterm.deob.attributes.code; +package info.sigterm.deob.attributes.code.instructions; + +import info.sigterm.deob.attributes.code.Instruction; +import info.sigterm.deob.attributes.code.InstructionType; +import info.sigterm.deob.attributes.code.Instructions; import java.io.DataInputStream; import java.io.IOException; @@ -9,7 +13,7 @@ public class Wide extends Instruction private int index; private int value; - Wide(Instructions instructions, InstructionType type, int pc) throws IOException + public Wide(Instructions instructions, InstructionType type, int pc) throws IOException { super(instructions, type, pc);