Fix read/write callbacks possibly being called recursively

Also fix possible unsafe sys bus reads
This commit is contained in:
CasualPokePlayer 2024-06-07 14:35:45 -07:00
parent 448e9fb9ec
commit 0a3ab1a055
3 changed files with 8 additions and 2 deletions

Binary file not shown.

View File

@ -145,11 +145,17 @@ Further Memory (not mapped to ARM9/ARM7 bus)
*/
template<bool arm9>
template <bool arm9>
static bool SafeToPeek(u32 addr)
{
if (arm9)
{
// dsp io reads are not safe
if ((addr & 0xFFFFFF00) == 0x04004200)
{
return false;
}
switch (addr)
{
case 0x04000130:

@ -1 +1 @@
Subproject commit 7b404d262defb03d47b8cadd5fd1392353994ba4
Subproject commit 2464c33bf2857c935f4afec9c25f72cea6621e74