X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fpsxmem.c;h=2f427acfa48f3cfe0381b92284c841d3ef0fa734;hb=4f0c5e3fd702a35b7a2ebc22519f59bbae7b3008;hp=cfd880baddfe50623eca20c42bcd2bb488fec136;hpb=a62012a79925d0af4c2162be152d7800c669e6d6;p=pcsx_rearmed.git

diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index cfd880ba..2f427acf 100644
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -31,10 +31,20 @@
 
 #include "memmap.h"
 
+#ifdef USE_LIBRETRO_VFS
+#include <streams/file_stream_transforms.h>
+#endif
+
 #ifndef MAP_ANONYMOUS
 #define MAP_ANONYMOUS MAP_ANON
 #endif
 
+#ifndef NDEBUG
+#include "debug.h"
+#else
+void DebugCheckBP(u32 address, enum breakpoint_types type) {}
+#endif
+
 void *(*psxMapHook)(unsigned long addr, size_t size, int is_fixed,
 		enum psxMapTag tag);
 void (*psxUnmapHook)(void *ptr, size_t size, enum psxMapTag tag);
@@ -43,7 +53,11 @@ 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;
 #endif
@@ -142,6 +156,9 @@ int psxMemInit() {
 
 #ifdef LIGHTREC
 	psxM = psxMap(0x30000000, 0x00210000, 1, MAP_TAG_RAM);
+	if (psxM == NULL)
+		psxM = psxMap(0x70000000, 0x00210000, 1, MAP_TAG_RAM);
+
 #else
 	psxM = psxMap(0x80000000, 0x00210000, 1, MAP_TAG_RAM);
 #endif
@@ -157,7 +174,12 @@ int psxMemInit() {
 	psxP = &psxM[0x200000];
 #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);
@@ -203,6 +225,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");
@@ -210,13 +234,15 @@ 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() {