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
drc: don't compile 64bit loads/stores in 32bit mode
[pcsx_rearmed.git]
/
libpcsxcore
/
psxmem.c
diff --git
a/libpcsxcore/psxmem.c
b/libpcsxcore/psxmem.c
index
fc4a90e
..
cc27552
100644
(file)
--- a/
libpcsxcore/psxmem.c
+++ b/
libpcsxcore/psxmem.c
@@
-67,7
+67,7
@@
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];
PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
psxP = &psxM[0x200000];
@@
-76,7
+76,7
@@
int psxMemInit() {
psxR = (s8 *)malloc(0x00080000);
if (psxMemRLUT == NULL || psxMemWLUT == NULL ||
psxR = (s8 *)malloc(0x00080000);
if (psxMemRLUT == NULL || psxMemWLUT == NULL ||
- psxM
== NULL
|| psxP == NULL || psxH == NULL) {
+ psxM
!= (void *)0x80000000
|| psxP == NULL || psxH == NULL) {
SysMessage(_("Error allocating memory!"));
return -1;
}
SysMessage(_("Error allocating memory!"));
return -1;
}