avoid bogus warning

[pcsx_rearmed.git] / libpcsxcore / psxmem.c

diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index 898eac9..27663f1 100644 (file)
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -24,14 +24,54 @@
 // TODO: Implement caches & cycle penalty.
 
 #include "psxmem.h"
 // TODO: Implement caches & cycle penalty.
 
 #include "psxmem.h"

+#include "psxmem_map.h"

 #include "r3000a.h"
 #include "psxhw.h"
 #include "r3000a.h"
 #include "psxhw.h"

+#include "debug.h"

 #include <sys/mman.h>
 
 #ifndef MAP_ANONYMOUS
 #define MAP_ANONYMOUS MAP_ANON
 #endif
 
 #include <sys/mman.h>
 
 #ifndef MAP_ANONYMOUS
 #define MAP_ANONYMOUS MAP_ANON
 #endif
 

+void *(*psxMapHook)(unsigned long addr, size_t size, int is_fixed,
+               enum psxMapTag tag);
+void (*psxUnmapHook)(void *ptr, size_t size, enum psxMapTag tag);
+
+void *psxMap(unsigned long addr, size_t size, int is_fixed,
+               enum psxMapTag tag)
+{
+       int flags = MAP_PRIVATE | MAP_ANONYMOUS;
+       void *req, *ret;
+
+       if (psxMapHook != NULL)
+               return psxMapHook(addr, size, is_fixed, tag);
+
+       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 (req != NULL && ret != req)
+               SysMessage("psxMap: warning: wanted to map @%p, got %p\n",
+                       req, ret);
+
+       return ret;
+}
+
+void psxUnmap(void *ptr, size_t size, enum psxMapTag tag)
+{
+       if (psxUnmapHook != NULL) {
+               psxUnmapHook(ptr, size, tag);
+               return;
+       }
+
+       munmap(ptr, size);
+}
+

 s8 *psxM = NULL; // Kernel & User Memory (2 Meg)
 s8 *psxP = NULL; // Parallel Port (64K)
 s8 *psxR = NULL; // BIOS ROM (512K)
 s8 *psxM = NULL; // Kernel & User Memory (2 Meg)
 s8 *psxP = NULL; // Parallel Port (64K)
 s8 *psxR = NULL; // BIOS ROM (512K)


@@ -67,18 +107,22 @@ int psxMemInit() {
        memset(psxMemRLUT, 0, 0x10000 * sizeof(void *));
        memset(psxMemWLUT, 0, 0x10000 * sizeof(void *));
 
        memset(psxMemRLUT, 0, 0x10000 * sizeof(void *));
        memset(psxMemWLUT, 0, 0x10000 * sizeof(void *));
 

-       psxM = mmap((void *)0x80000000, 0x00220000,
-               PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+       psxM = psxMap(0x80000000, 0x00210000, 1, MAP_TAG_RAM);
+#ifndef RAM_FIXED
+       if (psxM == NULL)
+               psxM = psxMap(0x70000000, 0x00210000, 0, MAP_TAG_RAM);
+#endif
+       if (psxM == NULL) {
+               SysMessage(_("mapping main RAM failed"));
+               return -1;
+       }

 
        psxP = &psxM[0x200000];
 
        psxP = &psxM[0x200000];

-       psxH = &psxM[0x210000];
-
-       psxR = mmap((void *)0x9fc00000, 0x80000,
-               PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+       psxH = psxMap(0x1f800000, 0x10000, 1, MAP_TAG_OTHER);
+       psxR = psxMap(0x1fc00000, 0x80000, 0, MAP_TAG_OTHER);

 
        if (psxMemRLUT == NULL || psxMemWLUT == NULL || 
 
        if (psxMemRLUT == NULL || psxMemWLUT == NULL || 

-               psxM != (void *)0x80000000 || psxR != (void *)0x9fc00000 ||
-               psxP == NULL || psxH == NULL) {
+               psxR == NULL || psxP == NULL || psxH != (void *)0x1f800000) {

                SysMessage(_("Error allocating memory!"));
                return -1;
        }
                SysMessage(_("Error allocating memory!"));
                return -1;
        }


@@ -133,8 +177,9 @@ void psxMemReset() {
 }
 
 void psxMemShutdown() {
 }
 
 void psxMemShutdown() {

-       munmap(psxM, 0x00220000);
-       munmap(psxR, 0x80000);
+       psxUnmap(psxM, 0x00210000, MAP_TAG_RAM);
+       psxUnmap(psxH, 0x1f800000, MAP_TAG_OTHER);
+       psxUnmap(psxR, 0x80000, MAP_TAG_OTHER);

 
        free(psxMemRLUT);
        free(psxMemWLUT);
 
        free(psxMemRLUT);
        free(psxMemWLUT);


@@ -261,7 +306,7 @@ void psxMemWrite16(u32 mem, u16 value) {
                                DebugCheckBP((mem & 0xffffff) | 0x80000000, W2);
                        *(u16 *)(p + (mem & 0xffff)) = SWAPu16(value);
 #ifdef PSXREC
                                DebugCheckBP((mem & 0xffffff) | 0x80000000, W2);
                        *(u16 *)(p + (mem & 0xffff)) = SWAPu16(value);
 #ifdef PSXREC

-                       psxCpu->Clear((mem & (~1)), 1);
+                       psxCpu->Clear((mem & (~3)), 1);

 #endif
                } else {
 #ifdef PSXMEM_LOG
 #endif
                } else {
 #ifdef PSXMEM_LOG