drc: drop less obvious dead code

[pcsx_rearmed.git] / libpcsxcore / psxmem.c

diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index 7001744..14fd911 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,26 +43,27 @@ 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;
        }
 
-       /* 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);
@@ -71,16 +73,15 @@ out:
                        return NULL;
                }
 
-               if (ret != NULL && ((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;
                }
        }
@@ -136,13 +137,8 @@ int psxMemInit() {
 
        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"));