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

iflt

Browse Source
This commit is contained in:
Adam
2016-01-29 20:31:22 -05:00
parent fac66bfe52
commit def680fb9c
3 changed files with 63 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/net/runelite/deob/attributes/code/instructions/IfCmpLt.java
View File

@@ -2,6 +2,8 @@ package net.runelite.deob.attributes.code.instructions;
import net.runelite.deob.attributes.code.InstructionType;
import net.runelite.deob.attributes.code.Instructions;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
import net.runelite.deob.execution.InstructionContext;
public class IfCmpLt extends If
{
@@ -10,4 +12,30 @@ public class IfCmpLt extends If
super(instructions, type, pc);
}
@Override
public boolean isSame(InstructionContext thisIc, InstructionContext otherIc)
{
if (super.isSame(thisIc, otherIc))
return true;
if (otherIc.getInstruction() instanceof IfCmpGe)
{
return true;
}
return false;
}
@Override
public void map(ParallelExecutorMapping mapping, InstructionContext ctx, InstructionContext other)
{
if (other.getInstruction() instanceof IfCmpGe)
{
super.mapOtherBranch(mapping, ctx, other);
}
else
{
super.map(mapping, ctx, other);
}
}
}

28
src/main/java/net/runelite/deob/attributes/code/instructions/IfLt.java
View File

@@ -2,6 +2,8 @@ package net.runelite.deob.attributes.code.instructions;
import net.runelite.deob.attributes.code.InstructionType;
import net.runelite.deob.attributes.code.Instructions;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
import net.runelite.deob.execution.InstructionContext;
public class IfLt extends If0
{
@@ -10,4 +12,30 @@ public class IfLt extends If0
super(instructions, type, pc);
}
@Override
public boolean isSame(InstructionContext thisIc, InstructionContext otherIc)
{
if (super.isSame(thisIc, otherIc))
return true;
if (otherIc.getInstruction() instanceof IfGe)
{
return true;
}
return false;
}
@Override
public void map(ParallelExecutorMapping mapping, InstructionContext ctx, InstructionContext other)
{
if (other.getInstruction() instanceof IfGe)
{
super.mapOtherBranch(mapping, ctx, other);
}
else
{
super.map(mapping, ctx, other);
}
}
}

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

@@ -35,6 +35,7 @@ public class MapStaticTest
{ "class162.method3270", "class86.method2020" },
{ "class29.method711", "class36.method742" },
{ "class72.run", "class72.run" },
{ "class64.vmethod3787", "class64.vmethod3664" },
};
// @Test
@@ -79,8 +80,8 @@ public class MapStaticTest
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("init");
Method m2 = group2.findClass("client").findMethod("init");
Method m1 = group1.findClass("class64").findMethod("vmethod3787");
Method m2 = group2.findClass("class64").findMethod("vmethod3664");
ParallelExecutorMapping mappings = MappingExecutorUtil.map(m1, m2);
@@ -97,8 +98,8 @@ public class MapStaticTest
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("class72").findMethod("run");
Method m2 = group2.findClass("class72").findMethod("run");
Method m1 = group1.findClass("class64").findMethod("vmethod3787");
Method m2 = group2.findClass("class64").findMethod("vmethod3664");
HashMap<Object, Object> all = new HashMap();
map(all, new HashSet(), m1, m2);
@@ -122,7 +123,7 @@ public class MapStaticTest
}
}
//@Test
@Test
public void testAllMap() throws Exception
{
ClassGroup group1 = JarUtil.loadJar(new File("d:/rs/07/adamin1.jar"));
@@ -147,8 +148,8 @@ public class MapStaticTest
{
System.out.println(e.getKey() + " <-> " + e.getValue());
}
System.out.println("Total " + all.size());
}
System.out.println("Total " + all.size());
}
public List<Method> getInitialMethods(ClassGroup group)