Adding better debug info

sictransit · Feb 17, 2020 · bb8ec55 · bb8ec55
1 parent 2da39ba
commit bb8ec55
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 21 deletions.
diff --git a/Core8/CPU.cs b/Core8/CPU.cs
@@ -63,6 +63,8 @@ public void Run()
                 {
                     if (debug)
                     {
+                        Log.Information(Registers.ToString());
+
                         if (breakpoints.Contains(Registers.PC.Content))
                         {
                             Log.Information($"Breakpoint hit!");
@@ -74,7 +76,7 @@ public void Run()
                         {
                             break;
                         }
-                    }
+                    }            
 
                     Interrupts.Interrupt();
 
@@ -83,6 +85,11 @@ public void Run()
                     Registers.PC.Increment();
 
                     instruction.Execute();
+
+                    if (debug)
+                    {
+                        Log.Information(instruction.ToString());
+                    }
                 }
             }
             catch (Exception ex)

diff --git a/Core8/Registers.cs b/Core8/Registers.cs
@@ -1,5 +1,7 @@
 using Core8.Model.Interfaces;
 using Core8.Model.Register;
+using Core8.Model.Register.Abstract;
+using System.Linq;
 
 namespace Core8
 {
@@ -35,5 +37,10 @@ public Registers()
         public UserFlag UF { get; }
 
         public SaveField SF { get; }
+
+        public override string ToString()
+        {
+            return string.Join(' ', new RegisterBase[] { PC, AC, DF, IB, UB, UF, SF, MQ }.Select(x => x.ToString()));
+        }
     }
 }
diff --git a/Emulator/Program.cs b/Emulator/Program.cs
@@ -61,6 +61,8 @@ private static void Assemble(string palbart, string file, bool run, int starting
                         pdp.DumpMemory();
                     }
 
+                    pdp.CPU.Debug(true);
+
                     pdp.Continue(waitForHalt: true);
 
                     Thread.Sleep(1000);

diff --git a/Emulator/pal/gc.asm b/Emulator/pal/gc.asm
@@ -15,35 +15,35 @@ MTCHAR,	0000					/MYST CHARACTER
 
 LOOP,							/READ AND PRINT LOOP
 		TAD I AIX1				/INCREMENT AIX1, THEN LOAD ACC FROM THAT LOCATION
-		SNA						/AC != 0? SKIP 
-		HLT						/HALT 
-		SPA						/POSITIVE AC? SKIP
-		JMS MYST				/PERFORM MYST MAGIC!
+		SNA						/AC != 0? SKIP! 
+		HLT						/WE'VE REACHED EOT, SO HALT 
+		SPA						/POSITIVE AC? SKIP!
+		JMS MYST				/PERFORM MYST MAGIC
 		JMS TTYO				/TTY OUTPUT
 		JMP LOOP				/LOOP
 
 MYST,	0						/MYST SUB-ROUTINE
 		DCA MTCHAR				/TEMP STORE CHAR 
 		TAD MTDATA				/LOAD MYST DATA
 
-		SMA						/BIT 0 SET? SKIP!
-		JMP .+3
-		ISZ MTCHAR				/TWEAK IT!
-		ISZ MTCHAR				/TWEAK IT!
+		SMA						/BIT 0 SET? TIME FOR MAGIC!
+		JMP .+3					/APPARENTLY NOT
+		ISZ MTCHAR				/DO MAGIC!
+		ISZ MTCHAR				/MORE MAGIC!
 
 		RAL						/ROTATE LEFT
-		SPA						/BIT 0 CLEAR? SKIP!
-		ISZ MTCHAR				/TWEAK IT!
+		SPA						/BIT 0 CLEAR? NO MAGIC!
+		ISZ MTCHAR				/DO MAGIC!
 
 		RAL						/ROTATE LEFT
 		DCA MTDATA				/AND STORE
 
-		TAD MTCHAR				/LOAD SAVED CHAR
+		TAD MTCHAR				/LOAD TEMP STORED CHAR
 		JMP I MYST				/RETURN	
 
 TTYO,	0						/TTY OUTPUT SUB-ROUTINE
 		TLS						/WRITE ACC TO TTY
-		TSF						/TTY READY? SKIP 
+		TSF						/TTY READY? SKIP! 
 		JMP .-1					/CHECK AGAIN
 		CLA						/CLEAR ACC
 		JMP I TTYO				/RETURN 

diff --git a/Model/Register/DataField.cs b/Model/Register/DataField.cs
@@ -14,7 +14,7 @@ public void SetDF(int value)
 
         public override string ToString()
         {
-            return string.Format($"{base.ToString()} {Content.ToOctalString()}");
+            return string.Format($"{base.ToString()} {Content.ToOctalString(1)}");
         }
     }
 }
diff --git a/Model/Register/InstructionBuffer.cs b/Model/Register/InstructionBuffer.cs
@@ -14,7 +14,7 @@ public void SetIB(int value)
 
         public override string ToString()
         {
-            return string.Format($"{base.ToString()} {Content.ToOctalString()}");
+            return string.Format($"{base.ToString()} {Content.ToOctalString(1)}");
         }
     }
 }
diff --git a/Model/Register/SaveField.cs b/Model/Register/SaveField.cs
@@ -30,7 +30,7 @@ public void SetUF(int value)
 
         public override string ToString()
         {
-            return string.Format($"{base.ToString()} {Content.ToOctalString()}");
+            return string.Format($"{base.ToString()} {Content.ToOctalString(3)}");
         }
     }
 }
diff --git a/Model/Register/UserBuffer.cs b/Model/Register/UserBuffer.cs
@@ -14,7 +14,7 @@ public void SetUB(int value)
 
         public override string ToString()
         {
-            return string.Format($"{base.ToString()} {Content.ToOctalString()}");
+            return string.Format($"{base.ToString()} {Content.ToOctalString(1)}");
         }
     }
 }
diff --git a/Model/Register/UserFlag.cs b/Model/Register/UserFlag.cs
@@ -14,7 +14,7 @@ public void SetUF(int value)
 
         public override string ToString()
         {
-            return string.Format($"{base.ToString()} {Content.ToOctalString()}");
+            return string.Format($"{base.ToString()} {Content.ToOctalString(1)}");
         }
     }
 }
diff --git a/Tests/Core8Tests/MAINDEC/Abstract/MAINDECTestsBase.cs b/Tests/Core8Tests/MAINDEC/Abstract/MAINDECTestsBase.cs
@@ -17,7 +17,7 @@ public abstract class MAINDECTestsBase : InstructionTestsBase
 
         protected virtual string[] UnexpectedOutput => new string[] { };
 
-        protected virtual TimeSpan MaxRunningTime => TimeSpan.FromSeconds(60);
+        protected virtual TimeSpan MaxRunningTime => TimeSpan.FromSeconds(10);
 
         protected virtual bool ExpectHLT => false;
 

diff --git a/Tests/Core8Tests/MAINDEC/AdderTest.cs b/Tests/Core8Tests/MAINDEC/AdderTest.cs
@@ -11,8 +11,6 @@ public class AdderTest : MAINDECTestsBase
 
         protected override string[] ExpectedOutput => new[] { "SIMAD", "SIMROT", "FCT", "RANDOM" };
 
-        protected override TimeSpan MaxRunningTime => TimeSpan.FromSeconds(600);
-
         [TestMethod]
         public override void Start()
         {