X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fpsxmem.c;h=11a01adcae6ca785f07fef1780a8f70232a896bf;hb=04758b20151324552ada2f31460078f5c6eb01e2;hp=422b485ce104f54fd7afae780c6bf320dbeab481;hpb=51014e8756a50a3550a65d0bc96152363e406950;p=pcsx_rearmed.git

diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index 422b485c..11a01adc 100644
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -28,7 +28,8 @@
 #include "r3000a.h"
 #include "psxhw.h"
 #include "debug.h"
-#include <sys/mman.h>
+
+#include "memmap.h"
 
 #ifndef MAP_ANONYMOUS
 #define MAP_ANONYMOUS MAP_ANON
@@ -41,40 +42,55 @@ void (*psxUnmapHook)(void *ptr, size_t size, enum psxMapTag tag);
 void *psxMap(unsigned long addr, size_t size, int is_fixed,
 		enum psxMapTag tag)
 {
+#ifdef LIGHTREC
+#ifdef MAP_FIXED_NOREPLACE
+	int flags = MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED_NOREPLACE;
+#else
+	int flags = MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED;
+#endif
+#else
 	int flags = MAP_PRIVATE | MAP_ANONYMOUS;
-	int tried_to_align = 0;
+#endif
+
+	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;
 	}
 
-	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);
 
-		if (ret != NULL && ((addr ^ (long)ret) & 0x00ffffff)
-		    && !tried_to_align)
+		if (is_fixed) {
+			psxUnmap(ret, size, tag);
+			return NULL;
+		}
+
+		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;
 		}
 	}
@@ -89,7 +105,8 @@ void psxUnmap(void *ptr, size_t size, enum psxMapTag tag)
 		return;
 	}
 
-	munmap(ptr, size);
+	if (ptr)
+		munmap(ptr, size);
 }
 
 s8 *psxM = NULL; // Kernel & User Memory (2 Meg)
@@ -127,15 +144,17 @@ int psxMemInit() {
 	memset(psxMemRLUT, 0, 0x10000 * sizeof(void *));
 	memset(psxMemWLUT, 0, 0x10000 * sizeof(void *));
 
-	psxM = psxMap(0x80000000, 0x00210000, 1, MAP_TAG_RAM);
-#ifndef RAM_FIXED
-#ifdef __BLACKBERRY_QNX__
+#ifdef LIGHTREC
+	psxM = psxMap(0x30000000, 0x00210000, 1, MAP_TAG_RAM);
 	if (psxM == NULL)
-		psxM = psxMap(0x70000000, 0x00210000, 0, MAP_TAG_RAM);
+		psxM = psxMap(0x70000000, 0x00210000, 1, MAP_TAG_RAM);
+
 #else
-	if (psxM == NULL)
-		psxM = psxMap(0x78000000, 0x00210000, 0, MAP_TAG_RAM);
+	psxM = psxMap(0x80000000, 0x00210000, 1, MAP_TAG_RAM);
 #endif
+#ifndef RAM_FIXED
+	if (psxM == NULL)
+		psxM = psxMap(0x77000000, 0x00210000, 0, MAP_TAG_RAM);
 #endif
 	if (psxM == NULL) {
 		SysMessage(_("mapping main RAM failed"));
@@ -143,12 +162,23 @@ int psxMemInit() {
 	}
 
 	psxP = &psxM[0x200000];
-	psxH = psxMap(0x1f800000, 0x10000, 1, MAP_TAG_OTHER);
+#ifdef LIGHTREC
+	psxH = psxMap(0x4f800000, 0x10000, 0, MAP_TAG_OTHER);
+	if (psxH == NULL)
+		psxH = psxMap(0x8f800000, 0x10000, 0, MAP_TAG_OTHER);
+
+	psxR = psxMap(0x4fc00000, 0x80000, 0, MAP_TAG_OTHER);
+	if (psxR == NULL)
+		psxR = psxMap(0x8fc00000, 0x80000, 0, MAP_TAG_OTHER);
+#else
+	psxH = psxMap(0x1f800000, 0x10000, 0, MAP_TAG_OTHER);
 	psxR = psxMap(0x1fc00000, 0x80000, 0, MAP_TAG_OTHER);
+#endif
 
 	if (psxMemRLUT == NULL || psxMemWLUT == NULL || 
-		psxR == NULL || psxP == NULL || psxH != (void *)0x1f800000) {
+	    psxR == NULL || psxP == NULL || psxH == NULL) {
 		SysMessage(_("Error allocating memory!"));
+		psxMemShutdown();
 		return -1;
 	}
 
@@ -183,7 +213,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);
@@ -202,12 +232,12 @@ void psxMemReset() {
 }
 
 void psxMemShutdown() {
-	psxUnmap(psxM, 0x00210000, MAP_TAG_RAM);
-	psxUnmap(psxH, 0x10000, MAP_TAG_OTHER);
-	psxUnmap(psxR, 0x80000, MAP_TAG_OTHER);
+	psxUnmap(psxM, 0x00210000, MAP_TAG_RAM); psxM = NULL;
+	psxUnmap(psxH, 0x10000, MAP_TAG_OTHER); psxH = NULL;
+	psxUnmap(psxR, 0x80000, MAP_TAG_OTHER); psxR = NULL;
 
-	free(psxMemRLUT);
-	free(psxMemWLUT);
+	free(psxMemRLUT); psxMemRLUT = NULL;
+	free(psxMemWLUT); psxMemWLUT = NULL;
 }
 
 static int writeok = 1;