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
(Libretro) Add NEON interlace enable core option and region core option
[pcsx_rearmed.git]
/
libpcsxcore
/
psxmem.c
diff --git
a/libpcsxcore/psxmem.c
b/libpcsxcore/psxmem.c
index
62bbe26
..
4da0cf4
100644
(file)
--- a/
libpcsxcore/psxmem.c
+++ b/
libpcsxcore/psxmem.c
@@
-52,8
+52,9
@@
retry:
goto out;
}
goto out;
}
- if (is_fixed)
- flags |= MAP_FIXED;
+ /* avoid MAP_FIXED, it overrides existing mappings.. */
+ /* if (is_fixed)
+ flags |= MAP_FIXED; */
req = (void *)addr;
ret = mmap(req, size, PROT_READ | PROT_WRITE, flags, -1, 0);
req = (void *)addr;
ret = mmap(req, size, PROT_READ | PROT_WRITE, flags, -1, 0);
@@
-65,6
+66,11
@@
out:
SysMessage("psxMap: warning: wanted to map @%08x, got %p\n",
addr, ret);
SysMessage("psxMap: warning: wanted to map @%08x, got %p\n",
addr, ret);
+ if (is_fixed) {
+ psxUnmap(ret, size, tag);
+ return NULL;
+ }
+
if (ret != NULL && ((addr ^ (long)ret) & 0x00ffffff)
&& !tried_to_align)
{
if (ret != NULL && ((addr ^ (long)ret) & 0x00ffffff)
&& !tried_to_align)
{