LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-07-03 16:04:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issue #266 AS3 deobfuscation fix - switches, try clauses

Browse Source 
Fixed substance components handling
This commit is contained in:
Jindra Petk
2013-07-27 18:20:26 +02:00
parent b6034cfa16
commit d68d4d22b4
16 changed files with 164 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java
View File

@@ -82,7 +82,7 @@ import java.util.logging.Logger;
public class AVM2Code implements Serializable {
public static final long serialVersionUID = 1L;
private static final boolean DEBUG_MODE = true;
private static final boolean DEBUG_MODE = false;
public static int toSourceLimit = -1;
public ArrayList<AVM2Instruction> code = new ArrayList<>();
public static boolean DEBUG_REWRITE = false;
@@ -1652,8 +1652,9 @@ public class AVM2Code implements Serializable {
for (ABCException e : body.exceptions) {
pos++;
try {
visitCode(adr2pos(e.start), -pos, refs);
visitCode(adr2pos(e.target), -pos, refs);
visitCode(adr2pos(e.start), adr2pos(e.start) - 1, refs);
visitCode(adr2pos(e.start), -1, refs);
visitCode(adr2pos(e.target), adr2pos(e.end), refs);
visitCode(adr2pos(e.end), -pos, refs);
} catch (ConvertException ex) {
Logger.getLogger(AVM2Code.class.getName()).log(Level.FINE, null, ex);
@@ -2166,7 +2167,7 @@ public class AVM2Code implements Serializable {
@SuppressWarnings("unchecked")
private static int removeTraps(HashMap<Integer, List<Integer>> refs, boolean secondPass, boolean useVisited, List<Object> localData, Stack<GraphTargetItem> stack, List<GraphTargetItem> output, AVM2GraphSource code, int ip, HashMap<Integer, Integer> visited, HashMap<Integer, HashMap<Integer, GraphTargetItem>> visitedStates, HashMap<GraphSourceItem, Decision> decisions, String path) {
boolean debugMode = true;
boolean debugMode = false;
int ret = 0;
iploop:
while ((ip > -1) && ip < code.size()) {
@@ -2224,9 +2225,6 @@ public class AVM2Code implements Serializable {
ip++;
continue;
}
if (ip == 131) {
System.err.println("debug");
}
if (debugMode) {
System.out.println((useVisited ? "useV " : "") + (secondPass ? "secondPass " : "") + "Visit " + ip + ": " + ins + " stack:" + Highlighting.stripHilights(stack.toString()));
}