all repos — mgba @ f25821524d79469e3589ab23340d7e6b4ae6a27f

mGBA Game Boy Advance Emulator

Debugger: Fix watchpoints triggering too late
Jeffrey Pfau jeffrey@endrift.com
Thu, 25 Dec 2014 14:48:30 -0800
commit

f25821524d79469e3589ab23340d7e6b4ae6a27f

parent

ca51098ca0ac23d88f5b9235c0cc0244521175b8

2 files changed, 6 insertions(+), 1 deletions(-)

jump to
M CHANGES → CHANGES 
@@ -29,6 +29,7 @@ - Video: Ensure FFmpeg encoder has audio frames
  - Video: Fix uncompressed PCM audio recording
  - GBA Video: Fix windows not disabling target 1 appropriately (fixes #161)
  - Debugger: Align PC-relative loads in Thumb
+ - Debugger: Fix watchpoints triggering too late
 Misc:
  - Qt: Disable sync to video by default
  - GBA: Exit cleanly on FATAL if the port supports it
M src/debugger/debugger.c → src/debugger/debugger.c 
@@ -59,9 +59,13 @@ if (debugger->state == DEBUGGER_EXITING) {
 		debugger->state = DEBUGGER_RUNNING;
 	}
 	while (debugger->state < DEBUGGER_EXITING) {
-		if (!debugger->breakpoints) {
+		if (!debugger->breakpoints && !debugger->watchpoints) {
 			while (debugger->state == DEBUGGER_RUNNING) {
 				ARMRunLoop(debugger->cpu);
+			}
+		} else if (!debugger->breakpoints) {
+			while (debugger->state == DEBUGGER_RUNNING) {
+				ARMRun(debugger->cpu);
 			}
 		} else {
 			while (debugger->state == DEBUGGER_RUNNING) {