X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fpsxmem.c;h=5d9b16164ce2869539169791c01bdd6125df4184;hb=f94d3b198b9b7afa5b9025ba70652bed11b12052;hp=1f7aa8cda92c56f8a988e3bab5972fea3f4ed6f3;hpb=479d58cf907d87d12c2ab6cf9acc17f88ef2eeec;p=pcsx_rearmed.git

diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index 1f7aa8cd..5d9b1616 100644
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -71,13 +71,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 ret;
 	}
 
-	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);
 
@@ -86,14 +86,14 @@ retry:
 			return MAP_FAILED;
 		}
 
-		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;
 		}
@@ -175,7 +175,7 @@ int psxMemInit(void)
 	unsigned int i;
 	int ret;
 
-	if (LIGHTREC_CUSTOM_MAP && Config.Cpu == CPU_DYNAREC)
+	if (LIGHTREC_CUSTOM_MAP)
 		ret = lightrec_init_mmap();
 	else
 		ret = psxMemInitMap();
@@ -255,7 +255,7 @@ void psxMemReset() {
 }
 
 void psxMemShutdown() {
-	if (LIGHTREC_CUSTOM_MAP && Config.Cpu == CPU_DYNAREC)
+	if (LIGHTREC_CUSTOM_MAP)
 		lightrec_free_mmap();
 	else
 		psxMemFreeMap();