diff options
| author | twinaphex | 2012-11-29 01:40:24 +0100 |
|---|---|---|
| committer | twinaphex | 2012-11-29 01:40:24 +0100 |
| commit | 01f0020f8c4d96ce7ff425c0cab66ad93bf2159c (patch) | |
| tree | 35d5f9f27fd33d95e1e005754a41102d3bd56f6b /libpcsxcore/new_dynarec | |
| parent | b194a2ecd43debbb3724e332b660b993725acd52 (diff) | |
| parent | c02c3b656781a406fc4f586ac0923529de186916 (diff) | |
| download | pcsx_rearmed-01f0020f8c4d96ce7ff425c0cab66ad93bf2159c.tar.gz pcsx_rearmed-01f0020f8c4d96ce7ff425c0cab66ad93bf2159c.tar.bz2 pcsx_rearmed-01f0020f8c4d96ce7ff425c0cab66ad93bf2159c.zip | |
Merge git://github.com/notaz/pcsx_rearmed
Diffstat (limited to 'libpcsxcore/new_dynarec')
| -rw-r--r-- | libpcsxcore/new_dynarec/pcsxmem.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/libpcsxcore/new_dynarec/pcsxmem.c b/libpcsxcore/new_dynarec/pcsxmem.c index f98ae22..88e8112 100644 --- a/libpcsxcore/new_dynarec/pcsxmem.c +++ b/libpcsxcore/new_dynarec/pcsxmem.c @@ -6,11 +6,11 @@ */ #include <stdio.h> -#include <sys/mman.h> #include "../psxhw.h" #include "../cdrom.h" #include "../mdec.h" #include "../gpu.h" +#include "../psxmem_map.h" #include "emu_if.h" #include "pcsxmem.h" @@ -300,16 +300,9 @@ void new_dyna_pcsx_mem_init(void) { int i; -#ifdef CUSTOM_MEMMAPS - // WIZ lack-of-RAM hack - extern void *memtab_mmap(void *addr, size_t size); - mem_readtab = memtab_mmap((void *)0x08000000, 0x200000 * 4); -#else // have to map these further to keep tcache close to .text - mem_readtab = mmap((void *)0x08000000, 0x200000 * 4, PROT_READ | PROT_WRITE, - MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); -#endif - if (mem_readtab == MAP_FAILED) { + mem_readtab = psxMap(0x08000000, 0x200000 * 4, 0, MAP_TAG_LUTS); + if (mem_readtab == NULL) { fprintf(stderr, "failed to map mem tables\n"); exit(1); } |