From 5215e06dfd4df1ce602ebe98f3088d0cdee75cc1 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Mon, 19 Oct 2026 17:45:50 +1000 Subject: [PATCH] Pad/SIO: Mask unused mode bits and write-only control bits on read Matches psxdiag and the SIO register docs. --- src/core/pad.cpp | 9 +++++++-- src/core/sio.cpp | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/core/pad.cpp b/src/core/pad.cpp index 7ca090d28..676619e61 100644 --- a/src/core/pad.cpp +++ b/src/core/pad.cpp @@ -59,6 +59,9 @@ union JOYCTRLRegister BitField RXINTEN; BitField ACKINTEN; BitField SLOT; + + // Acknowledge and reset are write-only, bits 7/14/15 always read as zero. + static constexpr u16 READ_MASK = 0b00111111'00101111; }; union JOYSTATRegister @@ -82,6 +85,8 @@ union JOYMODERegister BitField parity_enable; BitField parity_type; BitField clk_polarity; + + static constexpr u16 WRITE_MASK = 0b00000001'00111111; }; static bool CanTransfer(); @@ -580,7 +585,7 @@ u32 Pad::ReadRegister(u32 offset) return ZeroExtend32(s_state.JOY_MODE.bits); case 0x0A: // JOY_CTRL - return ZeroExtend32(s_state.JOY_CTRL.bits); + return ZeroExtend32(s_state.JOY_CTRL.bits & JOYCTRLRegister::READ_MASK); case 0x0E: // JOY_BAUD return ZeroExtend32(s_state.JOY_BAUD); @@ -650,7 +655,7 @@ void Pad::WriteRegister(u32 offset, u32 value) case 0x08: // JOY_MODE { DEBUG_LOG("JOY_MODE <- 0x{:08X}", value); - s_state.JOY_MODE.bits = Truncate16(value); + s_state.JOY_MODE.bits = Truncate16(value) & JOYMODERegister::WRITE_MASK; return; } diff --git a/src/core/sio.cpp b/src/core/sio.cpp index 77c977043..c450d0664 100644 --- a/src/core/sio.cpp +++ b/src/core/sio.cpp @@ -35,6 +35,9 @@ union SIO_CTRL BitField TXINTEN; BitField RXINTEN; BitField ACKINTEN; + + // Acknowledge and reset are write-only, bits 13-15 always read as zero. + static constexpr u16 READ_MASK = 0b00011111'10101111; }; union SIO_STAT @@ -63,6 +66,8 @@ union SIO_MODE BitField parity_enable; BitField parity_type; BitField stop_bit_length; + + static constexpr u16 WRITE_MASK = 0b00000000'11111111; }; } // namespace @@ -122,7 +127,7 @@ u32 SIO::ReadRegister(u32 offset) return ZeroExtend32(s_SIO_MODE.bits); case 0x0A: // SIO_CTRL - return ZeroExtend32(s_SIO_CTRL.bits); + return ZeroExtend32(s_SIO_CTRL.bits & SIO_CTRL::READ_MASK); case 0x0E: // SIO_BAUD return ZeroExtend32(s_SIO_BAUD); @@ -161,7 +166,7 @@ void SIO::WriteRegister(u32 offset, u32 value) case 0x08: // SIO_MODE { DEBUG_LOG("SIO_MODE <- 0x{:08X}", value); - s_SIO_MODE.bits = Truncate16(value); + s_SIO_MODE.bits = Truncate16(value) & SIO_MODE::WRITE_MASK; return; }