Remove beginning of original instruction graph, don't need it
This commit is contained in:
@@ -231,11 +231,6 @@ public class ClassFile
|
||||
i.children.add(this);
|
||||
}
|
||||
}
|
||||
|
||||
public void buildInstructionGraph()
|
||||
{
|
||||
methods.buildInstructionGraph();
|
||||
}
|
||||
|
||||
public boolean instanceOf(ClassFile other)
|
||||
{
|
||||
|
||||
@@ -47,10 +47,4 @@ public class ClassGroup
|
||||
for (ClassFile c : classes)
|
||||
c.buildClassGraph();
|
||||
}
|
||||
|
||||
public void buildInstructionGraph()
|
||||
{
|
||||
for (ClassFile c : classes)
|
||||
c.buildInstructionGraph();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -28,8 +28,6 @@ public class Field
|
||||
private Type type;
|
||||
private Attributes attributes;
|
||||
|
||||
private ArrayList<Instruction> instructions = new ArrayList<Instruction>(); // instructions which reference this field
|
||||
|
||||
Field(Fields fields) throws IOException
|
||||
{
|
||||
this.fields = fields;
|
||||
@@ -97,9 +95,4 @@ public class Field
|
||||
{
|
||||
return attributes;
|
||||
}
|
||||
|
||||
public void addReference(Instruction ins)
|
||||
{
|
||||
instructions.add(ins);
|
||||
}
|
||||
}
|
||||
@@ -115,14 +115,6 @@ public class Method
|
||||
{
|
||||
return (Code) attributes.findType(AttributeType.CODE);
|
||||
}
|
||||
|
||||
public void buildInstructionGraph()
|
||||
{
|
||||
Code code = getCode();
|
||||
|
||||
if (code != null)
|
||||
code.buildInstructionGraph();
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public <T extends Instruction & LVTInstruction> List<T> findLVTInstructionsForVariable(int index)
|
||||
|
||||
@@ -72,10 +72,4 @@ public class Methods
|
||||
return m;
|
||||
return null;
|
||||
}
|
||||
|
||||
public void buildInstructionGraph()
|
||||
{
|
||||
for (Method m : methods)
|
||||
m.buildInstructionGraph();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -111,9 +111,4 @@ public class Code extends Attribute
|
||||
{
|
||||
this.instructions = instructions;
|
||||
}
|
||||
|
||||
public void buildInstructionGraph()
|
||||
{
|
||||
instructions.buildInstructionGraph();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -202,10 +202,6 @@ public abstract class Instruction
|
||||
to.from.add(this);
|
||||
}
|
||||
|
||||
public void buildInstructionGraph()
|
||||
{
|
||||
}
|
||||
|
||||
public abstract void execute(Frame e);
|
||||
|
||||
/* does this terminate a block? */
|
||||
|
||||
@@ -210,13 +210,7 @@ public class Instructions
|
||||
if (i instanceof JumpingInstruction)
|
||||
((JumpingInstruction) i).buildJumpGraph();
|
||||
}
|
||||
|
||||
public void buildInstructionGraph()
|
||||
{
|
||||
for (Instruction i : instructions)
|
||||
i.buildInstructionGraph();
|
||||
}
|
||||
|
||||
|
||||
public Code getCode()
|
||||
{
|
||||
return code;
|
||||
|
||||
@@ -52,22 +52,6 @@ public class GetStatic extends Instruction implements GetFieldInstruction
|
||||
frame.addInstructionContext(ins);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void buildInstructionGraph()
|
||||
{
|
||||
Class clazz = field.getClassEntry();
|
||||
NameAndType nat = field.getNameAndType();
|
||||
|
||||
ClassFile cf = this.getInstructions().getCode().getAttributes().getClassFile().getGroup().findClass(clazz.getName());
|
||||
if (cf == null)
|
||||
return;
|
||||
|
||||
net.runelite.deob.Field f = cf.findFieldDeep(nat);
|
||||
assert f != null;
|
||||
|
||||
f.addReference(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Field getField()
|
||||
{
|
||||
|
||||
@@ -253,7 +253,7 @@ public class FieldMover implements Deobfuscator
|
||||
}
|
||||
|
||||
to.getCode().getInstructions().buildJumpGraph();
|
||||
frame.getMethod().getCode().getInstructions().buildInstructionGraph();
|
||||
frame.getMethod().getCode().getInstructions().buildJumpGraph();
|
||||
|
||||
for (Instruction i : orderedIns.values())
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user