X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fpsxmem.c;h=498246cfe37a6eb148262983d7b07027d2d23eee;hp=898eac9c14f962bbe7fc94ac27ce94433e6d5f1f;hb=6e1a0c4dc569a9635344e42e2f9e973f0b9ab6d5;hpb=a06c1d6e156b90ce9bfa18664256dfe8f815857e

diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index 898eac9c..498246cf 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,19 @@ 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);
 
 	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) {
+		psxM != (void *)0x80000000 || psxR == MAP_FAILED ||
+		psxP == NULL || psxH != (void *)0x1f800000) {
 		SysMessage(_("Error allocating memory!"));
 		return -1;
 	}
@@ -133,7 +135,8 @@ void psxMemReset() {
 }
 
 void psxMemShutdown() {
-	munmap(psxM, 0x00220000);
+	munmap(psxM, 0x00210000);
+	munmap(psxH, 0x1f800000);
 	munmap(psxR, 0x80000);
 
 	free(psxMemRLUT);
@@ -261,7 +264,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