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 ++----- libpcsxcore/psxmem.c | 74 ++++++++++++++++++++++++++------------- libpcsxcore/psxmem_map.h | 26 ++++++++++++++ 3 files changed, 78 insertions(+), 35 deletions(-) create mode 100644 libpcsxcore/psxmem_map.h (limited to 'libpcsxcore') 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); } diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c index ddcd05b..db902b0 100644 --- a/libpcsxcore/psxmem.c +++ b/libpcsxcore/psxmem.c @@ -24,6 +24,7 @@ // TODO: Implement caches & cycle penalty. #include "psxmem.h" +#include "psxmem_map.h" #include "r3000a.h" #include "psxhw.h" #include "debug.h" @@ -33,6 +34,44 @@ #define MAP_ANONYMOUS MAP_ANON #endif +void *(*psxMapHook)(unsigned long addr, size_t size, int is_fixed, + enum psxMapTag tag); +void (*psxUnmapHook)(void *ptr, size_t size, enum psxMapTag tag); + +void *psxMap(unsigned long addr, size_t size, int is_fixed, + enum psxMapTag tag) +{ + int flags = MAP_PRIVATE | MAP_ANONYMOUS; + void *req, *ret; + + if (psxMapHook != NULL) + return psxMapHook(addr, size, is_fixed, tag); + + if (is_fixed) + flags |= MAP_FIXED; + + req = (void *)addr; + ret = mmap(req, size, PROT_READ | PROT_WRITE, flags, -1, 0); + if (ret == MAP_FAILED) + return NULL; + + if (ret != req) + SysMessage("psxMap: warning: wanted to map @%p, got %p\n", + req, ret); + + return ret; +} + +void psxUnmap(void *ptr, size_t size, enum psxMapTag tag) +{ + if (psxUnmapHook != NULL) { + psxUnmapHook(ptr, size, tag); + return; + } + + munmap(ptr, size); +} + s8 *psxM = NULL; // Kernel & User Memory (2 Meg) s8 *psxP = NULL; // Parallel Port (64K) s8 *psxR = NULL; // BIOS ROM (512K) @@ -60,16 +99,6 @@ u8 **psxMemRLUT = NULL; 0xbfc0_0000-0xbfc7_ffff BIOS Mirror (512K) Uncached */ -#if 1 -void *plat_mmap(unsigned long addr, size_t size, int need_exec, int is_fixed); -void plat_munmap(void *ptr, size_t size); -#else -#define plat_mmap(addr, size, need_exec, is_fixed) \ - mmap((void *)addr, size, PROT_WRITE | PROT_READ, \ - MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0) -#define plat_munmap munmap -#endif - int psxMemInit() { int i; @@ -78,27 +107,22 @@ int psxMemInit() { memset(psxMemRLUT, 0, 0x10000 * sizeof(void *)); memset(psxMemWLUT, 0, 0x10000 * sizeof(void *)); - psxM = plat_mmap(0x80000000, 0x00210000, 0, 1); + psxM = psxMap(0x80000000, 0x00210000, 1, MAP_TAG_RAM); #ifndef RAM_FIXED - if (psxM == MAP_FAILED) - psxM = mmap((void *)0x70000000, 0x00210000, - PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0); + if (psxM == NULL) + psxM = psxMap(0x70000000, 0x00210000, 0, MAP_TAG_RAM); #endif - if (psxM == MAP_FAILED) { + if (psxM == NULL) { SysMessage(_("mapping main RAM failed")); return -1; } psxP = &psxM[0x200000]; - psxH = mmap((void *)0x1f800000, 0x00010000, - PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0); - - psxR = mmap((void *)0x1fc00000, 0x80000, - PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + psxH = psxMap(0x1f800000, 0x10000, 1, MAP_TAG_OTHER); + psxR = psxMap(0x1fc00000, 0x80000, 0, MAP_TAG_OTHER); if (psxMemRLUT == NULL || psxMemWLUT == NULL || - psxR == MAP_FAILED || - psxP == NULL || psxH != (void *)0x1f800000) { + psxR == NULL || psxP == NULL || psxH != (void *)0x1f800000) { SysMessage(_("Error allocating memory!")); return -1; } @@ -153,9 +177,9 @@ void psxMemReset() { } void psxMemShutdown() { - plat_munmap(psxM, 0x00210000); - munmap(psxH, 0x1f800000); - munmap(psxR, 0x80000); + psxUnmap(psxM, 0x00210000, MAP_TAG_RAM); + psxUnmap(psxH, 0x1f800000, MAP_TAG_OTHER); + psxUnmap(psxR, 0x80000, MAP_TAG_OTHER); free(psxMemRLUT); free(psxMemWLUT); diff --git a/libpcsxcore/psxmem_map.h b/libpcsxcore/psxmem_map.h new file mode 100644 index 0000000..df5fa51 --- /dev/null +++ b/libpcsxcore/psxmem_map.h @@ -0,0 +1,26 @@ +#ifndef __PSXMEM_MAP_H__ +#define __PSXMEM_MAP_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +enum psxMapTag { + MAP_TAG_OTHER = 0, + MAP_TAG_RAM, + MAP_TAG_VRAM, + MAP_TAG_LUTS, +}; + +extern void *(*psxMapHook)(unsigned long addr, size_t size, int is_fixed, + enum psxMapTag tag); +extern 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 psxUnmap(void *ptr, size_t size, enum psxMapTag tag); + +#ifdef __cplusplus +} +#endif +#endif -- cgit v1.2.3