aboutsummaryrefslogtreecommitdiff
path: root/libpcsxcore
diff options
context:
space:
mode:
authorCatalystG2013-03-24 20:24:44 -0400
committerCatalystG2013-03-24 20:24:44 -0400
commit0b5d059012a087cd108fe65edaa92e512101fc1a (patch)
tree0c99d4181847b3533b4905eb5ca0e6eea67c85ea /libpcsxcore
parent51014e8756a50a3550a65d0bc96152363e406950 (diff)
downloadpcsx_rearmed-0b5d059012a087cd108fe65edaa92e512101fc1a.tar.gz
pcsx_rearmed-0b5d059012a087cd108fe65edaa92e512101fc1a.tar.bz2
pcsx_rearmed-0b5d059012a087cd108fe65edaa92e512101fc1a.zip
Add missing ifdef, move QNX RAM mapping closer to others
Diffstat (limited to 'libpcsxcore')
-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);