lingo: store the immediates

PaulusParssinen · Feb 23, 2024 · d150001 · d150001
1 parent d469e12
commit d150001
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/Shockky.SourceGeneration.Tests/InstructionGeneratorTests.cs b/Shockky.SourceGeneration.Tests/InstructionGeneratorTests.cs
@@ -37,11 +37,11 @@ namespace Shockky.Lingo.Instructions;
         [global::System.CodeDom.Compiler.GeneratedCode("InstructionGenerator", <ASSEMBLY_VERSION>)]
         [global::System.Diagnostics.DebuggerNonUserCode]
         [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
-        public sealed class PushInt : IInstruction
+        public sealed class PushInt(int immediate) : IInstruction
         {
             public OPCode OP => OPCode.PushInt;
 
-            public int Immediate { get; set; }
+            public int Immediate { get; set; } = immediate;
 
             public int GetSize()
             {
@@ -92,10 +92,11 @@ public static IInstruction Read(ref global::Shockky.IO.ShockwaveReader input)
                     _ => 0
                 };
 
+                if (op >= 0x80) op = (byte)(op & 0x3F | 0x40);
                 return (OPCode)op switch
                 {
                     OPCode.Return => new Return(),
-                    OPCode.PushInt => new PushInt(),
+                    OPCode.PushInt => new PushInt(immediate),
                     _ => throw null
                 };
             }

diff --git a/Shockky.SourceGeneration/InstructionGenerator.cs b/Shockky.SourceGeneration/InstructionGenerator.cs
@@ -89,11 +89,16 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
                         """, true);
 
                     writer.WriteLine();
+                    writer.WriteLine("if (op >= 0x80) op = (byte)(op & 0x3F | 0x40);");
                     using (writer.WriteBlock("return (OPCode)op switch", isExpression: true))
                     {
                         foreach (var instruction in item.AsSpan())
                         {
-                            writer.WriteLine($"OPCode.{instruction.Name} => new {instruction.Name}(),");
+                            bool hasImmediate = instruction.ImmediateKind is not ImmediateKind.None;
+
+                            writer.Write($"OPCode.{instruction.Name} => new {instruction.Name}(");
+                            writer.WriteIf(hasImmediate, "immediate");
+                            writer.WriteLine("),");
                         }
                         writer.WriteLine("_ => throw null");
                     }
@@ -156,12 +161,18 @@ internal static bool TryGetInfo(
     internal static void WriteInstructionSyntax(IndentedTextWriter writer,
         InstructionInfo instruction)
     {
+        bool hasImmediate = instruction.ImmediateKind is not ImmediateKind.None;
+
         writer.WriteGeneratedAttributes(nameof(InstructionGenerator));
 
-        using (writer.WriteBlock($"public sealed class {instruction.Name} : IInstruction"))
+        if (hasImmediate)
         {
-            bool hasImmediate = instruction.ImmediateKind is not ImmediateKind.None;
+            writer.WriteLine($"public sealed class {instruction.Name}(int immediate) : IInstruction");
+        }
+        else writer.WriteLine($"public sealed class {instruction.Name} : IInstruction");
 
+        using (writer.WriteBlock())
+        {
             // Offer cached instance for instruction with no immediate
             writer.WriteLineIf(!hasImmediate, $"public static readonly {instruction.Name} Default = new();");
             writer.WriteLineIf(!hasImmediate);
@@ -174,7 +185,7 @@ internal static void WriteInstructionSyntax(IndentedTextWriter writer,
             {
                 writer.WriteLine("int IInstruction.Immediate { get; set; }");
             }
-            else writer.WriteLine("public int Immediate { get; set; }");
+            else writer.WriteLine("public int Immediate { get; set; } = immediate;");
             writer.WriteLine();
 
             if (hasImmediate)