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

#1070 Incorrect decompilation of switch statement fixed

Browse Source
This commit is contained in:
honfika@gmail.com
2015-12-03 09:40:26 +01:00
parent 35b917eca1
commit 507cc4c29b
4 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java
View File

@@ -1297,6 +1297,16 @@ public class AVM2Code implements Cloneable {
return ret;
}
public AVM2Instruction adr2ins(long address) throws ConvertException {
int pos = adr2pos(address, false);
if (pos == code.size()) {
// end
return null;
}
return code.get(pos);
}
public int adr2pos(long address) throws ConvertException {
return adr2pos(address, false);
}

1
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/deobfuscation/AVM2DeobfuscatorRegistersOld.java
View File

@@ -146,7 +146,6 @@ public class AVM2DeobfuscatorRegistersOld extends AVM2DeobfuscatorSimpleOld {
originalBody.exceptions = body.exceptions;
originalBody.setCode(body.getCode());
}
private int getFirstRegisterSetter(Reference<AVM2Instruction> assignment, int classIndex, boolean isStatic, int scriptIndex, ABC abc, MethodBody body, Set<Integer> ignoredRegisters, Set<Integer> ignoredGets) throws InterruptedException {

4
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java
View File

@@ -383,6 +383,10 @@ public class AVM2Instruction implements Cloneable, GraphSourceItem {
return offset + 4 /*getBytesLength()*/ + operands[0];
}
public void setTargetOffset(int offset) {
operands[0] = offset;
}
@Override
public List<Integer> getBranches(GraphSource code) {
List<Integer> ret = new ArrayList<>();

13
libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/Graph.java
View File

@@ -1793,22 +1793,27 @@ public class Graph {
hasExpr = true;
}
}
}
first = true;
pos = 0;
//This is tied to AS3 switch implementation which has nextparts switched from index 1. TODO: Make more universal
GraphPart defaultPart = hasExpr ? part.nextParts.get(1 + defaultBranch) : part.nextParts.get(0);
for (GraphPart p : part.nextParts) {
if (p != defaultPart) {
for (int i = 1; i < part.nextParts.size(); i++) {
if (hasExpr && i == 1 + defaultBranch) {
continue;
}
if (part.nextParts.get(i) != defaultPart) {
if (caseExpressions.containsKey(pos)) {
caseValues.add(caseExpressions.get(pos));
} else {
caseValues.add(new IntegerValueItem(null, localData.lineStartInstruction, pos));
}
pos++;
}
pos++;
}
first = true;