X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fpsxmem.c;h=37a0efd0d2bb13a4571366bd5224adf423860a0a;hb=7a8d521fba9c86ae7b51369ce061bf63112b745f;hp=c09965dc15e50353d583e80e3ebbf3ae880d2bf8;hpb=7bbabe80066083236adfd653f289de17443a7dd8;p=pcsx_rearmed.git

diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index c09965dc..37a0efd0 100644
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -27,10 +27,16 @@
 #include "psxmem_map.h"
 #include "r3000a.h"
 #include "psxhw.h"
-#include "debug.h"
+//#include "debug.h"
+#define DebugCheckBP(...)
 
+#include "lightrec/mem.h"
 #include "memmap.h"
 
+#ifdef USE_LIBRETRO_VFS
+#include <streams/file_stream_transforms.h>
+#endif
+
 #ifndef MAP_ANONYMOUS
 #define MAP_ANONYMOUS MAP_ANON
 #endif
@@ -51,36 +57,36 @@ retry:
 	if (psxMapHook != NULL) {
 		ret = psxMapHook(addr, size, 0, tag);
 		if (ret == NULL)
-			return NULL;
+			return MAP_FAILED;
 	}
 	else {
 		/* avoid MAP_FIXED, it overrides existing mappings.. */
 		/* if (is_fixed)
 			flags |= MAP_FIXED; */
 
-		req = (void *)addr;
+		req = (void *)(uintptr_t)addr;
 		ret = mmap(req, size, PROT_READ | PROT_WRITE, flags, -1, 0);
 		if (ret == MAP_FAILED)
-			return NULL;
+			return ret;
 	}
 
-	if (addr != 0 && ret != (void *)addr) {
+	if (addr != 0 && ret != (void *)(uintptr_t)addr) {
 		SysMessage("psxMap: warning: wanted to map @%08x, got %p\n",
 			addr, ret);
 
 		if (is_fixed) {
 			psxUnmap(ret, size, tag);
-			return NULL;
+			return MAP_FAILED;
 		}
 
-		if (((addr ^ (unsigned long)ret) & ~0xff000000l) && try_ < 2)
+		if (((addr ^ (unsigned long)(uintptr_t)ret) & ~0xff000000l) && try_ < 2)
 		{
 			psxUnmap(ret, size, tag);
 
 			// try to use similarly aligned memory instead
 			// (recompiler needs this)
 			mask = try_ ? 0xffff : 0xffffff;
-			addr = ((unsigned long)ret + mask) & ~mask;
+			addr = ((uintptr_t)ret + mask) & ~mask;
 			try_++;
 			goto retry;
 		}
@@ -127,35 +133,71 @@ u8 **psxMemRLUT = NULL;
 0xbfc0_0000-0xbfc7_ffff		BIOS Mirror (512K) Uncached
 */
 
-int psxMemInit() {
-	int i;
-
-	psxMemRLUT = (u8 **)malloc(0x10000 * sizeof(void *));
-	psxMemWLUT = (u8 **)malloc(0x10000 * sizeof(void *));
-	memset(psxMemRLUT, 0, 0x10000 * sizeof(void *));
-	memset(psxMemWLUT, 0, 0x10000 * sizeof(void *));
-
+static int psxMemInitMap(void)
+{
 	psxM = psxMap(0x80000000, 0x00210000, 1, MAP_TAG_RAM);
-#ifndef RAM_FIXED
-	if (psxM == NULL)
+	if (psxM == MAP_FAILED)
 		psxM = psxMap(0x77000000, 0x00210000, 0, MAP_TAG_RAM);
-#endif
-	if (psxM == NULL) {
+	if (psxM == MAP_FAILED) {
 		SysMessage(_("mapping main RAM failed"));
+		psxM = NULL;
 		return -1;
 	}
-
 	psxP = &psxM[0x200000];
+
 	psxH = psxMap(0x1f800000, 0x10000, 0, MAP_TAG_OTHER);
+	if (psxH == MAP_FAILED) {
+		SysMessage(_("Error allocating memory!"));
+		psxMemShutdown();
+		return -1;
+	}
+
 	psxR = psxMap(0x1fc00000, 0x80000, 0, MAP_TAG_OTHER);
+	if (psxR == MAP_FAILED) {
+		SysMessage(_("Error allocating memory!"));
+		psxMemShutdown();
+		return -1;
+	}
 
-	if (psxMemRLUT == NULL || psxMemWLUT == NULL || 
-	    psxR == NULL || psxP == NULL || psxH == NULL) {
+	return 0;
+}
+
+static void psxMemFreeMap(void)
+{
+	if (psxM) psxUnmap(psxM, 0x00210000, MAP_TAG_RAM);
+	if (psxH) psxUnmap(psxH, 0x10000, MAP_TAG_OTHER);
+	if (psxR) psxUnmap(psxR, 0x80000, MAP_TAG_OTHER);
+	psxM = psxH = psxR = NULL;
+	psxP = NULL;
+}
+
+int psxMemInit(void)
+{
+	unsigned int i;
+	int ret;
+
+	if (LIGHTREC_CUSTOM_MAP)
+		ret = lightrec_init_mmap();
+	else
+		ret = psxMemInitMap();
+	if (ret) {
+		SysMessage(_("Error allocating memory!"));
+		psxMemShutdown();
+		return -1;
+	}
+
+	psxMemRLUT = (u8 **)malloc(0x10000 * sizeof(void *));
+	psxMemWLUT = (u8 **)malloc(0x10000 * sizeof(void *));
+
+	if (psxMemRLUT == NULL || psxMemWLUT == NULL) {
 		SysMessage(_("Error allocating memory!"));
 		psxMemShutdown();
 		return -1;
 	}
 
+	memset(psxMemRLUT, (uintptr_t)INVALID_PTR, 0x10000 * sizeof(void *));
+	memset(psxMemWLUT, (uintptr_t)INVALID_PTR, 0x10000 * sizeof(void *));
+
 // MemR
 	for (i = 0; i < 0x80; i++) psxMemRLUT[i + 0x0000] = (u8 *)&psxM[(i & 0x1f) << 16];
 
@@ -180,7 +222,7 @@ int psxMemInit() {
 	// NOTE: Not sure if this is needed to fix any games but seems wise,
 	//       seeing as some games do read from PIO as part of copy-protection
 	//       check. (See fix in psxMemReset() regarding psxP region reads).
-	psxMemWLUT[0x1f00] = NULL;
+	psxMemWLUT[0x1f00] = INVALID_PTR;
 	psxMemWLUT[0x1f80] = (u8 *)psxH;
 
 	return 0;
@@ -193,6 +235,8 @@ void psxMemReset() {
 	memset(psxM, 0, 0x00200000);
 	memset(psxP, 0xff, 0x00010000);
 
+	Config.HLE = TRUE;
+
 	if (strcmp(Config.Bios, "HLE") != 0) {
 		sprintf(bios, "%s/%s", Config.BiosDir, Config.Bios);
 		f = fopen(bios, "rb");
@@ -200,19 +244,22 @@ void psxMemReset() {
 		if (f == NULL) {
 			SysMessage(_("Could not open BIOS:\"%s\". Enabling HLE Bios!\n"), bios);
 			memset(psxR, 0, 0x80000);
-			Config.HLE = TRUE;
 		} else {
-			fread(psxR, 1, 0x80000, f);
+			if (fread(psxR, 1, 0x80000, f) == 0x80000) {
+				Config.HLE = FALSE;
+			} else {
+				SysMessage(_("The selected BIOS:\"%s\" is of wrong size. Enabling HLE Bios!\n"), bios);
+			}
 			fclose(f);
-			Config.HLE = FALSE;
 		}
-	} else Config.HLE = TRUE;
+	}
 }
 
 void psxMemShutdown() {
-	psxUnmap(psxM, 0x00210000, MAP_TAG_RAM); psxM = NULL;
-	psxUnmap(psxH, 0x10000, MAP_TAG_OTHER); psxH = NULL;
-	psxUnmap(psxR, 0x80000, MAP_TAG_OTHER); psxR = NULL;
+	if (LIGHTREC_CUSTOM_MAP)
+		lightrec_free_mmap();
+	else
+		psxMemFreeMap();
 
 	free(psxMemRLUT); psxMemRLUT = NULL;
 	free(psxMemWLUT); psxMemWLUT = NULL;
@@ -232,7 +279,7 @@ u8 psxMemRead8(u32 mem) {
 			return psxHwRead8(mem);
 	} else {
 		p = (char *)(psxMemRLUT[t]);
-		if (p != NULL) {
+		if (p != INVALID_PTR) {
 			if (Config.Debug)
 				DebugCheckBP((mem & 0xffffff) | 0x80000000, R1);
 			return *(u8 *)(p + (mem & 0xffff));
@@ -257,7 +304,7 @@ u16 psxMemRead16(u32 mem) {
 			return psxHwRead16(mem);
 	} else {
 		p = (char *)(psxMemRLUT[t]);
-		if (p != NULL) {
+		if (p != INVALID_PTR) {
 			if (Config.Debug)
 				DebugCheckBP((mem & 0xffffff) | 0x80000000, R2);
 			return SWAPu16(*(u16 *)(p + (mem & 0xffff)));
@@ -282,7 +329,7 @@ u32 psxMemRead32(u32 mem) {
 			return psxHwRead32(mem);
 	} else {
 		p = (char *)(psxMemRLUT[t]);
-		if (p != NULL) {
+		if (p != INVALID_PTR) {
 			if (Config.Debug)
 				DebugCheckBP((mem & 0xffffff) | 0x80000000, R4);
 			return SWAPu32(*(u32 *)(p + (mem & 0xffff)));
@@ -307,7 +354,7 @@ void psxMemWrite8(u32 mem, u8 value) {
 			psxHwWrite8(mem, value);
 	} else {
 		p = (char *)(psxMemWLUT[t]);
-		if (p != NULL) {
+		if (p != INVALID_PTR) {
 			if (Config.Debug)
 				DebugCheckBP((mem & 0xffffff) | 0x80000000, W1);
 			*(u8 *)(p + (mem & 0xffff)) = value;
@@ -334,7 +381,7 @@ void psxMemWrite16(u32 mem, u16 value) {
 			psxHwWrite16(mem, value);
 	} else {
 		p = (char *)(psxMemWLUT[t]);
-		if (p != NULL) {
+		if (p != INVALID_PTR) {
 			if (Config.Debug)
 				DebugCheckBP((mem & 0xffffff) | 0x80000000, W2);
 			*(u16 *)(p + (mem & 0xffff)) = SWAPu16(value);
@@ -362,7 +409,7 @@ void psxMemWrite32(u32 mem, u32 value) {
 			psxHwWrite32(mem, value);
 	} else {
 		p = (char *)(psxMemWLUT[t]);
-		if (p != NULL) {
+		if (p != INVALID_PTR) {
 			if (Config.Debug)
 				DebugCheckBP((mem & 0xffffff) | 0x80000000, W4);
 			*(u32 *)(p + (mem & 0xffff)) = SWAPu32(value);
@@ -386,13 +433,11 @@ void psxMemWrite32(u32 mem, u32 value) {
 					case 0x800: case 0x804:
 						if (writeok == 0) break;
 						writeok = 0;
-						memset(psxMemWLUT + 0x0000, 0, 0x80 * sizeof(void *));
-						memset(psxMemWLUT + 0x8000, 0, 0x80 * sizeof(void *));
-						memset(psxMemWLUT + 0xa000, 0, 0x80 * sizeof(void *));
-#ifdef ICACHE_EMULATION
+						memset(psxMemWLUT + 0x0000, (uintptr_t)INVALID_PTR, 0x80 * sizeof(void *));
+						memset(psxMemWLUT + 0x8000, (uintptr_t)INVALID_PTR, 0x80 * sizeof(void *));
+						memset(psxMemWLUT + 0xa000, (uintptr_t)INVALID_PTR, 0x80 * sizeof(void *));
 						/* Required for icache interpreter otherwise Armored Core won't boot on icache interpreter */
 						psxCpu->Notify(R3000ACPU_NOTIFY_CACHE_ISOLATED, NULL);
-#endif
 						break;
 					case 0x00: case 0x1e988:
 						if (writeok == 1) break;
@@ -400,10 +445,8 @@ void psxMemWrite32(u32 mem, u32 value) {
 						for (i = 0; i < 0x80; i++) psxMemWLUT[i + 0x0000] = (void *)&psxM[(i & 0x1f) << 16];
 						memcpy(psxMemWLUT + 0x8000, psxMemWLUT, 0x80 * sizeof(void *));
 						memcpy(psxMemWLUT + 0xa000, psxMemWLUT, 0x80 * sizeof(void *));
-#ifdef ICACHE_EMULATION
 						/* Dynarecs might take this opportunity to flush their code cache */
 						psxCpu->Notify(R3000ACPU_NOTIFY_CACHE_UNISOLATED, NULL);
-#endif
 						break;
 					default:
 #ifdef PSXMEM_LOG
@@ -428,7 +471,7 @@ void *psxMemPointer(u32 mem) {
 			return NULL;
 	} else {
 		p = (char *)(psxMemWLUT[t]);
-		if (p != NULL) {
+		if (p != INVALID_PTR) {
 			return (void *)(p + (mem & 0xffff));
 		}
 		return NULL;