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

AS1/2: Better decompiling loops

Browse Source
This commit is contained in:
Jindra Petk
2013-01-23 21:46:21 +01:00
parent 03522032f8
commit bc19a6db2b
4 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/src/com/jpexs/asdec/Main.java
View File

@@ -810,7 +810,7 @@ public class Main {
if (debug) {
ConsoleHandler conHan = new ConsoleHandler();
conHan.setFormatter(formatterTxt);
conHan.setFormatter(formatterTxt);
logger.addHandler(conHan);
}

48
trunk/src/com/jpexs/asdec/action/Action.java
View File

@@ -91,6 +91,8 @@ public class Action {
"_ymouse"
};
private static Logger logger=Logger.getLogger(Action.class.getName());
/**
* Constructor
*
@@ -627,9 +629,21 @@ public class Action {
this.loopContinue = loopContinue;
this.loopBreak = loopBreak;
}
@Override
public String toString() {
return "[Loop continue:"+loopContinue+", break:"+loopBreak+"]";
}
}
private static void log(String s){
logger.fine(s);
}
private static List<TreeItem> actionsToTree(HashMap<Integer, String> registerNames, List<Long> unknownJumps, List<Loop> loopList, List<Action> jumpsOrIfs, Stack<TreeItem> stack, ConstantPool constants, List<Action> actions, int start, int end, int version) {
log("Entering "+start+"-"+end+(actions.size()>0?(" ("+actions.get(start).toString()+" - " +actions.get(end==actions.size()?end-1:end) +")"):""));
List<TreeItem> output = new ArrayList<TreeItem>();
int ip = start;
boolean isWhile = false;
@@ -675,6 +689,7 @@ public class Action {
break;
}
Action action = actions.get(ip);
log(""+Helper.formatAddress(addr)+" ip:"+ip+" action:"+action);
for (int j = 0; j < jumpsOrIfs.size(); j++) {
Action jif = jumpsOrIfs.get(j);
if (jif instanceof ActionIf) {
@@ -723,7 +738,6 @@ public class Action {
}
if (action instanceof ActionJump) {
int jumpIp = adr2ip(actions, ((ActionJump) action).getRef(version), version);
//if (jumpIp > ip) {
for (Loop l : loopList) {
if (l.loopBreak == ((ActionJump) action).getRef(version)) {
output.add(new BreakTreeItem(action, l.loopBreak));
@@ -737,7 +751,6 @@ public class Action {
continue loopip;
}
}
output.add(new ContinueTreeItem(action, ((ActionJump) action).getRef(version), false));
if (!unknownJumps.contains(((ActionJump) action).getRef(version))) {
@@ -772,37 +785,27 @@ public class Action {
int refIp = adr2ip(actions, ref, version);
if ((refIp > jumpIp) && (refIp <= end + 1)) {
hasElse = true;
jumpElseIp = adr2ip(actions, ((ActionJump) actions.get(jumpIp - 1)).getRef(version), version);
onFalse = actionsToTree(registerNames, unknownJumps, loopList, jumpsOrIfs, falseStack, constants, actions, jumpIp, jumpElseIp - 1, version);
jumpElseIp = adr2ip(actions, ((ActionJump) actions.get(jumpIp - 1)).getRef(version), version);
}
}
//}
Loop currentLoop = null;
if (isWhile || isForIn) {
currentLoop = new Loop(loopStart, jumpIp);
loopList.add(currentLoop);
currentLoop = new Loop(ip2adr(actions, loopStart, version), ip2adr(actions, jumpIp, version));
loopList.add(currentLoop);
}
boolean isFor = false;
boolean isTernar = false;
List<TreeItem> finalExpression = null;
TreeItem variableName = null;
/*if (isForIn) {
for (int t = ip + 1; t <= end; t++) {
Action actionSV = actions.get(t);
actionSV.translate(stack, constants, output, registerNames);
if (actionSV instanceof ActionSetVariable) {
SetVariableTreeItem svt = (SetVariableTreeItem) output.remove(output.size() - 1);
variableName = svt.name;
ip = t;
break;
}
}
}*/
TreeItem variableName = null;
try {
if(hasElse){
log("Going to onfalse");
onFalse = actionsToTree(registerNames, unknownJumps, loopList, jumpsOrIfs, falseStack, constants, actions, jumpIp, jumpElseIp - 1, version);
}
int trueStackSizeBefore = trueStack.size();
log("Going to ontrue");
onTrue = actionsToTree(registerNames, unknownJumps, loopList, jumpsOrIfs, trueStack, constants, actions, ip + 1, jumpIp - 1 - (hasElse || isWhile || isForIn ? 1 : 0), version);
if (onTrue.isEmpty() && trueStack.size() > trueStackSizeBefore) {
isTernar = true;
@@ -985,7 +988,7 @@ public class Action {
caseBodyIps.add(adr2ip(actions, ((ActionIf) actions.get(ip + 1)).getRef(version), version));
ip++;
do {
ip++;
ip++;
if ((actions.get(ip - 1) instanceof ActionStrictEquals) && (actions.get(ip) instanceof ActionIf)) {
caseValues.add(actionsToStackTree(registerNames, jumpsOrIfs, actions, constants, caseStart, ip - 2, version).pop());
caseStart = ip + 1;
@@ -1030,6 +1033,7 @@ public class Action {
}
}
output = checkClass(output);
log("Leaving "+start+"-"+end);
return output;
}

4
trunk/src/com/jpexs/asdec/action/gui/ActionPanel.java
View File

@@ -127,12 +127,12 @@ public class ActionPanel extends JPanel implements TreeSelectionListener, Action
final ASMSource asm = (ASMSource) obj;
(new Thread() {
@Override
public void run() {
public void run() {
editor.setText(asm.getASMSource(SWF.DEFAULT_VERSION));
if (Main.DO_DECOMPILE) {
List<com.jpexs.asdec.action.Action> as = asm.getActions(SWF.DEFAULT_VERSION);
com.jpexs.asdec.action.Action.setActionsAddresses(as, 0, SWF.DEFAULT_VERSION);
decompiledEditor.setText("//Decompiling...");
decompiledEditor.setText(Highlighting.stripHilights(com.jpexs.asdec.action.Action.actionsToSource(as, SWF.DEFAULT_VERSION)));
}
Main.stopWork();

7
trunk/src/com/jpexs/asdec/action/swf4/ActionIf.java
View File

@@ -76,4 +76,11 @@ public class ActionIf extends Action {
ret.add(this);
return ret;
}
@Override
public String toString() {
return "ActionIf";
}
}