Rename lookup2 -> lookup

This commit is contained in:
Adam
2015-10-18 18:44:43 -04:00
parent 95c4c441d0
commit d6f9509e5a
15 changed files with 15 additions and 45 deletions

View File

@@ -221,7 +221,7 @@ public abstract class Instruction
} }
// look up symbols from pool // look up symbols from pool
public void lookup2() public void lookup()
{ {
} }

View File

@@ -257,7 +257,7 @@ public class Instructions
public void lookup() public void lookup()
{ {
for (Instruction i : instructions) for (Instruction i : instructions)
i.lookup2(); i.lookup();
} }
public void regeneratePool() public void regeneratePool()

View File

@@ -15,7 +15,6 @@ import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import net.runelite.deob.ClassGroup; import net.runelite.deob.ClassGroup;
import net.runelite.deob.util.NameMappings;
public class ANewArray extends Instruction public class ANewArray extends Instruction
{ {
@@ -63,7 +62,7 @@ public class ANewArray extends Instruction
} }
@Override @Override
public void lookup2() public void lookup()
{ {
net.runelite.deob.signature.Type t = new net.runelite.deob.signature.Type(clazz.getName()); net.runelite.deob.signature.Type t = new net.runelite.deob.signature.Type(clazz.getName());
String name = t.getType(); String name = t.getType();

View File

@@ -8,14 +8,12 @@ import net.runelite.deob.execution.Frame;
import net.runelite.deob.execution.InstructionContext; import net.runelite.deob.execution.InstructionContext;
import net.runelite.deob.execution.Stack; import net.runelite.deob.execution.Stack;
import net.runelite.deob.execution.StackContext; import net.runelite.deob.execution.StackContext;
import net.runelite.deob.execution.Type;
import net.runelite.deob.pool.Class; import net.runelite.deob.pool.Class;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import net.runelite.deob.ClassGroup; import net.runelite.deob.ClassGroup;
import net.runelite.deob.util.NameMappings;
public class CheckCast extends Instruction public class CheckCast extends Instruction
{ {
@@ -60,7 +58,7 @@ public class CheckCast extends Instruction
} }
@Override @Override
public void lookup2() public void lookup()
{ {
ClassGroup group = this.getInstructions().getCode().getAttributes().getClassFile().getGroup(); ClassGroup group = this.getInstructions().getCode().getAttributes().getClassFile().getGroup();
myClass = group.findClass(clazz.getName()); myClass = group.findClass(clazz.getName());

View File

@@ -17,10 +17,6 @@ import net.runelite.deob.pool.NameAndType;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import net.runelite.deob.ClassGroup;
import net.runelite.deob.deobfuscators.arithmetic.Encryption;
import net.runelite.deob.deobfuscators.arithmetic.Pair;
import net.runelite.deob.util.NameMappings;
public class GetField extends Instruction implements GetFieldInstruction public class GetField extends Instruction implements GetFieldInstruction
{ {
@@ -84,7 +80,7 @@ public class GetField extends Instruction implements GetFieldInstruction
} }
@Override @Override
public void lookup2() public void lookup()
{ {
myField = getMyField(); myField = getMyField();
} }

View File

@@ -17,10 +17,6 @@ import net.runelite.deob.pool.NameAndType;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import net.runelite.deob.ClassGroup;
import net.runelite.deob.deobfuscators.arithmetic.Encryption;
import net.runelite.deob.deobfuscators.arithmetic.Pair;
import net.runelite.deob.util.NameMappings;
public class GetStatic extends Instruction implements GetFieldInstruction public class GetStatic extends Instruction implements GetFieldInstruction
{ {
@@ -88,7 +84,7 @@ public class GetStatic extends Instruction implements GetFieldInstruction
} }
@Override @Override
public void lookup2() public void lookup()
{ {
myField = this.getMyField(); myField = this.getMyField();
} }

View File

@@ -14,7 +14,6 @@ import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import net.runelite.deob.ClassGroup; import net.runelite.deob.ClassGroup;
import net.runelite.deob.util.NameMappings;
public class InstanceOf extends Instruction public class InstanceOf extends Instruction
{ {
@@ -58,7 +57,7 @@ public class InstanceOf extends Instruction
} }
@Override @Override
public void lookup2() public void lookup()
{ {
ClassGroup group = this.getInstructions().getCode().getAttributes().getClassFile().getGroup(); ClassGroup group = this.getInstructions().getCode().getAttributes().getClassFile().getGroup();
myClass = group.findClass(clazz.getName()); myClass = group.findClass(clazz.getName());

View File

@@ -11,9 +11,7 @@ import net.runelite.deob.execution.InstructionContext;
import net.runelite.deob.execution.Stack; import net.runelite.deob.execution.Stack;
import net.runelite.deob.execution.StackContext; import net.runelite.deob.execution.StackContext;
import net.runelite.deob.execution.Type; import net.runelite.deob.execution.Type;
import net.runelite.deob.pool.Class;
import net.runelite.deob.pool.InterfaceMethod; import net.runelite.deob.pool.InterfaceMethod;
import net.runelite.deob.pool.Method;
import net.runelite.deob.pool.NameAndType; import net.runelite.deob.pool.NameAndType;
import net.runelite.deob.pool.PoolEntry; import net.runelite.deob.pool.PoolEntry;
import net.runelite.deob.signature.Signature; import net.runelite.deob.signature.Signature;
@@ -24,7 +22,6 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import net.runelite.deob.execution.Execution; import net.runelite.deob.execution.Execution;
import net.runelite.deob.util.NameMappings;
public class InvokeInterface extends Instruction implements InvokeInstruction public class InvokeInterface extends Instruction implements InvokeInstruction
{ {
@@ -144,7 +141,7 @@ public class InvokeInterface extends Instruction implements InvokeInstruction
} }
@Override @Override
public void lookup2() public void lookup()
{ {
myMethods = this.getMethods(); myMethods = this.getMethods();
} }

View File

@@ -11,7 +11,6 @@ import net.runelite.deob.execution.InstructionContext;
import net.runelite.deob.execution.Stack; import net.runelite.deob.execution.Stack;
import net.runelite.deob.execution.StackContext; import net.runelite.deob.execution.StackContext;
import net.runelite.deob.execution.Type; import net.runelite.deob.execution.Type;
import net.runelite.deob.pool.Class;
import net.runelite.deob.pool.Method; import net.runelite.deob.pool.Method;
import net.runelite.deob.pool.NameAndType; import net.runelite.deob.pool.NameAndType;
import net.runelite.deob.pool.PoolEntry; import net.runelite.deob.pool.PoolEntry;
@@ -23,8 +22,6 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import net.runelite.deob.execution.Execution; import net.runelite.deob.execution.Execution;
import net.runelite.deob.pool.InterfaceMethod;
import net.runelite.deob.util.NameMappings;
public class InvokeSpecial extends Instruction implements InvokeInstruction public class InvokeSpecial extends Instruction implements InvokeInstruction
{ {
@@ -137,7 +134,7 @@ public class InvokeSpecial extends Instruction implements InvokeInstruction
} }
@Override @Override
public void lookup2() public void lookup()
{ {
myMethods = this.getMethods(); myMethods = this.getMethods();
} }

View File

@@ -11,7 +11,6 @@ import net.runelite.deob.execution.InstructionContext;
import net.runelite.deob.execution.Stack; import net.runelite.deob.execution.Stack;
import net.runelite.deob.execution.StackContext; import net.runelite.deob.execution.StackContext;
import net.runelite.deob.execution.Type; import net.runelite.deob.execution.Type;
import net.runelite.deob.pool.Class;
import net.runelite.deob.pool.Method; import net.runelite.deob.pool.Method;
import net.runelite.deob.pool.NameAndType; import net.runelite.deob.pool.NameAndType;
import net.runelite.deob.pool.PoolEntry; import net.runelite.deob.pool.PoolEntry;
@@ -23,7 +22,6 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import net.runelite.deob.execution.Execution; import net.runelite.deob.execution.Execution;
import net.runelite.deob.util.NameMappings;
public class InvokeStatic extends Instruction implements InvokeInstruction public class InvokeStatic extends Instruction implements InvokeInstruction
{ {
@@ -140,7 +138,7 @@ public class InvokeStatic extends Instruction implements InvokeInstruction
} }
@Override @Override
public void lookup2() public void lookup()
{ {
myMethods = this.getMethods(); myMethods = this.getMethods();
} }

View File

@@ -11,7 +11,6 @@ import net.runelite.deob.execution.InstructionContext;
import net.runelite.deob.execution.Stack; import net.runelite.deob.execution.Stack;
import net.runelite.deob.execution.StackContext; import net.runelite.deob.execution.StackContext;
import net.runelite.deob.execution.Type; import net.runelite.deob.execution.Type;
import net.runelite.deob.pool.Class;
import net.runelite.deob.pool.Method; import net.runelite.deob.pool.Method;
import net.runelite.deob.pool.NameAndType; import net.runelite.deob.pool.NameAndType;
import net.runelite.deob.pool.PoolEntry; import net.runelite.deob.pool.PoolEntry;
@@ -23,7 +22,6 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import net.runelite.deob.execution.Execution; import net.runelite.deob.execution.Execution;
import net.runelite.deob.util.NameMappings;
public class InvokeVirtual extends Instruction implements InvokeInstruction public class InvokeVirtual extends Instruction implements InvokeInstruction
{ {
@@ -141,7 +139,7 @@ public class InvokeVirtual extends Instruction implements InvokeInstruction
} }
@Override @Override
public void lookup2() public void lookup()
{ {
myMethods = this.getMethods(); myMethods = this.getMethods();
} }

View File

@@ -15,7 +15,6 @@ import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import net.runelite.deob.ClassGroup; import net.runelite.deob.ClassGroup;
import net.runelite.deob.util.NameMappings;
public class MultiANewArray extends Instruction public class MultiANewArray extends Instruction
{ {
@@ -66,7 +65,7 @@ public class MultiANewArray extends Instruction
} }
@Override @Override
public void lookup2() public void lookup()
{ {
net.runelite.deob.signature.Type t = new net.runelite.deob.signature.Type(clazz.getName()); net.runelite.deob.signature.Type t = new net.runelite.deob.signature.Type(clazz.getName());
String name = t.getType(); String name = t.getType();

View File

@@ -15,7 +15,6 @@ import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import net.runelite.deob.ClassGroup; import net.runelite.deob.ClassGroup;
import net.runelite.deob.util.NameMappings;
public class New extends Instruction public class New extends Instruction
{ {
@@ -61,7 +60,7 @@ public class New extends Instruction
} }
@Override @Override
public void lookup2() public void lookup()
{ {
ClassGroup group = this.getInstructions().getCode().getAttributes().getClassFile().getGroup(); ClassGroup group = this.getInstructions().getCode().getAttributes().getClassFile().getGroup();
myClass = group.findClass(clazz.getName()); myClass = group.findClass(clazz.getName());

View File

@@ -16,10 +16,6 @@ import net.runelite.deob.pool.NameAndType;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import net.runelite.deob.ClassGroup;
import net.runelite.deob.deobfuscators.arithmetic.Encryption;
import net.runelite.deob.deobfuscators.arithmetic.Pair;
import net.runelite.deob.util.NameMappings;
public class PutField extends Instruction implements SetFieldInstruction public class PutField extends Instruction implements SetFieldInstruction
{ {
@@ -79,7 +75,7 @@ public class PutField extends Instruction implements SetFieldInstruction
} }
@Override @Override
public void lookup2() public void lookup()
{ {
myField = getMyField(); myField = getMyField();
} }

View File

@@ -16,8 +16,6 @@ import net.runelite.deob.pool.NameAndType;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import net.runelite.deob.ClassGroup;
import net.runelite.deob.util.NameMappings;
public class PutStatic extends Instruction implements SetFieldInstruction public class PutStatic extends Instruction implements SetFieldInstruction
{ {
@@ -76,7 +74,7 @@ public class PutStatic extends Instruction implements SetFieldInstruction
} }
@Override @Override
public void lookup2() public void lookup()
{ {
myField = getMyField(); myField = getMyField();
} }