Fix disassembler and a code generation bug

vddCore · May 21, 2024 · fafd139 · fafd139
1 parent 7ec8660
commit fafd139
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/VirtualMachine/Ceres/Ceres.csproj b/VirtualMachine/Ceres/Ceres.csproj
@@ -4,7 +4,7 @@
     <Nullable>enable</Nullable>
     <LangVersion>11.0</LangVersion>
 
-    <Version>7.4.0</Version>
+    <Version>7.4.1</Version>
     <AssemblyName>Ceres</AssemblyName>
     <AssemblyTitle>Ceres</AssemblyTitle>
 

diff --git a/VirtualMachine/Ceres/ExecutionEngine/Diagnostics/Disassembler.cs b/VirtualMachine/Ceres/ExecutionEngine/Diagnostics/Disassembler.cs
@@ -103,9 +103,14 @@ public static void Disassemble(Chunk chunk, TextWriter output, DisassemblyOption
                     output.Write($"{indent}    {ip:X8}: ");
                     switch (opCode)
                     {
-                        case OpCode.INVOKE:
                         case OpCode.YIELD:
                         case OpCode.NEXT:
+                            output.Write(opCode);
+                            output.Write(" ");
+                            output.WriteLine(reader.ReadInt32());
+                            break;
+
+                        case OpCode.INVOKE:
                             output.Write(opCode);
                             output.Write(" ");
                             output.Write(reader.ReadInt32());

diff --git a/VirtualMachine/Ceres/TranslationEngine/Compiler.Expression.By.cs b/VirtualMachine/Ceres/TranslationEngine/Compiler.Expression.By.cs
@@ -33,7 +33,8 @@ public override void Visit(ByExpression byExpression)
 
                 Chunk.CodeGenerator.Emit(arms[i].DeepEquality ? OpCode.DEQ : OpCode.CEQ);
                 Chunk.CodeGenerator.Emit(OpCode.FJMP, labels[i]);
-
+                Chunk.CodeGenerator.Emit(OpCode.POP);
+
                 Visit(arms[i].ValueArm);
 
                 if (arms[i].ValueArm is Expression)