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

diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index 14fd9113..11a01adc 100644
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -42,7 +42,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 +144,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 +162,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) {
@@ -187,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);