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

Allow parallel mapping executor to step through static methods if it encounters an invokestatic that doesn't match the other executor. Maybe works. Hitting an ifnull vs if check fail in my test.

Browse Source
This commit is contained in:
Adam
2016-01-01 19:01:40 -05:00
parent 6bb02614ca
commit d029c128e3
5 changed files with 137 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/test/java/net/runelite/deob/deobfuscators/rename/MapStaticTest.java Normal file
View File

@@ -0,0 +1,36 @@
package net.runelite.deob.deobfuscators.rename;
import java.io.File;
import java.io.IOException;
import net.runelite.deob.ClassGroup;
import net.runelite.deob.Method;
import net.runelite.deob.util.JarUtil;
import org.junit.Assert;
import org.junit.Test;
public class MapStaticTest
{
//@Test
public void testMappable() throws IOException
{
ClassGroup group1 = JarUtil.loadJar(new File("d:/rs/07/adamin1.jar"));
ClassGroup group2 = JarUtil.loadJar(new File("d:/rs/07/adamin2.jar"));
// Assert.assertTrue(MappingExecutorUtil.isMappable(
// group1.findClass("class99").findMethod("method2220"),
// group2.findClass("class99").findMethod("method2149")
// ));
}
@Test
public void test() throws IOException
{
ClassGroup group1 = JarUtil.loadJar(new File("d:/rs/07/adamin1.jar"));
ClassGroup group2 = JarUtil.loadJar(new File("d:/rs/07/adamin2.jar"));
Method m1 = group1.findClass("client").findMethod("vmethod3050");
Method m2 = group2.findClass("client").findMethod("vmethod3007");
ParallelExecutorMapping mappings = MappingExecutorUtil.map(m1, m2);
}
}

13
src/test/java/net/runelite/deob/deobfuscators/rename/MapTest.java
View File

@@ -2,19 +2,8 @@ package net.runelite.deob.deobfuscators.rename;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import net.runelite.deob.ClassGroup;
import net.runelite.deob.Method;
import net.runelite.deob.attributes.code.Instruction;
import net.runelite.deob.attributes.code.instruction.types.MappableInstruction;
import net.runelite.deob.execution.Execution;
import net.runelite.deob.execution.Frame;
import net.runelite.deob.execution.InstructionContext;
import net.runelite.deob.execution.ParallellMappingExecutor;
import net.runelite.deob.util.JarUtil;
import org.junit.Assert;
import org.junit.Test;
@@ -34,7 +23,7 @@ public class MapTest
}
@Test
public void main() throws IOException
public void test() throws IOException
{
ClassGroup group1 = JarUtil.loadJar(new File("d:/rs/07/adamin1.jar"));
ClassGroup group2 = JarUtil.loadJar(new File("d:/rs/07/adamin2.jar"));