Make frame execute return instruction context. Had to change how wide works some. I dont know if its right. Also pop2 was totally messed up.

src/main/java/net/runelite/asm/attributes/code/Instruction.java

@@ -6,10 +6,9 @@ import net.runelite.asm.execution.Frame;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 import net.runelite.asm.Method;
-import net.runelite.asm.attributes.code.instruction.types.JumpingInstruction;
+import net.runelite.asm.execution.InstructionContext;
 
 public abstract class Instruction implements Cloneable
 {
@@ -181,7 +180,7 @@ public abstract class Instruction implements Cloneable
 		return type.getName() + " at pc " + frame.getPc() + " in " + frame.getMethod().getName() + " " + frame.getMethod().getDescriptor() + " class " + frame.getMethod().getCode().getAttributes().getClassFile().getName();
 	}
 
-	public abstract void execute(Frame e);
+	public abstract InstructionContext execute(Frame e);
 	
 	/* does this terminate a block? */
 	public boolean isTerminal()

src/main/java/net/runelite/asm/attributes/code/instructions/AALoad.java

@@ -17,7 +17,7 @@ public class AALoad extends Instruction implements ArrayLoad
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -32,6 +32,6 @@ public class AALoad extends Instruction implements ArrayLoad
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/AAStore.java

@@ -15,7 +15,7 @@ public class AAStore extends ArrayStore
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -28,7 +28,7 @@ public class AAStore extends ArrayStore
 		
 		array.getValue().arraySet(index.getValue(), value.getValue());
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 
 }

src/main/java/net/runelite/asm/attributes/code/instructions/AConstNull.java

@@ -7,19 +7,17 @@ import net.runelite.asm.execution.Frame;
 import net.runelite.asm.execution.InstructionContext;
 import net.runelite.asm.execution.Stack;
 import net.runelite.asm.execution.StackContext;
-
-import java.io.IOException;
 import net.runelite.asm.execution.Value;
 
 public class AConstNull extends Instruction
 {
-	public AConstNull(Instructions instructions, InstructionType type, int pc) throws IOException
+	public AConstNull(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -29,6 +27,6 @@ public class AConstNull extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/ALoad.java

@@ -28,12 +28,12 @@ public class ALoad extends Instruction implements LVTInstruction, WideInstructio
 		++length;
 	}
 
-	public ALoad(Instructions instructions, InstructionType type, int pc) throws IOException
+	public ALoad(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
 	
-	public ALoad(Instructions instructions, InstructionType type, Instruction instruction, int pc) throws IOException
+	public ALoad(Instructions instructions, InstructionType type, Instruction instruction, int pc)
 	{
 		super(instructions, type, pc);
 		wide = true;
@@ -62,7 +62,7 @@ public class ALoad extends Instruction implements LVTInstruction, WideInstructio
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -76,7 +76,7 @@ public class ALoad extends Instruction implements LVTInstruction, WideInstructio
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/ALoad_0.java

@@ -11,11 +11,10 @@ import net.runelite.asm.execution.StackContext;
 import net.runelite.asm.execution.VariableContext;
 import net.runelite.asm.execution.Variables;
 
-import java.io.IOException;
 
 public class ALoad_0 extends Instruction implements LVTInstruction
 {
-	public ALoad_0(Instructions instructions, InstructionType type, int pc) throws IOException
+	public ALoad_0(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
@@ -26,7 +25,7 @@ public class ALoad_0 extends Instruction implements LVTInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -40,7 +39,7 @@ public class ALoad_0 extends Instruction implements LVTInstruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/ALoad_1.java

@@ -11,11 +11,10 @@ import net.runelite.asm.execution.StackContext;
 import net.runelite.asm.execution.VariableContext;
 import net.runelite.asm.execution.Variables;
 
-import java.io.IOException;
 
 public class ALoad_1 extends Instruction implements LVTInstruction
 {
-	public ALoad_1(Instructions instructions, InstructionType type, int pc) throws IOException
+	public ALoad_1(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
@@ -26,7 +25,7 @@ public class ALoad_1 extends Instruction implements LVTInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -40,7 +39,7 @@ public class ALoad_1 extends Instruction implements LVTInstruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/ALoad_2.java

@@ -11,11 +11,10 @@ import net.runelite.asm.execution.StackContext;
 import net.runelite.asm.execution.VariableContext;
 import net.runelite.asm.execution.Variables;
 
-import java.io.IOException;
 
 public class ALoad_2 extends Instruction implements LVTInstruction
 {
-	public ALoad_2(Instructions instructions, InstructionType type, int pc) throws IOException
+	public ALoad_2(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
@@ -26,7 +25,7 @@ public class ALoad_2 extends Instruction implements LVTInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -40,7 +39,7 @@ public class ALoad_2 extends Instruction implements LVTInstruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/ALoad_3.java

@@ -11,11 +11,10 @@ import net.runelite.asm.execution.StackContext;
 import net.runelite.asm.execution.VariableContext;
 import net.runelite.asm.execution.Variables;
 
-import java.io.IOException;
 
 public class ALoad_3 extends Instruction implements LVTInstruction
 {
-	public ALoad_3(Instructions instructions, InstructionType type, int pc) throws IOException
+	public ALoad_3(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
@@ -26,7 +25,7 @@ public class ALoad_3 extends Instruction implements LVTInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -40,7 +39,7 @@ public class ALoad_3 extends Instruction implements LVTInstruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/ANewArray.java

@@ -44,7 +44,7 @@ public class ANewArray extends Instruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -59,7 +59,7 @@ public class ANewArray extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/AStore.java

@@ -47,7 +47,7 @@ public class AStore extends Instruction implements LVTInstruction, WideInstructi
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -58,7 +58,7 @@ public class AStore extends Instruction implements LVTInstruction, WideInstructi
 		
 		variables.set(index, new VariableContext(ins, object));
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/AStore_0.java

@@ -25,7 +25,7 @@ public class AStore_0 extends Instruction implements LVTInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -36,7 +36,7 @@ public class AStore_0 extends Instruction implements LVTInstruction
 		
 		variables.set(0, new VariableContext(ins, object));
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/AStore_1.java

@@ -25,7 +25,7 @@ public class AStore_1 extends Instruction implements LVTInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -36,7 +36,7 @@ public class AStore_1 extends Instruction implements LVTInstruction
 		
 		variables.set(1, new VariableContext(ins, object));
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/AStore_2.java

@@ -25,7 +25,7 @@ public class AStore_2 extends Instruction implements LVTInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -36,7 +36,7 @@ public class AStore_2 extends Instruction implements LVTInstruction
 		
 		variables.set(2, new VariableContext(ins, object));
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/AStore_3.java

@@ -25,7 +25,7 @@ public class AStore_3 extends Instruction implements LVTInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -36,7 +36,7 @@ public class AStore_3 extends Instruction implements LVTInstruction
 		
 		variables.set(3, new VariableContext(ins, object));
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/AThrow.java

@@ -7,20 +7,16 @@ import net.runelite.asm.execution.Frame;
 import net.runelite.asm.execution.InstructionContext;
 import net.runelite.asm.execution.Stack;
 import net.runelite.asm.execution.StackContext;
-import net.runelite.asm.execution.Type;
-
-import java.io.IOException;
-import java.util.List;
 
 public class AThrow extends Instruction
 {
-	public AThrow(Instructions instructions, InstructionType type, int pc) throws IOException
+	public AThrow(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -29,9 +25,9 @@ public class AThrow extends Instruction
 		StackContext exception = stack.pop();
 		ins.pop(exception);
 		
-		frame.addInstructionContext(ins);
-		
 		frame.stop();
+
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/ArrayLength.java

@@ -8,17 +8,16 @@ import net.runelite.asm.execution.InstructionContext;
 import net.runelite.asm.execution.Stack;
 import net.runelite.asm.execution.StackContext;
 
-import java.io.IOException;
 
 public class ArrayLength extends Instruction
 {
-	public ArrayLength(Instructions instructions, InstructionType type, int pc) throws IOException
+	public ArrayLength(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -32,6 +31,6 @@ public class ArrayLength extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/BALoad.java

@@ -17,7 +17,7 @@ public class BALoad extends Instruction implements ArrayLoad
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -32,6 +32,6 @@ public class BALoad extends Instruction implements ArrayLoad
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/BAStore.java

@@ -15,7 +15,7 @@ public class BAStore extends ArrayStore
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -28,6 +28,6 @@ public class BAStore extends ArrayStore
 		
 		array.getValue().arraySet(index.getValue(), value.getValue());
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/BiPush.java

@@ -47,7 +47,7 @@ public class BiPush extends Instruction implements PushConstantInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -57,7 +57,7 @@ public class BiPush extends Instruction implements PushConstantInstruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/CALoad.java

@@ -17,7 +17,7 @@ public class CALoad extends Instruction implements ArrayLoad
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -32,6 +32,6 @@ public class CALoad extends Instruction implements ArrayLoad
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/CAStore.java

@@ -15,7 +15,7 @@ public class CAStore extends ArrayStore
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -28,6 +28,6 @@ public class CAStore extends ArrayStore
 		
 		array.getValue().arraySet(index.getValue(), value.getValue());
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/CheckCast.java

@@ -41,7 +41,7 @@ public class CheckCast extends Instruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -58,7 +58,7 @@ public class CheckCast extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/D2F.java

@@ -8,17 +8,16 @@ import net.runelite.asm.execution.InstructionContext;
 import net.runelite.asm.execution.Stack;
 import net.runelite.asm.execution.StackContext;
 
-import java.io.IOException;
 
 public class D2F extends Instruction
 {
-	public D2F(Instructions instructions, InstructionType type, int pc) throws IOException
+	public D2F(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -32,6 +31,6 @@ public class D2F extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/D2I.java

@@ -8,17 +8,16 @@ import net.runelite.asm.execution.InstructionContext;
 import net.runelite.asm.execution.Stack;
 import net.runelite.asm.execution.StackContext;
 
-import java.io.IOException;
 
 public class D2I extends Instruction
 {
-	public D2I(Instructions instructions, InstructionType type, int pc) throws IOException
+	public D2I(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -32,6 +31,6 @@ public class D2I extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/D2L.java

@@ -8,17 +8,16 @@ import net.runelite.asm.execution.InstructionContext;
 import net.runelite.asm.execution.Stack;
 import net.runelite.asm.execution.StackContext;
 
-import java.io.IOException;
 
 public class D2L extends Instruction
 {
-	public D2L(Instructions instructions, InstructionType type, int pc) throws IOException
+	public D2L(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -32,6 +31,6 @@ public class D2L extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/DALoad.java

@@ -17,7 +17,7 @@ public class DALoad extends Instruction implements ArrayLoad
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -32,6 +32,6 @@ public class DALoad extends Instruction implements ArrayLoad
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/DAStore.java

@@ -15,7 +15,7 @@ public class DAStore extends ArrayStore
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -28,6 +28,6 @@ public class DAStore extends ArrayStore
 		
 		array.getValue().arraySet(index.getValue(), value.getValue());
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/DAdd.java

@@ -17,7 +17,7 @@ public class DAdd extends Instruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -41,6 +41,6 @@ public class DAdd extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/DCmpG.java

@@ -8,18 +8,17 @@ import net.runelite.asm.execution.InstructionContext;
 import net.runelite.asm.execution.Stack;
 import net.runelite.asm.execution.StackContext;
 
-import java.io.IOException;
 import net.runelite.asm.execution.Value;
 
 public class DCmpG extends Instruction
 {
-	public DCmpG(Instructions instructions, InstructionType type, int pc) throws IOException
+	public DCmpG(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -48,6 +47,6 @@ public class DCmpG extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/DCmpL.java

@@ -8,18 +8,17 @@ import net.runelite.asm.execution.InstructionContext;
 import net.runelite.asm.execution.Stack;
 import net.runelite.asm.execution.StackContext;
 
-import java.io.IOException;
 import net.runelite.asm.execution.Value;
 
 public class DCmpL extends Instruction
 {
-	public DCmpL(Instructions instructions, InstructionType type, int pc) throws IOException
+	public DCmpL(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -48,6 +47,6 @@ public class DCmpL extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/DConst_0.java

@@ -10,18 +10,17 @@ import net.runelite.asm.execution.Stack;
 import net.runelite.asm.execution.StackContext;
 import net.runelite.asm.pool.PoolEntry;
 
-import java.io.IOException;
 import net.runelite.asm.execution.Value;
 
 public class DConst_0 extends Instruction implements PushConstantInstruction
 {
-	public DConst_0(Instructions instructions, InstructionType type, int pc) throws IOException
+	public DConst_0(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -31,7 +30,7 @@ public class DConst_0 extends Instruction implements PushConstantInstruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 
 	@Override
@@ -43,6 +42,6 @@ public class DConst_0 extends Instruction implements PushConstantInstruction
 	@Override
 	public Instruction setConstant(PoolEntry entry)
 	{
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+		throw new UnsupportedOperationException("Not supported yet.");
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/DConst_1.java

@@ -8,20 +8,18 @@ import net.runelite.asm.execution.Frame;
 import net.runelite.asm.execution.InstructionContext;
 import net.runelite.asm.execution.Stack;
 import net.runelite.asm.execution.StackContext;
-import net.runelite.asm.pool.PoolEntry;
-
-import java.io.IOException;
 import net.runelite.asm.execution.Value;
+import net.runelite.asm.pool.PoolEntry;
 
 public class DConst_1 extends Instruction implements PushConstantInstruction
 {
-	public DConst_1(Instructions instructions, InstructionType type, int pc) throws IOException
+	public DConst_1(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -31,7 +29,7 @@ public class DConst_1 extends Instruction implements PushConstantInstruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override
@@ -43,6 +41,6 @@ public class DConst_1 extends Instruction implements PushConstantInstruction
 	@Override
 	public Instruction setConstant(PoolEntry entry)
 	{
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+		throw new UnsupportedOperationException("Not supported yet.");
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/DDiv.java

@@ -17,7 +17,7 @@ public class DDiv extends Instruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -41,6 +41,6 @@ public class DDiv extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/DLoad.java

@@ -63,7 +63,7 @@ public class DLoad extends Instruction implements LVTInstruction, WideInstructio
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -78,7 +78,7 @@ public class DLoad extends Instruction implements LVTInstruction, WideInstructio
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/DLoad_0.java

@@ -26,7 +26,7 @@ public class DLoad_0 extends Instruction implements LVTInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -41,7 +41,7 @@ public class DLoad_0 extends Instruction implements LVTInstruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/DLoad_1.java

@@ -26,7 +26,7 @@ public class DLoad_1 extends Instruction implements LVTInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -41,7 +41,7 @@ public class DLoad_1 extends Instruction implements LVTInstruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/DLoad_2.java

@@ -26,7 +26,7 @@ public class DLoad_2 extends Instruction implements LVTInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -41,7 +41,7 @@ public class DLoad_2 extends Instruction implements LVTInstruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/DLoad_3.java

@@ -26,7 +26,7 @@ public class DLoad_3 extends Instruction implements LVTInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -41,7 +41,7 @@ public class DLoad_3 extends Instruction implements LVTInstruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/DMul.java

@@ -17,7 +17,7 @@ public class DMul extends Instruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -41,6 +41,6 @@ public class DMul extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/DNeg.java

@@ -17,7 +17,7 @@ public class DNeg extends Instruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -38,6 +38,6 @@ public class DNeg extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/DRem.java

@@ -17,7 +17,7 @@ public class DRem extends Instruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -41,6 +41,6 @@ public class DRem extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/DStore.java

@@ -47,7 +47,7 @@ public class DStore extends Instruction implements LVTInstruction, WideInstructi
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -58,7 +58,7 @@ public class DStore extends Instruction implements LVTInstruction, WideInstructi
 		
 		variables.set(index, new VariableContext(ins, value));
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/DStore_0.java

@@ -11,7 +11,6 @@ import net.runelite.asm.execution.StackContext;
 import net.runelite.asm.execution.VariableContext;
 import net.runelite.asm.execution.Variables;
 
-import java.io.IOException;
 
 public class DStore_0 extends Instruction implements LVTInstruction
 {
@@ -26,7 +25,7 @@ public class DStore_0 extends Instruction implements LVTInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -37,7 +36,7 @@ public class DStore_0 extends Instruction implements LVTInstruction
 		
 		variables.set(0, new VariableContext(ins, value));
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/DStore_1.java

@@ -25,7 +25,7 @@ public class DStore_1 extends Instruction implements LVTInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -36,7 +36,7 @@ public class DStore_1 extends Instruction implements LVTInstruction
 		
 		variables.set(1, new VariableContext(ins, value));
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/DStore_2.java

@@ -11,7 +11,6 @@ import net.runelite.asm.execution.StackContext;
 import net.runelite.asm.execution.VariableContext;
 import net.runelite.asm.execution.Variables;
 
-import java.io.IOException;
 
 public class DStore_2 extends Instruction implements LVTInstruction
 {
@@ -26,7 +25,7 @@ public class DStore_2 extends Instruction implements LVTInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -37,7 +36,7 @@ public class DStore_2 extends Instruction implements LVTInstruction
 		
 		variables.set(2, new VariableContext(ins, value));
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/DStore_3.java

@@ -24,7 +24,7 @@ public class DStore_3 extends Instruction implements LVTInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -35,7 +35,7 @@ public class DStore_3 extends Instruction implements LVTInstruction
 		
 		variables.set(3, new VariableContext(ins, value));
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/DSub.java

@@ -17,7 +17,7 @@ public class DSub extends Instruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -41,6 +41,6 @@ public class DSub extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/Dup.java

@@ -19,7 +19,7 @@ public class Dup extends Instruction implements DupInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -37,7 +37,7 @@ public class Dup extends Instruction implements DupInstruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/Dup2.java

@@ -19,7 +19,7 @@ public class Dup2 extends Instruction implements DupInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -59,7 +59,7 @@ public class Dup2 extends Instruction implements DupInstruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/Dup2_X1.java

@@ -1,6 +1,5 @@
 package net.runelite.asm.attributes.code.instructions;
 
-import java.io.IOException;
 import net.runelite.asm.attributes.code.Instruction;
 import net.runelite.asm.attributes.code.InstructionType;
 import net.runelite.asm.attributes.code.Instructions;
@@ -24,7 +23,7 @@ public class Dup2_X1 extends Instruction implements DupInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -71,7 +70,7 @@ public class Dup2_X1 extends Instruction implements DupInstruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/Dup2_X2.java

@@ -1,6 +1,5 @@
 package net.runelite.asm.attributes.code.instructions;
 
-import java.io.IOException;
 import net.runelite.asm.attributes.code.Instruction;
 import net.runelite.asm.attributes.code.InstructionType;
 import net.runelite.asm.attributes.code.Instructions;
@@ -13,13 +12,13 @@ import net.runelite.asm.attributes.code.instruction.types.DupInstruction;
 
 public class Dup2_X2 extends Instruction implements DupInstruction
 {
-	public Dup2_X2(Instructions instructions, InstructionType type, int pc) throws IOException
+	public Dup2_X2(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -79,7 +78,7 @@ public class Dup2_X2 extends Instruction implements DupInstruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/Dup_X1.java

@@ -1,6 +1,5 @@
 package net.runelite.asm.attributes.code.instructions;
 
-import java.io.IOException;
 import net.runelite.asm.attributes.code.Instruction;
 import net.runelite.asm.attributes.code.InstructionType;
 import net.runelite.asm.attributes.code.Instructions;
@@ -23,7 +22,7 @@ public class Dup_X1 extends Instruction implements DupInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -48,7 +47,7 @@ public class Dup_X1 extends Instruction implements DupInstruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/Dup_X2.java

@@ -1,6 +1,5 @@
 package net.runelite.asm.attributes.code.instructions;
 
-import java.io.IOException;
 import net.runelite.asm.attributes.code.Instruction;
 import net.runelite.asm.attributes.code.InstructionType;
 import net.runelite.asm.attributes.code.Instructions;
@@ -13,13 +12,13 @@ import net.runelite.asm.attributes.code.instruction.types.DupInstruction;
 
 public class Dup_X2 extends Instruction implements DupInstruction
 {
-	public Dup_X2(Instructions instructions, InstructionType type, int pc) throws IOException
+	public Dup_X2(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -57,7 +56,7 @@ public class Dup_X2 extends Instruction implements DupInstruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/F2D.java

@@ -8,17 +8,16 @@ import net.runelite.asm.execution.InstructionContext;
 import net.runelite.asm.execution.Stack;
 import net.runelite.asm.execution.StackContext;
 
-import java.io.IOException;
 
 public class F2D extends Instruction
 {
-	public F2D(Instructions instructions, InstructionType type, int pc) throws IOException
+	public F2D(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -31,6 +30,6 @@ public class F2D extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/F2I.java

@@ -8,17 +8,16 @@ import net.runelite.asm.execution.InstructionContext;
 import net.runelite.asm.execution.Stack;
 import net.runelite.asm.execution.StackContext;
 
-import java.io.IOException;
 
 public class F2I extends Instruction
 {
-	public F2I(Instructions instructions, InstructionType type, int pc) throws IOException
+	public F2I(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -31,6 +30,6 @@ public class F2I extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/F2L.java

@@ -8,17 +8,16 @@ import net.runelite.asm.execution.InstructionContext;
 import net.runelite.asm.execution.Stack;
 import net.runelite.asm.execution.StackContext;
 
-import java.io.IOException;
 
 public class F2L extends Instruction
 {
-	public F2L(Instructions instructions, InstructionType type, int pc) throws IOException
+	public F2L(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -31,6 +30,6 @@ public class F2L extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/FALoad.java

@@ -17,7 +17,7 @@ public class FALoad extends Instruction implements ArrayLoad
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -32,6 +32,6 @@ public class FALoad extends Instruction implements ArrayLoad
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/FAStore.java

@@ -15,7 +15,7 @@ public class FAStore extends ArrayStore
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -28,6 +28,6 @@ public class FAStore extends ArrayStore
 		
 		array.getValue().arraySet(index.getValue(), value.getValue());
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/FAdd.java

@@ -17,7 +17,7 @@ public class FAdd extends Instruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -41,6 +41,6 @@ public class FAdd extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/FCmpG.java

@@ -7,19 +7,17 @@ import net.runelite.asm.execution.Frame;
 import net.runelite.asm.execution.InstructionContext;
 import net.runelite.asm.execution.Stack;
 import net.runelite.asm.execution.StackContext;
-
-import java.io.IOException;
 import net.runelite.asm.execution.Value;
 
 public class FCmpG extends Instruction
 {
-	public FCmpG(Instructions instructions, InstructionType type, int pc) throws IOException
+	public FCmpG(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -48,6 +46,6 @@ public class FCmpG extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/FCmpL.java

@@ -7,19 +7,17 @@ import net.runelite.asm.execution.Frame;
 import net.runelite.asm.execution.InstructionContext;
 import net.runelite.asm.execution.Stack;
 import net.runelite.asm.execution.StackContext;
-
-import java.io.IOException;
 import net.runelite.asm.execution.Value;
 
 public class FCmpL extends Instruction
 {
-	public FCmpL(Instructions instructions, InstructionType type, int pc) throws IOException
+	public FCmpL(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -48,6 +46,6 @@ public class FCmpL extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/FConst_0.java

@@ -8,20 +8,18 @@ import net.runelite.asm.execution.Frame;
 import net.runelite.asm.execution.InstructionContext;
 import net.runelite.asm.execution.Stack;
 import net.runelite.asm.execution.StackContext;
-import net.runelite.asm.pool.PoolEntry;
-
-import java.io.IOException;
 import net.runelite.asm.execution.Value;
+import net.runelite.asm.pool.PoolEntry;
 
 public class FConst_0 extends Instruction implements PushConstantInstruction
 {
-	public FConst_0(Instructions instructions, InstructionType type, int pc) throws IOException
+	public FConst_0(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -31,7 +29,7 @@ public class FConst_0 extends Instruction implements PushConstantInstruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 
 	@Override
@@ -43,6 +41,6 @@ public class FConst_0 extends Instruction implements PushConstantInstruction
 	@Override
 	public Instruction setConstant(PoolEntry entry)
 	{
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+		throw new UnsupportedOperationException("Not supported yet.");
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/FConst_1.java

@@ -8,20 +8,19 @@ import net.runelite.asm.execution.Frame;
 import net.runelite.asm.execution.InstructionContext;
 import net.runelite.asm.execution.Stack;
 import net.runelite.asm.execution.StackContext;
+import net.runelite.asm.execution.Value;
 import net.runelite.asm.pool.PoolEntry;
 
-import java.io.IOException;
-import net.runelite.asm.execution.Value;
 
 public class FConst_1 extends Instruction implements PushConstantInstruction
 {
-	public FConst_1(Instructions instructions, InstructionType type, int pc) throws IOException
+	public FConst_1(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -31,7 +30,7 @@ public class FConst_1 extends Instruction implements PushConstantInstruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 
 	@Override
@@ -43,6 +42,6 @@ public class FConst_1 extends Instruction implements PushConstantInstruction
 	@Override
 	public Instruction setConstant(PoolEntry entry)
 	{
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+		throw new UnsupportedOperationException("Not supported yet.");
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/FConst_2.java

@@ -8,20 +8,18 @@ import net.runelite.asm.execution.Frame;
 import net.runelite.asm.execution.InstructionContext;
 import net.runelite.asm.execution.Stack;
 import net.runelite.asm.execution.StackContext;
-import net.runelite.asm.pool.PoolEntry;
-
-import java.io.IOException;
 import net.runelite.asm.execution.Value;
+import net.runelite.asm.pool.PoolEntry;
 
 public class FConst_2 extends Instruction implements PushConstantInstruction
 {
-	public FConst_2(Instructions instructions, InstructionType type, int pc) throws IOException
+	public FConst_2(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -31,7 +29,7 @@ public class FConst_2 extends Instruction implements PushConstantInstruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 
 	@Override
@@ -43,6 +41,6 @@ public class FConst_2 extends Instruction implements PushConstantInstruction
 	@Override
 	public Instruction setConstant(PoolEntry entry)
 	{
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+		throw new UnsupportedOperationException("Not supported yet.");
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/FDiv.java

@@ -17,7 +17,7 @@ public class FDiv extends Instruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -41,6 +41,6 @@ public class FDiv extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/FLoad.java

@@ -63,7 +63,7 @@ public class FLoad extends Instruction implements LVTInstruction, WideInstructio
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -78,7 +78,7 @@ public class FLoad extends Instruction implements LVTInstruction, WideInstructio
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/FLoad_0.java

@@ -26,7 +26,7 @@ public class FLoad_0 extends Instruction implements LVTInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -41,7 +41,7 @@ public class FLoad_0 extends Instruction implements LVTInstruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/FLoad_1.java

@@ -26,7 +26,7 @@ public class FLoad_1 extends Instruction implements LVTInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -41,7 +41,7 @@ public class FLoad_1 extends Instruction implements LVTInstruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/FLoad_2.java

@@ -26,7 +26,7 @@ public class FLoad_2 extends Instruction implements LVTInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -41,7 +41,7 @@ public class FLoad_2 extends Instruction implements LVTInstruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/FLoad_3.java

@@ -26,7 +26,7 @@ public class FLoad_3 extends Instruction implements LVTInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -41,7 +41,7 @@ public class FLoad_3 extends Instruction implements LVTInstruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/FMul.java

@@ -17,7 +17,7 @@ public class FMul extends Instruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -41,6 +41,6 @@ public class FMul extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/FNeg.java

@@ -17,7 +17,7 @@ public class FNeg extends Instruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -38,6 +38,6 @@ public class FNeg extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/FRem.java

@@ -17,7 +17,7 @@ public class FRem extends Instruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -41,6 +41,6 @@ public class FRem extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/FStore.java

@@ -47,7 +47,7 @@ public class FStore extends Instruction implements LVTInstruction, WideInstructi
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -58,7 +58,7 @@ public class FStore extends Instruction implements LVTInstruction, WideInstructi
 		
 		variables.set(index, new VariableContext(ins, value));
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/FStore_0.java

@@ -25,7 +25,7 @@ public class FStore_0 extends Instruction implements LVTInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -36,7 +36,7 @@ public class FStore_0 extends Instruction implements LVTInstruction
 		
 		variables.set(0, new VariableContext(ins, value));
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/FStore_1.java

@@ -25,7 +25,7 @@ public class FStore_1 extends Instruction implements LVTInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -36,7 +36,7 @@ public class FStore_1 extends Instruction implements LVTInstruction
 		
 		variables.set(1, new VariableContext(ins, value));
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/FStore_2.java

@@ -25,7 +25,7 @@ public class FStore_2 extends Instruction implements LVTInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -36,7 +36,7 @@ public class FStore_2 extends Instruction implements LVTInstruction
 		
 		variables.set(2, new VariableContext(ins, value));
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/FStore_3.java

@@ -25,7 +25,7 @@ public class FStore_3 extends Instruction implements LVTInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -36,7 +36,7 @@ public class FStore_3 extends Instruction implements LVTInstruction
 		
 		variables.set(3, new VariableContext(ins, value));
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/FSub.java

@@ -17,7 +17,7 @@ public class FSub extends Instruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -41,6 +41,6 @@ public class FSub extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/GetField.java

@@ -60,7 +60,7 @@ public class GetField extends Instruction implements GetFieldInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -73,7 +73,7 @@ public class GetField extends Instruction implements GetFieldInstruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/GetStatic.java

@@ -60,7 +60,7 @@ public class GetStatic extends Instruction implements GetFieldInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -70,7 +70,7 @@ public class GetStatic extends Instruction implements GetFieldInstruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/Goto.java

@@ -66,12 +66,13 @@ public class Goto extends Instruction implements JumpingInstruction
 	}
 	
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ctx = new InstructionContext(this, frame);
-		frame.addInstructionContext(ctx);
 		
 		frame.jump(ctx, to);
+
+		return ctx;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/GotoW.java

@@ -44,12 +44,13 @@ public class GotoW extends Instruction implements JumpingInstruction
 	}
 	
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ctx = new InstructionContext(this, frame);
-		frame.addInstructionContext(ctx);
 		
 		frame.jump(ctx, to);
+
+		return ctx;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/I2B.java

@@ -8,17 +8,16 @@ import net.runelite.asm.execution.InstructionContext;
 import net.runelite.asm.execution.Stack;
 import net.runelite.asm.execution.StackContext;
 
-import java.io.IOException;
 
 public class I2B extends Instruction
 {
-	public I2B(Instructions instructions, InstructionType type, int pc) throws IOException
+	public I2B(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -31,6 +30,6 @@ public class I2B extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/I2C.java

@@ -8,17 +8,16 @@ import net.runelite.asm.execution.InstructionContext;
 import net.runelite.asm.execution.Stack;
 import net.runelite.asm.execution.StackContext;
 
-import java.io.IOException;
 
 public class I2C extends Instruction
 {
-	public I2C(Instructions instructions, InstructionType type, int pc) throws IOException
+	public I2C(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -31,6 +30,6 @@ public class I2C extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/I2D.java

@@ -8,17 +8,16 @@ import net.runelite.asm.execution.InstructionContext;
 import net.runelite.asm.execution.Stack;
 import net.runelite.asm.execution.StackContext;
 
-import java.io.IOException;
 
 public class I2D extends Instruction
 {
-	public I2D(Instructions instructions, InstructionType type, int pc) throws IOException
+	public I2D(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -31,6 +30,6 @@ public class I2D extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/I2F.java

@@ -8,17 +8,16 @@ import net.runelite.asm.execution.InstructionContext;
 import net.runelite.asm.execution.Stack;
 import net.runelite.asm.execution.StackContext;
 
-import java.io.IOException;
 
 public class I2F extends Instruction
 {
-	public I2F(Instructions instructions, InstructionType type, int pc) throws IOException
+	public I2F(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -31,6 +30,6 @@ public class I2F extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/I2L.java

@@ -8,17 +8,16 @@ import net.runelite.asm.execution.InstructionContext;
 import net.runelite.asm.execution.Stack;
 import net.runelite.asm.execution.StackContext;
 
-import java.io.IOException;
 
 public class I2L extends Instruction
 {
-	public I2L(Instructions instructions, InstructionType type, int pc) throws IOException
+	public I2L(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -31,6 +30,6 @@ public class I2L extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/I2S.java

@@ -8,17 +8,16 @@ import net.runelite.asm.execution.InstructionContext;
 import net.runelite.asm.execution.Stack;
 import net.runelite.asm.execution.StackContext;
 
-import java.io.IOException;
 
 public class I2S extends Instruction
 {
-	public I2S(Instructions instructions, InstructionType type, int pc) throws IOException
+	public I2S(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -31,6 +30,6 @@ public class I2S extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/IALoad.java

@@ -17,7 +17,7 @@ public class IALoad extends Instruction implements ArrayLoad
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -32,6 +32,6 @@ public class IALoad extends Instruction implements ArrayLoad
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/IAStore.java

@@ -15,7 +15,7 @@ public class IAStore extends ArrayStore
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -28,6 +28,6 @@ public class IAStore extends ArrayStore
 		
 		array.getValue().arraySet(index.getValue(), value.getValue());
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/IAdd.java

@@ -3,9 +3,6 @@ package net.runelite.asm.attributes.code.instructions;
 import net.runelite.asm.attributes.code.Instruction;
 import net.runelite.asm.attributes.code.InstructionType;
 import net.runelite.asm.attributes.code.Instructions;
-import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction;
-import net.runelite.deob.deobfuscators.arithmetic.DMath;
-import net.runelite.deob.deobfuscators.arithmetic.Encryption;
 import net.runelite.asm.execution.Frame;
 import net.runelite.asm.execution.InstructionContext;
 import net.runelite.asm.execution.Stack;
@@ -25,7 +22,7 @@ public class IAdd extends Instruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -49,6 +46,6 @@ public class IAdd extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/IAnd.java

@@ -17,7 +17,7 @@ public class IAnd extends Instruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -41,6 +41,6 @@ public class IAnd extends Instruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 }

src/main/java/net/runelite/asm/attributes/code/instructions/IConst_0.java

@@ -8,14 +8,12 @@ import net.runelite.asm.execution.Frame;
 import net.runelite.asm.execution.InstructionContext;
 import net.runelite.asm.execution.Stack;
 import net.runelite.asm.execution.StackContext;
-import net.runelite.asm.pool.PoolEntry;
-
-import java.io.IOException;
 import net.runelite.asm.execution.Value;
+import net.runelite.asm.pool.PoolEntry;
 
 public class IConst_0 extends Instruction implements PushConstantInstruction
 {
-	public IConst_0(Instructions instructions, InstructionType type, int pc) throws IOException
+	public IConst_0(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
@@ -26,7 +24,7 @@ public class IConst_0 extends Instruction implements PushConstantInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -36,7 +34,7 @@ public class IConst_0 extends Instruction implements PushConstantInstruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/IConst_1.java

@@ -8,14 +8,12 @@ import net.runelite.asm.execution.Frame;
 import net.runelite.asm.execution.InstructionContext;
 import net.runelite.asm.execution.Stack;
 import net.runelite.asm.execution.StackContext;
-import net.runelite.asm.pool.PoolEntry;
-
-import java.io.IOException;
 import net.runelite.asm.execution.Value;
+import net.runelite.asm.pool.PoolEntry;
 
 public class IConst_1 extends Instruction implements PushConstantInstruction
 {
-	public IConst_1(Instructions instructions, InstructionType type, int pc) throws IOException
+	public IConst_1(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
@@ -26,7 +24,7 @@ public class IConst_1 extends Instruction implements PushConstantInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -36,7 +34,7 @@ public class IConst_1 extends Instruction implements PushConstantInstruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/IConst_2.java

@@ -8,14 +8,13 @@ import net.runelite.asm.execution.Frame;
 import net.runelite.asm.execution.InstructionContext;
 import net.runelite.asm.execution.Stack;
 import net.runelite.asm.execution.StackContext;
+import net.runelite.asm.execution.Value;
 import net.runelite.asm.pool.PoolEntry;
 
-import java.io.IOException;
-import net.runelite.asm.execution.Value;
 
 public class IConst_2 extends Instruction implements PushConstantInstruction
 {
-	public IConst_2(Instructions instructions, InstructionType type, int pc) throws IOException
+	public IConst_2(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
@@ -26,7 +25,7 @@ public class IConst_2 extends Instruction implements PushConstantInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -36,7 +35,7 @@ public class IConst_2 extends Instruction implements PushConstantInstruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/IConst_3.java

@@ -8,14 +8,12 @@ import net.runelite.asm.execution.Frame;
 import net.runelite.asm.execution.InstructionContext;
 import net.runelite.asm.execution.Stack;
 import net.runelite.asm.execution.StackContext;
-import net.runelite.asm.pool.PoolEntry;
-
-import java.io.IOException;
 import net.runelite.asm.execution.Value;
+import net.runelite.asm.pool.PoolEntry;
 
 public class IConst_3 extends Instruction implements PushConstantInstruction
 {
-	public IConst_3(Instructions instructions, InstructionType type, int pc) throws IOException
+	public IConst_3(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
@@ -26,7 +24,7 @@ public class IConst_3 extends Instruction implements PushConstantInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -36,7 +34,7 @@ public class IConst_3 extends Instruction implements PushConstantInstruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/IConst_4.java

@@ -8,14 +8,12 @@ import net.runelite.asm.execution.Frame;
 import net.runelite.asm.execution.InstructionContext;
 import net.runelite.asm.execution.Stack;
 import net.runelite.asm.execution.StackContext;
-import net.runelite.asm.pool.PoolEntry;
-
-import java.io.IOException;
 import net.runelite.asm.execution.Value;
+import net.runelite.asm.pool.PoolEntry;
 
 public class IConst_4 extends Instruction implements PushConstantInstruction
 {
-	public IConst_4(Instructions instructions, InstructionType type, int pc) throws IOException
+	public IConst_4(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
@@ -26,7 +24,7 @@ public class IConst_4 extends Instruction implements PushConstantInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -36,7 +34,7 @@ public class IConst_4 extends Instruction implements PushConstantInstruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override

src/main/java/net/runelite/asm/attributes/code/instructions/IConst_5.java

@@ -8,14 +8,12 @@ import net.runelite.asm.execution.Frame;
 import net.runelite.asm.execution.InstructionContext;
 import net.runelite.asm.execution.Stack;
 import net.runelite.asm.execution.StackContext;
-import net.runelite.asm.pool.PoolEntry;
-
-import java.io.IOException;
 import net.runelite.asm.execution.Value;
+import net.runelite.asm.pool.PoolEntry;
 
 public class IConst_5 extends Instruction implements PushConstantInstruction
 {
-	public IConst_5(Instructions instructions, InstructionType type, int pc) throws IOException
+	public IConst_5(Instructions instructions, InstructionType type, int pc)
 	{
 		super(instructions, type, pc);
 	}
@@ -26,7 +24,7 @@ public class IConst_5 extends Instruction implements PushConstantInstruction
 	}
 
 	@Override
-	public void execute(Frame frame)
+	public InstructionContext execute(Frame frame)
 	{
 		InstructionContext ins = new InstructionContext(this, frame);
 		Stack stack = frame.getStack();
@@ -36,7 +34,7 @@ public class IConst_5 extends Instruction implements PushConstantInstruction
 		
 		ins.push(ctx);
 		
-		frame.addInstructionContext(ins);
+		return ins;
 	}
 	
 	@Override