don't cast between long and pointers for win64

[pcsx_rearmed.git] / libpcsxcore / psxmem.c

diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index 52d2759..2a96333 100644 (file)
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -27,7 +27,8 @@
 #include "psxmem_map.h"
 #include "r3000a.h"
 #include "psxhw.h"
-#include "debug.h"
+//#include "debug.h"
+#define DebugCheckBP(...)
 
 #include "memmap.h"
 
@@ -58,13 +59,13 @@ retry:
                /* if (is_fixed)
                        flags |= MAP_FIXED; */
 
-               req = (void *)addr;
+               req = (void *)(uintptr_t)addr;
                ret = mmap(req, size, PROT_READ | PROT_WRITE, flags, -1, 0);
                if (ret == MAP_FAILED)
                        return NULL;
        }
 
-       if (addr != 0 && ret != (void *)addr) {
+       if (addr != 0 && ret != (void *)(uintptr_t)addr) {
                SysMessage("psxMap: warning: wanted to map @%08x, got %p\n",
                        addr, ret);
 
@@ -73,14 +74,14 @@ retry:
                        return NULL;
                }
 
-               if (((addr ^ (unsigned long)ret) & ~0xff000000l) && try_ < 2)
+               if (((addr ^ (unsigned long)(uintptr_t)ret) & ~0xff000000l) && try_ < 2)
                {
                        psxUnmap(ret, size, tag);
 
                        // try to use similarly aligned memory instead
                        // (recompiler needs this)
                        mask = try_ ? 0xffff : 0xffffff;
-                       addr = ((unsigned long)ret + mask) & ~mask;
+                       addr = ((uintptr_t)ret + mask) & ~mask;
                        try_++;
                        goto retry;
                }
@@ -136,10 +137,8 @@ int psxMemInit() {
        memset(psxMemWLUT, 0, 0x10000 * sizeof(void *));
 
        psxM = psxMap(0x80000000, 0x00210000, 1, MAP_TAG_RAM);
-#ifndef RAM_FIXED
        if (psxM == NULL)
                psxM = psxMap(0x77000000, 0x00210000, 0, MAP_TAG_RAM);
-#endif
        if (psxM == NULL) {
                SysMessage(_("mapping main RAM failed"));
                return -1;