X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fpsxmem.c;h=1825cfe4f4b0c2161c62577b142ac668b0398826;hb=3918505613cb814f8f5e0e8e0471f7b2a2cd8464;hp=a1a641df1a441ad5ac532c687b5fe30bbce202ec;hpb=8a55ebcc07d4f860633db8c77bb9e16bcfa03313;p=pcsx_rearmed.git

diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index a1a641df..1825cfe4 100644
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -31,10 +31,18 @@
 
 #include "memmap.h"
 
+#ifdef USE_LIBRETRO_VFS
+#include <streams/file_stream_transforms.h>
+#endif
+
 #ifndef MAP_ANONYMOUS
 #define MAP_ANONYMOUS MAP_ANON
 #endif
 
+#ifdef NDEBUG
+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);
@@ -42,7 +50,16 @@ 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;
+#endif
+
 	int try_ = 0;
 	unsigned long mask;
 	void *req, *ret;
@@ -135,7 +152,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);
+	if (psxM == NULL)
+		psxM = psxMap(0x70000000, 0x00210000, 1, MAP_TAG_RAM);
+
+#else
 	psxM = psxMap(0x80000000, 0x00210000, 1, MAP_TAG_RAM);
+#endif
 #ifndef RAM_FIXED
 	if (psxM == NULL)
 		psxM = psxMap(0x77000000, 0x00210000, 0, MAP_TAG_RAM);
@@ -146,8 +170,18 @@ 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);
+#endif
 
 	if (psxMemRLUT == NULL || psxMemWLUT == NULL || 
 	    psxR == NULL || psxP == NULL || psxH == NULL) {