configure: various fixes

[pcsx_rearmed.git] / libpcsxcore / new_dynarec / pcsxmem.c

diff --git a/libpcsxcore/new_dynarec/pcsxmem.c b/libpcsxcore/new_dynarec/pcsxmem.c
index 99b1efa..f98ae22 100644 (file)
--- a/libpcsxcore/new_dynarec/pcsxmem.c
+++ b/libpcsxcore/new_dynarec/pcsxmem.c
@@ -15,7 +15,8 @@
 #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,9 +300,15 @@ 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) {
                fprintf(stderr, "failed to map mem tables\n");
                exit(1);