CPU/CachedInterpreter: Fix infinite loop when block compile fails

2021-04-14 19:02:11 +10:00
parent 58f5c99100
commit dd5277321b
2 changed files with 3 additions and 1 deletions
--- a/src/core/cpu_core.cpp
+++ b/src/core/cpu_core.cpp
@ -1918,7 +1918,8 @@ template<PGXPMode pgxp_mode>
 void InterpretUncachedBlock()
 {
  g_state.regs.npc = g_state.regs.pc;
-  FetchInstruction();
+  if (!FetchInstruction())
+    return;

  // At this point, pc contains the last address executed (in the previous block). The instruction has not been fetched
  // yet. pc shouldn't be updated until the fetch occurs, that way the exception occurs in the delay slot.