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

Move stuff to functions

Browse Source
This commit is contained in:
Adam
2015-11-07 22:40:51 -05:00
parent cb639749e1
commit 6ce5564e9f
1 changed files with 41 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/main/java/net/runelite/deob/deobfuscators/rename/Rename.java
View File

@@ -17,30 +17,22 @@ import net.runelite.deob.execution.Frame;
public class Rename public class Rename
{ {
public void run(ClassGroup one, ClassGroup two) // respective executions
private Execution eone, etwo;
// old -> new object mapping
private Map<Object, Object> objMap = new HashMap<>();
private boolean compare(Frame f1, Frame f2)
{ {
Execution eone = new Execution(one); Graph g1 = f1.getGraph(), g2 = f2.getGraph();
eone.populateInitialMethods();
eone.run();
Execution etwo = new Execution(two);
etwo.populateInitialMethods();
etwo.run();
List<Frame> f1 = eone.processedFrames.stream().filter(f -> f.getMethod() == one.findClass("client").findMethod("init")).collect(Collectors.toList());
List<Frame> f2 = etwo.processedFrames.stream().filter(f -> f.getMethod() == two.findClass("client").findMethod("init")).collect(Collectors.toList());
Frame ff1 = f1.get(0), ff2 = f2.get(0);
Graph g1 = ff1.getGraph(), g2 = ff2.getGraph();
IsomorphismTester isoTest = new TypedVF2IsomorphismTester(); IsomorphismTester isoTest = new TypedVF2IsomorphismTester();
System.out.println(isoTest.areIsomorphic(g1, g2)); if (!isoTest.areIsomorphic(g1, g2))
return false;
Map<Integer, Integer> mapping = isoTest.findIsomorphism(g1, g2); Map<Integer, Integer> mapping = isoTest.findIsomorphism(g1, g2);
Map<Integer, Instruction> map1 = ff1.getIdMap(), map2 = ff2.getIdMap(); Map<Integer, Instruction> map1 = f1.getIdMap(), map2 = f2.getIdMap();
Map<Object, Object> objMap = new HashMap<>();
for (Entry<Integer, Integer> e : mapping.entrySet()) for (Entry<Integer, Integer> e : mapping.entrySet())
{ {
@@ -67,11 +59,38 @@ public class Rename
objMap.put(m1, m2); objMap.put(m1, m2);
} }
//ii1.getMethods().
System.out.println("MATCH " + ii1.getMethods().get(0).getName() + " -> " + ii2.getMethods().get(0).getName()); System.out.println("MATCH " + ii1.getMethods().get(0).getName() + " -> " + ii2.getMethods().get(0).getName());
} }
return true;
}
private void process(Method one, Method two)
{
// get frames for respective methods
List<Frame> f1 = eone.processedFrames.stream().filter(f -> f.getMethod() == one).collect(Collectors.toList());
List<Frame> f2 = etwo.processedFrames.stream().filter(f -> f.getMethod() == two).collect(Collectors.toList());
for (Frame fr1 : f1)
for (Frame fr2 : f2)
if (compare(fr1, fr2))
return;
}
public void run(ClassGroup one, ClassGroup two)
{
eone = new Execution(one);
eone.populateInitialMethods();
eone.run();
etwo = new Execution(two);
etwo.populateInitialMethods();
etwo.run();
process(
one.findClass("client").findMethod("init"),
two.findClass("client").findMethod("init")
);
System.out.println("done"); System.out.println("done");
} }
} }