Code cleanup and minor performance fixes

Author: sictransit

Core8/CPU.cs

@@ -61,7 +61,7 @@ public void Run()
             {
                 while (running)
                 {
-                    if (debug)                        
+                    if (debug)
                     {
                         if (breakpoints.Contains(Registers.PC.Content))
                         {

Core8/Interrupts.cs

@@ -1,5 +1,4 @@
 using Core8.Model.Interfaces;
-using Serilog;
 
 namespace Core8
 {

Model/Instructions/Group3Instructions.cs

@@ -8,7 +8,7 @@ public class Group3Instructions : InstructionsBase
     {
         private const int MQL_MASK = 1 << 4;
         private const int MQA_MASK = 1 << 6;
-        private const int SWP_MASK = 1 << 4 | 1 << 6;
+        private const int SWP_MASK = MQL_MASK | MQA_MASK;
         private const int CLA_MASK = 1 << 7;
 
         public Group3Instructions(ICPU cpu) : base(cpu)

Model/Instructions/KeyboardInstructions.cs

@@ -11,7 +11,7 @@ public class KeyboardInstructions : TeleptypeInstructionsBase
         private const int KCC_MASK = 0b_010;
         private const int KRS_MASK = 0b_100;
         private const int KIE_MASK = 0b_101;
-        private const int KRB_MASK = 0b_110;
+        private const int KRB_MASK = KCC_MASK | KRS_MASK;
 
         public KeyboardInstructions(ICPU cpu) : base(cpu)
         {

Model/Instructions/MemoryManagementInstructions.cs

@@ -6,14 +6,16 @@ namespace Core8.Model.Instructions
 {
     public class MemoryManagementInstructions : PrivilegedInstructionsBase
     {
-        private const int CINT_MASK = 0b_110_010_000_100;
-        private const int RDF_MASK = 0b_110_010_001_100;
-        private const int RIF_MASK = 0b_110_010_010_100;
-        private const int RIB_MASK = 0b_110_010_011_100;
-        private const int RMF_MASK = 0b_110_010_100_100;
-        private const int SINT_MASK = 0b_110_010_101_100;
-        private const int CUF_MASK = 0b_110_010_110_100;
-        private const int SUF_MASK = 0b_110_010_111_100;
+        private const int MEM_MGMT_MASK = 0b_110_010_000_100;
+
+        private const int CINT_MASK = MEM_MGMT_MASK;
+        private const int RDF_MASK = (0b_001 << 3) | MEM_MGMT_MASK;
+        private const int RIF_MASK = (0b_010 << 3) | MEM_MGMT_MASK;
+        private const int RIB_MASK = (0b_011 << 3) | MEM_MGMT_MASK;
+        private const int RMF_MASK = (0b_100 << 3) | MEM_MGMT_MASK;
+        private const int SINT_MASK = (0b_101 << 3) | MEM_MGMT_MASK;
+        private const int CUF_MASK = (0b_110 << 3) | MEM_MGMT_MASK;
+        private const int SUF_MASK = (0b_111 << 3) | MEM_MGMT_MASK;
 
         private const int CDF_MASK = 1 << 0;
         private const int CIF_MASK = 1 << 1;

Model/Instructions/MemoryReferenceInstructions.cs

@@ -8,12 +8,12 @@ namespace Core8.Model.Instructions
 {
     public class MemoryReferenceInstructions : InstructionsBase
     {
-        private const int AND_MASK = 0b_000_00_0000000;
-        private const int TAD_MASK = 0b_001_00_0000000;
-        private const int ISZ_MASK = 0b_010_00_0000000;
-        private const int DCA_MASK = 0b_011_00_0000000;
-        private const int JMS_MASK = 0b_100_00_0000000;
-        private const int JMP_MASK = 0b_101_00_0000000;
+        private const int AND_MASK = 0b_000 << 9;
+        private const int TAD_MASK = 0b_001 << 9;
+        private const int ISZ_MASK = 0b_010 << 9;
+        private const int DCA_MASK = 0b_011 << 9;
+        private const int JMS_MASK = 0b_100 << 9;
+        private const int JMP_MASK = 0b_101 << 9;
 
         private const int ZERO = 1 << 7;
         private const int INDIRECT = 1 << 8;

Model/Instructions/TeleprinterInstructions.cs

@@ -6,11 +6,11 @@ namespace Core8.Model.Instructions
 {
     public class TeleprinterInstructions : TeleptypeInstructionsBase
     {
-        private const int TFL_MASK = 0b_000;
-        private const int TSF_MASK = 0b_001;
-        private const int TCF_MASK = 0b_010;
-        private const int TPC_MASK = 0b_100;
-        private const int TLS_MASK = 0b_110;
+        private const int TFL_MASK = 0;
+        private const int TSF_MASK = 1 << 0;
+        private const int TCF_MASK = 1 << 1;
+        private const int TPC_MASK = 1 << 2;
+        private const int TLS_MASK = TCF_MASK | TPC_MASK;
 
         public TeleprinterInstructions(ICPU cpu) : base(cpu)
         {

Tests/Core8Tests/MAINDEC/Abstract/MAINDECTestsBase.cs

@@ -52,7 +52,7 @@ protected void StartAndWaitForCompletion()
 
                 timeout = sw.Elapsed > MaxRunningTime;
 
-                Thread.Sleep(100);
+                Thread.Sleep(50);
             }
 
             if (!ExpectHLT)

Tests/Core8Tests/MAINDEC/RandomJMPJMSTest.cs

@@ -8,7 +8,7 @@ public class RandomJMPJMSTest : MAINDECTestsBase
     {
         protected override string TapeName => @"MAINDEC/tapes/MAINDEC-8E-D0JC-PB.bin";
 
-        protected override string[] ExpectedOutput => new[] { "JC\r\n" };
+        protected override string[] ExpectedOutput => new[] { "\r\nJC" };
 
         protected override string[] UnexpectedOutput => new[] { "F " };
 

Tests/Core8Tests/MAINDEC/RandomJMPTest.cs

@@ -8,7 +8,7 @@ public class RandomJMPTest : MAINDECTestsBase
     {
         protected override string TapeName => @"MAINDEC/tapes/MAINDEC-8E-D0HC-PB.bin";
 
-        protected override string[] ExpectedOutput => new[] { "HC\r\n" };
+        protected override string[] ExpectedOutput => new[] { "\r\nHC" };
 
         protected override string[] UnexpectedOutput => new[] { "Z =" };
 

Tests/Core8Tests/MAINDEC/RandomTADTest.cs

@@ -8,7 +8,7 @@ public class RandomTADTest : MAINDECTestsBase
     {
         protected override string TapeName => @"MAINDEC/tapes/MAINDEC-8E-D0EB-PB.bin";
 
-        protected override string[] ExpectedOutput => new[] { "T\r\n" };
+        protected override string[] ExpectedOutput => new[] { "\r\nT" };
 
         [TestMethod]
         public override void Start()