X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fpsxmem.c;h=b08d113dd27c6b2794772b149e2cb6b715bd2698;hp=fc4a90e945e2e0b81a7dec48e6fe5f440514040d;hb=7f2607ead57cd4ac8d1aa57c9160ece1657dc457;hpb=ef79bbde537d6b9c745a7d86cb9df1d04c35590d

diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index fc4a90e9..b08d113d 100644
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -67,16 +67,18 @@ int psxMemInit() {
 	memset(psxMemRLUT, 0, 0x10000 * sizeof(void *));
 	memset(psxMemWLUT, 0, 0x10000 * sizeof(void *));
 
-	psxM = mmap(0, 0x00220000,
+	psxM = mmap((void *)0x80000000, 0x00220000,
 		PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 
 	psxP = &psxM[0x200000];
 	psxH = &psxM[0x210000];
 
-	psxR = (s8 *)malloc(0x00080000);
+	psxR = mmap((void *)0x9fc00000, 0x80000,
+		PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 
 	if (psxMemRLUT == NULL || psxMemWLUT == NULL || 
-		psxM == NULL || psxP == NULL || psxH == NULL) {
+		psxM != (void *)0x80000000 || psxR != (void *)0x9fc00000 ||
+		psxP == NULL || psxH == NULL) {
 		SysMessage(_("Error allocating memory!"));
 		return -1;
 	}
@@ -132,8 +134,8 @@ void psxMemReset() {
 
 void psxMemShutdown() {
 	munmap(psxM, 0x00220000);
+	munmap(psxR, 0x80000);
 
-	free(psxR);
 	free(psxMemRLUT);
 	free(psxMemWLUT);
 }
@@ -259,7 +261,7 @@ void psxMemWrite16(u32 mem, u16 value) {
 				DebugCheckBP((mem & 0xffffff) | 0x80000000, W2);
 			*(u16 *)(p + (mem & 0xffff)) = SWAPu16(value);
 #ifdef PSXREC
-			psxCpu->Clear((mem & (~1)), 1);
+			psxCpu->Clear((mem & (~3)), 1);
 #endif
 		} else {
 #ifdef PSXMEM_LOG