ZXHawk: 128k/+2 High-port contention now reporting properly in fusetest

BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/CPUMonitor.cs

@@ -297,7 +297,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
 
                 case MachineType.ZXSpectrum128:
                 case MachineType.ZXSpectrum128Plus2:
-                    if ((lastPortAddr & 0xc000) == 0x4000)
+                    if ((lastPortAddr & 0xc000) == 0x4000 || (lastPortAddr & 0xc000) == 0xc000 && _machine.ContendedBankPaged())
                         highByte407f = true;
 
                     if (highByte407f)

BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Memory.cs

@@ -161,6 +161,13 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
         /// <param name="addr"></param>
         public abstract bool IsContended(ushort addr);
 
+
+        /// <summary>
+        /// Returns TRUE if there is a contended bank paged in
+        /// </summary>
+        /// <returns></returns>
+        public abstract bool ContendedBankPaged();
+
         #endregion
 
         #region Helper Methods

BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.Memory.cs

@@ -232,6 +232,24 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
             return false;
         }
 
+        /// <summary>
+        /// Returns TRUE if there is a contended bank paged in
+        /// </summary>
+        /// <returns></returns>
+        public override bool ContendedBankPaged()
+        {
+            switch (RAMPaged)
+            {
+                case 1:
+                case 3:
+                case 5:
+                case 7:
+                    return true;
+            }
+
+            return false;
+        }
+
         /// <summary>
         /// ULA reads the memory at the specified address
         /// (No memory contention)

BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Memory.cs

@@ -425,6 +425,24 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
             return false;
         }
 
+        /// <summary>
+        /// Returns TRUE if there is a contended bank paged in
+        /// </summary>
+        /// <returns></returns>
+        public override bool ContendedBankPaged()
+        {
+            switch (RAMPaged)
+            {
+                case 4:
+                case 5:
+                case 6:
+                case 7:
+                    return true;
+            }
+
+            return false;
+        }
+
         /// <summary>
         /// ULA reads the memory at the specified address
         /// (No memory contention)

BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.Memory.cs

@@ -426,6 +426,24 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
             return false;
         }
 
+        /// <summary>
+        /// Returns TRUE if there is a contended bank paged in
+        /// </summary>
+        /// <returns></returns>
+        public override bool ContendedBankPaged()
+        {
+            switch (RAMPaged)
+            {
+                case 4:
+                case 5:
+                case 6:
+                case 7:
+                    return true;
+            }
+
+            return false;
+        }
+
         /// <summary>
         /// ULA reads the memory at the specified address
         /// (No memory contention)

BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.Memory.cs

@@ -123,6 +123,15 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
             return false;
         }
 
+        /// <summary>
+        /// Returns TRUE if there is a contended bank paged in
+        /// </summary>
+        /// <returns></returns>
+        public override bool ContendedBankPaged()
+        {
+            return false;
+        }
+
         /// <summary>
         /// Sets up the ROM
         /// </summary>