aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCatalystG2013-03-24 20:24:44 -0400
committernotaz2013-03-25 03:44:32 +0200
commitf23d33868c571ef2a9206223530292e9c3c2709c (patch)
tree4f4746af09d6dc26964f474af8c1d828c4d65174
parenta48745850385e49bf1ca9f8c4e98d925032a8a06 (diff)
downloadpcsx_rearmed-f23d33868c571ef2a9206223530292e9c3c2709c.tar.gz
pcsx_rearmed-f23d33868c571ef2a9206223530292e9c3c2709c.tar.bz2
pcsx_rearmed-f23d33868c571ef2a9206223530292e9c3c2709c.zip
Add missing ifdef, move QNX RAM mapping closer to others
-rw-r--r--libpcsxcore/new_dynarec/new_dynarec.c3
-rw-r--r--libpcsxcore/psxmem.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/libpcsxcore/new_dynarec/new_dynarec.c b/libpcsxcore/new_dynarec/new_dynarec.c
index 5cdeb96..a3b766a 100644
--- a/libpcsxcore/new_dynarec/new_dynarec.c
+++ b/libpcsxcore/new_dynarec/new_dynarec.c
@@ -41,9 +41,10 @@
#include "assem_arm.h"
#endif
+#ifdef __BLACKBERRY_QNX__
#undef __clear_cache
#define __clear_cache(start,end) msync(start, (size_t)((void*)end - (void*)start), MS_SYNC | MS_CACHE_ONLY | MS_INVALIDATE_ICACHE);
-
+#endif
#define MAXBLOCK 4096
#define MAX_OUTPUT_BLOCK_SIZE 262144
diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index 422b485..62bbe26 100644
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -131,7 +131,7 @@ int psxMemInit() {
#ifndef RAM_FIXED
#ifdef __BLACKBERRY_QNX__
if (psxM == NULL)
- psxM = psxMap(0x70000000, 0x00210000, 0, MAP_TAG_RAM);
+ psxM = psxMap(0x77000000, 0x00210000, 0, MAP_TAG_RAM);
#else
if (psxM == NULL)
psxM = psxMap(0x78000000, 0x00210000, 0, MAP_TAG_RAM);