psxmem: Writes to PIO Expansion area have no effect. (#220)

[pcsx_rearmed.git] / libpcsxcore / psxmem.c

diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index a1a641d..61b14c6 100644 (file)
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -176,7 +176,11 @@ int psxMemInit() {
        memcpy(psxMemWLUT + 0x8000, psxMemWLUT, 0x80 * sizeof(void *));
        memcpy(psxMemWLUT + 0xa000, psxMemWLUT, 0x80 * sizeof(void *));
 
-       psxMemWLUT[0x1f00] = (u8 *)psxP;
+       // Don't allow writes to PIO Expansion region (psxP) to take effect.
+       // NOTE: Not sure if this is needed to fix any games but seems wise,
+       //       seeing as some games do read from PIO as part of copy-protection
+       //       check. (See fix in psxMemReset() regarding psxP region reads).
+       psxMemWLUT[0x1f00] = NULL;
        psxMemWLUT[0x1f80] = (u8 *)psxH;
 
        return 0;
@@ -307,7 +311,7 @@ void psxMemWrite8(u32 mem, u8 value) {
                        if (Config.Debug)
                                DebugCheckBP((mem & 0xffffff) | 0x80000000, W1);
                        *(u8 *)(p + (mem & 0xffff)) = value;
-#ifdef PSXREC
+#ifndef DRC_DISABLE
                        psxCpu->Clear((mem & (~3)), 1);
 #endif
                } else {
@@ -334,7 +338,7 @@ void psxMemWrite16(u32 mem, u16 value) {
                        if (Config.Debug)
                                DebugCheckBP((mem & 0xffffff) | 0x80000000, W2);
                        *(u16 *)(p + (mem & 0xffff)) = SWAPu16(value);
-#ifdef PSXREC
+#ifndef DRC_DISABLE
                        psxCpu->Clear((mem & (~3)), 1);
 #endif
                } else {
@@ -362,12 +366,12 @@ void psxMemWrite32(u32 mem, u32 value) {
                        if (Config.Debug)
                                DebugCheckBP((mem & 0xffffff) | 0x80000000, W4);
                        *(u32 *)(p + (mem & 0xffff)) = SWAPu32(value);
-#ifdef PSXREC
+#ifndef DRC_DISABLE
                        psxCpu->Clear(mem, 1);
 #endif
                } else {
                        if (mem != 0xfffe0130) {
-#ifdef PSXREC
+#ifndef DRC_DISABLE
                                if (!writeok)
                                        psxCpu->Clear(mem, 1);
 #endif