diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java index c6a5934e1..ddf4bdcfd 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java @@ -1110,7 +1110,7 @@ public class AVM2Code implements Cloneable { DumpInfo diParent = ais.dumpInfo; List addresses = new ArrayList<>(); //Do not add new jumps when processing these addresses (unreachable code,etc.) - List unAdresses = new ArrayList<>(); + List unAddresses = new ArrayList<>(); //Handle lookupswitches at the end - they can be invalid. Handle other instruction first so we can decide lookupswitch to be invalid based on other instructions inside it //Flashplayer does not check casecount in lookupswitch instruction so the instruction can "be" long and over other instructions List switchAddresses = new ArrayList<>(); @@ -1129,7 +1129,7 @@ public class AVM2Code implements Cloneable { } loopaddr: - while (!addresses.isEmpty() || !switchAddresses.isEmpty() || !unAdresses.isEmpty()) { + while (!addresses.isEmpty() || !switchAddresses.isEmpty() || !unAddresses.isEmpty()) { long address; boolean isSwitch = false; boolean handleJumps = true; @@ -1139,7 +1139,7 @@ public class AVM2Code implements Cloneable { address = switchAddresses.remove(0); isSwitch = true; } else { - address = unAdresses.remove(0); + address = unAddresses.remove(0); handleJumps = false; } if (address < startPos) { // no jump outside block @@ -1257,7 +1257,7 @@ public class AVM2Code implements Cloneable { if (handleJumps) { long target = ais.getPosition() + actualOperands[0]; addresses.add(target); - unAdresses.add(ais.getPosition()); + unAddresses.add(ais.getPosition()); continue loopaddr; } else { actualOperands[0] = 0; @@ -1266,7 +1266,7 @@ public class AVM2Code implements Cloneable { if (instr.isExitInstruction()) { //do not process jumps if there is return/throw instruction if (handleJumps) { - unAdresses.add(ais.getPosition()); + unAddresses.add(ais.getPosition()); continue loopaddr; } } @@ -1277,7 +1277,7 @@ public class AVM2Code implements Cloneable { for (int c = 2; c < actualOperands.length; c++) { addresses.add(startOffset + actualOperands[c]); } - unAdresses.add(ais.getPosition()); + unAddresses.add(ais.getPosition()); continue loopaddr; } else { int swlen = (int) (endOffset - startOffset); @@ -1379,7 +1379,7 @@ public class AVM2Code implements Cloneable { } /** - * Sets instruction addesses by their position. + * Sets instruction addresses by their position. */ public void markOffsets() { long address = 0; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/Action.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/Action.java index 19dfbfe43..0b89a0242 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/Action.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/Action.java @@ -852,11 +852,11 @@ public abstract class Action implements GraphSourceItem { * Converts action to ASM source. * * @param container Container - * @param knownAddreses List of important offsets to mark as labels + * @param knownAddresses List of important offsets to mark as labels * @param exportMode PCode or hex? * @return String of P-code source */ - public String getASMSource(ActionList container, Set knownAddreses, ScriptExportMode exportMode) { + public String getASMSource(ActionList container, Set knownAddresses, ScriptExportMode exportMode) { return toString(); } @@ -1441,13 +1441,13 @@ public abstract class Action implements GraphSourceItem { * Get ASM source with replaced Actions. * * @param container Container - * @param knownAddreses Known addresses + * @param knownAddresses Known addresses * @param exportMode Export mode * @param writer Writer * @return Writer */ - public GraphTextWriter getASMSourceReplaced(ActionList container, Set knownAddreses, ScriptExportMode exportMode, GraphTextWriter writer) { - writer.appendNoHilight(getASMSource(container, knownAddreses, exportMode)); + public GraphTextWriter getASMSourceReplaced(ActionList container, Set knownAddresses, ScriptExportMode exportMode, GraphTextWriter writer) { + writer.appendNoHilight(getASMSource(container, knownAddresses, exportMode)); return writer; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionWaitForFrame.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionWaitForFrame.java index d91dc6fd7..9ad77741e 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionWaitForFrame.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionWaitForFrame.java @@ -92,7 +92,7 @@ public class ActionWaitForFrame extends Action implements ActionStore { } @Override - public String getASMSource(ActionList container, Set knownAddreses, ScriptExportMode exportMode) { + public String getASMSource(ActionList container, Set knownAddresses, ScriptExportMode exportMode) { String ret = "WaitForFrame " + frame + ", " + skipCount; return ret; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java index 48af550c3..8e6651ad6 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java @@ -130,7 +130,7 @@ public class ActionIf extends Action { } @Override - public String getASMSource(ActionList container, Set knownAddreses, ScriptExportMode exportMode) { + public String getASMSource(ActionList container, Set knownAddresses, ScriptExportMode exportMode) { long address = getTargetAddress(); String ofsStr = Helper.formatAddress(address); return "If loc" + ofsStr + (!jumpUsed ? " ;compileTimeIgnore" : (!ignoreUsed ? " ;compileTimeJump" : "")); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionJump.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionJump.java index 4c3fc5343..90877b39c 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionJump.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionJump.java @@ -127,7 +127,7 @@ public class ActionJump extends Action { } @Override - public String getASMSource(ActionList container, Set knownAddreses, ScriptExportMode exportMode) { + public String getASMSource(ActionList container, Set knownAddresses, ScriptExportMode exportMode) { long address = getTargetAddress(); String ofsStr = Helper.formatAddress(address); return "Jump loc" + ofsStr; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java index 4329c72eb..f7111b1c9 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java @@ -356,7 +356,7 @@ public class ActionPush extends Action { } @Override - public GraphTextWriter getASMSourceReplaced(ActionList container, Set knownAddreses, ScriptExportMode exportMode, GraphTextWriter writer) { + public GraphTextWriter getASMSourceReplaced(ActionList container, Set knownAddresses, ScriptExportMode exportMode, GraphTextWriter writer) { if (replacement == null || replacement.size() < values.size()) { return toString(writer); } @@ -370,12 +370,12 @@ public class ActionPush extends Action { /** * Converts the parameters to string - use replacements when available. * @param container Container - * @param knownAddreses Known addresses + * @param knownAddresses Known addresses * @param exportMode Export mode * @param writer Writer * @return Writer */ - public GraphTextWriter paramsToStringReplaced(List container, Set knownAddreses, ScriptExportMode exportMode, GraphTextWriter writer) { + public GraphTextWriter paramsToStringReplaced(List container, Set knownAddresses, ScriptExportMode exportMode, GraphTextWriter writer) { if (replacement == null || replacement.size() < values.size()) { return paramsToString(writer); } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionWaitForFrame2.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionWaitForFrame2.java index 4e8fa7f47..640d6640d 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionWaitForFrame2.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionWaitForFrame2.java @@ -158,13 +158,13 @@ public class ActionWaitForFrame2 extends Action implements ActionStore { } @Override - public String getASMSource(ActionList container, Set knownAddreses, ScriptExportMode exportMode) { + public String getASMSource(ActionList container, Set knownAddresses, ScriptExportMode exportMode) { String ret = "WaitForFrame2 " + skipCount; /*for (int i = 0; i < skipped.size(); i++) { if (skipped.get(i) instanceof ActionEnd) { break; } - ret += "\r\n" + skipped.get(i).getASMSource(container, knownAddreses, version, exportMode); + ret += "\r\n" + skipped.get(i).getASMSource(container, knownAddresses, version, exportMode); }*/ return ret; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineFunction.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineFunction.java index 34191f04f..c72b6e4dc 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineFunction.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineFunction.java @@ -180,7 +180,7 @@ public class ActionDefineFunction extends Action implements GraphSourceItemConta } @Override - public String getASMSource(ActionList container, Set knownAddreses, ScriptExportMode exportMode) { + public String getASMSource(ActionList container, Set knownAddresses, ScriptExportMode exportMode) { StringBuilder paramStr = new StringBuilder(); for (int i = 0; i < paramNames.size(); i++) { paramStr.append(", "); @@ -191,7 +191,7 @@ public class ActionDefineFunction extends Action implements GraphSourceItemConta } @Override - public GraphTextWriter getASMSourceReplaced(ActionList container, Set knownAddreses, ScriptExportMode exportMode, GraphTextWriter writer) { + public GraphTextWriter getASMSourceReplaced(ActionList container, Set knownAddresses, ScriptExportMode exportMode, GraphTextWriter writer) { List oldParamNames = paramNames; if (replacedParamNames != null) { paramNames = replacedParamNames; @@ -200,7 +200,7 @@ public class ActionDefineFunction extends Action implements GraphSourceItemConta if (replacedFunctionName != null) { functionName = replacedFunctionName; } - String ret = getASMSource(container, knownAddreses, exportMode); + String ret = getASMSource(container, knownAddresses, exportMode); paramNames = oldParamNames; functionName = oldFunctionName; writer.appendNoHilight(ret); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java index b76a25a2b..723739088 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java @@ -125,7 +125,7 @@ public class ActionWith extends Action implements GraphSourceItemContainer { } @Override - public String getASMSource(ActionList container, Set knownAddreses, ScriptExportMode exportMode) { + public String getASMSource(ActionList container, Set knownAddresses, ScriptExportMode exportMode) { return "With {"; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf7/ActionDefineFunction2.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf7/ActionDefineFunction2.java index b786b91e0..fd940cd0e 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf7/ActionDefineFunction2.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf7/ActionDefineFunction2.java @@ -310,7 +310,7 @@ public class ActionDefineFunction2 extends Action implements GraphSourceItemCont } @Override - public GraphTextWriter getASMSourceReplaced(ActionList container, Set knownAddreses, ScriptExportMode exportMode, GraphTextWriter writer) { + public GraphTextWriter getASMSourceReplaced(ActionList container, Set knownAddresses, ScriptExportMode exportMode, GraphTextWriter writer) { List oldParamNames = paramNames; if (replacedParamNames != null) { paramNames = replacedParamNames; @@ -319,7 +319,7 @@ public class ActionDefineFunction2 extends Action implements GraphSourceItemCont if (replacedFunctionName != null) { functionName = replacedFunctionName; } - String ret = getASMSource(container, knownAddreses, exportMode); + String ret = getASMSource(container, knownAddresses, exportMode); paramNames = oldParamNames; functionName = oldFunctionName; writer.appendNoHilight(ret); @@ -328,7 +328,7 @@ public class ActionDefineFunction2 extends Action implements GraphSourceItemCont } @Override - public String getASMSource(ActionList container, Set knownAddreses, ScriptExportMode exportMode) { + public String getASMSource(ActionList container, Set knownAddresses, ScriptExportMode exportMode) { StringBuilder paramStr = new StringBuilder(); for (int i = 0; i < paramNames.size(); i++) { paramStr.append(", "); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java index 6db0dbc79..fc173856a 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java @@ -247,7 +247,7 @@ public class ActionTry extends Action implements GraphSourceItemContainer { } @Override - public String getASMSource(ActionList container, Set knownAddreses, ScriptExportMode exportMode) { + public String getASMSource(ActionList container, Set knownAddresses, ScriptExportMode exportMode) { StringBuilder ret = new StringBuilder(); ret.append("Try "); if (catchBlockFlag) {