notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make root counters use generic event scheduling code
[pcsx_rearmed.git]
/
libpcsxcore
/
psxmem.c
diff --git
a/libpcsxcore/psxmem.c
b/libpcsxcore/psxmem.c
index
cc27552
..
498246c
100644
(file)
--- a/
libpcsxcore/psxmem.c
+++ b/
libpcsxcore/psxmem.c
@@
-26,6
+26,7
@@
#include "psxmem.h"
#include "r3000a.h"
#include "psxhw.h"
#include "psxmem.h"
#include "r3000a.h"
#include "psxhw.h"
+#include "debug.h"
#include <sys/mman.h>
#ifndef MAP_ANONYMOUS
#include <sys/mman.h>
#ifndef MAP_ANONYMOUS
@@
-67,16
+68,19
@@
int psxMemInit() {
memset(psxMemRLUT, 0, 0x10000 * sizeof(void *));
memset(psxMemWLUT, 0, 0x10000 * sizeof(void *));
memset(psxMemRLUT, 0, 0x10000 * sizeof(void *));
memset(psxMemWLUT, 0, 0x10000 * sizeof(void *));
- psxM = mmap((void *)0x80000000, 0x002
2
0000,
- PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+ psxM = mmap((void *)0x80000000, 0x002
1
0000,
+ PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS
| MAP_FIXED
, -1, 0);
psxP = &psxM[0x200000];
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 ||
if (psxMemRLUT == NULL || psxMemWLUT == NULL ||
- psxM != (void *)0x80000000 || psxP == NULL || psxH == NULL) {
+ psxM != (void *)0x80000000 || psxR == MAP_FAILED ||
+ psxP == NULL || psxH != (void *)0x1f800000) {
SysMessage(_("Error allocating memory!"));
return -1;
}
SysMessage(_("Error allocating memory!"));
return -1;
}
@@
-131,9
+135,10
@@
void psxMemReset() {
}
void psxMemShutdown() {
}
void psxMemShutdown() {
- munmap(psxM, 0x00220000);
+ munmap(psxM, 0x00210000);
+ munmap(psxH, 0x1f800000);
+ munmap(psxR, 0x80000);
- free(psxR);
free(psxMemRLUT);
free(psxMemWLUT);
}
free(psxMemRLUT);
free(psxMemWLUT);
}
@@
-259,7
+264,7
@@
void psxMemWrite16(u32 mem, u16 value) {
DebugCheckBP((mem & 0xffffff) | 0x80000000, W2);
*(u16 *)(p + (mem & 0xffff)) = SWAPu16(value);
#ifdef PSXREC
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
#endif
} else {
#ifdef PSXMEM_LOG