From 44757a8323284b82ae68b7d6d28ac6f979909068 Mon Sep 17 00:00:00 2001
From: Arisotura <thetotalworm@gmail.com>
Date: Thu, 25 Nov 2021 16:49:43 +0100
Subject: SPU: block reads from ARM7 BIOS region. fixes #1267 (and prolly
 whatever other stupid game tries to play sound from NULL)

---
 src/NDS.cpp |  2 +-
 src/SPU.cpp | 24 +++++++++++++++++++-----
 2 files changed, 20 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/NDS.cpp b/src/NDS.cpp
index b3e4d2c..e809313 100644
--- a/src/NDS.cpp
+++ b/src/NDS.cpp
@@ -2516,7 +2516,7 @@ u32 ARM7Read32(u32 addr)
               (GBACart::SRAMRead(addr+3) << 24);
     }
 
-    printf("unknown arm7 read32 %08X | %08X\n", addr, ARM7->R[15]);
+    //printf("unknown arm7 read32 %08X | %08X\n", addr, ARM7->R[15]);
     return 0;
 }
 
diff --git a/src/SPU.cpp b/src/SPU.cpp
index 8ae437e..1de6a26 100644
--- a/src/SPU.cpp
+++ b/src/SPU.cpp
@@ -285,12 +285,26 @@ void Channel::FIFO_BufferData()
     if ((FIFOReadOffset + 16) > totallen)
         burstlen = totallen - FIFOReadOffset;
 
-    for (u32 i = 0; i < burstlen; i += 4)
+    // sound DMA can't read from the ARM7 BIOS
+    if ((SrcAddr + FIFOReadOffset) >= 0x00004000)
     {
-        FIFO[FIFOWritePos] = BusRead32(SrcAddr + FIFOReadOffset);
-        FIFOReadOffset += 4;
-        FIFOWritePos++;
-        FIFOWritePos &= 0x7;
+        for (u32 i = 0; i < burstlen; i += 4)
+        {
+            FIFO[FIFOWritePos] = BusRead32(SrcAddr + FIFOReadOffset);
+            FIFOReadOffset += 4;
+            FIFOWritePos++;
+            FIFOWritePos &= 0x7;
+        }
+    }
+    else
+    {
+        for (u32 i = 0; i < burstlen; i += 4)
+        {
+            FIFO[FIFOWritePos] = 0;
+            FIFOReadOffset += 4;
+            FIFOWritePos++;
+            FIFOWritePos &= 0x7;
+        }
     }
 
     FIFOLevel += burstlen;
-- 
cgit v1.2.3