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

Allow inlining methods with exceptions

Browse Source
This commit is contained in:
Adam
2015-08-22 22:53:03 -04:00
parent 0bfc3e3c38
commit 4d4dd9715e
4 changed files with 103 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
src/main/java/net/runelite/deob/Deob.java
View File

@@ -47,66 +47,66 @@ public class Deob
// bdur = System.currentTimeMillis() - bstart; // bdur = System.currentTimeMillis() - bstart;
// System.out.println("rename unique took " + bdur/1000L + " seconds"); // System.out.println("rename unique took " + bdur/1000L + " seconds");
// remove except RuntimeException // // remove except RuntimeException
bstart = System.currentTimeMillis(); // bstart = System.currentTimeMillis();
new RuntimeExceptions().run(group); // new RuntimeExceptions().run(group);
bdur = System.currentTimeMillis() - bstart; // bdur = System.currentTimeMillis() - bstart;
System.out.println("runtime exception took " + bdur/1000L + " seconds"); // System.out.println("runtime exception took " + bdur/1000L + " seconds");
//
// remove unused methods // // remove unused methods
bstart = System.currentTimeMillis(); // bstart = System.currentTimeMillis();
new UnusedMethods().run(group); // new UnusedMethods().run(group);
bdur = System.currentTimeMillis() - bstart; // bdur = System.currentTimeMillis() - bstart;
System.out.println("unused methods took " + bdur/1000L + " seconds"); // System.out.println("unused methods took " + bdur/1000L + " seconds");
//
new UnreachedCode().run(group); // new UnreachedCode().run(group);
//
// remove illegal state exceptions, frees up some parameters // // remove illegal state exceptions, frees up some parameters
bstart = System.currentTimeMillis(); // bstart = System.currentTimeMillis();
new IllegalStateExceptions().run(group); // new IllegalStateExceptions().run(group);
bdur = System.currentTimeMillis() - bstart; // bdur = System.currentTimeMillis() - bstart;
System.out.println("illegal state exception took " + bdur/1000L + " seconds"); // System.out.println("illegal state exception took " + bdur/1000L + " seconds");
//
// remove constant logically dead parameters // // remove constant logically dead parameters
bstart = System.currentTimeMillis(); // bstart = System.currentTimeMillis();
new ConstantParameter().run(group); // new ConstantParameter().run(group);
bdur = System.currentTimeMillis() - bstart; // bdur = System.currentTimeMillis() - bstart;
System.out.println("constant param took " + bdur/1000L + " seconds"); // System.out.println("constant param took " + bdur/1000L + " seconds");
//
// remove unhit blocks // // remove unhit blocks
bstart = System.currentTimeMillis(); // bstart = System.currentTimeMillis();
new UnreachedCode().run(group); // new UnreachedCode().run(group);
//new UnusedBlocks().run(group); // //new UnusedBlocks().run(group);
bdur = System.currentTimeMillis() - bstart; // bdur = System.currentTimeMillis() - bstart;
System.out.println("unused blocks took " + bdur/1000L + " seconds"); // System.out.println("unused blocks took " + bdur/1000L + " seconds");
//
// remove unused parameters // // remove unused parameters
bstart = System.currentTimeMillis(); // bstart = System.currentTimeMillis();
new UnusedParameters().run(group); // new UnusedParameters().run(group);
bdur = System.currentTimeMillis() - bstart; // bdur = System.currentTimeMillis() - bstart;
System.out.println("unused params took " + bdur/1000L + " seconds"); // System.out.println("unused params took " + bdur/1000L + " seconds");
//
// remove jump obfuscation // // remove jump obfuscation
//new Jumps().run(group); // //new Jumps().run(group);
//
// remove unused fields // // remove unused fields
bstart = System.currentTimeMillis(); // bstart = System.currentTimeMillis();
new UnusedFields().run(group); // new UnusedFields().run(group);
bdur = System.currentTimeMillis() - bstart; // bdur = System.currentTimeMillis() - bstart;
System.out.println("unused fields took " + bdur/1000L + " seconds"); // System.out.println("unused fields took " + bdur/1000L + " seconds");
//
// remove unused methods, again? // // remove unused methods, again?
bstart = System.currentTimeMillis(); // bstart = System.currentTimeMillis();
new UnusedMethods().run(group); // new UnusedMethods().run(group);
bdur = System.currentTimeMillis() - bstart; // bdur = System.currentTimeMillis() - bstart;
System.out.println("unused methods took " + bdur/1000L + " seconds"); // System.out.println("unused methods took " + bdur/1000L + " seconds");
new MethodInliner().run(group); new MethodInliner().run(group);
//
new MethodMover().run(group); // new MethodMover().run(group);
//
new FieldInliner().run(group); // new FieldInliner().run(group);
// XXX this is broken because when moving clinit around, some fields can depend on other fields // XXX this is broken because when moving clinit around, some fields can depend on other fields
// (like multianewarray) // (like multianewarray)

13
src/main/java/net/runelite/deob/attributes/code/Exception.java
View File

@@ -41,6 +41,14 @@ public class Exception
{ {
ConstantPool pool = exceptions.getCode().getAttributes().getClassFile().getPool(); ConstantPool pool = exceptions.getCode().getAttributes().getClassFile().getPool();
assert start.getInstructions() == exceptions.getCode().getInstructions();
assert end.getInstructions() == exceptions.getCode().getInstructions();
assert handler.getInstructions() == exceptions.getCode().getInstructions();
assert start.getInstructions().getInstructions().contains(start);
assert end.getInstructions().getInstructions().contains(end);
assert handler.getInstructions().getInstructions().contains(handler);
out.writeShort(start.getPc()); out.writeShort(start.getPc());
out.writeShort(end.getPc()); out.writeShort(end.getPc());
out.writeShort(handler.getPc()); out.writeShort(handler.getPc());
@@ -52,6 +60,11 @@ public class Exception
return exceptions; return exceptions;
} }
public void setExceptions(Exceptions exceptions)
{
this.exceptions = exceptions;
}
public Instruction getStart() public Instruction getStart()
{ {
return start; return start;

8
src/main/java/net/runelite/deob/attributes/code/Exceptions.java
View File

@@ -29,6 +29,11 @@ public class Exceptions
exceptions.add(new Exception(this)); exceptions.add(new Exception(this));
} }
public void add(Exception e)
{
exceptions.add(e);
}
public void remove(Exception e) public void remove(Exception e)
{ {
exceptions.remove(e); exceptions.remove(e);
@@ -38,7 +43,10 @@ public class Exceptions
{ {
out.writeShort(exceptions.size()); out.writeShort(exceptions.size());
for (Exception e : exceptions) for (Exception e : exceptions)
{
assert e.getExceptions() == this;
e.write(out); e.write(out);
}
} }
public Code getCode() public Code getCode()

34
src/main/java/net/runelite/deob/deobfuscators/MethodInliner.java
View File

@@ -25,6 +25,7 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import net.runelite.deob.attributes.code.Exceptions;
public class MethodInliner implements Deobfuscator public class MethodInliner implements Deobfuscator
{ {
@@ -100,9 +101,6 @@ public class MethodInliner implements Deobfuscator
if (invokedMethod.isSynchronized()) if (invokedMethod.isSynchronized())
continue; continue;
if (!invokedMethod.getCode().getExceptions().getExceptions().isEmpty())
continue;
// assign variables on stack to lvt // assign variables on stack to lvt
Signature descriptor = invokedMethod.getDescriptor(); Signature descriptor = invokedMethod.getDescriptor();
@@ -112,7 +110,7 @@ public class MethodInliner implements Deobfuscator
lvtIndexes.put(j, idx); lvtIndexes.put(j, idx);
idx += descriptor.getTypeOfArg(j).getSlots(); idx += descriptor.getTypeOfArg(j).getSlots();
} }
for (int j = descriptor.size() - 1; j >= 0; --j) for (int j = descriptor.size() - 1; j >= 0; --j)
{ {
Type type = descriptor.getTypeOfArg(j); Type type = descriptor.getTypeOfArg(j);
@@ -131,19 +129,15 @@ public class MethodInliner implements Deobfuscator
case "S": case "S":
case "I": case "I":
storeIns = new IStore(ins, lvtIndex + paramLvtIndex); storeIns = new IStore(ins, lvtIndex + paramLvtIndex);
//lvtIndex += type.getSlots();
break; break;
case "J": case "J":
storeIns = new LStore(ins, lvtIndex + paramLvtIndex); storeIns = new LStore(ins, lvtIndex + paramLvtIndex);
//lvtIndex += type.getSlots();
break; break;
case "F": case "F":
storeIns = new FStore(ins, lvtIndex + paramLvtIndex); storeIns = new FStore(ins, lvtIndex + paramLvtIndex);
//lvtIndex += type.getSlots();
break; break;
case "D": case "D":
storeIns = new DStore(ins, lvtIndex + paramLvtIndex); storeIns = new DStore(ins, lvtIndex + paramLvtIndex);
//lvtIndex += type.getSlots();
break; break;
} }
} }
@@ -152,7 +146,6 @@ public class MethodInliner implements Deobfuscator
{ {
assert storeIns == null; assert storeIns == null;
storeIns = new AStore(ins, lvtIndex + paramLvtIndex); storeIns = new AStore(ins, lvtIndex + paramLvtIndex);
//lvtIndex += type.getSlots();
} }
assert storeIns != null; assert storeIns != null;
@@ -164,6 +157,7 @@ public class MethodInliner implements Deobfuscator
code.setMaxStack(maxStack); code.setMaxStack(maxStack);
inline(m, i, invokedMethod, lvtIndex); inline(m, i, invokedMethod, lvtIndex);
moveExceptions(m, invokedMethod);
++inlineCount; ++inlineCount;
break; break;
} }
@@ -204,6 +198,9 @@ public class MethodInliner implements Deobfuscator
} }
invokeIns.from.clear(); invokeIns.from.clear();
for (net.runelite.deob.attributes.code.Exception e : invokeMethodCode.getExceptions().getExceptions())
e.replace(invokeIns, nop);
methodInstructions.remove(invokeIns); methodInstructions.remove(invokeIns);
for (Instruction i : invokeMethodInstructions.getInstructions()) for (Instruction i : invokeMethodInstructions.getInstructions())
@@ -225,6 +222,9 @@ public class MethodInliner implements Deobfuscator
i2.replace(oldI, i); i2.replace(oldI, i);
oldI.from.clear(); oldI.from.clear();
for (net.runelite.deob.attributes.code.Exception e : invokeMethodCode.getExceptions().getExceptions())
e.replace(oldI, i);
} }
if (i instanceof LVTInstruction) if (i instanceof LVTInstruction)
@@ -245,6 +245,9 @@ public class MethodInliner implements Deobfuscator
i2.replace(oldI, i); i2.replace(oldI, i);
oldI.from.clear(); oldI.from.clear();
for (net.runelite.deob.attributes.code.Exception e : invokeMethodCode.getExceptions().getExceptions())
e.replace(oldI, i);
} }
} }
@@ -257,6 +260,19 @@ public class MethodInliner implements Deobfuscator
removeMethods.add(invokeMethod); removeMethods.add(invokeMethod);
} }
private void moveExceptions(Method to, Method from)
{
Exceptions exceptions = from.getCode().getExceptions();
Exceptions toExceptions = to.getCode().getExceptions();
for (net.runelite.deob.attributes.code.Exception e : exceptions.getExceptions())
{
e.setExceptions(toExceptions);
toExceptions.add(e);
}
exceptions.getExceptions().clear();
}
@Override @Override
public void run(ClassGroup group) public void run(ClassGroup group)
{ {