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

load AVM2 instuctions dynamically (much less memory usage after loading an swf, but still fast decompiling)

Browse Source
This commit is contained in:
[email protected]
2014-09-06 00:43:11 +02:00
parent 3c72c84cd9
commit 8ba93afa4d
11 changed files with 137 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
+2 -9
View File
@@ -1456,14 +1456,7 @@ public class CommandLineArgumentParser {
byte[] data = Helper.getBytesFromHexaText(text);
MethodBody mb = abc.bodies.get(bodyIndex);
mb.codeBytes = data;
try {
ABCInputStream ais = new ABCInputStream(new MemoryInputStream(mb.codeBytes));
mb.code = new AVM2Code(ais);
} catch (UnknownInstructionCode re) {
mb.code = new AVM2Code();
Logger.getLogger(CommandLineArgumentParser.class.getName()).log(Level.SEVERE, null, re);
}
mb.code.compact();
mb.setCode(null);
} else {
Trait trait = abc.findTraitByTraitId(classIndex, traitId);
try {
@@ -1490,7 +1483,7 @@ public class CommandLineArgumentParser {
}
}, abc.bodies.get(bodyIndex), abc.method_info.get(abc.bodies.get(bodyIndex).method_info));
acode.getBytes(abc.bodies.get(bodyIndex).codeBytes);
abc.bodies.get(bodyIndex).code = acode;
abc.bodies.get(bodyIndex).setCode(acode);
} catch (com.jpexs.decompiler.flash.abc.avm2.parser.ParseException ex) {
System.err.println("%error% on line %line%".replace("%error%", ex.text).replace("%line%", "" + ex.line));
System.exit(1);
src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
+1 -1
View File
@@ -872,7 +872,7 @@ public class ABCPanel extends JPanel implements ItemListener, ActionListener, Se
code.code.add(new AVM2Instruction(0, new GetLocal0Ins(), new int[0]));
code.code.add(new AVM2Instruction(0, new PushScopeIns(), new int[0]));
code.code.add(new AVM2Instruction(0, new ReturnVoidIns(), new int[0]));
body.code = code;
body.setCode(code);
Traits traits = new Traits();
traits.traits = new ArrayList<>();
body.traits = traits;
src/com/jpexs/decompiler/flash/gui/abc/ASMSourceEditorPane.java
+6 -16
View File
@@ -17,9 +17,7 @@
package com.jpexs.decompiler.flash.gui.abc;
import com.jpexs.decompiler.flash.abc.ABC;
import com.jpexs.decompiler.flash.abc.ABCInputStream;
import com.jpexs.decompiler.flash.abc.avm2.AVM2Code;
import com.jpexs.decompiler.flash.abc.avm2.UnknownInstructionCode;
import com.jpexs.decompiler.flash.abc.avm2.graph.AVM2Graph;
import com.jpexs.decompiler.flash.abc.avm2.parser.ParseException;
import com.jpexs.decompiler.flash.abc.avm2.parser.pcode.ASM3Parser;
@@ -37,7 +35,6 @@ import com.jpexs.decompiler.flash.tags.Tag;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.ScopeStack;
import com.jpexs.helpers.Helper;
import com.jpexs.helpers.MemoryInputStream;
import java.io.IOException;
import java.io.StringReader;
import java.util.ArrayList;
@@ -73,7 +70,7 @@ public class ASMSourceEditorPane extends LineMarkedEditorPane implements CaretLi
private HilightedText getHilightedText(ScriptExportMode exportMode) {
HilightedTextWriter writer = new HilightedTextWriter(Configuration.getCodeFormatting(), true);
abc.bodies.get(bodyIndex).code.toASMSource(abc.constants, trait, abc.method_info.get(abc.bodies.get(bodyIndex).method_info), abc.bodies.get(bodyIndex), exportMode, writer);
abc.bodies.get(bodyIndex).getCode().toASMSource(abc.constants, trait, abc.method_info.get(abc.bodies.get(bodyIndex).method_info), abc.bodies.get(bodyIndex), exportMode, writer);
return new HilightedText(writer);
}
@@ -99,7 +96,7 @@ public class ASMSourceEditorPane extends LineMarkedEditorPane implements CaretLi
setContentType("text/plain");
if (textHexOnly == null) {
HilightedTextWriter writer = new HilightedTextWriter(Configuration.getCodeFormatting(), true);
Helper.byteArrayToHexWithHeader(writer, abc.bodies.get(bodyIndex).code.getBytes());
Helper.byteArrayToHexWithHeader(writer, abc.bodies.get(bodyIndex).getCode().getBytes());
textHexOnly = new HilightedText(writer);
}
setText(textHexOnly);
@@ -171,7 +168,7 @@ public class ASMSourceEditorPane extends LineMarkedEditorPane implements CaretLi
public void graph() {
try {
AVM2Graph gr = new AVM2Graph(abc.bodies.get(bodyIndex).code, abc, abc.bodies.get(bodyIndex), false, -1, -1, new HashMap<Integer, GraphTargetItem>(), new ScopeStack(), new HashMap<Integer, String>(), new ArrayList<String>(), new HashMap<Integer, Integer>(), abc.bodies.get(bodyIndex).code.visitCode(abc.bodies.get(bodyIndex)));
AVM2Graph gr = new AVM2Graph(abc.bodies.get(bodyIndex).getCode(), abc, abc.bodies.get(bodyIndex), false, -1, -1, new HashMap<Integer, GraphTargetItem>(), new ScopeStack(), new HashMap<Integer, String>(), new ArrayList<String>(), new HashMap<Integer, Integer>(), abc.bodies.get(bodyIndex).getCode().visitCode(abc.bodies.get(bodyIndex)));
(new GraphDialog(getAbcPanel().getMainPanel().getMainFrame().getWindow(), gr, name)).setVisible(true);
} catch (InterruptedException ex) {
Logger.getLogger(ASMSourceEditorPane.class.getName()).log(Level.SEVERE, null, ex);
@@ -182,7 +179,7 @@ public class ASMSourceEditorPane extends LineMarkedEditorPane implements CaretLi
HashMap<Integer, Object> args = new HashMap<>();
args.put(0, new Object()); //object "this"
args.put(1, new Long(466561)); //param1
Object o = abc.bodies.get(bodyIndex).code.execute(args, abc.constants);
Object o = abc.bodies.get(bodyIndex).getCode().execute(args, abc.constants);
View.showMessageDialog(this, "Returned object:" + o.toString());
}
@@ -193,14 +190,7 @@ public class ASMSourceEditorPane extends LineMarkedEditorPane implements CaretLi
byte[] data = Helper.getBytesFromHexaText(text);
MethodBody mb = abc.bodies.get(bodyIndex);
mb.codeBytes = data;
try {
ABCInputStream ais = new ABCInputStream(new MemoryInputStream(mb.codeBytes));
mb.code = new AVM2Code(ais);
} catch (UnknownInstructionCode re) {
mb.code = new AVM2Code();
Logger.getLogger(ASMSourceEditorPane.class.getName()).log(Level.SEVERE, null, re);
}
mb.code.compact();
mb.setCode(null);
} else {
AVM2Code acode = ASM3Parser.parse(new StringReader(text), abc.constants, trait, new MissingSymbolHandler() {
//no longer ask for adding new constants
@@ -225,7 +215,7 @@ public class ASMSourceEditorPane extends LineMarkedEditorPane implements CaretLi
}
}, abc.bodies.get(bodyIndex), abc.method_info.get(abc.bodies.get(bodyIndex).method_info));
acode.getBytes(abc.bodies.get(bodyIndex).codeBytes);
abc.bodies.get(bodyIndex).code = acode;
abc.bodies.get(bodyIndex).setCode(acode);
}
((Tag) abc.parentTag).setModified(true);
} catch (IOException ex) {
src/com/jpexs/decompiler/flash/gui/abc/DecompiledEditorPane.java
+1 -1
View File
@@ -229,7 +229,7 @@ public class DecompiledEditorPane extends LineMarkedEditorPane implements CaretL
int pos = getCaretPosition();
Highlighting h = Highlighting.search(highlights, pos);
if (h != null) {
List<AVM2Instruction> list = abc.bodies.get(abcPanel.detailPanel.methodTraitPanel.methodCodePanel.getBodyIndex()).code.code;
List<AVM2Instruction> list = abc.bodies.get(abcPanel.detailPanel.methodTraitPanel.methodCodePanel.getBodyIndex()).getCode().code;
AVM2Instruction lastIns = null;
long inspos = 0;
AVM2Instruction selIns = null;