X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fnew_dynarec%2Fpcsxmem.c;h=a42852ad7af43e81553c6970a36f84feaa00e590;hp=99b1efa63c07fe6b3bcd5769b9721b0e4a816ee8;hb=9705788a21dc36515ba498d45ba2f197f7bcd628;hpb=5905989e5215a4e29e6be27216ea46f288ed16a5

diff --git a/libpcsxcore/new_dynarec/pcsxmem.c b/libpcsxcore/new_dynarec/pcsxmem.c
index 99b1efa6..a42852ad 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
@@ -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);
@@ -146,9 +147,9 @@ make_rcnt_funcs(2)
 
 static void io_write_ireg16(u32 value)
 {
-	if (Config.Sio) psxHu16ref(0x1070) |= 0x80;
+	//if (Config.Sio) psxHu16ref(0x1070) |= 0x80;
 	if (Config.SpuIrq) psxHu16ref(0x1070) |= 0x200;
-	psxHu16ref(0x1070) &= psxHu16(0x1074) & value;
+	psxHu16ref(0x1070) &= value;
 }
 
 static void io_write_imask16(u32 value)
@@ -160,9 +161,9 @@ static void io_write_imask16(u32 value)
 
 static void io_write_ireg32(u32 value)
 {
-	if (Config.Sio) psxHu32ref(0x1070) |= 0x80;
+	//if (Config.Sio) psxHu32ref(0x1070) |= 0x80;
 	if (Config.SpuIrq) psxHu32ref(0x1070) |= 0x200;
-	psxHu32ref(0x1070) &= psxHu32(0x1074) & value;
+	psxHu32ref(0x1070) &= value;
 }
 
 static void io_write_imask32(u32 value)
@@ -300,10 +301,9 @@ void new_dyna_pcsx_mem_init(void)
 	int i;
 
 	// 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);
-	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;
@@ -475,3 +475,9 @@ void new_dyna_pcsx_mem_reset(void)
 
 	map_item(&mem_iowtab[IOMEM32(0x1810)], GPU_writeData, 1);
 }
+
+void new_dyna_pcsx_mem_shutdown(void)
+{
+	psxUnmap(mem_readtab, 0x200000 * 4, MAP_TAG_LUTS);
+	mem_writetab = mem_readtab = NULL;
+}