From 87e5b45fe1aa734289cf57531c89988cfafff524 Mon Sep 17 00:00:00 2001 From: notaz Date: Tue, 27 Nov 2012 17:08:39 +0200 Subject: clean up mmap hacks still messy but perhaps beter --- libpcsxcore/new_dynarec/pcsxmem.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'libpcsxcore/new_dynarec') 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 -#include #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); } -- cgit v1.2.3