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

Unused params. Don't know how much this helps.

Browse Source
This commit is contained in:
Adam
2016-04-04 09:48:40 -04:00
parent f5b8d681ef
commit b1af823585
1 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/net/runelite/deob/deobfuscators/UnusedParameters.java
View File

@@ -1,5 +1,7 @@
package net.runelite.deob.deobfuscators; package net.runelite.deob.deobfuscators;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
@@ -25,6 +27,24 @@ import org.apache.commons.collections4.CollectionUtils;
public class UnusedParameters implements Deobfuscator public class UnusedParameters implements Deobfuscator
{ {
private Map<List<Method>, Collection<Integer>> unused = new HashMap<>(); private Map<List<Method>, Collection<Integer>> unused = new HashMap<>();
private Multimap<Instruction, InstructionContext> invokes = HashMultimap.create();
private void visit(InstructionContext ictx)
{
Instruction i = ictx.getInstruction();
if (!(i instanceof InvokeInstruction))
return;
InvokeInstruction ii = (InvokeInstruction) i;
List<Method> methods = ii.getMethods();
if (!unused.containsKey(methods))
return;
for (Method m : methods)
invokes.put(i, ictx);
}
private void buildUnused(ClassGroup group) private void buildUnused(ClassGroup group)
{ {
@@ -144,7 +164,7 @@ public class UnusedParameters implements Deobfuscator
ii.removeParameter(paramIndex); // remove parameter from instruction ii.removeParameter(paramIndex); // remove parameter from instruction
Collection<InstructionContext> ics = execution.getInstructonContexts(i); Collection<InstructionContext> ics = invokes.get(i);//execution.getInstructonContexts(i);
if (ics != null) if (ics != null)
{ {
InstructionContext ins = ics.toArray(new InstructionContext[0])[0]; InstructionContext ins = ics.toArray(new InstructionContext[0])[0];
@@ -198,15 +218,18 @@ public class UnusedParameters implements Deobfuscator
do do
{ {
group.buildClassGraph(); group.buildClassGraph();
invokes.clear();
this.buildUnused(group);
Execution execution = new Execution(group); Execution execution = new Execution(group);
execution.addExecutionVisitor(ictx -> visit(ictx));
execution.populateInitialMethods(); execution.populateInitialMethods();
execution.run(); execution.run();
this.buildUnused(group);
i = this.processUnused(execution, group); i = this.processUnused(execution, group);
System.out.println("PASS " + pnum++ + " " + i); System.out.println("PASS " + pnum++ + " " + i);
count += i; count += i;
} }
while (i > 0); while (i > 0);