From 263dd20ec3d0d495b9e233ff25eae66e12b5d3a5 Mon Sep 17 00:00:00 2001
From: Jaklyy <102590697+Jaklyy@users.noreply.github.com>
Date: Mon, 14 Oct 2024 22:48:25 -0400
Subject: [PATCH 1/2] nvmnvmnvm

---
 src/CP15.cpp | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/CP15.cpp b/src/CP15.cpp
index 14b87c73..7d8ff01a 100644
--- a/src/CP15.cpp
+++ b/src/CP15.cpp
@@ -915,8 +915,9 @@ u32 ARMv5::CodeRead32(u32 addr, bool branch)
 
         //return *(u32*)&CurICacheLine[addr & 0x1C];
     }
-
-    WriteBufferDrain();
+    
+    if (PU_Map[addr>>12] & 0x30)
+        WriteBufferDrain();
 
     NDS.ARM9Timestamp = NDS.ARM9Timestamp + ((1<<NDS.ARM9ClockShift)-1) & ~((1<<NDS.ARM9ClockShift)-1);
 
@@ -962,7 +963,8 @@ bool ARMv5::DataRead8(u32 addr, u32* val)
         return true;
     }
     
-    WriteBufferDrain();
+    if (PU_Map[addr>>12] & 0x30)
+        WriteBufferDrain();
 
     NDS.ARM9Timestamp = NDS.ARM9Timestamp + ((1<<NDS.ARM9ClockShift)-1) & ~((1<<NDS.ARM9ClockShift)-1);
     
@@ -1008,8 +1010,9 @@ bool ARMv5::DataRead16(u32 addr, u32* val)
         *val = *(u16*)&DTCM[addr & (DTCMPhysicalSize - 1)];
         return true;
     }
-
-    WriteBufferDrain();
+    
+    if (PU_Map[addr>>12] & 0x30)
+        WriteBufferDrain();
 
     NDS.ARM9Timestamp = NDS.ARM9Timestamp + ((1<<NDS.ARM9ClockShift)-1) & ~((1<<NDS.ARM9ClockShift)-1);
     
@@ -1055,8 +1058,9 @@ bool ARMv5::DataRead32(u32 addr, u32* val)
         *val = *(u32*)&DTCM[addr & (DTCMPhysicalSize - 1)];
         return true;
     }
-
-    WriteBufferDrain();
+    
+    if (PU_Map[addr>>12] & 0x30)
+        WriteBufferDrain();
 
     NDS.ARM9Timestamp = NDS.ARM9Timestamp + ((1<<NDS.ARM9ClockShift)-1) & ~((1<<NDS.ARM9ClockShift)-1);
     
@@ -1101,8 +1105,9 @@ bool ARMv5::DataRead32S(u32 addr, u32* val)
         *val = *(u32*)&DTCM[addr & (DTCMPhysicalSize - 1)];
         return true;
     }
-
-    WriteBufferDrain();
+    
+    if (PU_Map[addr>>12] & 0x30)
+        WriteBufferDrain();
 
     NDS.ARM9Timestamp += DataCycles;
 

From 5f003eb967bfe5a4571e6830462f5e167dcf83f8 Mon Sep 17 00:00:00 2001
From: Jaklyy <102590697+Jaklyy@users.noreply.github.com>
Date: Tue, 15 Oct 2024 20:23:03 -0400
Subject: [PATCH 2/2] fix builds with jit disabled

---
 src/ARM.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/ARM.cpp b/src/ARM.cpp
index f97c26e2..6ac989af 100644
--- a/src/ARM.cpp
+++ b/src/ARM.cpp
@@ -595,8 +595,11 @@ void ARMv5::Execute()
             Halted = 0;
             if (NDS.IME[0] & 0x1)
             {
+#ifdef JIT_ENABLED
                 if constexpr (mode == CPUExecuteMode::JIT) TriggerIRQ<mode>();
-                else IRQ = 1;
+                else
+#endif
+                    IRQ = 1;
             }
         }
         else