diff sms.c @ 2424:767ec72acca7

Avoid conflicts between watchpoints and normal debugger entry
author Michael Pavone <pavone@retrodev.com>
date Wed, 24 Jan 2024 18:51:44 -0800
parents c97609fe8315
children
line wrap: on
line diff
--- a/sms.c	Sat Jan 20 21:16:04 2024 -0800
+++ b/sms.c	Wed Jan 24 18:51:44 2024 -0800
@@ -478,8 +478,10 @@
 				}
 			}
 		}
-		if (system->enter_debugger && sms->z80->pc) {
-			system->enter_debugger = 0;
+		if ((system->enter_debugger || sms->z80->wp_hit) && sms->z80->pc) {
+			if (!sms->z80->wp_hit) {
+				system->enter_debugger = 0;
+			}
 #ifndef IS_LIB
 			zdebugger(sms->z80, sms->z80->pc);
 #endif
@@ -495,7 +497,7 @@
 			}
 		}
 
-		if (system->enter_debugger) {
+		if (system->enter_debugger || sms->z80->wp_hit) {
 			target_cycle = sms->z80->Z80_CYCLE + 1;
 		}
 		z80_run(sms->z80, target_cycle);