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

ise tests/cleanup. needs more optimizations.

Browse Source
This commit is contained in:
Adam
2016-03-24 10:13:18 -04:00
parent 3f91d272d6
commit 2fdf2b47bc
2 changed files with 56 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/net/runelite/deob/deobfuscators/IllegalStateExceptions.java
View File

@@ -1,5 +1,6 @@
package net.runelite.deob.deobfuscators; package net.runelite.deob.deobfuscators;
import java.util.Collection;
import java.util.List; import java.util.List;
import net.runelite.asm.ClassFile; import net.runelite.asm.ClassFile;
@@ -14,10 +15,8 @@ import net.runelite.asm.attributes.code.instruction.types.JumpingInstruction;
import net.runelite.asm.attributes.code.instructions.AThrow; import net.runelite.asm.attributes.code.instructions.AThrow;
import net.runelite.asm.attributes.code.instructions.Goto; import net.runelite.asm.attributes.code.instructions.Goto;
import net.runelite.asm.attributes.code.instructions.If; import net.runelite.asm.attributes.code.instructions.If;
import net.runelite.asm.attributes.code.instructions.If0;
import net.runelite.asm.attributes.code.instructions.New; import net.runelite.asm.attributes.code.instructions.New;
import net.runelite.asm.execution.Execution; import net.runelite.asm.execution.Execution;
import net.runelite.asm.execution.Frame;
import net.runelite.asm.execution.InstructionContext; import net.runelite.asm.execution.InstructionContext;
public class IllegalStateExceptions implements Deobfuscator public class IllegalStateExceptions implements Deobfuscator
@@ -35,7 +34,7 @@ public class IllegalStateExceptions implements Deobfuscator
if (c == null) if (c == null)
continue; continue;
assert execution.methods.contains(m); //assert execution.methods.contains(m);
Instructions instructions = c.getInstructions(); Instructions instructions = c.getInstructions();
instructions.buildJumpGraph(); instructions.buildJumpGraph();
@@ -45,7 +44,7 @@ public class IllegalStateExceptions implements Deobfuscator
{ {
Instruction ins = ilist.get(i); Instruction ins = ilist.get(i);
if (!(ins instanceof ComparisonInstruction)) if (!(ins instanceof ComparisonInstruction)) // the if
continue; continue;
Instruction ins2 = ilist.get(i + 1); Instruction ins2 = ilist.get(i + 1);
@@ -62,22 +61,20 @@ public class IllegalStateExceptions implements Deobfuscator
Instruction to = jumpIns.getJumps().get(0); Instruction to = jumpIns.getJumps().get(0);
// remove stack of if. // remove stack of if.
boolean found = false; Collection<InstructionContext> ics = execution.getInstructonContexts(ins);
outer: if (ics == null)
for (Frame f : execution.processedFrames) continue; // never executed
if (f.getMethod() == m)
{
for (InstructionContext ic : f.getInstructions())
if (ic.getInstruction() == ins) // this is the if
{
found = true;
if (ins instanceof If) boolean found = false;
ic.removeStack(1); for (InstructionContext ic : ics)
ic.removeStack(0); {
break outer; found = true;
}
} if (ins instanceof If)
ic.removeStack(1);
ic.removeStack(0);
break;
}
if (!found) if (!found)
{ {
System.out.println("Unable to locate instruction ctx to remove stack for illegalstateexception " + ins.getType().getName() + " in method " + m.getName() + " class " + m.getMethods().getClassFile().getName()); System.out.println("Unable to locate instruction ctx to remove stack for illegalstateexception " + ins.getType().getName() + " in method " + m.getName() + " class " + m.getMethods().getClassFile().getName());

40
src/test/java/net/runelite/deob/deobfuscators/IllegalStateExceptionsTest.java Normal file
View File

@@ -0,0 +1,40 @@
package net.runelite.deob.deobfuscators;
import java.io.File;
import java.io.IOException;
import net.runelite.asm.ClassGroup;
import net.runelite.deob.util.JarUtil;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
public class IllegalStateExceptionsTest
{
private static final File GAMEPACK = new File(RenameUniqueTest.class.getResource("/gamepack_v16.jar").getFile());
@Rule
public TemporaryFolder folder = new TemporaryFolder();
private ClassGroup group;
@Before
public void before() throws IOException
{
group = JarUtil.loadJar(GAMEPACK);
}
@After
public void after() throws IOException
{
JarUtil.saveJar(group, folder.newFile());
}
@Test
public void testRun()
{
IllegalStateExceptions ise = new IllegalStateExceptions();
ise.run(group);
}
}