LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-05-25 19:15:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added #1718 Show progress on injecting debug info / SWD generation (before Debugging)

Browse Source
This commit is contained in:
Jindra Petřík
2021-12-05 19:54:41 +01:00
parent 3dd2885358
commit 3a3cac1fe9
5 changed files with 85 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
View File

@@ -3386,14 +3386,14 @@ public final class SWF implements SWFContainerItem, Timelined {
* @param decompileDir Directory to virtual decompile (will affect
* debugfile)
*/
public void enableDebugging(boolean injectAS3Code, File decompileDir) {
public void enableDebugging(boolean injectAS3Code, File decompileDir) throws InterruptedException {
enableDebugging(injectAS3Code, decompileDir, false);
}
/**
* Enables debugging. Adds tags to enable debugging.
*/
public void enableDebugging() {
public void enableDebugging() throws InterruptedException {
enableDebugging(false, null, false);
}
@@ -3406,7 +3406,7 @@ public final class SWF implements SWFContainerItem, Timelined {
* debugfile)
* @param telemetry Enable telemetry info?
*/
public void enableDebugging(boolean injectAS3Code, File decompileDir, boolean telemetry) {
public void enableDebugging(boolean injectAS3Code, File decompileDir, boolean telemetry) throws InterruptedException {
enableDebugging(injectAS3Code, decompileDir, telemetry, false);
}
@@ -3414,9 +3414,15 @@ public final class SWF implements SWFContainerItem, Timelined {
* Injects debugline and debugfile instructions to AS3 P-code (lines of
* P-code)
*/
public void injectAS3PcodeDebugInfo() {
public void injectAS3PcodeDebugInfo() throws InterruptedException {
List<ScriptPack> packs = getAS3Packs();
int i = 0;
for (ScriptPack s : packs) {
if (Thread.currentThread().isInterrupted()) {
throw new InterruptedException();
}
i++;
informListeners("inject_debuginfo", "" + i + "/" + packs.size() + ": " + s.getPath());
int abcIndex = s.allABCs.indexOf(s.abc);
if (s.isSimple) {
s.injectPCodeDebugInfo(abcIndex);
@@ -3429,9 +3435,15 @@ public final class SWF implements SWFContainerItem, Timelined {
*
* @param decompileDir Directory to set file information paths
*/
public void injectAS3DebugInfo(File decompileDir) {
public void injectAS3DebugInfo(File decompileDir) throws InterruptedException {
List<ScriptPack> packs = getAS3Packs();
int i = 0;
for (ScriptPack s : packs) {
if (Thread.currentThread().isInterrupted()) {
throw new InterruptedException();
}
i++;
informListeners("inject_debuginfo", "" + i + "/" + packs.size() + ": " + s.getPath());
if (s.isSimple) {
s.injectDebugInfo(decompileDir);
}
@@ -3448,7 +3460,7 @@ public final class SWF implements SWFContainerItem, Timelined {
* @param telemetry Enable telemetry info?
* @param pcodeLevel inject Pcode lines instead of decompiled lines
*/
public void enableDebugging(boolean injectAS3Code, File decompileDir, boolean telemetry, boolean pcodeLevel) {
public void enableDebugging(boolean injectAS3Code, File decompileDir, boolean telemetry, boolean pcodeLevel) throws InterruptedException {
if (injectAS3Code) {
if (pcodeLevel) {
@@ -3532,7 +3544,7 @@ public final class SWF implements SWFContainerItem, Timelined {
return r;
}
public boolean generatePCodeSwdFile(File file, Map<String, Set<Integer>> breakpoints) throws IOException {
public boolean generatePCodeSwdFile(File file, Map<String, Set<Integer>> breakpoints) throws IOException, InterruptedException {
DebugIDTag dit = getDebugId();
if (dit == null) {
return false;
@@ -3552,6 +3564,10 @@ public final class SWF implements SWFContainerItem, Timelined {
List<String> names = new ArrayList<>(asms.keySet());
Collections.sort(names);
for (String name : names) {
if (Thread.currentThread().isInterrupted()) {
throw new InterruptedException();
}
informListeners("generate_swd", name);
moduleId++;
String sname = "#PCODE " + name;
int bitmap = SWD.bitmapAction;
@@ -3623,6 +3639,10 @@ public final class SWF implements SWFContainerItem, Timelined {
List<String> names = new ArrayList<>(asms.keySet());
Collections.sort(names);
for (String name : names) {
if (Thread.currentThread().isInterrupted()) {
throw new InterruptedException();
}
informListeners("generate_swd", name);
List<SWD.DebugRegisters> regitems = new ArrayList<>();
moduleId++;
HighlightedText cs;