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

Fixed #1894 AS3 - XML filters in some corner cases

Browse Source
This commit is contained in:
Jindra Petřík
2022-11-30 19:36:16 +01:00
parent a41926a662
commit e588cbda3a
8 changed files with 41 additions and 2 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

@@ -1656,6 +1656,9 @@ public class AVM2Graph extends Graph {
@Override
protected GraphTargetItem checkLoop(List<GraphTargetItem> output, LoopItem loopItem, BaseLocalData localData, List<Loop> loops, List<ThrowState> throwStates, TranslateStack stack) {
if (debugDoNotProcess) {
return loopItem;
}
AVM2LocalData aLocalData = (AVM2LocalData) localData;
if (loopItem instanceof WhileItem) {
WhileItem w = (WhileItem) loopItem;
@@ -1775,6 +1778,8 @@ public class AVM2Graph extends Graph {
regIndex = setLocal.regIndex;
}
}
} else if (output.get(i) instanceof PushItem) {
//ignored
} else {
break;
}
@@ -1795,6 +1800,8 @@ public class AVM2Graph extends Graph {
setLocalIp = avm2code.adr2pos(setLocal.getSrc().getAddress());
break;
}
} else if (output.get(i) instanceof PushItem){
//allowed
} else {
break;
}
@@ -1818,11 +1825,21 @@ public class AVM2Graph extends Graph {
if (setLocal.regIndex == regIndex) {
setLocal.value = filter;
}
} else if (output.get(i) instanceof PushItem) {
//ignored
} else {
break;
}
}
for (int i = output.size() - 2 /*last is loop*/; i >= 0; i--) {
if (output.get(i) instanceof PushItem) {
PushItem pu = (PushItem)output.remove(i);
stack.push(pu.value);
} else {
break;
}
}
if (usages.isEmpty()) {
output.add(filter);
} else {
@@ -2010,7 +2027,9 @@ public class AVM2Graph extends Graph {
@Override
protected void finalProcess(List<GraphTargetItem> list, int level, FinalProcessLocalData localData, String path) throws InterruptedException {
if (debugDoNotProcess) {
return;
}
if (level == 0) {
if (!list.isEmpty()) {
if (list.get(list.size() - 1) instanceof ReturnVoidAVM2Item) {

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

@@ -90,6 +90,7 @@ public class Graph {
private boolean debugPrintLoopList = false;
private boolean debugGetLoops = false;
private boolean debugPrintGraph = false;
protected boolean debugDoNotProcess = false;
private static final Logger logger = Logger.getLogger(Graph.class.getName());
@@ -913,6 +914,9 @@ public class Graph {
}
private void finalProcessAll(List<GraphTargetItem> list, int level, FinalProcessLocalData localData, String path) throws InterruptedException {
if (debugDoNotProcess) {
return;
}
finalProcess(list, level, localData, path);
for (GraphTargetItem item : list) {
if (item instanceof Block) {
@@ -1191,6 +1195,9 @@ public class Graph {
}
protected void processIfs(List<GraphTargetItem> list) {
if (debugDoNotProcess) {
return;
}
for (int i = 0; i < list.size(); i++) {
GraphTargetItem item = list.get(i);
if ((item instanceof LoopItem) && (item instanceof Block)) {