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

Rename classes last so we can do it in 1 pass

Browse Source
This commit is contained in:
Adam
2015-11-19 22:19:51 -05:00
parent dad328de12
commit 3db11969c3
1 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java
View File

@@ -143,9 +143,8 @@ public class RenameUnique implements Deobfuscator
return list; return list;
} }
private NameMappings generateClassNames(ClassGroup group) private void generateClassNames(NameMappings map, ClassGroup group)
{ {
NameMappings map = new NameMappings();
int i = 0; int i = 0;
for (ClassFile cf : group.getClasses()) for (ClassFile cf : group.getClasses())
@@ -155,13 +154,10 @@ public class RenameUnique implements Deobfuscator
map.map(cf.getPoolClass(), "class" + i++); map.map(cf.getPoolClass(), "class" + i++);
} }
return map;
} }
private NameMappings generatFieldNames(ClassGroup group) private void generatFieldNames(NameMappings map, ClassGroup group)
{ {
NameMappings map = new NameMappings();
int i = 0; int i = 0;
for (ClassFile cf : group.getClasses()) for (ClassFile cf : group.getClasses())
@@ -172,13 +168,10 @@ public class RenameUnique implements Deobfuscator
map.map(field.getPoolField(), "field" + i++); map.map(field.getPoolField(), "field" + i++);
} }
return map;
} }
private NameMappings generateMethodNames(ClassGroup group) private void generateMethodNames(NameMappings map, ClassGroup group)
{ {
NameMappings map = new NameMappings();
int i = 0; int i = 0;
for (ClassFile cf : group.getClasses()) for (ClassFile cf : group.getClasses())
@@ -199,8 +192,6 @@ public class RenameUnique implements Deobfuscator
for (Method m : virtualMethods) for (Method m : virtualMethods)
map.map(m.getPoolMethod(), name); map.map(m.getPoolMethod(), name);
} }
return map;
} }
private void regeneratePool(ClassGroup group) private void regeneratePool(ClassGroup group)
@@ -222,22 +213,14 @@ public class RenameUnique implements Deobfuscator
group.buildClassGraph(); group.buildClassGraph();
group.lookup(); group.lookup();
NameMappings mappings = this.generateClassNames(group); NameMappings mappings = new NameMappings();
this.generateClassNames(mappings, group);
this.generatFieldNames(mappings, group);
this.generateMethodNames(mappings, group);
int classes = 0, fields = 0, methods = 0; int classes = 0, fields = 0, methods = 0;
for (ClassFile cf : group.getClasses())
{
String newName = mappings.get(cf.getPoolClass());
if (newName == null)
continue;
renameClass(group, cf, newName);
++classes;
}
mappings = this.generatFieldNames(group);
// rename fields // rename fields
for (ClassFile cf : group.getClasses()) for (ClassFile cf : group.getClasses())
for (Field field : cf.getFields().getFields()) for (Field field : cf.getFields().getFields())
@@ -250,8 +233,6 @@ public class RenameUnique implements Deobfuscator
++fields; ++fields;
} }
mappings = this.generateMethodNames(group);
// rename methods // rename methods
for (ClassFile cf : group.getClasses()) for (ClassFile cf : group.getClasses())
for (Method method : cf.getMethods().getMethods()) for (Method method : cf.getMethods().getMethods())
@@ -268,6 +249,16 @@ public class RenameUnique implements Deobfuscator
methods += virtualMethods.size(); methods += virtualMethods.size();
} }
for (ClassFile cf : group.getClasses())
{
String newName = mappings.get(cf.getPoolClass());
if (newName == null)
continue;
renameClass(group, cf, newName);
++classes;
}
this.regeneratePool(group); this.regeneratePool(group);
System.out.println("Uniquely renamed " + classes + " classes, " + fields + " fields, and " + methods + " methods"); System.out.println("Uniquely renamed " + classes + " classes, " + fields + " fields, and " + methods + " methods");