ReVanced/smali
1
0
Fork 0
mirror of https://github.com/revanced/smali.git synced 2025-05-29 12:20:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Massage the try blocks before writing them out to a dex file

Browse Source
This commit is contained in:
Ben Gruver 2013-04-14 18:36:05 -07:00
parent 8c3d16b7ee
commit ab73502b60
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dexlib2/src/main/java/org/jf/dexlib2/writer/CodeItemPool.java
View File

@ -46,6 +46,7 @@ import org.jf.dexlib2.iface.reference.*;
import org.jf.dexlib2.util.MethodUtil;
import org.jf.dexlib2.util.ReferenceUtil;
import org.jf.dexlib2.writer.util.InstructionWriteUtil;
import org.jf.dexlib2.writer.util.TryListBuilder;
import org.jf.util.ExceptionWithContext;
import javax.annotation.Nonnull;
@ -152,7 +153,7 @@ public class CodeItemPool {
InstructionWriteUtil instrWriteUtil = new InstructionWriteUtil(methodImpl, dexFile.stringPool);
writer.writeUshort(instrWriteUtil.getOutParamCount());
List<? extends TryBlock> tryBlocks = methodImpl.getTryBlocks();
List<? extends TryBlock> tryBlocks = TryListBuilder.massageTryBlocks(methodImpl.getTryBlocks());
writer.writeUshort(tryBlocks.size());
writer.writeInt(dexFile.debugInfoPool.getOffset(method));
writer.writeInt(instrWriteUtil.getCodeUnitCount());

14
dexlib2/src/main/java/org/jf/dexlib2/writer/util/TryListBuilder.java
View File

@ -62,6 +62,20 @@ public class TryListBuilder
listEnd.prev = listStart;
}
public static List<TryBlock> massageTryBlocks(List<? extends TryBlock> tryBlocks) {
TryListBuilder tlb = new TryListBuilder();
for (TryBlock tryBlock: tryBlocks) {
int startAddress = tryBlock.getStartCodeAddress();
int endAddress = startAddress + tryBlock.getCodeUnitCount();
for (ExceptionHandler exceptionHandler: tryBlock.getExceptionHandlers()) {
tlb.addHandler(exceptionHandler.getExceptionType(), startAddress, endAddress,
exceptionHandler.getHandlerCodeAddress());
}
}
return tlb.getTryBlocks();
}
private static class TryBounds {
@Nonnull public final MutableTryBlock start;
@Nonnull public final MutableTryBlock end;