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

Fix methodinliner to move jumps to the function being inlined to the right place

Browse Source 
(cherry picked from commit fae040a98f)
This commit is contained in:
Adam
2015-09-05 19:10:57 -04:00
parent 9878fb59b3
commit 9c16bc7ede
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,6 +111,8 @@ public class MethodInliner implements Deobfuscator
idx += descriptor.getTypeOfArg(j).getSlots(); idx += descriptor.getTypeOfArg(j).getSlots();
} }
Instruction firstParamStore = null;
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);
@@ -151,12 +153,15 @@ public class MethodInliner implements Deobfuscator
// insert storeIns before invoke instruction // insert storeIns before invoke instruction
ins.getInstructions().add(invokeIdx++, storeIns); ins.getInstructions().add(invokeIdx++, storeIns);
if (firstParamStore == null)
firstParamStore = storeIns;
} }
int maxStack = code.getMaxStack() + invokedMethod.getCode().getMaxStack(); // not really right but ok int maxStack = code.getMaxStack() + invokedMethod.getCode().getMaxStack(); // not really right but ok
code.setMaxStack(maxStack); code.setMaxStack(maxStack);
inline(m, i, invokedMethod, lvtIndex); inline(m, i, invokedMethod, lvtIndex, firstParamStore);
moveExceptions(m, invokedMethod); moveExceptions(m, invokedMethod);
++inlineCount; ++inlineCount;
break; break;
@@ -165,7 +170,7 @@ public class MethodInliner implements Deobfuscator
return inlineCount; return inlineCount;
} }
private void inline(Method method, Instruction invokeIns, Method invokeMethod, int lvtBase) private void inline(Method method, Instruction invokeIns, Method invokeMethod, int lvtBase, Instruction firstParamStore)
{ {
Code methodCode = method.getCode(), Code methodCode = method.getCode(),
invokeMethodCode = invokeMethod.getCode(); invokeMethodCode = invokeMethod.getCode();
@@ -177,11 +182,17 @@ public class MethodInliner implements Deobfuscator
Instruction nextInstruction = methodInstructions.getInstructions().get(idx + 1); Instruction nextInstruction = methodInstructions.getInstructions().get(idx + 1);
// move stuff which jumps to invokeIns to nop // move stuff which jumps to invokeIns to firstParamStore. If there are no arguments that are stored,
// firstParamStore is null, and so create a nop instruction.
Instruction nop = new NOP(methodInstructions); if (firstParamStore == null)
methodInstructions.getInstructions().add(idx + 1, nop); {
++idx; Instruction nop = new NOP(methodInstructions);
methodInstructions.getInstructions().add(idx + 1, nop);
++idx;
firstParamStore = nop;
}
methodInstructions.buildJumpGraph(); methodInstructions.buildJumpGraph();
invokeMethodInstructions.buildJumpGraph(); invokeMethodInstructions.buildJumpGraph();
@@ -191,15 +202,15 @@ public class MethodInliner implements Deobfuscator
assert fromI.jump.contains(invokeIns); assert fromI.jump.contains(invokeIns);
fromI.jump.remove(invokeIns); fromI.jump.remove(invokeIns);
fromI.replace(invokeIns, nop); fromI.replace(invokeIns, firstParamStore);
fromI.jump.add(nop); fromI.jump.add(firstParamStore);
nop.from.add(fromI); firstParamStore.from.add(fromI);
} }
invokeIns.from.clear(); invokeIns.from.clear();
for (net.runelite.deob.attributes.code.Exception e : invokeMethodCode.getExceptions().getExceptions()) for (net.runelite.deob.attributes.code.Exception e : invokeMethodCode.getExceptions().getExceptions())
e.replace(invokeIns, nop); e.replace(invokeIns, firstParamStore);
methodInstructions.remove(invokeIns); methodInstructions.remove(invokeIns);