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

Fixed: #2267 Script decompilation - Loop detection causing §§goto instructions in some cases

Browse Source
This commit is contained in:
Jindra Petřík
2024-08-08 19:15:11 +02:00
parent f219b49372
commit 50c8e3a8e3
8 changed files with 81 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2949,6 +2949,14 @@ public class Graph {
List<StopPartKind> stopPartKind2 = new ArrayList<>(stopPartKind);
stopPartKind2.add(StopPartKind.OTHER);
Set<GraphPart> subVisited = new HashSet<>();
/*
* Save loop phases to be able to walk precontinue block again.
*/
List<Integer> loopPhases = new ArrayList<>();
for (Loop el : loops) {
loopPhases.add(el.phase);
}
precontinueCommands = printGraph(foundGotos, partCodes, partCodePos, subVisited, localData, new TranslateStack(path), allParts, null, backup, stopPart2, stopPartKind2, loops, throwStates, null, staticOperation, path, recursionLevel + 1);
currentLoop.loopPreContinue = backup;
checkContinueAtTheEnd(precontinueCommands, currentLoop);
@@ -2980,6 +2988,13 @@ public class Graph {
}
if (currentLoop.loopPreContinue == null) {
precontinueCommands.clear();
/**
* Restore loop phases
*/
for (int i = 0; i < loopPhases.size(); i++) {
loops.get(i).phase = loopPhases.get(i);
}
}
}
}