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
move layer control to plugin/plugin_lib
[pcsx_rearmed.git]
/
libpcsxcore
/
psxmem.c
diff --git
a/libpcsxcore/psxmem.c
b/libpcsxcore/psxmem.c
index
fc4a90e
..
898eac9
100644
(file)
--- a/
libpcsxcore/psxmem.c
+++ b/
libpcsxcore/psxmem.c
@@
-67,16
+67,18
@@
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(0, 0x00220000,
+ psxM = mmap(
(void *)0x8000000
0, 0x00220000,
PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
psxP = &psxM[0x200000];
psxH = &psxM[0x210000];
PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
psxP = &psxM[0x200000];
psxH = &psxM[0x210000];
- psxR = (s8 *)malloc(0x00080000);
+ psxR = mmap((void *)0x9fc00000, 0x80000,
+ PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
if (psxMemRLUT == NULL || psxMemWLUT == NULL ||
if (psxMemRLUT == NULL || psxMemWLUT == NULL ||
- psxM == NULL || psxP == NULL || psxH == NULL) {
+ psxM != (void *)0x80000000 || psxR != (void *)0x9fc00000 ||
+ psxP == NULL || psxH == NULL) {
SysMessage(_("Error allocating memory!"));
return -1;
}
SysMessage(_("Error allocating memory!"));
return -1;
}
@@
-132,8
+134,8
@@
void psxMemReset() {
void psxMemShutdown() {
munmap(psxM, 0x00220000);
void psxMemShutdown() {
munmap(psxM, 0x00220000);
+ munmap(psxR, 0x80000);
- free(psxR);
free(psxMemRLUT);
free(psxMemWLUT);
}
free(psxMemRLUT);
free(psxMemWLUT);
}