drc: add a timing hack for Internal Section

[pcsx_rearmed.git] / libpcsxcore / psxmem.c

diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index f12a981..c09965d 100644 (file)
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -28,7 +28,8 @@
 #include "r3000a.h"
 #include "psxhw.h"
 #include "debug.h"
-#include <sys/mman.h>
+
+#include "memmap.h"
 
 #ifndef MAP_ANONYMOUS
 #define MAP_ANONYMOUS MAP_ANON
@@ -42,39 +43,45 @@ void *psxMap(unsigned long addr, size_t size, int is_fixed,
                enum psxMapTag tag)
 {
        int flags = MAP_PRIVATE | MAP_ANONYMOUS;
-       int tried_to_align = 0;
+       int try_ = 0;
        unsigned long mask;
        void *req, *ret;
 
 retry:
        if (psxMapHook != NULL) {
-               ret = psxMapHook(addr, size, is_fixed, tag);
-               goto out;
+               ret = psxMapHook(addr, size, 0, tag);
+               if (ret == NULL)
+                       return NULL;
+       }
+       else {
+               /* avoid MAP_FIXED, it overrides existing mappings.. */
+               /* if (is_fixed)
+                       flags |= MAP_FIXED; */
+
+               req = (void *)addr;
+               ret = mmap(req, size, PROT_READ | PROT_WRITE, flags, -1, 0);
+               if (ret == MAP_FAILED)
+                       return NULL;
        }
 
-       if (is_fixed)
-               flags |= MAP_FIXED;
-
-       req = (void *)addr;
-       ret = mmap(req, size, PROT_READ | PROT_WRITE, flags, -1, 0);
-       if (ret == MAP_FAILED)
-               return NULL;
-
-out:
        if (addr != 0 && ret != (void *)addr) {
                SysMessage("psxMap: warning: wanted to map @%08x, got %p\n",
                        addr, ret);
 
-               if (ret != NULL && ((addr ^ (long)ret) & 0x00ffffff)
-                   && !tried_to_align)
+               if (is_fixed) {
+                       psxUnmap(ret, size, tag);
+                       return NULL;
+               }
+
+               if (((addr ^ (unsigned long)ret) & ~0xff000000l) && try_ < 2)
                {
                        psxUnmap(ret, size, tag);
 
                        // try to use similarly aligned memory instead
                        // (recompiler needs this)
-                       mask = (addr - 1) & ~addr & 0x07ffffff;
-                       addr = (unsigned long)(ret + mask) & ~mask;
-                       tried_to_align = 1;
+                       mask = try_ ? 0xffff : 0xffffff;
+                       addr = ((unsigned long)ret + mask) & ~mask;
+                       try_++;
                        goto retry;
                }
        }
@@ -89,7 +96,8 @@ void psxUnmap(void *ptr, size_t size, enum psxMapTag tag)
                return;
        }
 
-       munmap(ptr, size);
+       if (ptr)
+               munmap(ptr, size);
 }
 
 s8 *psxM = NULL; // Kernel & User Memory (2 Meg)
@@ -130,7 +138,7 @@ int psxMemInit() {
        psxM = psxMap(0x80000000, 0x00210000, 1, MAP_TAG_RAM);
 #ifndef RAM_FIXED
        if (psxM == NULL)
-               psxM = psxMap(0x78000000, 0x00210000, 0, MAP_TAG_RAM);
+               psxM = psxMap(0x77000000, 0x00210000, 0, MAP_TAG_RAM);
 #endif
        if (psxM == NULL) {
                SysMessage(_("mapping main RAM failed"));
@@ -138,12 +146,13 @@ int psxMemInit() {
        }
 
        psxP = &psxM[0x200000];
-       psxH = psxMap(0x1f800000, 0x10000, 1, MAP_TAG_OTHER);
+       psxH = psxMap(0x1f800000, 0x10000, 0, MAP_TAG_OTHER);
        psxR = psxMap(0x1fc00000, 0x80000, 0, MAP_TAG_OTHER);
 
        if (psxMemRLUT == NULL || psxMemWLUT == NULL || 
-               psxR == NULL || psxP == NULL || psxH != (void *)0x1f800000) {
+           psxR == NULL || psxP == NULL || psxH == NULL) {
                SysMessage(_("Error allocating memory!"));
+               psxMemShutdown();
                return -1;
        }
 
@@ -167,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;
@@ -178,7 +191,7 @@ void psxMemReset() {
        char bios[1024];
 
        memset(psxM, 0, 0x00200000);
-       memset(psxP, 0, 0x00010000);
+       memset(psxP, 0xff, 0x00010000);
 
        if (strcmp(Config.Bios, "HLE") != 0) {
                sprintf(bios, "%s/%s", Config.BiosDir, Config.Bios);
@@ -197,12 +210,12 @@ void psxMemReset() {
 }
 
 void psxMemShutdown() {
-       psxUnmap(psxM, 0x00210000, MAP_TAG_RAM);
-       psxUnmap(psxH, 0x10000, MAP_TAG_OTHER);
-       psxUnmap(psxR, 0x80000, MAP_TAG_OTHER);
+       psxUnmap(psxM, 0x00210000, MAP_TAG_RAM); psxM = NULL;
+       psxUnmap(psxH, 0x10000, MAP_TAG_OTHER); psxH = NULL;
+       psxUnmap(psxR, 0x80000, MAP_TAG_OTHER); psxR = NULL;
 
-       free(psxMemRLUT);
-       free(psxMemWLUT);
+       free(psxMemRLUT); psxMemRLUT = NULL;
+       free(psxMemWLUT); psxMemWLUT = NULL;
 }
 
 static int writeok = 1;
@@ -227,7 +240,7 @@ u8 psxMemRead8(u32 mem) {
 #ifdef PSXMEM_LOG
                        PSXMEM_LOG("err lb %8.8lx\n", mem);
 #endif
-                       return 0;
+                       return 0xFF;
                }
        }
 }
@@ -252,7 +265,7 @@ u16 psxMemRead16(u32 mem) {
 #ifdef PSXMEM_LOG
                        PSXMEM_LOG("err lh %8.8lx\n", mem);
 #endif
-                       return 0;
+                       return 0xFFFF;
                }
        }
 }
@@ -277,7 +290,7 @@ u32 psxMemRead32(u32 mem) {
 #ifdef PSXMEM_LOG
                        if (writeok) { PSXMEM_LOG("err lw %8.8lx\n", mem); }
 #endif
-                       return 0;
+                       return 0xFFFFFFFF;
                }
        }
 }
@@ -298,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 {
@@ -325,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 {
@@ -353,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
@@ -376,6 +389,10 @@ void psxMemWrite32(u32 mem, u32 value) {
                                                memset(psxMemWLUT + 0x0000, 0, 0x80 * sizeof(void *));
                                                memset(psxMemWLUT + 0x8000, 0, 0x80 * sizeof(void *));
                                                memset(psxMemWLUT + 0xa000, 0, 0x80 * sizeof(void *));
+#ifdef ICACHE_EMULATION
+                                               /* Required for icache interpreter otherwise Armored Core won't boot on icache interpreter */
+                                               psxCpu->Notify(R3000ACPU_NOTIFY_CACHE_ISOLATED, NULL);
+#endif
                                                break;
                                        case 0x00: case 0x1e988:
                                                if (writeok == 1) break;
@@ -383,6 +400,10 @@ void psxMemWrite32(u32 mem, u32 value) {
                                                for (i = 0; i < 0x80; i++) psxMemWLUT[i + 0x0000] = (void *)&psxM[(i & 0x1f) << 16];
                                                memcpy(psxMemWLUT + 0x8000, psxMemWLUT, 0x80 * sizeof(void *));
                                                memcpy(psxMemWLUT + 0xa000, psxMemWLUT, 0x80 * sizeof(void *));
+#ifdef ICACHE_EMULATION
+                                               /* Dynarecs might take this opportunity to flush their code cache */
+                                               psxCpu->Notify(R3000ACPU_NOTIFY_CACHE_UNISOLATED, NULL);
+#endif
                                                break;
                                        default:
 #ifdef PSXMEM_LOG