Debugger: Fix watchpoints triggering too late

This commit is contained in:
Jeffrey Pfau 2014-12-25 14:48:30 -08:00
parent 1183a6145c
commit 378f5f7d43
2 changed files with 6 additions and 1 deletions

View File

@ -17,6 +17,7 @@ Bugfixes:
- Video: Fix uncompressed PCM audio recording - Video: Fix uncompressed PCM audio recording
- GBA Video: Fix windows not disabling target 1 appropriately (fixes #161) - GBA Video: Fix windows not disabling target 1 appropriately (fixes #161)
- Debugger: Align PC-relative loads in Thumb - Debugger: Align PC-relative loads in Thumb
- Debugger: Fix watchpoints triggering too late
Misc: Misc:
- Qt: Disable sync to video by default - Qt: Disable sync to video by default
- GBA: Exit cleanly on FATAL if the port supports it - GBA: Exit cleanly on FATAL if the port supports it

View File

@ -59,7 +59,11 @@ void ARMDebuggerRun(struct ARMDebugger* debugger) {
debugger->state = DEBUGGER_RUNNING; debugger->state = DEBUGGER_RUNNING;
} }
while (debugger->state < DEBUGGER_EXITING) { while (debugger->state < DEBUGGER_EXITING) {
if (!debugger->breakpoints) { if (!debugger->breakpoints && !debugger->watchpoints) {
while (debugger->state == DEBUGGER_RUNNING) {
ARMRun(debugger->cpu);
}
} else if (!debugger->breakpoints) {
while (debugger->state == DEBUGGER_RUNNING) { while (debugger->state == DEBUGGER_RUNNING) {
ARMRun(debugger->cpu); ARMRun(debugger->cpu);
} }