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

#1594 Option to use old style of getlocalx, setlocalx with underscore

Browse Source
This commit is contained in:
Jindra Petřík
2021-02-11 12:51:00 +01:00
parent ac15728b9d
commit ac89162be0
6 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java
View File

@@ -12,7 +12,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library.
* License along with this library.
*/
package com.jpexs.decompiler.flash.abc.avm2.instructions;
import com.jpexs.decompiler.flash.BaseLocalData;
@@ -41,7 +42,9 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
*
@@ -65,6 +68,15 @@ public class AVM2Instruction implements Cloneable, GraphSourceItem {
private long virtualAddress = -1;
private static final Map<String, String> oldStyleNames = new HashMap<>();
static {
for (int i = 0; i <= 3; i++) {
oldStyleNames.put("getlocal" + i, "getlocal_" + i);
oldStyleNames.put("setlocal" + i, "setlocal_" + i);
}
}
@Override
public long getFileOffset() {
return -1;
@@ -373,13 +385,20 @@ public class AVM2Instruction implements Cloneable, GraphSourceItem {
}
public GraphTextWriter toString(GraphTextWriter writer, LocalData localData) {
public GraphTextWriter toString(GraphTextWriter writer, LocalData localData) {
writer.appendNoHilight(Helper.formatAddress(address) + " " + String.format("%-30s", Helper.byteArrToString(getBytes())) + getCustomizedInstructionName());
writer.appendNoHilight(getParams(localData.constantsAvm2, localData.fullyQualifiedNames) + getComment());
return writer;
}
private String getCustomizedInstructionName() {
if (Configuration.useOldStyleGetSetLocalsAs3PCode.get() && oldStyleNames.containsKey(definition.instructionName)) {
return oldStyleNames.get(definition.instructionName);
}
return definition.instructionName;
}
public String toStringNoAddress(AVM2ConstantPool constants, List<DottedChain> fullyQualifiedNames) {
public String toStringNoAddress(AVM2ConstantPool constants, List<DottedChain> fullyQualifiedNames) {
String s = getCustomizedInstructionName();
if (Configuration.padAs3PCodeInstructionName.get()) {
for (int i = s.length(); i < 19; i++) {
s += " ";

4
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
View File

@@ -664,6 +664,10 @@ public final class Configuration {
@ConfigurationCategory("format")
public static ConfigurationItem<Boolean> labelOnSeparateLineAs3PCode = null;
@ConfigurationDefaultBoolean(false)
@ConfigurationCategory("script")
public static ConfigurationItem<Boolean> useOldStyleGetSetLocalsAs3PCode = null;
private enum OSId {
WINDOWS, OSX, UNIX
}