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: more timing hacks
[pcsx_rearmed.git]
/
libpcsxcore
/
psxmem.c
diff --git
a/libpcsxcore/psxmem.c
b/libpcsxcore/psxmem.c
index
2ca5dd5
..
86da68c
100644
(file)
--- a/
libpcsxcore/psxmem.c
+++ b/
libpcsxcore/psxmem.c
@@
-28,7
+28,8
@@
#include "r3000a.h"
#include "psxhw.h"
#include "debug.h"
#include "r3000a.h"
#include "psxhw.h"
#include "debug.h"
-#include <sys/mman.h>
+
+#include "memmap.h"
#ifndef MAP_ANONYMOUS
#define MAP_ANONYMOUS MAP_ANON
#ifndef MAP_ANONYMOUS
#define MAP_ANONYMOUS MAP_ANON
@@
-150,11
+151,11
@@
int psxMemInit() {
}
psxP = &psxM[0x200000];
}
psxP = &psxM[0x200000];
- psxH = psxMap(0x1f800000, 0x10000,
1
, MAP_TAG_OTHER);
+ psxH = psxMap(0x1f800000, 0x10000,
0
, MAP_TAG_OTHER);
psxR = psxMap(0x1fc00000, 0x80000, 0, MAP_TAG_OTHER);
if (psxMemRLUT == NULL || psxMemWLUT == NULL ||
psxR = psxMap(0x1fc00000, 0x80000, 0, MAP_TAG_OTHER);
if (psxMemRLUT == NULL || psxMemWLUT == NULL ||
-
psxR == NULL || psxP == NULL || psxH != (void *)0x1f800000
) {
+
psxR == NULL || psxP == NULL || psxH == NULL
) {
SysMessage(_("Error allocating memory!"));
psxMemShutdown();
return -1;
SysMessage(_("Error allocating memory!"));
psxMemShutdown();
return -1;