Merge pull request #536 from gameblabla/cdrom_fixes

[pcsx_rearmed.git] / libpcsxcore / psxmem.c

diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index 6277220..1825cfe 100644 (file)
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -31,10 +31,18 @@
 
 #include "memmap.h"
 
+#ifdef USE_LIBRETRO_VFS
+#include <streams/file_stream_transforms.h>
+#endif
+
 #ifndef MAP_ANONYMOUS
 #define MAP_ANONYMOUS MAP_ANON
 #endif
 
+#ifdef NDEBUG
+void DebugCheckBP(u32 address, enum breakpoint_types type) {}
+#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);
@@ -42,8 +50,17 @@ void (*psxUnmapHook)(void *ptr, size_t size, enum psxMapTag tag);
 void *psxMap(unsigned long addr, size_t size, int is_fixed,
                enum psxMapTag tag)
 {
+#ifdef LIGHTREC
+#ifdef MAP_FIXED_NOREPLACE
+       int flags = MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED_NOREPLACE;
+#else
+       int flags = MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED;
+#endif
+#else
        int flags = MAP_PRIVATE | MAP_ANONYMOUS;
-       int tried_to_align = 0;
+#endif
+
+       int try_ = 0;
        unsigned long mask;
        void *req, *ret;
 
@@ -73,15 +90,15 @@ retry:
                        return NULL;
                }
 
-               if (((addr ^ (long)ret) & 0x00ffffff) && !tried_to_align)
+               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;
                }
        }
@@ -135,15 +152,17 @@ int psxMemInit() {
        memset(psxMemRLUT, 0, 0x10000 * sizeof(void *));
        memset(psxMemWLUT, 0, 0x10000 * sizeof(void *));
 
+#ifdef LIGHTREC
+       psxM = psxMap(0x30000000, 0x00210000, 1, MAP_TAG_RAM);
+       if (psxM == NULL)
+               psxM = psxMap(0x70000000, 0x00210000, 1, MAP_TAG_RAM);
+
+#else
        psxM = psxMap(0x80000000, 0x00210000, 1, MAP_TAG_RAM);
+#endif
 #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"));
@@ -151,8 +170,18 @@ int psxMemInit() {
        }
 
        psxP = &psxM[0x200000];
+#ifdef LIGHTREC
+       psxH = psxMap(0x4f800000, 0x10000, 0, MAP_TAG_OTHER);
+       if (psxH == NULL)
+               psxH = psxMap(0x8f800000, 0x10000, 0, MAP_TAG_OTHER);
+
+       psxR = psxMap(0x4fc00000, 0x80000, 0, MAP_TAG_OTHER);
+       if (psxR == NULL)
+               psxR = psxMap(0x8fc00000, 0x80000, 0, MAP_TAG_OTHER);
+#else
        psxH = psxMap(0x1f800000, 0x10000, 0, MAP_TAG_OTHER);
        psxR = psxMap(0x1fc00000, 0x80000, 0, MAP_TAG_OTHER);
+#endif
 
        if (psxMemRLUT == NULL || psxMemWLUT == NULL || 
            psxR == NULL || psxP == NULL || psxH == NULL) {
@@ -192,7 +221,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);