LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-05-29 18:34:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try..catch..finally in ASC2 - correct default branch detection

Browse Source
This commit is contained in:
Jindra Petřík
2021-02-02 20:31:06 +01:00
parent a91d96405b
commit 51ceb60ea4
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2Graph.java
View File

@@ -328,16 +328,25 @@ public class AVM2Graph extends Graph {
if (tryPartRefs.size() == 1) {
GraphPart beforeTryPart = tryPartRefs.get(0);
if (beforeTryPart.getHeight() > 2) {
if (avm2code.code.get(beforeTryPart.end).definition instanceof SetLocalTypeIns) {
int setLocalRegister = ((SetLocalTypeIns) avm2code.code.get(beforeTryPart.end).definition).getRegisterId(avm2code.code.get(beforeTryPart.end));
if (setLocalRegister == switchedReg) {
if (avm2code.code.get(beforeTryPart.end - 1).definition instanceof PushByteIns) {
if (switchPart != null) {
defaultPushByte = avm2code.code.get(beforeTryPart.end - 1).operands[0];
int pos = beforeTryPart.end;
while (beforeTryPart.start <= pos) {
if (avm2code.code.get(pos).definition instanceof SetLocalTypeIns) {
int setLocalRegister = ((SetLocalTypeIns) avm2code.code.get(pos).definition).getRegisterId(avm2code.code.get(beforeTryPart.end));
if (setLocalRegister == switchedReg) {
if (avm2code.code.get(pos - 1).definition instanceof PushByteIns) {
if (switchPart != null) {
defaultPushByte = avm2code.code.get(pos - 1).operands[0];
}
}
}
break;
} else if (avm2code.code.get(pos).definition instanceof DebugLineIns) {
pos--;
} else {
break;
}
}
}
}
}