spu: rework synchronization

[pcsx_rearmed.git] / libpcsxcore / psxmem.c

diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index 498246c..7001744 100644 (file)
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -24,6 +24,7 @@
 // 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 "debug.h"
 #include "r3000a.h"
 #include "psxhw.h"
 #include "debug.h"


@@ -33,6 +34,71 @@
 #define MAP_ANONYMOUS MAP_ANON
 #endif
 
 #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;
+       int tried_to_align = 0;
+       unsigned long mask;
+       void *req, *ret;
+
+retry:
+       if (psxMapHook != NULL) {
+               ret = psxMapHook(addr, size, is_fixed, tag);
+               goto out;
+       }
+
+       /* 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;
+
+out:
+       if (addr != 0 && ret != (void *)addr) {
+               SysMessage("psxMap: warning: wanted to map @%08x, got %p\n",
+                       addr, ret);
+
+               if (is_fixed) {
+                       psxUnmap(ret, size, tag);
+                       return NULL;
+               }
+
+               if (ret != NULL && ((addr ^ (long)ret) & 0x00ffffff)
+                   && !tried_to_align)
+               {
+                       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;
+                       goto retry;
+               }
+       }
+
+       return ret;
+}
+
+void psxUnmap(void *ptr, size_t size, enum psxMapTag tag)
+{
+       if (psxUnmapHook != NULL) {
+               psxUnmapHook(ptr, size, tag);
+               return;
+       }
+
+       if (ptr)
+               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)


@@ -68,20 +134,29 @@ 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, 0x00210000,
-               PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
+       psxM = psxMap(0x80000000, 0x00210000, 1, MAP_TAG_RAM);
+#ifndef RAM_FIXED
+#ifdef __BLACKBERRY_QNX__
+       if (psxM == NULL)
+               psxM = psxMap(0x77000000, 0x00210000, 0, MAP_TAG_RAM);
+#else
+       if (psxM == NULL)
+               psxM = psxMap(0x78000000, 0x00210000, 0, MAP_TAG_RAM);
+#endif
+#endif
+       if (psxM == NULL) {
+               SysMessage(_("mapping main RAM failed"));
+               return -1;
+       }

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

-       psxH = mmap((void *)0x1f800000, 0x00010000,
-               PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
-
-       psxR = mmap((void *)0x1fc00000, 0x80000,
-               PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+       psxH = psxMap(0x1f800000, 0x10000, 0, 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 == MAP_FAILED ||
-               psxP == NULL || psxH != (void *)0x1f800000) {
+           psxR == NULL || psxP == NULL || psxH == NULL) {

                SysMessage(_("Error allocating memory!"));
                SysMessage(_("Error allocating memory!"));

+               psxMemShutdown();

                return -1;
        }
 
                return -1;
        }
 


@@ -135,12 +210,12 @@ void psxMemReset() {
 }
 
 void psxMemShutdown() {
 }
 
 void psxMemShutdown() {

-       munmap(psxM, 0x00210000);
-       munmap(psxH, 0x1f800000);
-       munmap(psxR, 0x80000);
+       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;
 }
 
 static int writeok = 1;


@@ -150,8 +225,8 @@ u8 psxMemRead8(u32 mem) {
        u32 t;
 
        t = mem >> 16;
        u32 t;
 
        t = mem >> 16;

-       if (t == 0x1f80) {
-               if (mem < 0x1f801000)
+       if (t == 0x1f80 || t == 0x9f80 || t == 0xbf80) {
+               if ((mem & 0xffff) < 0x400)

                        return psxHu8(mem);
                else
                        return psxHwRead8(mem);
                        return psxHu8(mem);
                else
                        return psxHwRead8(mem);


@@ -175,8 +250,8 @@ u16 psxMemRead16(u32 mem) {
        u32 t;
 
        t = mem >> 16;
        u32 t;
 
        t = mem >> 16;

-       if (t == 0x1f80) {
-               if (mem < 0x1f801000)
+       if (t == 0x1f80 || t == 0x9f80 || t == 0xbf80) {
+               if ((mem & 0xffff) < 0x400)

                        return psxHu16(mem);
                else
                        return psxHwRead16(mem);
                        return psxHu16(mem);
                else
                        return psxHwRead16(mem);


@@ -200,8 +275,8 @@ u32 psxMemRead32(u32 mem) {
        u32 t;
 
        t = mem >> 16;
        u32 t;
 
        t = mem >> 16;

-       if (t == 0x1f80) {
-               if (mem < 0x1f801000)
+       if (t == 0x1f80 || t == 0x9f80 || t == 0xbf80) {
+               if ((mem & 0xffff) < 0x400)

                        return psxHu32(mem);
                else
                        return psxHwRead32(mem);
                        return psxHu32(mem);
                else
                        return psxHwRead32(mem);


@@ -225,8 +300,8 @@ void psxMemWrite8(u32 mem, u8 value) {
        u32 t;
 
        t = mem >> 16;
        u32 t;
 
        t = mem >> 16;

-       if (t == 0x1f80) {
-               if (mem < 0x1f801000)
+       if (t == 0x1f80 || t == 0x9f80 || t == 0xbf80) {
+               if ((mem & 0xffff) < 0x400)

                        psxHu8(mem) = value;
                else
                        psxHwWrite8(mem, value);
                        psxHu8(mem) = value;
                else
                        psxHwWrite8(mem, value);


@@ -252,8 +327,8 @@ void psxMemWrite16(u32 mem, u16 value) {
        u32 t;
 
        t = mem >> 16;
        u32 t;
 
        t = mem >> 16;

-       if (t == 0x1f80) {
-               if (mem < 0x1f801000)
+       if (t == 0x1f80 || t == 0x9f80 || t == 0xbf80) {
+               if ((mem & 0xffff) < 0x400)

                        psxHu16ref(mem) = SWAPu16(value);
                else
                        psxHwWrite16(mem, value);
                        psxHu16ref(mem) = SWAPu16(value);
                else
                        psxHwWrite16(mem, value);


@@ -280,8 +355,8 @@ void psxMemWrite32(u32 mem, u32 value) {
 
 //     if ((mem&0x1fffff) == 0x71E18 || value == 0x48088800) SysPrintf("t2fix!!\n");
        t = mem >> 16;
 
 //     if ((mem&0x1fffff) == 0x71E18 || value == 0x48088800) SysPrintf("t2fix!!\n");
        t = mem >> 16;

-       if (t == 0x1f80) {
-               if (mem < 0x1f801000)
+       if (t == 0x1f80 || t == 0x9f80 || t == 0xbf80) {
+               if ((mem & 0xffff) < 0x400)

                        psxHu32ref(mem) = SWAPu32(value);
                else
                        psxHwWrite32(mem, value);
                        psxHu32ref(mem) = SWAPu32(value);
                else
                        psxHwWrite32(mem, value);


@@ -338,8 +413,8 @@ void *psxMemPointer(u32 mem) {
        u32 t;
 
        t = mem >> 16;
        u32 t;
 
        t = mem >> 16;

-       if (t == 0x1f80) {
-               if (mem < 0x1f801000)
+       if (t == 0x1f80 || t == 0x9f80 || t == 0xbf80) {
+               if ((mem & 0xffff) < 0x400)

                        return (void *)&psxH[mem];
                else
                        return NULL;
                        return (void *)&psxH[mem];
                else
                        return NULL;