Add a parameter to exclude debug instructions from reassembled SWF

piepie62 · piepie62 · commit d1e0221012f0 · 2022-05-11T18:29:31.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@ Native/BytecodeEditor/BytecodeEditor.vcxproj.user
 *.dll
 AS3/bin
 AS3/obj
+*.ane
diff --git a/ANEBytecodeEditor.ane b/ANEBytecodeEditor.ane
diff --git a/AS3/src/com/cff/anebe/BytecodeEditor.as b/AS3/src/com/cff/anebe/BytecodeEditor.as
@@ -93,7 +93,7 @@ package com.cff.anebe
 		
 		// Assembles an SWF from a map of file name to file contents. If replaceSWF is unspecified, and Disassemble was called, uses
 		// the last SWF's data for the rest of the SWF.
-		public function Assemble(strings:Object, replaceSWF:ByteArray = null):ByteArray
+		public function Assemble(strings:Object, includeDebugInstructions:Boolean, replaceSWF:ByteArray = null):ByteArray
 		{
 			if (replaceSWF != null)
 			{
@@ -155,7 +155,7 @@ package com.cff.anebe
 				vec[vec.length] = str;
 			}
 			
-			ret = extContext.call("Assemble", strings, vec);
+			ret = extContext.call("Assemble", strings, vec, includeDebugInstructions);
 			
 			if (ret == null)
 			{
@@ -248,7 +248,7 @@ package com.cff.anebe
 		
 		// Assembles an SWF from a map of file name to file contents, asynchronously. If replaceSWF is unspecified, and Disassemble was called, uses
 		// the last SWF's data for the rest of the SWF.
-		public function AssembleAsync(strings:Object, replaceSWF:ByteArray = null):void
+		public function AssembleAsync(strings:Object, includeDebugInstructions:Boolean, replaceSWF:ByteArray = null):void
 		{
 			if (replaceSWF != null)
 			{
@@ -310,7 +310,7 @@ package com.cff.anebe
 				vec[vec.length] = str;
 			}
 			
-			ret = extContext.call("AssembleAsync", strings, vec);
+			ret = extContext.call("AssembleAsync", strings, vec, includeDebugInstructions);
 			
 			if (ret == null)
 			{
@@ -364,4 +364,4 @@ package com.cff.anebe
 		}
 	}
 
-}
+}
diff --git a/Native/BytecodeEditor/include/Assembler.hpp b/Native/BytecodeEditor/include/Assembler.hpp
@@ -28,6 +28,7 @@ class Assembler
 {
 private:
     const std::unordered_map<std::string, std::string>& strings;
+    bool includeDebugInstructions;
 
     static constexpr char addUniqueMethod[] = "method";
     static constexpr char addUniqueClass[]  = "class";
@@ -1379,7 +1380,12 @@ class Assembler
                     OPCode(uint8_t(OPCode::OP_setlocal0) + instruction.arguments[0].uintv());
             }
 
-            ret.emplace_back(std::move(instruction));
+            if (includeDebugInstructions || (instruction.opcode != OPCode::OP_debug &&
+                                                instruction.opcode != OPCode::OP_debugfile &&
+                                                instruction.opcode != OPCode::OP_debugline))
+            {
+                ret.emplace_back(std::move(instruction));
+            }
         }
 
         for (const auto& f : jumpFixups)
@@ -1471,7 +1477,11 @@ class Assembler
         }
     }
 
-    Assembler(const std::unordered_map<std::string, std::string>& strings) : strings(strings) {}
+    Assembler(
+        const std::unordered_map<std::string, std::string>& strings, bool includeDebugInstructions)
+        : strings(strings), includeDebugInstructions(includeDebugInstructions)
+    {
+    }
 
     ASASM::ASProgram readProgram()
     {
@@ -1565,14 +1575,15 @@ class Assembler
     }
 
 public:
-    static ASASM::ASProgram assemble(const std::unordered_map<std::string, std::string>& strings)
+    static ASASM::ASProgram assemble(
+        const std::unordered_map<std::string, std::string>& strings, bool includeDebugInstructions)
     {
         if (!strings.contains("main.asasm"))
         {
             throw StringException("Assembly start (main.asasm) not found");
         }
 
-        Assembler assembler(strings);
+        Assembler assembler(strings, includeDebugInstructions);
 
         std::shared_ptr<SourceFile> mainFile =
             std::make_shared<SourceFile>("main.asasm", strings.at("main.asasm"));
diff --git a/Native/BytecodeEditor/include/BytecodeEditor.hpp b/Native/BytecodeEditor/include/BytecodeEditor.hpp
@@ -8,6 +8,7 @@
 #include <thread>
 #include <unordered_map>
 #include <variant>
+#include <vector>
 
 class BytecodeEditor
 {
@@ -28,8 +29,8 @@ class BytecodeEditor
     FREObject disassemble();
     FREObject disassembleAsync();
 
-    FREObject assemble(std::unordered_map<std::string, std::string>&& data);
-    FREObject assembleAsync(std::unordered_map<std::string, std::string>&& data);
+    FREObject assemble(std::unordered_map<std::string, std::string>&& data, bool includeDebugInstructions);
+    FREObject assembleAsync(std::unordered_map<std::string, std::string>&& data, bool includeDebugInstructions);
 
     void setSWF(SWF::SWFFile&& file) { currentSWF = std::move(file); }
 
@@ -39,7 +40,7 @@ class BytecodeEditor
         {
             runningTask.join();
         }
-        currentSWF = std::nullopt;
+        currentSWF   = std::nullopt;
         m_taskResult = std::monostate{};
     }
 
diff --git a/Native/BytecodeEditor/source/ANEBytecodeEditor.cpp b/Native/BytecodeEditor/source/ANEBytecodeEditor.cpp
@@ -31,9 +31,9 @@ FREObject Disassemble(FREContext ctx, void* funcData, uint32_t argc, FREObject a
 
 FREObject Assemble(FREContext ctx, void* funcData, uint32_t argc, FREObject argv[])
 {
-    if (argc != 2)
+    if (argc != 3)
     {
-        FAIL("argc should be 2");
+        FAIL("argc should be 3");
     }
 
     GET_EDITOR(ctx);
@@ -49,6 +49,11 @@ FREObject Assemble(FREContext ctx, void* funcData, uint32_t argc, FREObject argv
     {
         FAIL("argv[1] is not a vector");
     }
+    DO_OR_FAIL("Failed to get argv[2] type", FREGetObjectType(argv[2], &type));
+    if (type != FRE_TYPE_BOOLEAN)
+    {
+        FAIL("argv[2] is not a boolean");
+    }
 
     uint32_t vecSize;
     DO_OR_FAIL("Failed to get argv[1] size", FREGetArrayLength(argv[1], &vecSize));
@@ -72,7 +77,11 @@ FREObject Assemble(FREContext ctx, void* funcData, uint32_t argc, FREObject argv
         strings.emplace(key, val);
     }
 
-    return editor->assemble(std::move(strings));
+    uint32_t includeDebugInstructions;
+    DO_OR_FAIL("Failed to get argv[2]'s boolean value",
+        FREGetObjectAsBool(argv[2], &includeDebugInstructions));
+
+    return editor->assemble(std::move(strings), includeDebugInstructions != 0);
 }
 
 FREObject DisassembleAsync(FREContext ctx, void* funcData, uint32_t argc, FREObject argv[])
@@ -89,9 +98,9 @@ FREObject DisassembleAsync(FREContext ctx, void* funcData, uint32_t argc, FREObj
 
 FREObject AssembleAsync(FREContext ctx, void* funcData, uint32_t argc, FREObject argv[])
 {
-    if (argc != 2)
+    if (argc != 3)
     {
-        FAIL("argc should be 2");
+        FAIL("argc should be 3");
     }
 
     GET_EDITOR(ctx);
@@ -107,6 +116,11 @@ FREObject AssembleAsync(FREContext ctx, void* funcData, uint32_t argc, FREObject
     {
         FAIL("argv[1] is not a vector");
     }
+    DO_OR_FAIL("Failed to get argv[2] type", FREGetObjectType(argv[2], &type));
+    if (type != FRE_TYPE_BOOLEAN)
+    {
+        FAIL("argv[2] is not a boolean");
+    }
 
     uint32_t vecSize;
     DO_OR_FAIL("Failed to get argv[1] size", FREGetArrayLength(argv[1], &vecSize));
@@ -130,7 +144,11 @@ FREObject AssembleAsync(FREContext ctx, void* funcData, uint32_t argc, FREObject
         strings.emplace(key, val);
     }
 
-    return editor->assembleAsync(std::move(strings));
+    uint32_t includeDebugInstructions;
+    DO_OR_FAIL("Failed to get argv[2]'s boolean value",
+        FREGetObjectAsBool(argv[2], &includeDebugInstructions));
+
+    return editor->assembleAsync(std::move(strings), includeDebugInstructions != 0);
 }
 
 FREObject AsyncTaskResult(FREContext ctx, void* funcData, uint32_t argc, FREObject argv[])
diff --git a/Native/BytecodeEditor/source/BytecodeEditor.cpp b/Native/BytecodeEditor/source/BytecodeEditor.cpp
@@ -51,7 +51,8 @@ FREObject BytecodeEditor::disassemble()
     }
 }
 
-FREObject BytecodeEditor::assemble(std::unordered_map<std::string, std::string>&& strings)
+FREObject BytecodeEditor::assemble(
+    std::unordered_map<std::string, std::string>&& strings, bool includeDebugInstructions)
 {
     if (runningTask.joinable())
     {
@@ -62,8 +63,8 @@ FREObject BytecodeEditor::assemble(std::unordered_map<std::string, std::string>&
     {
         FAIL("No SWF data specified to reassemble");
     }
-    std::vector<uint8_t> data =
-        std::move(ABC::ABCWriter(Assembler::assemble(strings).toABC()).data());
+    std::vector<uint8_t> data = std::move(
+        ABC::ABCWriter(Assembler::assemble(strings, includeDebugInstructions).toABC()).data());
 
     currentSWF->replaceABCData(data.data(), data.size());
 
@@ -117,22 +118,24 @@ FREObject BytecodeEditor::disassembleAsync()
     return ret;
 }
 
-FREObject BytecodeEditor::assembleAsync(std::unordered_map<std::string, std::string>&& strings)
+FREObject BytecodeEditor::assembleAsync(
+    std::unordered_map<std::string, std::string>&& strings, bool includeDebugInstructions)
 {
     if (runningTask.joinable())
     {
         FAIL("Already running a task");
     }
 
-    runningTask = std::jthread([this, strings = std::move(strings)] {
+    runningTask = std::jthread([this, strings = std::move(strings), includeDebugInstructions] {
         if (!currentSWF)
         {
             FAIL_ASYNC("No SWF data specified to reassemble");
         }
         try
         {
-            std::vector<uint8_t> data =
-                std::move(ABC::ABCWriter(Assembler::assemble(strings).toABC()).data());
+            std::vector<uint8_t> data = std::move(
+                ABC::ABCWriter(Assembler::assemble(strings, includeDebugInstructions).toABC())
+                    .data());
 
             currentSWF->replaceABCData(data.data(), data.size());
 
@@ -225,4 +228,4 @@ FREObject BytecodeEditor::taskResult()
         default:
             FAIL("Invalid task result index");
     }
-}
+}

-Original file line number
+Diff line change
 *.dll
 AS3/bin
 AS3/obj
 +*.ane
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ package com.cff.anebe`
`93`	`93`
`94`	`94`	`// Assembles an SWF from a map of file name to file contents. If replaceSWF is unspecified, and Disassemble was called, uses`
`95`	`95`	`// the last SWF's data for the rest of the SWF.`
`96`		`- public function Assemble(strings:Object, replaceSWF:ByteArray = null):ByteArray`
	`96`	`+ public function Assemble(strings:Object, includeDebugInstructions:Boolean, replaceSWF:ByteArray = null):ByteArray`
`97`	`97`	`{`
`98`	`98`	`if (replaceSWF != null)`
`99`	`99`	`{`
`@@ -155,7 +155,7 @@ package com.cff.anebe`
`155`	`155`	`vec[vec.length] = str;`
`156`	`156`	`}`
`157`	`157`
`158`		`- ret = extContext.call("Assemble", strings, vec);`
	`158`	`+ ret = extContext.call("Assemble", strings, vec, includeDebugInstructions);`
`159`	`159`
`160`	`160`	`if (ret == null)`
`161`	`161`	`{`
`@@ -248,7 +248,7 @@ package com.cff.anebe`
`248`	`248`
`249`	`249`	`// Assembles an SWF from a map of file name to file contents, asynchronously. If replaceSWF is unspecified, and Disassemble was called, uses`
`250`	`250`	`// the last SWF's data for the rest of the SWF.`
`251`		`- public function AssembleAsync(strings:Object, replaceSWF:ByteArray = null):void`
	`251`	`+ public function AssembleAsync(strings:Object, includeDebugInstructions:Boolean, replaceSWF:ByteArray = null):void`
`252`	`252`	`{`
`253`	`253`	`if (replaceSWF != null)`
`254`	`254`	`{`
`@@ -310,7 +310,7 @@ package com.cff.anebe`
`310`	`310`	`vec[vec.length] = str;`
`311`	`311`	`}`
`312`	`312`
`313`		`- ret = extContext.call("AssembleAsync", strings, vec);`
	`313`	`+ ret = extContext.call("AssembleAsync", strings, vec, includeDebugInstructions);`
`314`	`314`
`315`	`315`	`if (ret == null)`
`316`	`316`	`{`
`@@ -364,4 +364,4 @@ package com.cff.anebe`
`364`	`364`	`}`
`365`	`365`	`}`
`366`	`366`
`367`		`-}`
	`367`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ class Assembler`
`28`	`28`	`{`
`29`	`29`	`private:`
`30`	`30`	`const std::unordered_map<std::string, std::string>& strings;`
	`31`	`+ bool includeDebugInstructions;`
`31`	`32`
`32`	`33`	`static constexpr char addUniqueMethod[] = "method";`
`33`	`34`	`static constexpr char addUniqueClass[] = "class";`
`@@ -1379,7 +1380,12 @@ class Assembler`
`1379`	`1380`	`OPCode(uint8_t(OPCode::OP_setlocal0) + instruction.arguments[0].uintv());`
`1380`	`1381`	`}`
`1381`	`1382`
`1382`		`- ret.emplace_back(std::move(instruction));`
	`1383`	`+ if (includeDebugInstructions \|\| (instruction.opcode != OPCode::OP_debug &&`
	`1384`	`+ instruction.opcode != OPCode::OP_debugfile &&`
	`1385`	`+ instruction.opcode != OPCode::OP_debugline))`
	`1386`	`+ {`
	`1387`	`+ ret.emplace_back(std::move(instruction));`
	`1388`	`+ }`
`1383`	`1389`	`}`
`1384`	`1390`
`1385`	`1391`	`for (const auto& f : jumpFixups)`
`@@ -1471,7 +1477,11 @@ class Assembler`
`1471`	`1477`	`}`
`1472`	`1478`	`}`
`1473`	`1479`
`1474`		`- Assembler(const std::unordered_map<std::string, std::string>& strings) : strings(strings) {}`
	`1480`	`+ Assembler(`
	`1481`	`+ const std::unordered_map<std::string, std::string>& strings, bool includeDebugInstructions)`
	`1482`	`+ : strings(strings), includeDebugInstructions(includeDebugInstructions)`
	`1483`	`+ {`
	`1484`	`+ }`
`1475`	`1485`
`1476`	`1486`	`ASASM::ASProgram readProgram()`
`1477`	`1487`	`{`
`@@ -1565,14 +1575,15 @@ class Assembler`
`1565`	`1575`	`}`
`1566`	`1576`
`1567`	`1577`	`public:`
`1568`		`- static ASASM::ASProgram assemble(const std::unordered_map<std::string, std::string>& strings)`
	`1578`	`+ static ASASM::ASProgram assemble(`
	`1579`	`+ const std::unordered_map<std::string, std::string>& strings, bool includeDebugInstructions)`
`1569`	`1580`	`{`
`1570`	`1581`	`if (!strings.contains("main.asasm"))`
`1571`	`1582`	`{`
`1572`	`1583`	`throw StringException("Assembly start (main.asasm) not found");`
`1573`	`1584`	`}`
`1574`	`1585`
`1575`		`- Assembler assembler(strings);`
	`1586`	`+ Assembler assembler(strings, includeDebugInstructions);`
`1576`	`1587`
`1577`	`1588`	`std::shared_ptr<SourceFile> mainFile =`
`1578`	`1589`	`std::make_shared<SourceFile>("main.asasm", strings.at("main.asasm"));`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`#include <thread>`
`9`	`9`	`#include <unordered_map>`
`10`	`10`	`#include <variant>`
	`11`	`+#include <vector>`
`11`	`12`
`12`	`13`	`class BytecodeEditor`
`13`	`14`	`{`
`@@ -28,8 +29,8 @@ class BytecodeEditor`
`28`	`29`	`FREObject disassemble();`
`29`	`30`	`FREObject disassembleAsync();`
`30`	`31`
`31`		`- FREObject assemble(std::unordered_map<std::string, std::string>&& data);`
`32`		`- FREObject assembleAsync(std::unordered_map<std::string, std::string>&& data);`
	`32`	`+ FREObject assemble(std::unordered_map<std::string, std::string>&& data, bool includeDebugInstructions);`
	`33`	`+ FREObject assembleAsync(std::unordered_map<std::string, std::string>&& data, bool includeDebugInstructions);`
`33`	`34`
`34`	`35`	`void setSWF(SWF::SWFFile&& file) { currentSWF = std::move(file); }`
`35`	`36`
`@@ -39,7 +40,7 @@ class BytecodeEditor`
`39`	`40`	`{`
`40`	`41`	`runningTask.join();`
`41`	`42`	`}`
`42`		`- currentSWF = std::nullopt;`
	`43`	`+ currentSWF = std::nullopt;`
`43`	`44`	`m_taskResult = std::monostate{};`
`44`	`45`	`}`
`45`	`46`
Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,9 @@ FREObject Disassemble(FREContext ctx, void* funcData, uint32_t argc, FREObject a`
`31`	`31`
`32`	`32`	`FREObject Assemble(FREContext ctx, void* funcData, uint32_t argc, FREObject argv[])`
`33`	`33`	`{`
`34`		`- if (argc != 2)`
	`34`	`+ if (argc != 3)`
`35`	`35`	`{`
`36`		`- FAIL("argc should be 2");`
	`36`	`+ FAIL("argc should be 3");`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`GET_EDITOR(ctx);`
`@@ -49,6 +49,11 @@ FREObject Assemble(FREContext ctx, void* funcData, uint32_t argc, FREObject argv`
`49`	`49`	`{`
`50`	`50`	`FAIL("argv[1] is not a vector");`
`51`	`51`	`}`
	`52`	`+ DO_OR_FAIL("Failed to get argv[2] type", FREGetObjectType(argv[2], &type));`
	`53`	`+ if (type != FRE_TYPE_BOOLEAN)`
	`54`	`+ {`
	`55`	`+ FAIL("argv[2] is not a boolean");`
	`56`	`+ }`
`52`	`57`
`53`	`58`	`uint32_t vecSize;`
`54`	`59`	`DO_OR_FAIL("Failed to get argv[1] size", FREGetArrayLength(argv[1], &vecSize));`
`@@ -72,7 +77,11 @@ FREObject Assemble(FREContext ctx, void* funcData, uint32_t argc, FREObject argv`
`72`	`77`	`strings.emplace(key, val);`
`73`	`78`	`}`
`74`	`79`
`75`		`- return editor->assemble(std::move(strings));`
	`80`	`+ uint32_t includeDebugInstructions;`
	`81`	`+ DO_OR_FAIL("Failed to get argv[2]'s boolean value",`
	`82`	`+ FREGetObjectAsBool(argv[2], &includeDebugInstructions));`
	`83`	`+`
	`84`	`+ return editor->assemble(std::move(strings), includeDebugInstructions != 0);`
`76`	`85`	`}`
`77`	`86`
`78`	`87`	`FREObject DisassembleAsync(FREContext ctx, void* funcData, uint32_t argc, FREObject argv[])`
`@@ -89,9 +98,9 @@ FREObject DisassembleAsync(FREContext ctx, void* funcData, uint32_t argc, FREObj`
`89`	`98`
`90`	`99`	`FREObject AssembleAsync(FREContext ctx, void* funcData, uint32_t argc, FREObject argv[])`
`91`	`100`	`{`
`92`		`- if (argc != 2)`
	`101`	`+ if (argc != 3)`
`93`	`102`	`{`
`94`		`- FAIL("argc should be 2");`
	`103`	`+ FAIL("argc should be 3");`
`95`	`104`	`}`
`96`	`105`
`97`	`106`	`GET_EDITOR(ctx);`
`@@ -107,6 +116,11 @@ FREObject AssembleAsync(FREContext ctx, void* funcData, uint32_t argc, FREObject`
`107`	`116`	`{`
`108`	`117`	`FAIL("argv[1] is not a vector");`
`109`	`118`	`}`
	`119`	`+ DO_OR_FAIL("Failed to get argv[2] type", FREGetObjectType(argv[2], &type));`
	`120`	`+ if (type != FRE_TYPE_BOOLEAN)`
	`121`	`+ {`
	`122`	`+ FAIL("argv[2] is not a boolean");`
	`123`	`+ }`
`110`	`124`
`111`	`125`	`uint32_t vecSize;`
`112`	`126`	`DO_OR_FAIL("Failed to get argv[1] size", FREGetArrayLength(argv[1], &vecSize));`
`@@ -130,7 +144,11 @@ FREObject AssembleAsync(FREContext ctx, void* funcData, uint32_t argc, FREObject`
`130`	`144`	`strings.emplace(key, val);`
`131`	`145`	`}`
`132`	`146`
`133`		`- return editor->assembleAsync(std::move(strings));`
	`147`	`+ uint32_t includeDebugInstructions;`
	`148`	`+ DO_OR_FAIL("Failed to get argv[2]'s boolean value",`
	`149`	`+ FREGetObjectAsBool(argv[2], &includeDebugInstructions));`
	`150`	`+`
	`151`	`+ return editor->assembleAsync(std::move(strings), includeDebugInstructions != 0);`
`134`	`152`	`}`
`135`	`153`
`136`	`154`	`FREObject AsyncTaskResult(FREContext ctx, void* funcData, uint32_t argc, FREObject argv[])`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,8 @@ FREObject BytecodeEditor::disassemble()`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
`54`		`-FREObject BytecodeEditor::assemble(std::unordered_map<std::string, std::string>&& strings)`
	`54`	`+FREObject BytecodeEditor::assemble(`
	`55`	`+ std::unordered_map<std::string, std::string>&& strings, bool includeDebugInstructions)`
`55`	`56`	`{`
`56`	`57`	`if (runningTask.joinable())`
`57`	`58`	`{`
`@@ -62,8 +63,8 @@ FREObject BytecodeEditor::assemble(std::unordered_map<std::string, std::string>&`
`62`	`63`	`{`
`63`	`64`	`FAIL("No SWF data specified to reassemble");`
`64`	`65`	`}`
`65`		`- std::vector<uint8_t> data =`
`66`		`- std::move(ABC::ABCWriter(Assembler::assemble(strings).toABC()).data());`
	`66`	`+ std::vector<uint8_t> data = std::move(`
	`67`	`+ ABC::ABCWriter(Assembler::assemble(strings, includeDebugInstructions).toABC()).data());`
`67`	`68`
`68`	`69`	`currentSWF->replaceABCData(data.data(), data.size());`
`69`	`70`
`@@ -117,22 +118,24 @@ FREObject BytecodeEditor::disassembleAsync()`
`117`	`118`	`return ret;`
`118`	`119`	`}`
`119`	`120`
`120`		`-FREObject BytecodeEditor::assembleAsync(std::unordered_map<std::string, std::string>&& strings)`
	`121`	`+FREObject BytecodeEditor::assembleAsync(`
	`122`	`+ std::unordered_map<std::string, std::string>&& strings, bool includeDebugInstructions)`
`121`	`123`	`{`
`122`	`124`	`if (runningTask.joinable())`
`123`	`125`	`{`
`124`	`126`	`FAIL("Already running a task");`
`125`	`127`	`}`
`126`	`128`
`127`		`- runningTask = std::jthread([this, strings = std::move(strings)] {`
	`129`	`+ runningTask = std::jthread([this, strings = std::move(strings), includeDebugInstructions] {`
`128`	`130`	`if (!currentSWF)`
`129`	`131`	`{`
`130`	`132`	`FAIL_ASYNC("No SWF data specified to reassemble");`
`131`	`133`	`}`
`132`	`134`	`try`
`133`	`135`	`{`
`134`		`- std::vector<uint8_t> data =`
`135`		`- std::move(ABC::ABCWriter(Assembler::assemble(strings).toABC()).data());`
	`136`	`+ std::vector<uint8_t> data = std::move(`
	`137`	`+ ABC::ABCWriter(Assembler::assemble(strings, includeDebugInstructions).toABC())`
	`138`	`+ .data());`
`136`	`139`
`137`	`140`	`currentSWF->replaceABCData(data.data(), data.size());`
`138`	`141`
`@@ -225,4 +228,4 @@ FREObject BytecodeEditor::taskResult()`
`225`	`228`	`default:`
`226`	`229`	`FAIL("Invalid task result index");`
`227`	`230`	`}`
`228`		`-}`
	`231`	`+}`