#include "psxmem.h"
#include "r3000a.h"
#include "psxhw.h"
+#include "debug.h"
#include <sys/mman.h>
#ifndef MAP_ANONYMOUS
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 = mmap((void *)0x80000000, 0x00210000,
+ PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
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) {
+ psxM != (void *)0x80000000 || psxR == MAP_FAILED ||
+ psxP == NULL || psxH != (void *)0x1f800000) {
SysMessage(_("Error allocating memory!"));
return -1;
}
}
void psxMemShutdown() {
- munmap(psxM, 0x00220000);
+ munmap(psxM, 0x00210000);
+ munmap(psxH, 0x1f800000);
+ munmap(psxR, 0x80000);
- free(psxR);
free(psxMemRLUT);
free(psxMemWLUT);
}
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