X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fpsxmem.c;h=cfd880baddfe50623eca20c42bcd2bb488fec136;hb=9c9d02e498a0ec5de6ea83f58b79fb972887c650;hp=6277220cded77b27bad2772afb4a457b8912d4f3;hpb=85f2398236b54db46340dad14330102f281ca4f3;p=pcsx_rearmed.git

diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index 6277220c..cfd880ba 100644
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -42,8 +42,13 @@ 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
+	int flags = MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED;
+#else
 	int flags = MAP_PRIVATE | MAP_ANONYMOUS;
-	int tried_to_align = 0;
+#endif
+
+	int try_ = 0;
 	unsigned long mask;
 	void *req, *ret;
 
@@ -73,15 +78,15 @@ retry:
 			return NULL;
 		}
 
-		if (((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 +140,14 @@ int psxMemInit() {
 	memset(psxMemRLUT, 0, 0x10000 * sizeof(void *));
 	memset(psxMemWLUT, 0, 0x10000 * sizeof(void *));
 
+#ifdef LIGHTREC
+	psxM = psxMap(0x30000000, 0x00210000, 1, MAP_TAG_RAM);
+#else
 	psxM = psxMap(0x80000000, 0x00210000, 1, MAP_TAG_RAM);
+#endif
 #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 +155,13 @@ int psxMemInit() {
 	}
 
 	psxP = &psxM[0x200000];
+#ifdef LIGHTREC
+	psxH = psxMap(0x4f800000, 0x10000, 0, MAP_TAG_OTHER);
+	psxR = psxMap(0x4fc00000, 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 == NULL) {
@@ -192,7 +201,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);