aboutsummaryrefslogtreecommitdiff
path: root/libpcsxcore
diff options
context:
space:
mode:
Diffstat (limited to 'libpcsxcore')
-rw-r--r--libpcsxcore/psxmem.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index cfd880b..11a01ad 100644
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -43,7 +43,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 +146,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 +164,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);