X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fpsxmem.c;h=1cabd53cfd236b7e5ea012b4915f660d8b9ed642;hp=498246cfe37a6eb148262983d7b07027d2d23eee;hb=a327ad27099341fb6eed61aa0419dff418429f96;hpb=3a321131b0f1d75685b7487517fc84738f4186d2

diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index 498246cf..1cabd53c 100644
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -70,6 +70,15 @@ int psxMemInit() {
 
 	psxM = mmap((void *)0x80000000, 0x00210000,
 		PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
+#ifndef RAM_FIXED
+	if (psxM == MAP_FAILED)
+		psxM = mmap((void *)0x70000000, 0x00210000,
+			PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
+#endif
+	if (psxM == MAP_FAILED) {
+		SysMessage(_("mapping main RAM failed"));
+		return -1;
+	}
 
 	psxP = &psxM[0x200000];
 	psxH = mmap((void *)0x1f800000, 0x00010000,
@@ -79,7 +88,7 @@ int psxMemInit() {
 		PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 
 	if (psxMemRLUT == NULL || psxMemWLUT == NULL || 
-		psxM != (void *)0x80000000 || psxR == MAP_FAILED ||
+		psxR == MAP_FAILED ||
 		psxP == NULL || psxH != (void *)0x1f800000) {
 		SysMessage(_("Error allocating memory!"));
 		return -1;