X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fnew_dynarec%2Fpcsxmem.c;h=88e8112fa7acc8e18759020a326ad55526b367df;hb=665f33e1e8ce2e40a7939a33075c3bce1c90790c;hp=47b876ef3bdeb03179308ca124aa235ba2e3dba1;hpb=5b9f1b9e4aa51af5712cf1d90552ace57d9f486b;p=pcsx_rearmed.git

diff --git a/libpcsxcore/new_dynarec/pcsxmem.c b/libpcsxcore/new_dynarec/pcsxmem.c
index 47b876ef..88e8112f 100644
--- a/libpcsxcore/new_dynarec/pcsxmem.c
+++ b/libpcsxcore/new_dynarec/pcsxmem.c
@@ -6,16 +6,17 @@
  */
 
 #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"
 
 #ifdef __thumb__
-#error the dynarec does not have Thumb support, please remove -mthumb
+#error the dynarec is incompatible with Thumb functions,
+#error please add -marm to compile flags
 #endif
 
 //#define memprintf printf
@@ -299,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);
 	}