LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-25 23:40:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added AS3 P-code - Editing interface methods

Browse Source
This commit is contained in:
Jindra Petřík
2022-12-18 23:10:24 +01:00
parent c4799bc92e
commit f7869abe0b
8 changed files with 141 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/jpexs/decompiler/flash/gui/MainPanel.java
+2 -1
View File
@@ -3668,6 +3668,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
SWF swf = abcPanel.getSwf();
swf.deobfuscate(level);
} else {
int mi = abcPanel.detailPanel.methodTraitPanel.methodCodePanel.getMethodIndex();
int bi = abcPanel.detailPanel.methodTraitPanel.methodCodePanel.getBodyIndex();
DecompiledEditorPane decompiledTextArea = abcPanel.decompiledTextArea;
Trait t = abcPanel.decompiledTextArea.getCurrentTrait();
@@ -3678,7 +3679,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
boolean isStatic = decompiledTextArea.getIsStatic();
abc.bodies.get(bi).deobfuscate(level, t, scriptIndex, classIndex, isStatic, ""/*FIXME*/);
}
abcPanel.detailPanel.methodTraitPanel.methodCodePanel.setBodyIndex(decompiledTextArea.getScriptLeaf().getPathScriptName(), bi, abc, t, abcPanel.detailPanel.methodTraitPanel.methodCodePanel.getScriptIndex());
abcPanel.detailPanel.methodTraitPanel.methodCodePanel.setMethod(decompiledTextArea.getScriptLeaf().getPathScriptName(), mi, bi, abc, t, abcPanel.detailPanel.methodTraitPanel.methodCodePanel.getScriptIndex());
}
} catch (Exception ex) {
logger.log(Level.SEVERE, "Deobfuscation error", ex);
src/com/jpexs/decompiler/flash/gui/abc/ASMSourceEditorPane.java
+35 -14
View File
@@ -73,6 +73,9 @@ public class ASMSourceEditorPane extends DebuggableEditorPane implements CaretLi
public ABC abc;
public int bodyIndex = -1;
public int methodIndex = -1;
private int scriptIndex = -1;
@@ -125,8 +128,23 @@ public class ASMSourceEditorPane extends DebuggableEditorPane implements CaretLi
if (trait != null && exportMode != ScriptExportMode.AS && exportMode != ScriptExportMode.AS_METHOD_STUBS) {
trait.convertTraitHeader(abc, writer);
}
MethodBody body = abc.bodies.get(bodyIndex);
abc.bodies.get(bodyIndex).getCode().toASMSource(abc, abc.constants, abc.method_info.get(body.method_info), body, exportMode, writer);
if (bodyIndex > -1) {
MethodBody body = abc.bodies.get(bodyIndex);
abc.bodies.get(bodyIndex).getCode().toASMSource(abc, abc.constants, abc.method_info.get(body.method_info), body, exportMode, writer);
} else {
writer.appendNoHilight("method");
if (Configuration.indentAs3PCode.get()) {
writer.indent();
}
writer.newLine();
abc.method_info.get(methodIndex).toASMSource(abc.constants, writer);
if (Configuration.indentAs3PCode.get()) {
writer.unindent();
}
writer.appendNoHilight("end ; method").newLine();
}
if (trait != null && exportMode != ScriptExportMode.AS && exportMode != ScriptExportMode.AS_METHOD_STUBS) {
if (Configuration.indentAs3PCode.get()) {
writer.unindent();
@@ -158,7 +176,9 @@ public class ASMSourceEditorPane extends DebuggableEditorPane implements CaretLi
changeContentType("text/plain");
if (textHexOnly == null) {
HighlightedTextWriter writer = new HighlightedTextWriter(Configuration.getCodeFormatting(), true);
Helper.byteArrayToHexWithHeader(writer, abc.bodies.get(bodyIndex).getCodeBytes());
if (bodyIndex > -1) {
Helper.byteArrayToHexWithHeader(writer, abc.bodies.get(bodyIndex).getCodeBytes());
}
textHexOnly = new HighlightedText(writer);
}
setText(textHexOnly);
@@ -220,15 +240,13 @@ public class ASMSourceEditorPane extends DebuggableEditorPane implements CaretLi
return super.getName();
}
public void setBodyIndex(String scriptPathName, int bodyIndex, ABC abc, String name, Trait trait, int scriptIndex) {
public void setMethod(String scriptPathName, int methodIndex, int bodyIndex, ABC abc, String name, Trait trait, int scriptIndex) {
this.methodIndex = methodIndex;
this.bodyIndex = bodyIndex;
this.abc = abc;
this.name = name;
this.trait = trait;
this.scriptIndex = scriptIndex;
if (bodyIndex == -1) {
return;
}
this.scriptIndex = scriptIndex;
textWithHex = null;
textNoHex = null;
textHexOnly = null;
@@ -270,9 +288,11 @@ public class ASMSourceEditorPane extends DebuggableEditorPane implements CaretLi
try {
String text = getText();
if (text.trim().startsWith(Helper.hexData)) {
byte[] data = Helper.getBytesFromHexaText(text);
MethodBody mb = abc.bodies.get(bodyIndex);
mb.setCodeBytes(data);
if (bodyIndex > -1) {
byte[] data = Helper.getBytesFromHexaText(text);
MethodBody mb = abc.bodies.get(bodyIndex);
mb.setCodeBytes(data);
}
} else {
AVM2Code acode = ASM3Parser.parse(abc, new StringReader(text), trait, new MissingSymbolHandler() {
//no longer ask for adding new constants
@@ -310,9 +330,10 @@ public class ASMSourceEditorPane extends DebuggableEditorPane implements CaretLi
public boolean missingFloat4(Float4 value) {
return true;
}
}, abc.bodies.get(bodyIndex), abc.method_info.get(abc.bodies.get(bodyIndex).method_info));
//acode.getBytes(abc.bodies.get(bodyIndex).getCodeBytes());
abc.bodies.get(bodyIndex).setCode(acode);
}, bodyIndex == -1 ? null : abc.bodies.get(bodyIndex), abc.method_info.get(methodIndex));
if (bodyIndex > -1) {
abc.bodies.get(bodyIndex).setCode(acode);
}
}
((Tag) abc.parentTag).setModified(true);
src/com/jpexs/decompiler/flash/gui/abc/DecompiledEditorPane.java
+6 -4
View File
@@ -205,9 +205,11 @@ public class DecompiledEditorPane extends DebuggableEditorPane implements CaretL
return false;
}
int bi = abc.findBodyIndex(methodIndex);
if (bi == -1) {
//in interfaces, there is no body
/*if (bi == -1) {
return false;
}
}*/
//fix for inner functions:
if (trait instanceof TraitMethodGetterSetter) {
@@ -224,8 +226,8 @@ public class DecompiledEditorPane extends DebuggableEditorPane implements CaretL
}
abcPanel.detailPanel.showCard(DetailPanel.METHOD_GETTER_SETTER_TRAIT_CARD, trait, traitIndex, abc);
MethodCodePanel methodCodePanel = abcPanel.detailPanel.methodTraitPanel.methodCodePanel;
if (reset || (methodCodePanel.getBodyIndex() != bi)) {
methodCodePanel.setBodyIndex(scriptName, bi, abc, name, trait, script.scriptIndex);
if (reset || (methodCodePanel.getMethodIndex()!= methodIndex)) {
methodCodePanel.setMethod(scriptName, methodIndex, bi, abc, name, trait, script.scriptIndex);
abcPanel.detailPanel.setEditMode(false);
this.isStatic = isStatic;
}
src/com/jpexs/decompiler/flash/gui/abc/MethodCodePanel.java
+8 -4
View File
@@ -91,17 +91,21 @@ public class MethodCodePanel extends JPanel {
sourceTextArea.hilighSpecial(type, specialValue);
}
public void setBodyIndex(String scriptPathName, int bodyIndex, ABC abc, Trait trait, int scriptIndex) {
sourceTextArea.setBodyIndex(scriptPathName, bodyIndex, abc, sourceTextArea.getName(), trait, scriptIndex);
public void setMethod(String scriptPathName, int methodIndex, int bodyIndex, ABC abc, Trait trait, int scriptIndex) {
sourceTextArea.setMethod(scriptPathName, methodIndex, bodyIndex, abc, sourceTextArea.getName(), trait, scriptIndex);
}
public void setBodyIndex(String scriptPathName, int bodyIndex, ABC abc, String name, Trait trait, int scriptIndex) {
sourceTextArea.setBodyIndex(scriptPathName, bodyIndex, abc, name, trait, scriptIndex);
public void setMethod(String scriptPathName, int methodIndex, int bodyIndex, ABC abc, String name, Trait trait, int scriptIndex) {
sourceTextArea.setMethod(scriptPathName, methodIndex, bodyIndex, abc, name, trait, scriptIndex);
}
public int getBodyIndex() {
return sourceTextArea.bodyIndex;
}
public int getMethodIndex() {
return sourceTextArea.methodIndex;
}
public void clear() {
sourceTextArea.clear();