X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fpsxmem.c;h=caa0d65a257db26e7945fb183545dd1688a42bbf;hb=39e609f79f169f495821d6f8cfa2501ba32e17a2;hp=86da68ce693e86654ea425c86f2e5865e4efd703;hpb=624241c2572665e128d2566aaa4cdd4f0d55ab2f;p=pcsx_rearmed.git

diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index 86da68ce..caa0d65a 100644
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -42,27 +42,28 @@ void (*psxUnmapHook)(void *ptr, size_t size, enum psxMapTag tag);
 void *psxMap(unsigned long addr, size_t size, int is_fixed,
 		enum psxMapTag tag)
 {
-	int flags = MAP_PRIVATE | MAP_ANONYMOUS;
-	int tried_to_align = 0;
+	int flags = MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED;
+	int try_ = 0;
 	unsigned long mask;
 	void *req, *ret;
 
 retry:
 	if (psxMapHook != NULL) {
-		ret = psxMapHook(addr, size, is_fixed, tag);
-		goto out;
+		ret = psxMapHook(addr, size, 0, tag);
+		if (ret == NULL)
+			return NULL;
+	}
+	else {
+		/* avoid MAP_FIXED, it overrides existing mappings.. */
+		/* if (is_fixed)
+			flags |= MAP_FIXED; */
+
+		req = (void *)addr;
+		ret = mmap(req, size, PROT_READ | PROT_WRITE, flags, -1, 0);
+		if (ret == MAP_FAILED)
+			return NULL;
 	}
 
-	/* avoid MAP_FIXED, it overrides existing mappings.. */
-	/* if (is_fixed)
-		flags |= MAP_FIXED; */
-
-	req = (void *)addr;
-	ret = mmap(req, size, PROT_READ | PROT_WRITE, flags, -1, 0);
-	if (ret == MAP_FAILED)
-		return NULL;
-
-out:
 	if (addr != 0 && ret != (void *)addr) {
 		SysMessage("psxMap: warning: wanted to map @%08x, got %p\n",
 			addr, ret);
@@ -72,16 +73,15 @@ out:
 			return NULL;
 		}
 
-		if (ret != NULL && ((addr ^ (long)ret) & 0x00ffffff)
-		    && !tried_to_align)
+		if (((addr ^ (unsigned long)ret) & ~0xff000000l) && try_ < 2)
 		{
 			psxUnmap(ret, size, tag);
 
 			// try to use similarly aligned memory instead
 			// (recompiler needs this)
-			mask = (addr - 1) & ~addr & 0x07ffffff;
-			addr = (unsigned long)(ret + mask) & ~mask;
-			tried_to_align = 1;
+			mask = try_ ? 0xffff : 0xffffff;
+			addr = ((unsigned long)ret + mask) & ~mask;
+			try_++;
 			goto retry;
 		}
 	}
@@ -135,15 +135,10 @@ int psxMemInit() {
 	memset(psxMemRLUT, 0, 0x10000 * sizeof(void *));
 	memset(psxMemWLUT, 0, 0x10000 * sizeof(void *));
 
-	psxM = psxMap(0x80000000, 0x00210000, 1, MAP_TAG_RAM);
+	psxM = psxMap(0x30000000, 0x00210000, 1, MAP_TAG_RAM);
 #ifndef RAM_FIXED
-#ifdef __BLACKBERRY_QNX__
 	if (psxM == NULL)
 		psxM = psxMap(0x77000000, 0x00210000, 0, MAP_TAG_RAM);
-#else
-	if (psxM == NULL)
-		psxM = psxMap(0x78000000, 0x00210000, 0, MAP_TAG_RAM);
-#endif
 #endif
 	if (psxM == NULL) {
 		SysMessage(_("mapping main RAM failed"));
@@ -151,8 +146,8 @@ int psxMemInit() {
 	}
 
 	psxP = &psxM[0x200000];
-	psxH = psxMap(0x1f800000, 0x10000, 0, MAP_TAG_OTHER);
-	psxR = psxMap(0x1fc00000, 0x80000, 0, MAP_TAG_OTHER);
+	psxH = psxMap(0x4f800000, 0x10000, 0, MAP_TAG_OTHER);
+	psxR = psxMap(0x4fc00000, 0x80000, 0, MAP_TAG_OTHER);
 
 	if (psxMemRLUT == NULL || psxMemWLUT == NULL || 
 	    psxR == NULL || psxP == NULL || psxH == NULL) {
@@ -192,7 +187,7 @@ void psxMemReset() {
 	char bios[1024];
 
 	memset(psxM, 0, 0x00200000);
-	memset(psxP, 0, 0x00010000);
+	memset(psxP, 0xff, 0x00010000);
 
 	if (strcmp(Config.Bios, "HLE") != 0) {
 		sprintf(bios, "%s/%s", Config.BiosDir, Config.Bios);