Compiler: Always allocate 1 stack variable for the top level (<=V10)

Nenkai · May 7, 2023 · 5c57574 · 5c57574
1 parent 30156c8
commit 5c57574
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 11 deletions.
diff --git a/GTAdhocToolchain.CLI/Program.cs b/GTAdhocToolchain.CLI/Program.cs
@@ -224,7 +224,7 @@ private static void BuildScript(string inputPath, string output, int version = 1
                 var compiler = new AdhocScriptCompiler();
                 compiler.SetSourcePath(compiler.SymbolMap, inputPath);
                 compiler.SetVersion(version);
-                compiler.SetupStack();
+                compiler.CreateStack();
 
                 if (debugExceptions)
                     compiler.BuildTryCatchDebugStatements();

diff --git a/GTAdhocToolchain.Compiler/AdhocScriptCompiler.cs b/GTAdhocToolchain.Compiler/AdhocScriptCompiler.cs
@@ -59,6 +59,10 @@ public void CompileScript(Script script)
         {
             Logger.Info("Started script compilation.");
 
+            // Always an empty one in old versions (same in subroutines)
+            if (Version <= 10)
+                Stack.AddLocalVariable(null);
+
             EnterScope(this, script);
             CompileScriptBody(this, script);
             LeaveScope(this);
@@ -951,7 +955,7 @@ public void CompileSubroutine(AdhocCodeFrame frame, Node parentNode, Node body,
             subroutine.CodeFrame.ParentFrame = this;
             subroutine.CodeFrame.CurrentModule = frame.CurrentModule;
             subroutine.CodeFrame.Version = this.Version;
-            subroutine.CodeFrame.SetupStack();
+            subroutine.CodeFrame.CreateStack();
 
             if (isMethod)
             {
@@ -1550,7 +1554,7 @@ private void CompileAnonymousSubroutine(AdhocCodeFrame frame, Node parentNode, N
             subroutine.CodeFrame.SourceFilePath = frame.SourceFilePath;
             subroutine.CodeFrame.CurrentModule = frame.CurrentModule;
             subroutine.CodeFrame.Version = this.Version;
-            subroutine.CodeFrame.SetupStack();
+            subroutine.CodeFrame.CreateStack();
 
             /* Unlike JS, adhoc can capture variables from the parent frame
              * Example:

diff --git a/GTAdhocToolchain.Core/AdhocCodeFrame.cs b/GTAdhocToolchain.Core/AdhocCodeFrame.cs
@@ -96,7 +96,10 @@ public class AdhocCodeFrame
         /// </summary>
         public bool HasRestElement { get; set; }
 
-        public void SetupStack()
+        /// <summary>
+        /// Creates the stack (depending on the adhoc version).
+        /// </summary>
+        public void CreateStack()
         {
             if (Version >= 11)
                 Stack = new AdhocStack();

diff --git a/GTAdhocToolchain.Core/Instructions/InsFunctionConst.cs b/GTAdhocToolchain.Core/Instructions/InsFunctionConst.cs
@@ -23,7 +23,7 @@ public override void Serialize(AdhocStream stream)
         public override void Deserialize(AdhocStream stream)
         {
             CodeFrame.Version = stream.Version;
-            CodeFrame.SetupStack();
+            CodeFrame.CreateStack();
             CodeFrame.Read(stream);
         }
 

diff --git a/GTAdhocToolchain.Core/Instructions/InsFunctionDefine.cs b/GTAdhocToolchain.Core/Instructions/InsFunctionDefine.cs
@@ -26,7 +26,7 @@ public override void Deserialize(AdhocStream stream)
             Name = stream.ReadSymbol();
 
             CodeFrame.Version = stream.Version;
-            CodeFrame.SetupStack();
+            CodeFrame.CreateStack();
             CodeFrame.Read(stream);
         }
 

diff --git a/GTAdhocToolchain.Core/Instructions/InsMethodConst.cs b/GTAdhocToolchain.Core/Instructions/InsMethodConst.cs
@@ -23,7 +23,7 @@ public override void Serialize(AdhocStream stream)
         public override void Deserialize(AdhocStream stream)
         {
             CodeFrame.Version = stream.Version;
-            CodeFrame.SetupStack();
+            CodeFrame.CreateStack();
             CodeFrame.Read(stream);
         }
 

diff --git a/GTAdhocToolchain.Core/Instructions/InsMethodDefine.cs b/GTAdhocToolchain.Core/Instructions/InsMethodDefine.cs
@@ -26,7 +26,7 @@ public override void Deserialize(AdhocStream stream)
             Name = stream.ReadSymbol();
 
             CodeFrame.Version = stream.Version;
-            CodeFrame.SetupStack();
+            CodeFrame.CreateStack();
             CodeFrame.Read(stream);
         }
 

diff --git a/GTAdhocToolchain.Disasm/AdhocFile.cs b/GTAdhocToolchain.Disasm/AdhocFile.cs
@@ -50,7 +50,7 @@ public static List<AdhocFile> ReadFromFile(string path)
 
             adhoc.TopLevelFrame = new AdhocCodeFrame();
             adhoc.TopLevelFrame.Version = version;
-            adhoc.TopLevelFrame.SetupStack();
+            adhoc.TopLevelFrame.CreateStack();
             adhoc.TopLevelFrame.Read(stream);
 
             scripts.Add(adhoc);

diff --git a/GTAdhocToolchain.Project/AdhocProject.cs b/GTAdhocToolchain.Project/AdhocProject.cs
@@ -172,7 +172,7 @@ public bool Build(bool debug = false)
                 compiler.SetProjectDirectory(ProjectDir);
                 compiler.SetSourcePath(compiler.SymbolMap, ProjectFolder + "/" + tmpFileName);
                 compiler.SetVersion(Version);
-                compiler.SetupStack();
+                compiler.CreateStack();
 
                 if (debug)
                     compiler.BuildTryCatchDebugStatements();
@@ -262,7 +262,7 @@ private void BuildPackageFile()
                     compiler.SetProjectDirectory(ProjectDir);
                     compiler.SetSourcePath(compiler.SymbolMap, srcFile.SourcePath);
                     compiler.SetVersion(Version);
-                    compiler.SetupStack();
+                    compiler.CreateStack();
                     compiler.CompileScript(program);
 
                     AdhocCodeGen codeGen = new AdhocCodeGen(compiler, compiler.SymbolMap);