Class writing, call graph, eclipse project

src/main/java/info/sigterm/deob/attributes/Attribute.java

@@ -1,13 +1,16 @@
 package info.sigterm.deob.attributes;
 
+import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
-public class Attribute
+public abstract class Attribute
 {
 	private Attributes attributes;
 	private AttributeType type;
 	private int length;
+	public int nameIndex;
 
 	Attribute(Attributes attr, AttributeType type) throws IOException
 	{
@@ -17,6 +20,18 @@ public class Attribute
 		DataInputStream is = attr.getStream();
 		this.length = is.readInt();
 	}
+	
+	public void write(DataOutputStream out) throws IOException
+	{
+		ByteArrayOutputStream bout = new ByteArrayOutputStream();
+		writeAttr(new DataOutputStream(bout));
+		
+		byte[] b = bout.toByteArray();
+		out.writeInt(b.length);
+		out.write(b);
+	}
+	
+	public abstract void writeAttr(DataOutputStream out) throws IOException;
 
 	public Attributes getAttributes()
 	{

src/main/java/info/sigterm/deob/attributes/AttributeType.java

@@ -8,6 +8,7 @@ public enum AttributeType
 
 	private String name;
 	private Class<? extends Attribute> clazz;
+	public int nameIndex;
 
 	AttributeType(String name, Class<? extends Attribute> clazz)
 	{

src/main/java/info/sigterm/deob/attributes/Attributes.java

@@ -6,6 +6,7 @@ import info.sigterm.deob.Method;
 import info.sigterm.deob.pool.UTF8;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 import java.lang.reflect.Constructor;
 
@@ -99,6 +100,7 @@ public class Attributes
 			{
 				Constructor<? extends Attribute> con = type.getAttributeClass().getConstructor(new Class[] { Attributes.class });
 				Attribute attr = con.newInstance(this);
+				attr.nameIndex = nameIndex;
 
 				attributes[i] = attr;
 			}
@@ -108,4 +110,14 @@ public class Attributes
 			}
 		}
 	}
+	
+	public void write(DataOutputStream out) throws IOException
+	{
+		out.writeShort(count);
+		for (Attribute a : attributes)
+		{
+			out.writeShort(a.nameIndex);
+			a.write(out);
+		}
+	}
 }

src/main/java/info/sigterm/deob/attributes/Code.java

@@ -4,6 +4,7 @@ import info.sigterm.deob.attributes.code.Exceptions;
 import info.sigterm.deob.attributes.code.Instructions;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class Code extends Attribute
@@ -26,7 +27,7 @@ public class Code extends Attribute
 		instructions = new Instructions(this);
 
 		exceptions = new Exceptions(this);
-		attributes = new Attributes(this);
+		this.attributes = new Attributes(this);
 	}
 
 	public int getMaxStack()
@@ -53,4 +54,20 @@ public class Code extends Attribute
 	{
 		instructions.buildInstructionGraph();
 	}
+	
+	public void buildCallGraph()
+	{
+		instructions.buildCallGraph();
+	}
+
+	@Override
+	public void writeAttr(DataOutputStream out) throws IOException
+	{
+		out.writeShort(maxStack);
+		out.writeShort(maxLocals);
+		
+		instructions.write(out);
+		exceptions.write(out);
+		attributes.write(out);
+	}
 }

src/main/java/info/sigterm/deob/attributes/ConstantValue.java

@@ -3,22 +3,29 @@ package info.sigterm.deob.attributes;
 import info.sigterm.deob.pool.PoolEntry;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class ConstantValue extends Attribute
 {
-	private int constantVlaueIndex;
+	private int constantValueIndex;
 
 	public ConstantValue(Attributes attributes) throws IOException
 	{
 		super(attributes, AttributeType.CONSTANT_VALUE);
 
 		DataInputStream is = attributes.getStream();
-		constantVlaueIndex = is.readUnsignedShort();
+		constantValueIndex = is.readUnsignedShort();
 	}
 
 	public PoolEntry getValue()
 	{
-		return this.getAttributes().getClassFile().getPool().getEntry(constantVlaueIndex);
+		return this.getAttributes().getClassFile().getPool().getEntry(constantValueIndex);
+	}
+
+	@Override
+	public void writeAttr(DataOutputStream out) throws IOException
+	{
+		out.writeShort(constantValueIndex);
 	}
 }

src/main/java/info/sigterm/deob/attributes/Unknown.java

@@ -1,6 +1,7 @@
 package info.sigterm.deob.attributes;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class Unknown extends Attribute
@@ -29,4 +30,10 @@ public class Unknown extends Attribute
 
 		assert read == len;
 	}
+
+	@Override
+	public void writeAttr(DataOutputStream out) throws IOException
+	{
+		out.write(data);
+	}
 }

src/main/java/info/sigterm/deob/attributes/code/Exception.java

@@ -3,6 +3,7 @@ package info.sigterm.deob.attributes.code;
 import info.sigterm.deob.ConstantPool;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class Exception
@@ -26,6 +27,14 @@ public class Exception
 		catchType = is.readUnsignedShort();
 	}
 	
+	public void write(DataOutputStream out) throws IOException
+	{
+		out.writeShort(startPc);
+		out.writeShort(endPc);
+		out.writeShort(handlerPc);
+		out.writeShort(catchType);
+	}
+	
 	public Exceptions getExceptions()
 	{
 		return exceptions;

src/main/java/info/sigterm/deob/attributes/code/Exceptions.java

@@ -4,6 +4,7 @@ import info.sigterm.deob.attributes.Code;
 import info.sigterm.deob.execution.ObjectInstance;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -25,6 +26,13 @@ public class Exceptions
 		for (int i = 0; i < count; ++i)
 			exceptions[i] = new Exception(this);
 	}
+	
+	public void write(DataOutputStream out) throws IOException
+	{
+		out.writeShort(exceptions.length);
+		for (Exception e : exceptions)
+			e.write(out);
+	}
 
 	public Code getCode()
 	{

src/main/java/info/sigterm/deob/attributes/code/Instruction.java

@@ -2,6 +2,8 @@ package info.sigterm.deob.attributes.code;
 
 import info.sigterm.deob.execution.Frame;
 
+import java.io.DataOutputStream;
+import java.io.IOException;
 import java.util.ArrayList;
 
 public abstract class Instruction
@@ -21,6 +23,11 @@ public abstract class Instruction
 		this.type = type;
 		this.pc = pc;
 	}
+	
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		out.writeByte(type.getCode());
+	}
 
 	public Instructions getInstructions()
 	{
@@ -59,6 +66,10 @@ public abstract class Instruction
 	public void buildInstructionGraph()
 	{
 	}
+	
+	public void buildCallGraph()
+	{
+	}
 
 	public abstract void execute(Frame e);
 }

src/main/java/info/sigterm/deob/attributes/code/Instructions.java

@@ -2,15 +2,18 @@ package info.sigterm.deob.attributes.code;
 
 import info.sigterm.deob.attributes.Code;
 
+import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
+import java.util.List;
 
 public class Instructions
 {
 	private Code code;
-	private ArrayList<Instruction> instructions = new ArrayList<Instruction>();
+	private List<Instruction> instructions = new ArrayList<>();
 
 	public Instructions(Code code) throws IOException
 	{
@@ -46,6 +49,21 @@ public class Instructions
 
 		buildJumpGraph();
 	}
+	
+	public void write(DataOutputStream out) throws IOException
+	{
+		ByteArrayOutputStream b = new ByteArrayOutputStream();
+		DataOutputStream o = new DataOutputStream(b);
+		int pc = 0;
+		for (Instruction i : instructions)
+		{
+			i.write(o, pc);
+			pc = o.size();
+		}
+		byte[] ba = b.toByteArray();
+		out.writeInt(ba.length);
+		out.write(ba);
+	}
 
 	private void buildJumpGraph()
 	{
@@ -58,6 +76,12 @@ public class Instructions
 		for (Instruction i : instructions)
 			i.buildInstructionGraph();
 	}
+	
+	public void buildCallGraph()
+	{
+		for (Instruction i : instructions)
+			i.buildCallGraph();
+	}
 
 	public Code getCode()
 	{

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

@@ -6,6 +6,7 @@ import info.sigterm.deob.attributes.code.Instructions;
 import info.sigterm.deob.execution.Frame;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class ALoad extends Instruction
@@ -20,6 +21,13 @@ public class ALoad extends Instruction
 		index = is.readByte();
 		length += 1;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeByte(index);
+	}
 
 	@Override
 	public void execute(Frame frame)

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

@@ -10,6 +10,7 @@ import info.sigterm.deob.execution.Frame;
 import info.sigterm.deob.pool.Class;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class ANewArray extends Instruction
@@ -24,6 +25,13 @@ public class ANewArray extends Instruction
 		index = is.readUnsignedShort();
 		length += 2;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeShort(index);
+	}
 
 	@Override
 	public void execute(Frame frame)

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

@@ -6,6 +6,7 @@ import info.sigterm.deob.attributes.code.Instructions;
 import info.sigterm.deob.execution.Frame;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class AStore extends Instruction
@@ -20,6 +21,13 @@ public class AStore extends Instruction
 		index = is.readByte();
 		length += 1;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeByte(index);
+	}
 
 	@Override
 	public void execute(Frame frame)

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

@@ -6,6 +6,7 @@ import info.sigterm.deob.attributes.code.Instructions;
 import info.sigterm.deob.execution.Frame;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class BiPush extends Instruction
@@ -20,6 +21,13 @@ public class BiPush extends Instruction
 		b = is.readByte();
 		length += 1;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeByte(b);
+	}
 
 	@Override
 	public void execute(Frame frame)

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

@@ -10,6 +10,7 @@ import info.sigterm.deob.execution.ObjectInstance;
 import info.sigterm.deob.pool.Class;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class CheckCast extends Instruction
@@ -24,6 +25,13 @@ public class CheckCast extends Instruction
 		index = is.readUnsignedShort();
 		length += 2;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeShort(index);
+	}
 
 	@Override
 	public void execute(Frame e)

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

@@ -6,6 +6,7 @@ import info.sigterm.deob.attributes.code.Instructions;
 import info.sigterm.deob.execution.Frame;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class DLoad extends Instruction
@@ -20,6 +21,13 @@ public class DLoad extends Instruction
 		index = is.readByte();
 		length += 1;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeByte(index);
+	}
 
 	@Override
 	public void execute(Frame frame)

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

@@ -6,6 +6,7 @@ import info.sigterm.deob.attributes.code.Instructions;
 import info.sigterm.deob.execution.Frame;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class DStore extends Instruction
@@ -20,6 +21,13 @@ public class DStore extends Instruction
 		index = is.readByte();
 		length += 1;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeByte(index);
+	}
 
 	@Override
 	public void execute(Frame frame)

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

@@ -6,6 +6,7 @@ import info.sigterm.deob.attributes.code.Instructions;
 import info.sigterm.deob.execution.Frame;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class FLoad extends Instruction
@@ -20,6 +21,13 @@ public class FLoad extends Instruction
 		index = is.readByte();
 		length += 1;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeByte(index);
+	}
 
 	@Override
 	public void execute(Frame frame)

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

@@ -6,6 +6,7 @@ import info.sigterm.deob.attributes.code.Instructions;
 import info.sigterm.deob.execution.Frame;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class FStore extends Instruction
@@ -20,6 +21,13 @@ public class FStore extends Instruction
 		index = is.readByte();
 		length += 1;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeByte(index);
+	}
 
 	@Override
 	public void execute(Frame frame)

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

@@ -12,6 +12,7 @@ import info.sigterm.deob.pool.Field;
 import info.sigterm.deob.pool.NameAndType;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class GetField extends Instruction
@@ -26,6 +27,13 @@ public class GetField extends Instruction
 		index = is.readUnsignedShort();
 		length += 2;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeShort(index);
+	}
 
 	@Override
 	public void execute(Frame frame)

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

@@ -13,6 +13,7 @@ import info.sigterm.deob.pool.Field;
 import info.sigterm.deob.pool.NameAndType;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class GetStatic extends Instruction
@@ -27,6 +28,13 @@ public class GetStatic extends Instruction
 		index = is.readUnsignedShort();
 		length += 2;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeShort(index);
+	}
 
 	@Override
 	public void execute(Frame frame)

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

@@ -6,6 +6,7 @@ import info.sigterm.deob.attributes.code.Instructions;
 import info.sigterm.deob.execution.Frame;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class Goto extends Instruction
@@ -20,6 +21,13 @@ public class Goto extends Instruction
 		offset = is.readShort();
 		length += 2;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeShort(offset);
+	}
 
 	@Override
 	public void buildJumpGraph()

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

@@ -6,6 +6,7 @@ import info.sigterm.deob.attributes.code.Instructions;
 import info.sigterm.deob.execution.Frame;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class GotoW extends Instruction
@@ -20,6 +21,13 @@ public class GotoW extends Instruction
 		offset = is.readInt();
 		length += 4;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeInt(offset);
+	}
 
 	@Override
 	public void buildJumpGraph()

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

@@ -6,6 +6,7 @@ import info.sigterm.deob.attributes.code.Instructions;
 import info.sigterm.deob.execution.Frame;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class IInc extends Instruction
@@ -22,6 +23,14 @@ public class IInc extends Instruction
 		inc = is.readByte();
 		length += 2;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeByte(index);
+		out.writeByte(inc);
+	}
 
 	@Override
 	public void execute(Frame frame)

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

@@ -6,6 +6,7 @@ import info.sigterm.deob.attributes.code.Instructions;
 import info.sigterm.deob.execution.Frame;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class ILoad extends Instruction
@@ -20,6 +21,13 @@ public class ILoad extends Instruction
 		index = is.readByte();
 		length += 1;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeByte(index);
+	}
 
 	@Override
 	public void execute(Frame frame)

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

@@ -6,6 +6,7 @@ import info.sigterm.deob.attributes.code.Instructions;
 import info.sigterm.deob.execution.Frame;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class IStore extends Instruction
@@ -20,6 +21,13 @@ public class IStore extends Instruction
 		index = is.readByte();
 		length += 1;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeByte(index);
+	}
 
 	@Override
 	public void execute(Frame frame)

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

@@ -7,6 +7,7 @@ import info.sigterm.deob.execution.Frame;
 import info.sigterm.deob.execution.Path;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class If extends Instruction
@@ -21,6 +22,13 @@ public class If extends Instruction
 		offset = is.readShort();
 		length += 2;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeShort(offset);
+	}
 
 	@Override
 	public void buildJumpGraph()

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

@@ -7,6 +7,7 @@ import info.sigterm.deob.execution.Frame;
 import info.sigterm.deob.execution.Path;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class If0 extends Instruction
@@ -21,6 +22,13 @@ public class If0 extends Instruction
 		offset = is.readShort();
 		length += 2;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeShort(offset);
+	}
 
 	@Override
 	public void buildJumpGraph()

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

@@ -10,6 +10,7 @@ import info.sigterm.deob.execution.ObjectInstanceBase;
 import info.sigterm.deob.pool.Class;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class InstanceOf extends Instruction
@@ -24,6 +25,13 @@ public class InstanceOf extends Instruction
 		index = is.readUnsignedShort();
 		length += 2;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeShort(index);
+	}
 
 	@Override
 	public void execute(Frame e)

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

@@ -10,8 +10,10 @@ import info.sigterm.deob.execution.ClassInstance;
 import info.sigterm.deob.execution.Frame;
 import info.sigterm.deob.execution.ObjectInstance;
 import info.sigterm.deob.pool.InterfaceMethod;
+import info.sigterm.deob.pool.NameAndType;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class InvokeInterface extends Instruction
@@ -29,6 +31,36 @@ public class InvokeInterface extends Instruction
 		is.skip(1);
 		length += 4;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeShort(index);
+		out.writeByte(count);
+		out.writeByte(0);
+	}
+	
+	@Override
+	public void buildCallGraph()
+	{
+		ClassFile thisClass = this.getInstructions().getCode().getAttributes().getClassFile();
+
+		ConstantPool pool = thisClass.getPool();
+		InterfaceMethod method = (InterfaceMethod) pool.getEntry(index);
+		
+		info.sigterm.deob.pool.Class clazz = method.getClassEntry();
+		NameAndType nat = method.getNameAndType();
+		
+		info.sigterm.deob.Method thisMethod = this.getInstructions().getCode().getAttributes().getMethod();
+		
+		ClassFile otherClass = this.getInstructions().getCode().getAttributes().getClassFile().getGroup().findClass(clazz.getName());
+		if (otherClass == null)
+			return;
+		info.sigterm.deob.Method other = otherClass.findMethod(nat);
+		
+		thisMethod.addCallTo(this, other);
+	}
 
 	@Override
 	public void execute(Frame e)

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

@@ -9,9 +9,11 @@ import info.sigterm.deob.execution.ClassInstance;
 import info.sigterm.deob.execution.Frame;
 import info.sigterm.deob.execution.ObjectInstance;
 import info.sigterm.deob.pool.Method;
+import info.sigterm.deob.pool.NameAndType;
 import info.sigterm.deob.pool.PoolEntry;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class InvokeSpecial extends Instruction
@@ -26,6 +28,35 @@ public class InvokeSpecial extends Instruction
 		index = is.readUnsignedShort();
 		length += 2;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeShort(index);
+	}
+	
+	@Override
+	public void buildCallGraph()
+	{
+		ClassFile thisClass = this.getInstructions().getCode().getAttributes().getClassFile();
+
+		ConstantPool pool = thisClass.getPool();
+		Method method = (Method) pool.getEntry(index);
+		
+		info.sigterm.deob.pool.Class clazz = method.getClassEntry();
+		NameAndType nat = method.getNameAndType();
+		
+		info.sigterm.deob.Method thisMethod = this.getInstructions().getCode().getAttributes().getMethod();
+		
+		ClassFile otherClass = this.getInstructions().getCode().getAttributes().getClassFile().getGroup().findClass(clazz.getName());
+		if (otherClass == null)
+			return;
+		
+		info.sigterm.deob.Method other = otherClass.findMethod(nat);
+		
+		thisMethod.addCallTo(this, other);
+	}
 
 	@Override
 	public void execute(Frame e)

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

@@ -7,8 +7,10 @@ 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.Method;
+import info.sigterm.deob.pool.NameAndType;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class InvokeStatic extends Instruction
@@ -23,6 +25,35 @@ public class InvokeStatic extends Instruction
 		index = is.readUnsignedShort();
 		length += 2;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeShort(index);
+	}
+	
+	@Override
+	public void buildCallGraph()
+	{
+		ClassFile thisClass = this.getInstructions().getCode().getAttributes().getClassFile();
+
+		ConstantPool pool = thisClass.getPool();
+		Method method = (Method) pool.getEntry(index);
+		
+		info.sigterm.deob.pool.Class clazz = method.getClassEntry();
+		NameAndType nat = method.getNameAndType();
+		
+		info.sigterm.deob.Method thisMethod = this.getInstructions().getCode().getAttributes().getMethod();
+		
+		ClassFile otherClass = this.getInstructions().getCode().getAttributes().getClassFile().getGroup().findClass(clazz.getName());
+		if (otherClass == null)
+			return;
+		
+		info.sigterm.deob.Method other = otherClass.findMethod(nat);
+		
+		thisMethod.addCallTo(this, other);
+	}
 
 	@Override
 	public void execute(Frame e)

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

@@ -9,8 +9,10 @@ import info.sigterm.deob.execution.ClassInstance;
 import info.sigterm.deob.execution.Frame;
 import info.sigterm.deob.execution.ObjectInstance;
 import info.sigterm.deob.pool.Method;
+import info.sigterm.deob.pool.NameAndType;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class InvokeVirtual extends Instruction
@@ -25,6 +27,36 @@ public class InvokeVirtual extends Instruction
 		index = is.readUnsignedShort();
 		length += 2;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeShort(index);
+	}
+	
+	@Override
+	public void buildCallGraph()
+	{
+		ClassFile thisClass = this.getInstructions().getCode().getAttributes().getClassFile();
+
+		ConstantPool pool = thisClass.getPool();
+		Method method = (Method) pool.getEntry(index);
+		
+		info.sigterm.deob.pool.Class clazz = method.getClassEntry();
+		NameAndType nat = method.getNameAndType();
+		
+		info.sigterm.deob.Method thisMethod = this.getInstructions().getCode().getAttributes().getMethod();
+		
+		ClassFile otherClass = this.getInstructions().getCode().getAttributes().getClassFile().getGroup().findClass(clazz.getName());
+		if (otherClass == null)
+			return;
+		info.sigterm.deob.Method other = otherClass.findMethod(nat);
+		if (other == null)
+			return;
+		
+		thisMethod.addCallTo(this, other);
+	}
 
 	@Override
 	public void execute(Frame e)

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

@@ -8,6 +8,7 @@ import info.sigterm.deob.execution.Frame;
 import info.sigterm.deob.pool.PoolEntry;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class LDC extends Instruction
@@ -22,6 +23,13 @@ public class LDC extends Instruction
 		index = is.readByte();
 		length += 1;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeByte(index);
+	}
 
 	@Override
 	public void execute(Frame frame)

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

@@ -8,6 +8,7 @@ import info.sigterm.deob.execution.Frame;
 import info.sigterm.deob.pool.PoolEntry;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class LDC2_W extends Instruction
@@ -22,6 +23,13 @@ public class LDC2_W extends Instruction
 		index = is.readUnsignedShort();
 		length += 2;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeShort(index);
+	}
 
 	@Override
 	public void execute(Frame frame)

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

@@ -8,6 +8,7 @@ import info.sigterm.deob.execution.Frame;
 import info.sigterm.deob.pool.PoolEntry;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class LDC_W extends Instruction
@@ -22,6 +23,13 @@ public class LDC_W extends Instruction
 		index = is.readUnsignedShort();
 		length += 2;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeShort(index);
+	}
 
 	@Override
 	public void execute(Frame frame)

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

@@ -6,6 +6,7 @@ import info.sigterm.deob.attributes.code.Instructions;
 import info.sigterm.deob.execution.Frame;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class LLoad extends Instruction
@@ -20,6 +21,13 @@ public class LLoad extends Instruction
 		index = is.readByte();
 		length += 1;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeByte(index);
+	}
 
 	@Override
 	public void execute(Frame frame)

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

@@ -6,6 +6,7 @@ import info.sigterm.deob.attributes.code.Instructions;
 import info.sigterm.deob.execution.Frame;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class LStore extends Instruction
@@ -20,6 +21,13 @@ public class LStore extends Instruction
 		index = is.readByte();
 		length += 1;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeByte(index);
+	}
 
 	@Override
 	public void execute(Frame frame)

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

@@ -7,6 +7,7 @@ import info.sigterm.deob.execution.Frame;
 import info.sigterm.deob.execution.Path;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class LookupSwitch extends Instruction
@@ -40,6 +41,25 @@ public class LookupSwitch extends Instruction
 
 		length += tableSkip + 8 + (count * 8);
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		
+		int tableSkip = 4 - (pc + 1) % 4;
+		if (tableSkip == 4) tableSkip = 0;
+		if (tableSkip > 0) out.write(new byte[tableSkip]);
+		
+		out.writeInt(def);
+		
+		out.writeInt(count);
+		for (int i = 0; i < count; ++i)
+		{
+			out.writeInt(match[i]);
+			out.writeInt(branch[i]);
+		}
+	}
 
 	@Override
 	public void buildJumpGraph()

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

@@ -9,6 +9,7 @@ import info.sigterm.deob.execution.Stack;
 import info.sigterm.deob.pool.Class;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class MultiANewArray extends Instruction
@@ -26,6 +27,14 @@ public class MultiANewArray extends Instruction
 		length += 3;
 	}
 	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeShort(index);
+		out.writeByte(dimensions);
+	}
+	
 	@Override
 	public void execute(Frame e)
 	{

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

@@ -10,6 +10,7 @@ import info.sigterm.deob.execution.ObjectInstance;
 import info.sigterm.deob.pool.Class;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class New extends Instruction
@@ -24,6 +25,13 @@ public class New extends Instruction
 		index = is.readUnsignedShort();
 		length += 2;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeShort(index);
+	}
 
 	@Override
 	public void execute(Frame e)

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

@@ -6,6 +6,7 @@ import info.sigterm.deob.attributes.code.Instructions;
 import info.sigterm.deob.execution.Frame;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class NewArray extends Instruction
@@ -20,6 +21,13 @@ public class NewArray extends Instruction
 		this.type = is.readUnsignedByte();
 		length += 1;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeByte(type);
+	}
 
 	@Override
 	public void execute(Frame e)

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

@@ -12,6 +12,7 @@ import info.sigterm.deob.pool.Field;
 import info.sigterm.deob.pool.NameAndType;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class PutField extends Instruction
@@ -26,6 +27,13 @@ public class PutField extends Instruction
 		index = is.readUnsignedShort();
 		length += 2;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeShort(index);
+	}
 
 	@Override
 	public void execute(Frame e)

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

@@ -13,6 +13,7 @@ import info.sigterm.deob.pool.Field;
 import info.sigterm.deob.pool.NameAndType;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class PutStatic extends Instruction
@@ -27,6 +28,13 @@ public class PutStatic extends Instruction
 		index = is.readUnsignedShort();
 		length += 2;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeShort(index);
+	}
 
 	@Override
 	public void execute(Frame e)

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

@@ -6,6 +6,7 @@ import info.sigterm.deob.attributes.code.Instructions;
 import info.sigterm.deob.execution.Frame;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class SiPush extends Instruction
@@ -20,6 +21,13 @@ public class SiPush extends Instruction
 		s = is.readShort();
 		length += 2;
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		out.writeShort(s);
+	}
 
 	@Override
 	public void execute(Frame frame)

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

@@ -7,6 +7,7 @@ import info.sigterm.deob.execution.Frame;
 import info.sigterm.deob.execution.Path;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class TableSwitch extends Instruction
@@ -38,6 +39,23 @@ public class TableSwitch extends Instruction
 
 		length += tableSkip + 12 + (count * 4);
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		
+		int tableSkip = 4 - (pc + 1) % 4;
+		if (tableSkip == 4) tableSkip = 0;
+		if (tableSkip > 0) out.write(new byte[tableSkip]);
+		
+		out.writeInt(def);
+		out.writeInt(low);
+		out.writeInt(high);
+		
+		for (int i = 0; i < high - low + 1; ++i)
+			out.writeInt(jumps[i]);
+	}
 
 	@Override
 	public void buildJumpGraph()

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

@@ -6,6 +6,7 @@ import info.sigterm.deob.attributes.code.Instructions;
 import info.sigterm.deob.execution.Frame;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 
 public class Wide extends Instruction
@@ -33,6 +34,22 @@ public class Wide extends Instruction
 			length += 2;
 		}
 	}
+	
+	@Override
+	public void write(DataOutputStream out, int pc) throws IOException
+	{
+		super.write(out, pc);
+		
+		out.writeByte(opcode);
+		out.writeShort(index);
+		
+		InstructionType optype = InstructionType.findInstructionFromCode(opcode);
+		assert optype != null;
+		if (optype == InstructionType.IINC)
+		{
+			out.writeShort(value);
+		}
+	}
 
 	@Override
 	public void execute(Frame e)