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=b08d113dd27c6b2794772b149e2cb6b715bd2698;hb=aafcb4ddc257478d613611adcae7cb13fd716577;hpb=3e31e934ebbfa48941cdcc66e316ff743a4c908d

diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index b08d113d..1cabd53c 100644
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -26,6 +26,7 @@
 #include "psxmem.h"
 #include "r3000a.h"
 #include "psxhw.h"
+#include "debug.h"
 #include <sys/mman.h>
 
 #ifndef MAP_ANONYMOUS
@@ -67,18 +68,28 @@ int psxMemInit() {
 	memset(psxMemRLUT, 0, 0x10000 * sizeof(void *));
 	memset(psxMemWLUT, 0, 0x10000 * sizeof(void *));
 
-	psxM = mmap((void *)0x80000000, 0x00220000,
-		PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+	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 = &psxM[0x210000];
+	psxH = mmap((void *)0x1f800000, 0x00010000,
+		PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
 
-	psxR = mmap((void *)0x9fc00000, 0x80000,
+	psxR = mmap((void *)0x1fc00000, 0x80000,
 		PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 
 	if (psxMemRLUT == NULL || psxMemWLUT == NULL || 
-		psxM != (void *)0x80000000 || psxR != (void *)0x9fc00000 ||
-		psxP == NULL || psxH == NULL) {
+		psxR == MAP_FAILED ||
+		psxP == NULL || psxH != (void *)0x1f800000) {
 		SysMessage(_("Error allocating memory!"));
 		return -1;
 	}
@@ -133,7 +144,8 @@ void psxMemReset() {
 }
 
 void psxMemShutdown() {
-	munmap(psxM, 0x00220000);
+	munmap(psxM, 0x00210000);
+	munmap(psxH, 0x1f800000);
 	munmap(psxR, 0x80000);
 
 	free(psxMemRLUT);