pipe error messages through single function

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

diff --git a/libpcsxcore/new_dynarec/pcsxmem.c b/libpcsxcore/new_dynarec/pcsxmem.c
index 47b876e..90f7765 100644 (file)
--- 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
@@ -33,7 +34,7 @@ static void map_item(u32 *out, const void *h, u32 flag)
 {
        u32 hv = (u32)h;
        if (hv & 1) {
-               fprintf(stderr, "FATAL: %p has LSB set\n", h);
+               SysPrintf("FATAL: %p has LSB set\n", h);
                abort();
        }
        *out = (hv >> 1) | (flag << 31);
@@ -299,17 +300,10 @@ 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");
+       mem_readtab = psxMap(0x08000000, 0x200000 * 4, 0, MAP_TAG_LUTS);
+       if (mem_readtab == NULL) {
+               SysPrintf("failed to map mem tables\n");
                exit(1);
        }
        mem_writetab = mem_readtab + 0x100000;