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

break detection fix,

Browse Source 
do..while fix
This commit is contained in:
Jindra Petřík
2021-02-07 21:38:22 +01:00
parent ebb0c9a8c5
commit ebc8e86323
8 changed files with 125 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1013,6 +1013,9 @@ public class Graph {
}
for (Loop l : loops) {
if (l.phase == 2) {
continue;
}
if (l.loopContinue == part) {
return (new ContinueItem(null, firstIns, l.id));
}
@@ -1419,12 +1422,22 @@ public class Graph {
found = null;
loopcand:
for (GraphPart cand : currentLoop.breakCandidates) {
for (GraphPart cand2 : currentLoop.breakCandidates) {
for (int c1 = 0; c1 < currentLoop.breakCandidates.size(); c1++) {
GraphPart cand = currentLoop.breakCandidates.get(c1);
for (int c2 = 0; c2 < currentLoop.breakCandidates.size(); c2++) {
GraphPart cand2 = currentLoop.breakCandidates.get(c2);
if (cand == cand2) {
continue;
}
if (cand.leadsTo(localData, this, code, cand2, loops, throwStates, true)) {
int curLevl = currentLoop.breakCandidatesLevels.get(c1);
int curLev2 = currentLoop.breakCandidatesLevels.get(c2);
/*
found = cand;
int lev2 = currentLoop.breakCandidatesLevels.get(c2);
currentLoop.breakCandidates.set(c1, cand2);
currentLoop.breakCandidatesLevels.set(c1, lev2);*/
int lev1 = Integer.MAX_VALUE;
int lev2 = Integer.MAX_VALUE;
for (int i = 0; i < currentLoop.breakCandidates.size(); i++) {
@@ -1440,11 +1453,21 @@ public class Graph {
}
}
//
GraphPart other;
int curLev;
if (lev1 <= lev2) {
found = cand2;
other = cand;
curLev = curLevl;
} else {
found = cand;
other = cand2;
curLev = curLev2;
}
currentLoop.breakCandidates.add(other);
currentLoop.breakCandidatesLevels.add(curLev);
break loopcand;
}
}
@@ -2743,8 +2766,6 @@ public class Graph {
List<List<GraphTargetItem>> caseCommands = new ArrayList<>();
GraphPart next = breakPart;
GraphTargetItem ti = checkLoop(new ArrayList<>() /*??*/, next, stopPart, loops, throwStates);
//create switch as new loop break command detection to work
Loop currentLoop = new Loop(loops.size(), null, next);
currentLoop.phase = 1;
@@ -2848,8 +2869,11 @@ public class Graph {
}
}
nextRef.setVal(next);
tiRef.setVal(ti);
currentLoop.phase = 2;
GraphTargetItem ti = checkLoop(new ArrayList<>() /*??*/, next, stopPart, loops, throwStates);
tiRef.setVal(ti);
return new SwitchItem(null, switchStartItem, currentLoop, switchedObject, caseValuesMap, caseCommands, valuesMapping);
}

21
libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/precontinues/GraphPrecontinueDetector.java
View File

@@ -106,8 +106,26 @@ public class GraphPrecontinueDetector {
boolean wholeLoop = false;
boolean inTryTarget = false;
boolean hasMoreNexts = false;
boolean usePreNode = false;
if (node.parentNode == null) {
if (node.prev.size() == 1) {
Node prev = node.prev.get(0);
if (prev.next.size() == 2) {
Node other = null;
if (prev.next.get(0) == node) {
other = prev.next.get(1);
} else {
other = prev.next.get(0);
}
if (other.graphPart == el.loopBreak) {
node = prev;
usePreNode = true;
}
}
}
}
if (node.next.size() > 1) {
if (!usePreNode && node.next.size() > 1) {
if (node.next.size() == 2) {
Node other = null;
if (node.next.get(0).graphPart == el.loopContinue) {
@@ -142,6 +160,7 @@ public class GraphPrecontinueDetector {
}
if (!wholeLoop && !inTryTarget && !hasMoreNexts) {
el.loopPreContinue = node.graphPart;
//System.err.println("set precontinue of loop " + el.loopContinue + " to " + el.loopPreContinue);
}
}
}