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

Issues #78,#81,#82 Fixed deobfuscation, exceptions during printgraph,...

Browse Source
This commit is contained in:
Jindra Petk
2013-05-03 20:40:07 +02:00
parent fb69ba2a8a
commit 3b82cf2fac
14 changed files with 148 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
trunk/src/com/jpexs/decompiler/flash/graph/Graph.java
View File

@@ -20,6 +20,7 @@ import com.jpexs.decompiler.flash.abc.avm2.treemodel.CommentTreeItem;
import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.helpers.Highlighting;
import java.util.ArrayList;
import java.util.EmptyStackException;
import java.util.HashMap;
import java.util.List;
import java.util.Stack;
@@ -557,9 +558,20 @@ public class Graph {
if ((ti = checkLoop(next, stopPart, loops)) != null) {
ret.add(ti);
} else {
printGraph(localData, stack, allParts, parent, next, reversed ? sp1 : sp0, loops, forFinalCommands);
GraphTargetItem second = stack.pop();
GraphTargetItem first = stack.pop();
GraphTargetItem second = null;
if (first.isCompileTime() && (reversed == first.toBoolean())) {
second = new TrueItem(null);
} else {
printGraph(localData, stack, allParts, parent, next, reversed ? sp1 : sp0, loops, forFinalCommands);
try {
second = stack.pop();
} catch (EmptyStackException ese) {
ese.printStackTrace();
System.err.println(part.toString());
System.out.println("" + first.isCompileTime() + first.toBoolean());
}
}
if (!reversed) {
AndItem a = new AndItem(null, first, second);
stack.push(a);
@@ -605,9 +617,16 @@ public class Graph {
if ((ti = checkLoop(next, stopPart, loops)) != null) {
ret.add(ti);
} else {
printGraph(localData, stack, allParts, parent, next, reversed ? sp1 : sp0, loops, forFinalCommands);
GraphTargetItem second = stack.pop();
GraphTargetItem first = stack.pop();
GraphTargetItem second = null;
if (first.isCompileTime() && (reversed == !first.toBoolean())) {
second = new TrueItem(null);
} else {
printGraph(localData, stack, allParts, parent, next, reversed ? sp1 : sp0, loops, forFinalCommands);
second = stack.pop();
}
if (reversed) {
AndItem a = new AndItem(null, first, second);
stack.push(a);