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

Field moving works

Browse Source
This commit is contained in:
Adam
2015-08-22 12:18:24 -04:00
parent 35d8a98365
commit 1853bb1be1
6 changed files with 79 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/runelite/deob/Deob.java
+60 -60
View File
@@ -46,72 +46,72 @@ public class Deob
// bdur = System.currentTimeMillis() - bstart;
// System.out.println("rename unique took " + bdur/1000L + " seconds");
// remove except RuntimeException
bstart = System.currentTimeMillis();
new RuntimeExceptions().run(group);
bdur = System.currentTimeMillis() - bstart;
System.out.println("runtime exception took " + bdur/1000L + " seconds");
// remove unused methods
bstart = System.currentTimeMillis();
new UnusedMethods().run(group);
bdur = System.currentTimeMillis() - bstart;
System.out.println("unused methods took " + bdur/1000L + " seconds");
new UnreachedCode().run(group);
// remove illegal state exceptions, frees up some parameters
bstart = System.currentTimeMillis();
new IllegalStateExceptions().run(group);
bdur = System.currentTimeMillis() - bstart;
System.out.println("illegal state exception took " + bdur/1000L + " seconds");
// remove constant logically dead parameters
bstart = System.currentTimeMillis();
new ConstantParameter().run(group);
bdur = System.currentTimeMillis() - bstart;
System.out.println("constant param took " + bdur/1000L + " seconds");
// remove unhit blocks
bstart = System.currentTimeMillis();
new UnreachedCode().run(group);
//new UnusedBlocks().run(group);
bdur = System.currentTimeMillis() - bstart;
System.out.println("unused blocks took " + bdur/1000L + " seconds");
// remove unused parameters
bstart = System.currentTimeMillis();
new UnusedParameters().run(group);
bdur = System.currentTimeMillis() - bstart;
System.out.println("unused params took " + bdur/1000L + " seconds");
// remove jump obfuscation
//new Jumps().run(group);
// remove unused fields
bstart = System.currentTimeMillis();
new UnusedFields().run(group);
bdur = System.currentTimeMillis() - bstart;
System.out.println("unused fields took " + bdur/1000L + " seconds");
// remove unused methods, again?
bstart = System.currentTimeMillis();
new UnusedMethods().run(group);
bdur = System.currentTimeMillis() - bstart;
System.out.println("unused methods took " + bdur/1000L + " seconds");
new MethodInliner().run(group);
// new ModularArithmeticDeobfuscation().run(group);
// // remove except RuntimeException
// bstart = System.currentTimeMillis();
// new RuntimeExceptions().run(group);
// bdur = System.currentTimeMillis() - bstart;
// System.out.println("runtime exception took " + bdur/1000L + " seconds");
//
// // remove unused methods
// bstart = System.currentTimeMillis();
// new UnusedMethods().run(group);
// bdur = System.currentTimeMillis() - bstart;
// System.out.println("unused methods took " + bdur/1000L + " seconds");
//
// new UnreachedCode().run(group);
//
// // remove illegal state exceptions, frees up some parameters
// bstart = System.currentTimeMillis();
// new IllegalStateExceptions().run(group);
// bdur = System.currentTimeMillis() - bstart;
// System.out.println("illegal state exception took " + bdur/1000L + " seconds");
//
// // remove constant logically dead parameters
// bstart = System.currentTimeMillis();
// new ConstantParameter().run(group);
// bdur = System.currentTimeMillis() - bstart;
// System.out.println("constant param took " + bdur/1000L + " seconds");
//
// // remove unhit blocks
// bstart = System.currentTimeMillis();
// new UnreachedCode().run(group);
// //new UnusedBlocks().run(group);
// bdur = System.currentTimeMillis() - bstart;
// System.out.println("unused blocks took " + bdur/1000L + " seconds");
//
// // remove unused parameters
// bstart = System.currentTimeMillis();
// new UnusedParameters().run(group);
// bdur = System.currentTimeMillis() - bstart;
// System.out.println("unused params took " + bdur/1000L + " seconds");
//
// // remove jump obfuscation
// //new Jumps().run(group);
//
// // remove unused fields
// bstart = System.currentTimeMillis();
// new UnusedFields().run(group);
// bdur = System.currentTimeMillis() - bstart;
// System.out.println("unused fields took " + bdur/1000L + " seconds");
//
// // remove unused methods, again?
// bstart = System.currentTimeMillis();
// new UnusedMethods().run(group);
// bdur = System.currentTimeMillis() - bstart;
// System.out.println("unused methods took " + bdur/1000L + " seconds");
//
//
// new MethodInliner().run(group);
//
// new MethodMover().run(group);
//new FieldMover().run(group);
//
// new FieldInliner().run(group);
new FieldMover().run(group);
//new UnusedClass().run(group);
// new ModularArithmeticDeobfuscation().run(group);
saveJar(group, args[1]);
src/main/java/net/runelite/deob/attributes/Attributes.java
+1 -3
View File
@@ -38,11 +38,9 @@ public class Attributes
method = m;
}
public Attributes(Code c) throws IOException
public Attributes(Code c)
{
code = c;
load();
}
public Method getMethod()
src/main/java/net/runelite/deob/attributes/Code.java
+6
View File
@@ -20,6 +20,9 @@ public class Code extends Attribute
public Code(Attributes attributes)
{
super(attributes, AttributeType.CODE);
exceptions = new Exceptions(this);
this.attributes = new Attributes(this);
}
@Override
@@ -34,7 +37,10 @@ public class Code extends Attribute
instructions.load();
exceptions = new Exceptions(this);
exceptions.load();
this.attributes = new Attributes(this);
this.attributes.load();
instructions.buildBlocks();
instructions.buildJumpGraph();
src/main/java/net/runelite/deob/attributes/code/Exceptions.java
+5 -2
View File
@@ -14,10 +14,13 @@ public class Exceptions
private Code code;
private List<Exception> exceptions = new ArrayList<Exception>();
public Exceptions(Code code) throws IOException
public Exceptions(Code code)
{
this.code = code;
}
public void load() throws IOException
{
DataInputStream is = code.getAttributes().getStream();
int count = is.readUnsignedShort();
src/main/java/net/runelite/deob/deobfuscators/FieldMover.java
+2
View File
@@ -200,6 +200,8 @@ public class FieldMover implements Deobfuscator
code.setInstructions(instructions);
instructions.getInstructions().add(new VReturn(instructions, InstructionType.RETURN, 0)); // add return
to.getMethods().getMethods().add(toClinit);
}
moveInitializer(setField, toClinit);
src/main/java/net/runelite/deob/deobfuscators/UnusedParameters.java
+5 -5
View File
@@ -255,15 +255,15 @@ public class UnusedParameters implements Deobfuscator
@Override
public void run(ClassGroup group)
{
Execution execution = new Execution(group);
execution.populateInitialMethods();
execution.run();
{
int count = 0;
int[] i;
do
{
Execution execution = new Execution(group);
execution.populateInitialMethods();
execution.run();
i = checkParametersOnce(execution, group);
count += i[0];