3 files changed, 13 insertions, 4 deletions
diff --git a/libpcsxcore/new_dynarec/emu_if.c b/libpcsxcore/new_dynarec/emu_if.c
index b8e9883..02e108f 100644
--- a/libpcsxcore/new_dynarec/emu_if.c
+++ b/libpcsxcore/new_dynarec/emu_if.c
@@ -344,6 +344,7 @@ static void ari64_clear(u32 addr, u32 size)
 static void ari64_shutdown()
 {
 	new_dynarec_cleanup();
+	new_dyna_pcsx_mem_shutdown();
 }
 
 extern void intExecute();
@@ -394,6 +395,7 @@ void invalidate_block(unsigned int block) {}
 void new_dyna_pcsx_mem_init(void) {}
 void new_dyna_pcsx_mem_reset(void) {}
 void new_dyna_pcsx_mem_load_state(void) {}
+void new_dyna_pcsx_mem_shutdown(void) {}
 #endif
 
 #ifdef DRC_DBG
diff --git a/libpcsxcore/new_dynarec/pcsxmem.c b/libpcsxcore/new_dynarec/pcsxmem.c
index 90f7765..a42852a 100644
--- a/libpcsxcore/new_dynarec/pcsxmem.c
+++ b/libpcsxcore/new_dynarec/pcsxmem.c
@@ -147,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)
@@ -161,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)
@@ -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;
+}
diff --git a/libpcsxcore/new_dynarec/pcsxmem.h b/libpcsxcore/new_dynarec/pcsxmem.h
index f962562..99bb5d4 100644
--- a/libpcsxcore/new_dynarec/pcsxmem.h
+++ b/libpcsxcore/new_dynarec/pcsxmem.h
@@ -4,5 +4,6 @@ extern u8 zero_mem[0x1000];
 void new_dyna_pcsx_mem_init(void);
 void new_dyna_pcsx_mem_reset(void);
 void new_dyna_pcsx_mem_load_state(void);
+void new_dyna_pcsx_mem_shutdown(void);
 
 int pcsxmem_is_handler_dynamic(u_int addr);