Optimized code chunk unserialization.

UnderminersTeam · Feb 19, 2023 · 2c55f33 · 2c55f33
1 parent eb001ad
commit 2c55f33
Show file tree

Hide file tree

Showing 9 changed files with 107 additions and 17 deletions.
diff --git a/UndertaleModCli/Program.UMTLibInherited.cs b/UndertaleModCli/Program.UMTLibInherited.cs
@@ -417,6 +417,9 @@ public string GetDecompiledText(string codeName, GlobalDecompileContext context
     /// <inheritdoc/>
     public string GetDecompiledText(UndertaleCode code, GlobalDecompileContext context = null)
     {
+        if (code.ParentEntry is not null)
+            return $"// This code entry is a reference to an anonymous function within \"{code.ParentEntry.Name.Content}\", decompile that instead.";
+
         GlobalDecompileContext decompileContext = context is null ? new(Data, false) : context;
         try
         {
@@ -437,6 +440,9 @@ public string GetDisassemblyText(string codeName)
     /// <inheritdoc/>
     public string GetDisassemblyText(UndertaleCode code)
     {
+        if (code.ParentEntry is not null)
+            return $"; This code entry is a reference to an anonymous function within \"{code.ParentEntry.Name.Content}\", disassemble that instead.";
+
         try
         {
             return code != null ? code.Disassemble(Data.Variables, Data.CodeLocals.For(code)) : "";
@@ -639,6 +645,8 @@ public void ReplaceTextInGML(string codeName, string keyword, string replacement
     public void ReplaceTextInGML(UndertaleCode code, string keyword, string replacement, bool caseSensitive = false, bool isRegex = false, GlobalDecompileContext context = null)
     {
         if (code == null) throw new ArgumentNullException(nameof(code));
+        if (code.ParentEntry is not null)
+            return;
 
         EnsureDataLoaded();
 
@@ -748,6 +756,9 @@ void ImportCode(string codeName, string gmlCode, bool isGML = true, bool doParse
             code.Name = Data.Strings.MakeString(codeName);
             Data.Code.Add(code);
         }
+        else if (code.ParentEntry is not null)
+            return;
+
         if (Data?.GeneralInfo.BytecodeVersion > 14 && Data.CodeLocals.ByName(codeName) == null)
         {
             UndertaleCodeLocals locals = new UndertaleCodeLocals();
@@ -1155,6 +1166,9 @@ public string GetGUIDFromCodeName(string codeName)
     void SafeImport(string codeName, string gmlCode, bool isGML, bool destroyASM = true, bool checkDecompiler = false, bool throwOnError = false)
     {
         UndertaleCode code = Data.Code.ByName(codeName);
+        if (code?.ParentEntry is not null)
+            return;
+
         try
         {
             if (isGML)

diff --git a/UndertaleModLib/Models/UndertaleCode.cs b/UndertaleModLib/Models/UndertaleCode.cs
@@ -1013,6 +1013,8 @@ public class UndertaleCode : UndertaleNamedResource, UndertaleObjectWithBlobs, I
 
     public uint Length { get; set; }
 
+    public static int CurrCodeIndex { get; set; }
+
 
     /// <summary>
     /// The amount of local variables this code entry has. <br/>
@@ -1110,6 +1112,8 @@ public void Unserialize(UndertaleReader reader)
         else if (reader.Bytecode14OrLower)
         {
             Instructions.Clear();
+            Instructions.Capacity = reader.InstructionArraysLengths[CurrCodeIndex];
+
             uint here = reader.Position;
             uint stop = here + Length;
             while (reader.Position < stop)
@@ -1132,14 +1136,21 @@ public void Unserialize(UndertaleReader reader)
             }
             int BytecodeRelativeAddress = reader.ReadInt32();
             _bytecodeAbsoluteAddress = (uint)((int)reader.Position - 4 + BytecodeRelativeAddress);
-            uint here = reader.Position;
-            reader.Position = _bytecodeAbsoluteAddress;
+
             if (Length > 0 && reader.GMS2_3 && reader.GetOffsetMap().TryGetValue(_bytecodeAbsoluteAddress, out var i))
             {
                 ParentEntry = (i as UndertaleInstruction).Entry;
                 ParentEntry.ChildEntries.Add(this);
+
+                Offset = reader.ReadUInt32();
+                return;
             }
+
+            uint here = reader.Position;
+            reader.Position = _bytecodeAbsoluteAddress;
+
             Instructions.Clear();
+            Instructions.Capacity = reader.InstructionArraysLengths[CurrCodeIndex];
             while (reader.Position < _bytecodeAbsoluteAddress + Length)
             {
                 uint a = (reader.Position - _bytecodeAbsoluteAddress) / 4;
@@ -1149,9 +1160,12 @@ public void Unserialize(UndertaleReader reader)
             }
             if (ParentEntry == null && Instructions.Count != 0)
                 Instructions[0].Entry = this;
+
             reader.Position = here;
             Offset = reader.ReadUInt32();
         }
+
+        CurrCodeIndex++;
     }
 
     /// <inheritdoc cref="UndertaleObject.UnserializeChildObjectCount(UndertaleReader)"/>
@@ -1169,10 +1183,16 @@ public static uint UnserializeChildObjectCount(UndertaleReader reader)
 
             // Get instructions count
             uint instrCount = 0;
+            uint instrSubCount = 0;
             while (reader.Position < stop)
-                instrCount += 1 + UndertaleInstruction.UnserializeChildObjectCount(reader);
+            {
+                instrCount++;
+                instrSubCount += UndertaleInstruction.UnserializeChildObjectCount(reader);
+            }
 
-            count += instrCount;
+            reader.InstructionArraysLengths[CurrCodeIndex] = (int)instrCount;
+
+            count += instrCount + instrSubCount;
         }
         else
         {
@@ -1192,17 +1212,25 @@ public static uint UnserializeChildObjectCount(UndertaleReader reader)
             uint here = reader.Position;
             reader.Position = bytecodeAbsoluteAddress;
 
-            // Get instructions count
+            // Get instructions counts
             uint instrCount = 0;
+            uint instrSubCount = 0;
             while (reader.Position < bytecodeAbsoluteAddress + length)
-                instrCount += 1 + UndertaleInstruction.UnserializeChildObjectCount(reader);
+            {
+                instrCount++;
+                instrSubCount += UndertaleInstruction.UnserializeChildObjectCount(reader);
+            }
+
+            reader.InstructionArraysLengths[CurrCodeIndex] = (int)instrCount;
 
             reader.Position = here;
             reader.Position += 4; // "Offset"
 
-            count += instrCount;
+            count += instrCount + instrSubCount;
         }
 
+        CurrCodeIndex++;
+
         return count;
     }
 
@@ -1266,6 +1294,9 @@ public IList<UndertaleVariable> FindReferencedLocalVars()
     /// <param name="instructions">The instructions to append.</param>
     public void Append(IList<UndertaleInstruction> instructions)
     {
+        if (ParentEntry is not null)
+            return;
+
         Instructions.AddRange(instructions);
         UpdateAddresses();
     }
@@ -1276,6 +1307,9 @@ public void Append(IList<UndertaleInstruction> instructions)
     /// <param name="instructions">The new instructions for this code entry.</param>
     public void Replace(IList<UndertaleInstruction> instructions)
     {
+        if (ParentEntry is not null)
+            return;
+
         Instructions.Clear();
         Append(instructions);
     }
@@ -1288,6 +1322,9 @@ public void Replace(IList<UndertaleInstruction> instructions)
     /// <exception cref="Exception"> if the GML code does not compile or if there's an error writing the code to the profile entry.</exception>
     public void AppendGML(string gmlCode, UndertaleData data)
     {
+        if (ParentEntry is not null)
+            return;
+
         CompileContext context = Compiler.Compiler.CompileGMLText(gmlCode, data, this);
         if (!context.SuccessfulCompile || context.HasError)
         {
@@ -1323,6 +1360,9 @@ public void AppendGML(string gmlCode, UndertaleData data)
     /// <exception cref="Exception">If the GML code does not compile or if there's an error writing the code to the profile entry.</exception>
     public void ReplaceGML(string gmlCode, UndertaleData data)
     {
+        if (ParentEntry is not null)
+            return;
+
         CompileContext context = Compiler.Compiler.CompileGMLText(gmlCode, data, this);
         if (!context.SuccessfulCompile || context.HasError)
         {

diff --git a/UndertaleModLib/UndertaleChunks.cs b/UndertaleModLib/UndertaleChunks.cs
@@ -697,7 +697,11 @@ internal override void UnserializeChunk(UndertaleReader reader)
                 List = null;
                 return;
             }
+
+            UndertaleCode.CurrCodeIndex = 0;
             base.UnserializeChunk(reader);
+
+            reader.InstructionArraysLengths = null;
         }
 
         internal override uint UnserializeObjectCount(UndertaleReader reader)
@@ -708,9 +712,13 @@ internal override uint UnserializeObjectCount(UndertaleReader reader)
             if (reader.undertaleData.UnsupportedBytecodeVersion)
                 return reader.ReadUInt32();
 
-            reader.GMS2BytecodeAddresses = new((int)reader.ReadUInt32());
+            int codeCount = (int)reader.ReadUInt32();
             reader.Position -= 4;
 
+            reader.GMS2BytecodeAddresses = new(codeCount);
+            reader.InstructionArraysLengths = new int[codeCount];
+            UndertaleCode.CurrCodeIndex = 0;
+
             uint count = base.UnserializeObjectCount(reader);
             reader.GMS2BytecodeAddresses.Clear();
 

diff --git a/UndertaleModLib/UndertaleIO.cs b/UndertaleModLib/UndertaleIO.cs
@@ -300,6 +300,7 @@ public override bool ReadBoolean()
         private readonly Dictionary<Type, uint> staticObjCountDict = new();
         private readonly Dictionary<Type, uint> staticObjSizeDict = new();
         public HashSet<uint> GMS2BytecodeAddresses;
+        public int[] InstructionArraysLengths;
 
         private readonly BindingFlags publicStaticFlags
             = BindingFlags.Public | BindingFlags.Static | BindingFlags.FlattenHierarchy;

diff --git a/UndertaleModTool/ImportCodeSystem.cs b/UndertaleModTool/ImportCodeSystem.cs
@@ -107,6 +107,9 @@ public void ReplaceTextInGML(string codeName, string keyword, string replacement
         }
         public void ReplaceTextInGML(UndertaleCode code, string keyword, string replacement, bool caseSensitive = false, bool isRegex = false, GlobalDecompileContext context = null)
         {
+            if (code.ParentEntry is not null)
+                return;
+
             EnsureDataLoaded();
 
             string passBack = "";
@@ -201,6 +204,9 @@ void ImportCode(string codeName, string gmlCode, bool IsGML = true, bool doParse
                 code.Name = Data.Strings.MakeString(codeName);
                 Data.Code.Add(code);
             }
+            else if (code.ParentEntry is not null)
+                return;
+
             if (Data?.GeneralInfo.BytecodeVersion > 14 && Data.CodeLocals.ByName(codeName) == null)
             {
                 UndertaleCodeLocals locals = new UndertaleCodeLocals();
@@ -410,6 +416,9 @@ void ImportCode(string codeName, string gmlCode, bool IsGML = true, bool doParse
         void SafeImport(string codeName, string gmlCode, bool IsGML, bool destroyASM = true, bool CheckDecompiler = false, bool throwOnError = false)
         {
             UndertaleCode code = Data.Code.ByName(codeName);
+            if (code?.ParentEntry is not null)
+                return;
+
             try
             {
                 if (IsGML)

diff --git a/UndertaleModTool/ProfileSystem.cs b/UndertaleModTool/ProfileSystem.cs
@@ -23,6 +23,9 @@ public string GetDecompiledText(string codeName, GlobalDecompileContext context
         }
         public string GetDecompiledText(UndertaleCode code, GlobalDecompileContext context = null)
         {
+            if (code.ParentEntry is not null)
+                return $"// This code entry is a reference to an anonymous function within \"{code.ParentEntry.Name.Content}\", decompile that instead.";
+
             GlobalDecompileContext DECOMPILE_CONTEXT = context is null ? new(Data, false) : context;
             try
             {
@@ -36,6 +39,9 @@ public string GetDecompiledText(UndertaleCode code, GlobalDecompileContext conte
 
         public string GetDisassemblyText(UndertaleCode code)
         {
+            if (code.ParentEntry is not null)
+                return $"; This code entry is a reference to an anonymous function within \"{code.ParentEntry.Name.Content}\", disassemble that instead.";
+
             try
             {
                 return code != null ? code.Disassemble(Data.Variables, Data.CodeLocals.For(code)) : "";

diff --git a/UndertaleModTool/Scripts/Resource Unpackers/ExportASM.csx b/UndertaleModTool/Scripts/Resource Unpackers/ExportASM.csx
@@ -3,6 +3,7 @@ using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Linq;
 
 EnsureDataLoaded();
 
@@ -16,7 +17,10 @@ if (Directory.Exists(codeFolder))
 
 Directory.CreateDirectory(codeFolder);
 
-SetProgressBar(null, "Code Entries", 0, Data.Code.Count);
+List<UndertaleCode> toDump = Data.Code.Where(c => c.ParentEntry is null)
+                                      .ToList();
+
+SetProgressBar(null, "Code Entries", 0, toDump.Count);
 StartProgressBarUpdater();
 
 await DumpCode();
@@ -34,7 +38,7 @@ string GetFolder(string path)
 
 async Task DumpCode()
 {
-    await Task.Run(() => Parallel.ForEach(Data.Code, DumpCode));
+    await Task.Run(() => Parallel.ForEach(toDump, DumpCode));
 }
 
 void DumpCode(UndertaleCode code)

diff --git a/UndertaleModTool/Scripts/Technical Scripts/ExportAllCode2_3.csx b/UndertaleModTool/Scripts/Technical Scripts/ExportAllCode2_3.csx
@@ -3,6 +3,7 @@ using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Linq;
 
 EnsureDataLoaded();
 
@@ -28,7 +29,10 @@ if (Directory.Exists(codeFolder))
 
 Directory.CreateDirectory(codeFolder);
 
-SetProgressBar(null, "Code Entries", 0, Data.Code.Count);
+List<UndertaleCode> toDump = Data.Code.Where(c => c.ParentEntry is null)
+                                      .ToList();
+
+SetProgressBar(null, "Code Entries", 0, toDump.Count);
 StartProgressBarUpdater();
 
 int failed = 0;
@@ -48,16 +52,16 @@ void DumpCode()
     //Because 2.3 code names get way too long, we're gonna convert it to an index based system, starting with a lookup system
     string index_path = Path.Combine(codeFolder, "LookUpTable.txt");
     string index_text = "This is zero indexed, index 0 starts at line 2.";
-    for (var i = 0; i < Data.Code.Count; i++)
+    for (var i = 0; i < toDump.Count; i++)
     {
-        UndertaleCode code = Data.Code[i];
+        UndertaleCode code = toDump[i];
         index_text += "\n";
         index_text += code.Name.Content;
     }
     File.WriteAllText(index_path, index_text);
-    for (var i = 0; i < Data.Code.Count; i++)
+    for (var i = 0; i < toDump.Count; i++)
     {
-        UndertaleCode code = Data.Code[i];
+        UndertaleCode code = toDump[i];
         string path = Path.Combine(codeFolder, i.ToString() + ".gml");
         try
         {

diff --git a/UndertaleModTool/Scripts/Technical Scripts/ExportAllCodeSync.csx b/UndertaleModTool/Scripts/Technical Scripts/ExportAllCodeSync.csx
@@ -3,6 +3,7 @@ using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Linq;
 
 EnsureDataLoaded();
 
@@ -16,7 +17,10 @@ if (Directory.Exists(codeFolder))
 
 Directory.CreateDirectory(codeFolder);
 
-SetProgressBar(null, "Code Entries", 0, Data.Code.Count);
+List<UndertaleCode> toDump = Data.Code.Where(c => c.ParentEntry is null)
+                                      .ToList();
+
+SetProgressBar(null, "Code Entries", 0, toDump.Count);
 StartProgressBarUpdater();
 
 int failed = 0;
@@ -34,7 +38,7 @@ string GetFolder(string path)
 
 void DumpCode()
 {
-    foreach(UndertaleCode code in Data.Code)
+    foreach(UndertaleCode code in toDump)
     {
         string path = Path.Combine(codeFolder, code.Name.Content + ".gml");
         if (code.ParentEntry == null)