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
Merge pull request #380 from negativeExponent/fix_makefile
[pcsx_rearmed.git]
/
libpcsxcore
/
psxmem.c
diff --git
a/libpcsxcore/psxmem.c
b/libpcsxcore/psxmem.c
index
a1a641d
..
caa0d65
100644
(file)
--- a/
libpcsxcore/psxmem.c
+++ b/
libpcsxcore/psxmem.c
@@
-42,7
+42,7
@@
void (*psxUnmapHook)(void *ptr, size_t size, enum psxMapTag tag);
void *psxMap(unsigned long addr, size_t size, int is_fixed,
enum psxMapTag tag)
{
void *psxMap(unsigned long addr, size_t size, int is_fixed,
enum psxMapTag tag)
{
- int flags = MAP_PRIVATE | MAP_ANONYMOUS;
+ int flags = MAP_PRIVATE | MAP_ANONYMOUS
| MAP_FIXED
;
int try_ = 0;
unsigned long mask;
void *req, *ret;
int try_ = 0;
unsigned long mask;
void *req, *ret;
@@
-135,7
+135,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 = psxMap(0x
8
0000000, 0x00210000, 1, MAP_TAG_RAM);
+ psxM = psxMap(0x
3
0000000, 0x00210000, 1, MAP_TAG_RAM);
#ifndef RAM_FIXED
if (psxM == NULL)
psxM = psxMap(0x77000000, 0x00210000, 0, MAP_TAG_RAM);
#ifndef RAM_FIXED
if (psxM == NULL)
psxM = psxMap(0x77000000, 0x00210000, 0, MAP_TAG_RAM);
@@
-146,8
+146,8
@@
int psxMemInit() {
}
psxP = &psxM[0x200000];
}
psxP = &psxM[0x200000];
- psxH = psxMap(0x
1
f800000, 0x10000, 0, MAP_TAG_OTHER);
- psxR = psxMap(0x
1
fc00000, 0x80000, 0, MAP_TAG_OTHER);
+ psxH = psxMap(0x
4
f800000, 0x10000, 0, MAP_TAG_OTHER);
+ psxR = psxMap(0x
4
fc00000, 0x80000, 0, MAP_TAG_OTHER);
if (psxMemRLUT == NULL || psxMemWLUT == NULL ||
psxR == NULL || psxP == NULL || psxH == NULL) {
if (psxMemRLUT == NULL || psxMemWLUT == NULL ||
psxR == NULL || psxP == NULL || psxH == NULL) {