From 75e67aee17067a1a58bf8a3fc65926fcada68f2c Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Mon, 10 Feb 2020 18:06:06 -0800
Subject: [PATCH] Debugger: Don't skip undefined instructions when debugger
 attached

---
 CHANGES       | 1 +
 src/gba/gba.c | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 684444f5f..444c0a8af 100644
--- a/CHANGES
+++ b/CHANGES
@@ -21,6 +21,7 @@ Other fixes:
  - Core: Fix race condition initializing thread proxy
  - Core: Ensure ELF regions can be written before trying
  - Core: Fix integer overflow in ELF loading
+ - Debugger: Don't skip undefined instructions when debugger attached
  - FFmpeg: Fix crash when -strict -2 is needed for vcodec or container
  - FFmpeg: Disallow recording video with no audio nor video
  - Qt: Only dynamically reset video scale if a game is running
diff --git a/src/gba/gba.c b/src/gba/gba.c
index d145ce214..8dd40d492 100644
--- a/src/gba/gba.c
+++ b/src/gba/gba.c
@@ -742,11 +742,9 @@ void GBAIllegal(struct ARMCore* cpu, uint32_t opcode) {
 			.type.bp.opcode = opcode
 		};
 		mDebuggerEnter(gba->debugger->d.p, DEBUGGER_ENTER_ILLEGAL_OP, &info);
-	} else
-#endif
-	{
-		ARMRaiseUndefined(cpu);
 	}
+#endif
+	ARMRaiseUndefined(cpu);
 }
 
 void GBABreakpoint(struct ARMCore* cpu, int immediate) {