Fix 6270 reading invalid reg returning read buffer

drhelius · Sep 9, 2024 · 47ce4d6 · 47ce4d6
1 parent 02ef64d
commit 47ce4d6
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/huc6270_inline.h b/src/huc6270_inline.h
@@ -82,15 +82,11 @@ inline u8 HuC6270::ReadRegister(u32 address)
         }
         // Data register (LSB)
         case 2:
-            if (m_address_register == HUC6270_REG_VRR)
-            {
-                return m_read_buffer & 0xFF;
-            }
-            else
+            if (m_address_register != HUC6270_REG_VRR)
             {
                 //Debug("HuC6270 invalid read data register: %02X", m_address_register);
-                return m_register[HUC6270_REG_VWR] & 0xFF;
             }
+            return m_read_buffer & 0xFF;
             break;
         // Data register (MSB)
         case 3:
@@ -114,7 +110,7 @@ inline u8 HuC6270::ReadRegister(u32 address)
             else
             {
                 //Debug("HuC6270 invalid read data register: %02X", m_address_register);
-                return m_register[HUC6270_REG_VWR] & 0xFF;
+                return m_read_buffer >> 8;
             }
             break;
         default: