initial Android support

[pcsx_rearmed.git] / libpcsxcore / psxmem.c

diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index fc4a90e..ddcd05b 100644 (file)
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -26,6 +26,7 @@
 #include "psxmem.h"
 #include "r3000a.h"
 #include "psxhw.h"
+#include "debug.h"
 #include <sys/mman.h>
 
 #ifndef MAP_ANONYMOUS
@@ -59,6 +60,16 @@ u8 **psxMemRLUT = NULL;
 0xbfc0_0000-0xbfc7_ffff                BIOS Mirror (512K) Uncached
 */
 
+#if 1
+void *plat_mmap(unsigned long addr, size_t size, int need_exec, int is_fixed);
+void  plat_munmap(void *ptr, size_t size);
+#else
+#define plat_mmap(addr, size, need_exec, is_fixed) \
+       mmap((void *)addr, size, PROT_WRITE | PROT_READ, \
+       MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0)
+#define plat_munmap munmap
+#endif
+
 int psxMemInit() {
        int i;
 
@@ -67,16 +78,27 @@ int psxMemInit() {
        memset(psxMemRLUT, 0, 0x10000 * sizeof(void *));
        memset(psxMemWLUT, 0, 0x10000 * sizeof(void *));
 
-       psxM = mmap(0, 0x00220000,
-               PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+       psxM = plat_mmap(0x80000000, 0x00210000, 0, 1);
+#ifndef RAM_FIXED
+       if (psxM == MAP_FAILED)
+               psxM = mmap((void *)0x70000000, 0x00210000,
+                       PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
+#endif
+       if (psxM == MAP_FAILED) {
+               SysMessage(_("mapping main RAM failed"));
+               return -1;
+       }
 
        psxP = &psxM[0x200000];
-       psxH = &psxM[0x210000];
+       psxH = mmap((void *)0x1f800000, 0x00010000,
+               PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
 
-       psxR = (s8 *)malloc(0x00080000);
+       psxR = mmap((void *)0x1fc00000, 0x80000,
+               PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 
        if (psxMemRLUT == NULL || psxMemWLUT == NULL || 
-               psxM == NULL || psxP == NULL || psxH == NULL) {
+               psxR == MAP_FAILED ||
+               psxP == NULL || psxH != (void *)0x1f800000) {
                SysMessage(_("Error allocating memory!"));
                return -1;
        }
@@ -131,9 +153,10 @@ void psxMemReset() {
 }
 
 void psxMemShutdown() {
-       munmap(psxM, 0x00220000);
+       plat_munmap(psxM, 0x00210000);
+       munmap(psxH, 0x1f800000);
+       munmap(psxR, 0x80000);
 
-       free(psxR);
        free(psxMemRLUT);
        free(psxMemWLUT);
 }
@@ -259,7 +282,7 @@ void psxMemWrite16(u32 mem, u16 value) {
                                DebugCheckBP((mem & 0xffffff) | 0x80000000, W2);
                        *(u16 *)(p + (mem & 0xffff)) = SWAPu16(value);
 #ifdef PSXREC
-                       psxCpu->Clear((mem & (~1)), 1);
+                       psxCpu->Clear((mem & (~3)), 1);
 #endif
                } else {
 #ifdef PSXMEM_LOG