Some branching/jumping

src/main/java/info/sigterm/deob/attributes/code/instructions/AALoad.java

@@ -3,6 +3,7 @@ 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 info.sigterm.deob.execution.ArrayInstance;
 import info.sigterm.deob.execution.Frame;
 import info.sigterm.deob.execution.Stack;
 
@@ -19,8 +20,8 @@ public class AALoad extends Instruction
 		Stack stack = frame.getStack();
 		
 		int index = (int) stack.pop();
-		Object[] array = (Object[]) stack.pop();
+		ArrayInstance array = (ArrayInstance) stack.pop();
 		
-		stack.push(array[index]);
+		stack.push(array.get(index));
 	}
 }

src/main/java/info/sigterm/deob/attributes/code/instructions/AAStore.java

@@ -3,7 +3,9 @@ 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 info.sigterm.deob.execution.ArrayInstance;
 import info.sigterm.deob.execution.Frame;
+import info.sigterm.deob.execution.ObjectInstance;
 import info.sigterm.deob.execution.Stack;
 
 public class AAStore extends Instruction
@@ -18,10 +20,10 @@ public class AAStore extends Instruction
 	{
 		Stack stack = frame.getStack();
 		
-		Object value = stack.pop();
+		ObjectInstance value = (ObjectInstance) stack.pop();
 		int index = (int) stack.pop();
-		Object[] array = (Object[]) stack.pop();
+		ArrayInstance array = (ArrayInstance) stack.pop();
 		
-		array[index] = value;
+		array.put(value, index);
 	}
 }

src/main/java/info/sigterm/deob/attributes/code/instructions/ALoad.java

@@ -3,6 +3,7 @@ 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 info.sigterm.deob.execution.Frame;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -20,4 +21,10 @@ public class ALoad extends Instruction
 		length += 1;
 	}
 
+	@Override
+	public void execute(Frame frame)
+	{
+		Object obj = frame.getVariables().get(index);
+		frame.getStack().push(obj);
+	}
 }

src/main/java/info/sigterm/deob/attributes/code/instructions/ANewArray.java

@@ -1,8 +1,13 @@
 package info.sigterm.deob.attributes.code.instructions;
 
+import info.sigterm.deob.ClassFile;
 import info.sigterm.deob.attributes.code.Instruction;
 import info.sigterm.deob.attributes.code.InstructionType;
 import info.sigterm.deob.attributes.code.Instructions;
+import info.sigterm.deob.execution.ArrayInstance;
+import info.sigterm.deob.execution.ClassInstance;
+import info.sigterm.deob.execution.Frame;
+import info.sigterm.deob.pool.Class;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -20,4 +25,24 @@ public class ANewArray extends Instruction
 		length += 2;
 	}
 
+	@Override
+	public void execute(Frame frame)
+	{
+		ClassFile thisClass = this.getInstructions().getCode().getAttributes().getClassFile();
+		Class clazz = (Class) thisClass.getPool().getEntry(index);
+		
+		int count = (int) frame.getStack().pop();
+		
+		ClassFile cf = thisClass.getGroup().findClass(clazz.getName());
+		if (cf == null)
+		{
+			frame.getStack().push(null);
+			return;
+		}
+		
+		ClassInstance type = frame.getPath().getClassInstance(cf);
+		ArrayInstance array = frame.getPath().createArray(type, count);
+		
+		frame.getStack().push(array);
+	}
 }

src/main/java/info/sigterm/deob/attributes/code/instructions/BiPush.java

@@ -3,6 +3,7 @@ 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 info.sigterm.deob.execution.Frame;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -20,4 +21,9 @@ public class BiPush extends Instruction
 		length += 1;
 	}
 
+	@Override
+	public void execute(Frame frame)
+	{
+		frame.getStack().push((int) b);
+	}
 }

src/main/java/info/sigterm/deob/attributes/code/instructions/CheckCast.java

@@ -1,8 +1,13 @@
 package info.sigterm.deob.attributes.code.instructions;
 
+import info.sigterm.deob.ClassFile;
+import info.sigterm.deob.ConstantPool;
 import info.sigterm.deob.attributes.code.Instruction;
 import info.sigterm.deob.attributes.code.InstructionType;
 import info.sigterm.deob.attributes.code.Instructions;
+import info.sigterm.deob.execution.Frame;
+import info.sigterm.deob.execution.ObjectInstance;
+import info.sigterm.deob.pool.Class;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -20,4 +25,30 @@ public class CheckCast extends Instruction
 		length += 2;
 	}
 
+	@Override
+	public void execute(Frame e)
+	{
+		ClassFile thisClass = this.getInstructions().getCode().getAttributes().getClassFile();
+
+		ConstantPool pool = thisClass.getPool();
+		Class clazz = (Class) pool.getEntry(index);
+		
+		ObjectInstance obj = (ObjectInstance) e.getStack().pop();
+		if (obj == null)
+		{
+			e.getStack().push(null);
+			return;
+		}
+		
+		ClassFile otherClass = thisClass.getGroup().findClass(clazz.getName());
+		boolean instanceOf = obj.getType().getClassFile().instanceOf(otherClass);
+		
+		if (!instanceOf)
+		{
+			// XXX throw
+		}
+		
+		e.getStack().push(obj);
+	}
+
 }

src/main/java/info/sigterm/deob/attributes/code/instructions/DLoad.java

@@ -3,6 +3,7 @@ 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 info.sigterm.deob.execution.Frame;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -20,4 +21,10 @@ public class DLoad extends Instruction
 		length += 1;
 	}
 
+	@Override
+	public void execute(Frame frame)
+	{
+		double d = (double) frame.getVariables().get(index);
+		frame.getStack().push(d);
+	}
 }

src/main/java/info/sigterm/deob/attributes/code/instructions/DStore.java

@@ -3,6 +3,7 @@ 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 info.sigterm.deob.execution.Frame;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -20,4 +21,10 @@ public class DStore extends Instruction
 		length += 1;
 	}
 
+	@Override
+	public void execute(Frame frame)
+	{
+		double d = (double) frame.getStack().pop();
+		frame.getVariables().set(index, d);
+	}
 }

src/main/java/info/sigterm/deob/attributes/code/instructions/FLoad.java

@@ -3,6 +3,7 @@ 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 info.sigterm.deob.execution.Frame;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -20,4 +21,10 @@ public class FLoad extends Instruction
 		length += 1;
 	}
 
+	@Override
+	public void execute(Frame frame)
+	{
+		float f = (float) frame.getVariables().get(index);
+		frame.getStack().push(f);
+	}
 }

src/main/java/info/sigterm/deob/attributes/code/instructions/FStore.java

@@ -3,6 +3,7 @@ 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 info.sigterm.deob.execution.Frame;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -20,4 +21,10 @@ public class FStore extends Instruction
 		length += 1;
 	}
 
+	@Override
+	public void execute(Frame frame)
+	{
+		float f = (float) frame.getStack().pop();
+		frame.getVariables().set(index, f);
+	}
 }

src/main/java/info/sigterm/deob/attributes/code/instructions/GetField.java

@@ -1,8 +1,15 @@
 package info.sigterm.deob.attributes.code.instructions;
 
+import info.sigterm.deob.ClassFile;
+import info.sigterm.deob.ConstantPool;
 import info.sigterm.deob.attributes.code.Instruction;
 import info.sigterm.deob.attributes.code.InstructionType;
 import info.sigterm.deob.attributes.code.Instructions;
+import info.sigterm.deob.execution.FieldInstance;
+import info.sigterm.deob.execution.Frame;
+import info.sigterm.deob.execution.ObjectInstance;
+import info.sigterm.deob.pool.Field;
+import info.sigterm.deob.pool.NameAndType;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -20,4 +27,19 @@ public class GetField extends Instruction
 		length += 2;
 	}
 
+	@Override
+	public void execute(Frame frame)
+	{
+		ObjectInstance object = (ObjectInstance) frame.getStack().pop();
+		
+		ClassFile thisClass = this.getInstructions().getCode().getAttributes().getClassFile();
+
+		ConstantPool pool = thisClass.getPool();
+		Field entry = (Field) pool.getEntry(index);
+
+		NameAndType nat = entry.getNameAndType();
+		
+		FieldInstance field = object.getField(nat);
+		frame.getStack().push(field.getValue());
+	}
 }

src/main/java/info/sigterm/deob/attributes/code/instructions/Goto.java

@@ -3,15 +3,16 @@ 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 info.sigterm.deob.execution.Frame;
 
 import java.io.DataInputStream;
 import java.io.IOException;
 
-public class Branch extends Instruction
+public class Goto extends Instruction
 {
 	private short offset;
 
-	public Branch(Instructions instructions, InstructionType type, int pc) throws IOException
+	public Goto(Instructions instructions, InstructionType type, int pc) throws IOException
 	{
 		super(instructions, type, pc);
 
@@ -25,4 +26,10 @@ public class Branch extends Instruction
 	{
 		this.addJump(offset);
 	}
+	
+	@Override
+	public void execute(Frame e)
+	{
+		e.jump(offset);
+	}
 }

src/main/java/info/sigterm/deob/attributes/code/instructions/GotoW.java

@@ -3,6 +3,7 @@ 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 info.sigterm.deob.execution.Frame;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -25,4 +26,10 @@ public class GotoW extends Instruction
 	{
 		this.addJump(offset);
 	}
+	
+	@Override
+	public void execute(Frame e)
+	{
+		e.jump(offset);
+	}
 }

src/main/java/info/sigterm/deob/attributes/code/instructions/IInc.java

@@ -3,6 +3,7 @@ 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 info.sigterm.deob.execution.Frame;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -22,4 +23,11 @@ public class IInc extends Instruction
 		length += 2;
 	}
 
+	@Override
+	public void execute(Frame frame)
+	{
+		int i = (int) frame.getVariables().get(index);
+		i += inc;
+		frame.getVariables().set(index, i);
+	}
 }

src/main/java/info/sigterm/deob/attributes/code/instructions/ILoad.java

@@ -3,6 +3,7 @@ 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 info.sigterm.deob.execution.Frame;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -20,4 +21,10 @@ public class ILoad extends Instruction
 		length += 1;
 	}
 
+	@Override
+	public void execute(Frame frame)
+	{
+		int i = (int) frame.getVariables().get(index);
+		frame.getStack().push(i);
+	}
 }

src/main/java/info/sigterm/deob/attributes/code/instructions/If.java

@@ -0,0 +1,41 @@
+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 info.sigterm.deob.execution.Frame;
+import info.sigterm.deob.execution.Path;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+
+public class If extends Instruction
+{
+	private short offset;
+
+	public If(Instructions instructions, InstructionType type, int pc) throws IOException
+	{
+		super(instructions, type, pc);
+
+		DataInputStream is = instructions.getCode().getAttributes().getStream();
+		offset = is.readShort();
+		length += 2;
+	}
+
+	@Override
+	public void buildJumpGraph()
+	{
+		this.addJump(offset);
+	}
+	
+	@Override
+	public void execute(Frame e)
+	{
+		e.getStack().pop();
+		e.getStack().pop();
+		
+		Path other = e.getPath().dup();
+		Frame frame = other.getCurrentFrame();
+		frame.jump(offset);
+	}
+}

src/main/java/info/sigterm/deob/attributes/code/instructions/If0.java

@@ -3,21 +3,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 info.sigterm.deob.execution.Frame;
+import info.sigterm.deob.execution.Path;
 
 import java.io.DataInputStream;
 import java.io.IOException;
 
-public class JSR_W extends Instruction
+public class If0 extends Instruction
 {
-	private int offset;
+	private short offset;
 
-	public JSR_W(Instructions instructions, InstructionType type, int pc) throws IOException
+	public If0(Instructions instructions, InstructionType type, int pc) throws IOException
 	{
 		super(instructions, type, pc);
 
 		DataInputStream is = instructions.getCode().getAttributes().getStream();
-		offset = is.readInt();
-		length += 4;
+		offset = is.readShort();
+		length += 2;
 	}
 
 	@Override
@@ -25,4 +27,14 @@ public class JSR_W extends Instruction
 	{
 		this.addJump(offset);
 	}
+
+	@Override
+	public void execute(Frame e)
+	{
+		e.getStack().pop();
+		
+		Path other = e.getPath().dup();
+		Frame frame = other.getCurrentFrame();
+		frame.jump(offset);
+	}
 }

src/main/java/info/sigterm/deob/attributes/code/instructions/IfNonNull.java

@@ -1,23 +0,0 @@
-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;
-	}
-
-}

src/main/java/info/sigterm/deob/attributes/code/instructions/IfNull.java

@@ -1,23 +0,0 @@
-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;
-	}
-
-}

src/main/java/info/sigterm/deob/attributes/code/instructions/InstanceOf.java

@@ -1,8 +1,13 @@
 package info.sigterm.deob.attributes.code.instructions;
 
+import info.sigterm.deob.ClassFile;
+import info.sigterm.deob.ConstantPool;
 import info.sigterm.deob.attributes.code.Instruction;
 import info.sigterm.deob.attributes.code.InstructionType;
 import info.sigterm.deob.attributes.code.Instructions;
+import info.sigterm.deob.execution.Frame;
+import info.sigterm.deob.execution.ObjectInstanceBase;
+import info.sigterm.deob.pool.Class;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -20,4 +25,24 @@ public class InstanceOf extends Instruction
 		length += 2;
 	}
 
+	@Override
+	public void execute(Frame e)
+	{
+		ClassFile thisClass = this.getInstructions().getCode().getAttributes().getClassFile();
+
+		ConstantPool pool = thisClass.getPool();
+		Class clazz = (Class) pool.getEntry(index);
+		
+		ObjectInstanceBase obj = (ObjectInstanceBase) e.getStack().pop();
+		if (obj == null)
+		{
+			e.getStack().push(0);
+			return;
+			
+		}
+		
+		ClassFile otherClass = thisClass.getGroup().findClass(clazz.getName());
+		boolean instanceOf = obj.getType().getClassFile().instanceOf(otherClass);
+		e.getStack().push(instanceOf ? 1 : 0);
+	}
 }

src/main/java/info/sigterm/deob/attributes/code/instructions/LDC.java

@@ -1,8 +1,11 @@
 package info.sigterm.deob.attributes.code.instructions;
 
+import info.sigterm.deob.ClassFile;
 import info.sigterm.deob.attributes.code.Instruction;
 import info.sigterm.deob.attributes.code.InstructionType;
 import info.sigterm.deob.attributes.code.Instructions;
+import info.sigterm.deob.execution.Frame;
+import info.sigterm.deob.pool.PoolEntry;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -20,4 +23,11 @@ public class LDC extends Instruction
 		length += 1;
 	}
 
+	@Override
+	public void execute(Frame frame)
+	{
+		ClassFile thisClass = this.getInstructions().getCode().getAttributes().getClassFile();
+		PoolEntry entry = thisClass.getPool().getEntry(index);
+		frame.getStack().push(entry.getObject());
+	}
 }

src/main/java/info/sigterm/deob/attributes/code/instructions/LDC2_W.java

@@ -1,8 +1,11 @@
 package info.sigterm.deob.attributes.code.instructions;
 
+import info.sigterm.deob.ClassFile;
 import info.sigterm.deob.attributes.code.Instruction;
 import info.sigterm.deob.attributes.code.InstructionType;
 import info.sigterm.deob.attributes.code.Instructions;
+import info.sigterm.deob.execution.Frame;
+import info.sigterm.deob.pool.PoolEntry;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -20,4 +23,11 @@ public class LDC2_W extends Instruction
 		length += 2;
 	}
 
+	@Override
+	public void execute(Frame frame)
+	{
+		ClassFile thisClass = this.getInstructions().getCode().getAttributes().getClassFile();
+		PoolEntry entry = thisClass.getPool().getEntry(index);
+		frame.getStack().push(entry.getObject());
+	}
 }

src/main/java/info/sigterm/deob/attributes/code/instructions/LDC_W.java

@@ -1,8 +1,11 @@
 package info.sigterm.deob.attributes.code.instructions;
 
+import info.sigterm.deob.ClassFile;
 import info.sigterm.deob.attributes.code.Instruction;
 import info.sigterm.deob.attributes.code.InstructionType;
 import info.sigterm.deob.attributes.code.Instructions;
+import info.sigterm.deob.execution.Frame;
+import info.sigterm.deob.pool.PoolEntry;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -20,4 +23,11 @@ public class LDC_W extends Instruction
 		length += 2;
 	}
 
+	@Override
+	public void execute(Frame frame)
+	{
+		ClassFile thisClass = this.getInstructions().getCode().getAttributes().getClassFile();
+		PoolEntry entry = thisClass.getPool().getEntry(index);
+		frame.getStack().push(entry.getObject());
+	}
 }

src/main/java/info/sigterm/deob/attributes/code/instructions/LLoad.java

@@ -3,6 +3,7 @@ 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 info.sigterm.deob.execution.Frame;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -20,4 +21,10 @@ public class LLoad extends Instruction
 		length += 1;
 	}
 
+	@Override
+	public void execute(Frame frame)
+	{
+		long l = (long) frame.getVariables().get(index);
+		frame.getStack().push(l);
+	}
 }

src/main/java/info/sigterm/deob/attributes/code/instructions/LStore.java

@@ -3,6 +3,7 @@ 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 info.sigterm.deob.execution.Frame;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -20,4 +21,10 @@ public class LStore extends Instruction
 		length += 1;
 	}
 
+	@Override
+	public void execute(Frame frame)
+	{
+		long l = (long) frame.getStack().pop();
+		frame.getVariables().set(index, l);
+	}
 }

src/main/java/info/sigterm/deob/attributes/code/instructions/MonitorEnter.java

@@ -0,0 +1,19 @@
+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 info.sigterm.deob.execution.Frame;
+
+public class MonitorEnter extends Instruction
+{
+	public MonitorEnter(Instructions instructions, InstructionType type, int pc)
+	{
+		super(instructions, type, pc);
+	}
+
+	@Override
+	public void execute(Frame frame)
+	{
+	}
+}

src/main/java/info/sigterm/deob/attributes/code/instructions/MonitorExit.java

@@ -0,0 +1,19 @@
+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 info.sigterm.deob.execution.Frame;
+
+public class MonitorExit extends Instruction
+{
+	public MonitorExit(Instructions instructions, InstructionType type, int pc)
+	{
+		super(instructions, type, pc);
+	}
+
+	@Override
+	public void execute(Frame frame)
+	{
+	}
+}

src/main/java/info/sigterm/deob/attributes/code/instructions/Ret.java

@@ -1,23 +0,0 @@
-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;
-	}
-
-}

src/main/java/info/sigterm/deob/attributes/code/instructions/SiPush.java

@@ -3,6 +3,7 @@ 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 info.sigterm.deob.execution.Frame;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -20,4 +21,9 @@ public class SiPush extends Instruction
 		length += 2;
 	}
 
+	@Override
+	public void execute(Frame frame)
+	{
+		frame.getStack().push(s);
+	}
 }