LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-23 19:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed switch local reg not properly recognized in some cases

Browse Source
This commit is contained in:
Jindra Petřík
2021-01-29 19:01:19 +01:00
parent ee47975c19
commit e68cf59d5f
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library.
* License along with this library.
*/
package com.jpexs.decompiler.flash.abc.avm2.graph;
import com.jpexs.decompiler.flash.BaseLocalData;
@@ -80,6 +81,7 @@ import com.jpexs.decompiler.graph.model.SwitchItem;
import com.jpexs.decompiler.graph.model.WhileItem;
import com.jpexs.helpers.Reference;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
@@ -716,11 +718,14 @@ public class AVM2Graph extends Graph {
}
}
List<GraphTargetItem> otherSide = new ArrayList<>();
if (leftReg > 0) {
switchedObject = new LocalRegAVM2Item(null, null, leftReg, null);
caseValuesMap = caseValuesMapRight;
otherSide = caseValuesMapLeft;
} else if (rightReg > 0) {
switchedObject = new LocalRegAVM2Item(null, null, rightReg, null);
otherSide = caseValuesMapRight;
}
if ((leftReg < 0 && rightReg < 0) || (cnt == 1)) {
@@ -737,7 +742,9 @@ public class AVM2Graph extends Graph {
ret.addAll(output);
Reference<GraphPart> nextRef = new Reference<>(null);
Reference<GraphTargetItem> tiRef = new Reference<>(null);
Reference<GraphTargetItem> tiRef = new Reference<>(null);
SwitchItem sw = handleSwitch(switchedObject, switchStartItem, foundGotos, partCodes, partCodePos, allParts, stack, stopPart, loops, localData, staticOperation, path, caseValuesMap, defaultPart, caseBodyParts, nextRef, tiRef);
checkSwitch(localData, sw, otherSide, ret);
ret.add(sw);
if (nextRef.getVal() != null) {
if (tiRef.getVal() != null) {
ret.add(tiRef.getVal());
@@ -1203,7 +1210,7 @@ public class AVM2Graph extends Graph {
}
@Override
@Override
protected void checkSwitch(BaseLocalData localData, SwitchItem switchItem, Collection<? extends GraphTargetItem> otherSides, List<GraphTargetItem> output) {
if (output.isEmpty()) {
return;
}
@@ -1215,7 +1222,7 @@ public class AVM2Graph extends Graph {
int setLocalIp = InstructionDefinition.getItemIp(avm2LocalData, setLocal);;
Set<Integer> allUsages = new HashSet<>(avm2LocalData.getSetLocalUsages(setLocalIp));
boolean isOtherSideReg = false;
boolean isOtherSideReg = false;
for (GraphTargetItem otherSide : otherSides) {
if (otherSide instanceof LocalRegAVM2Item) {
LocalRegAVM2Item otherLog = (LocalRegAVM2Item) otherSide;
if (otherLog.regIndex != setLocal.regIndex) {

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

@@ -1567,6 +1567,10 @@ public class Graph {
parts = ((GraphPartMulti) part).parts;
} else {
parts.add(part);
while (part.nextParts.size() == 1 && part.nextParts.get(0).refs.size() == 1) {
part = part.nextParts.get(0);
parts.add(part);
}
}
for (GraphPart p : parts) {
int end = p.end;
@@ -1750,7 +1754,7 @@ public class Graph {
SwitchItem sw = handleSwitch(switchedItem, originalSwitchedItem.getSrc(), foundGotos, partCodes, partCodePos, allParts, stack, stopPart, loops, localData, staticOperation, path,
caseValues, defaultPart, caseBodyParts, nextRef, tiRef);
GraphPart next = nextRef.getVal();
checkSwitch(localData, sw, caseExpressionOtherSides, currentRet);
checkSwitch(localData, sw, caseExpressionOtherSides.values(), currentRet);
currentRet.add(sw);
if (next != null) {
if (tiRef.getVal() != null) {
@@ -2119,7 +2123,7 @@ public class Graph {
return ret;
}
protected void checkSwitch(BaseLocalData localData, SwitchItem switchItem, Map<Integer, GraphTargetItem> otherSides, List<GraphTargetItem> output) {
protected void checkSwitch(BaseLocalData localData, SwitchItem switchItem, Collection<? extends GraphTargetItem> otherSides, List<GraphTargetItem> output) {
}