Merge branch 'interpreter-fixes' into chemical-x

2024-11-07 13:20:34 -05:00 · 2024-11-07 13:20:34 -05:00 · b3dec0b66a
parent 0d68cc05b6 ef5de6091b
commit b3dec0b66a
1 changed files with 3 additions and 0 deletions
--- a/src/ARMInterpreter_Branch.cpp
+++ b/src/ARMInterpreter_Branch.cpp
@ -115,6 +115,9 @@ void T_BL_LONG_1(ARM* cpu)

 void T_BL_LONG_2(ARM* cpu)
 {
+    if ((cpu->CurInstr & 0x1801) == 0x0801) // "BLX" with bit 0 set is an unvalid instruction.
+        return T_UNK(cpu); // TODO: Check ARM7 for exceptions
+    
    cpu->AddCycles_C();
    s32 offset = (cpu->CurInstr & 0x7FF) << 1;
    u32 pc = cpu->R[14] + offset;