ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Map java/lang/reflect/Field and Method

Browse Source
This commit is contained in:
Adam
2016-03-27 19:16:25 -04:00
parent afcb4a1c36
commit d58116b4ea
6 changed files with 3 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/net/runelite/asm/attributes/code/instructions/ArrayStore.java
View File

@@ -4,7 +4,6 @@ import net.runelite.asm.Field;
import net.runelite.asm.attributes.code.Instruction; import net.runelite.asm.attributes.code.Instruction;
import net.runelite.asm.attributes.code.InstructionType; import net.runelite.asm.attributes.code.InstructionType;
import net.runelite.asm.attributes.code.Instructions; import net.runelite.asm.attributes.code.Instructions;
import net.runelite.asm.attributes.code.instruction.types.ArrayLoad;
import net.runelite.asm.attributes.code.instruction.types.ArrayStoreInstruction; import net.runelite.asm.attributes.code.instruction.types.ArrayStoreInstruction;
import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction; import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction;
import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil; import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil;

6
src/main/java/net/runelite/asm/attributes/code/instructions/InvokeInterface.java
View File

@@ -249,12 +249,6 @@ public class InvokeInterface extends Instruction implements InvokeInstruction
List<net.runelite.asm.Method> thisMethods = thisIi.getMethods(), List<net.runelite.asm.Method> thisMethods = thisIi.getMethods(),
otherMethods = otherIi.getMethods(); otherMethods = otherIi.getMethods();
if ((thisMethods != null) != (otherMethods != null))
return false;
if (thisMethods == null || otherMethods == null)
return true; // we don't map these anyway
if (thisMethods.size() != otherMethods.size()) if (thisMethods.size() != otherMethods.size())
return false; return false;

6
src/main/java/net/runelite/asm/attributes/code/instructions/InvokeSpecial.java
View File

@@ -250,12 +250,6 @@ public class InvokeSpecial extends Instruction implements InvokeInstruction
List<net.runelite.asm.Method> thisMethods = thisIi.getMethods(), List<net.runelite.asm.Method> thisMethods = thisIi.getMethods(),
otherMethods = otherIi.getMethods(); otherMethods = otherIi.getMethods();
if ((thisMethods != null) != (otherMethods != null))
return false;
if (thisMethods == null || otherMethods == null)
return true; // we don't map these anyway
if (thisMethods.size() != otherMethods.size()) if (thisMethods.size() != otherMethods.size())
return false; return false;

7
src/main/java/net/runelite/asm/attributes/code/instructions/InvokeStatic.java
View File

@@ -19,7 +19,6 @@ import net.runelite.asm.signature.Signature;
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 java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import net.runelite.asm.Field; import net.runelite.asm.Field;
@@ -220,12 +219,6 @@ public class InvokeStatic extends Instruction implements InvokeInstruction
List<net.runelite.asm.Method> thisMethods = thisIi.getMethods(), List<net.runelite.asm.Method> thisMethods = thisIi.getMethods(),
otherMethods = otherIi.getMethods(); otherMethods = otherIi.getMethods();
if ((thisMethods != null) != (otherMethods != null))
return false;
if (thisMethods == null || otherMethods == null)
return true; // we don't map these anyway
if (thisMethods.size() != otherMethods.size()) if (thisMethods.size() != otherMethods.size())
return false; return false;

6
src/main/java/net/runelite/asm/attributes/code/instructions/InvokeVirtual.java
View File

@@ -255,12 +255,6 @@ public class InvokeVirtual extends Instruction implements InvokeInstruction
List<net.runelite.asm.Method> thisMethods = thisIi.getMethods(), List<net.runelite.asm.Method> thisMethods = thisIi.getMethods(),
otherMethods = otherIi.getMethods(); otherMethods = otherIi.getMethods();
if ((thisMethods != null) != (otherMethods != null))
return false;
if (thisMethods == null || otherMethods == null)
return true; // we don't map these anyway
if (thisMethods.size() != otherMethods.size()) if (thisMethods.size() != otherMethods.size())
return false; return false;

3
src/main/java/net/runelite/deob/deobfuscators/rename/MappingExecutorUtil.java
View File

@@ -200,6 +200,9 @@ public class MappingExecutorUtil
return false; return false;
} }
if (className.startsWith("java/lang/reflect/"))
return true;
if (className.startsWith("java/") || className.startsWith("netscape/") || className.startsWith("javax/")) if (className.startsWith("java/") || className.startsWith("netscape/") || className.startsWith("javax/"))
return false; return false;