From 0e6a31360f37da3b51441d4e8639a85b86ebfd4f Mon Sep 17 00:00:00 2001
From: David Banks <dave@hoglet.com>
Date: Sat, 20 Mar 2021 17:21:03 +0000
Subject: [PATCH] Z80: IO Breakpoint/watchpoint mask defaults to 0xFF

Change-Id: Ifbe37871ad9cee29fedc81f967149dc058ab3648
---
 firmware/AtomBusMon.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/firmware/AtomBusMon.c b/firmware/AtomBusMon.c
index ff470b0..28f9f45 100644
--- a/firmware/AtomBusMon.c
+++ b/firmware/AtomBusMon.c
@@ -453,6 +453,10 @@ modes_t modes[MAXBKPTS];
 #define WATCH_EXEC      9
 #define TRANSIENT      10
 
+// Mask to test if the breakpoint/watchpoint is a Z80 IO
+#if defined(CPU_Z80)
+#define MASK_IO ((1 << BRKPT_IO_READ) |  (1 << WATCH_IO_READ) |  (1 << BRKPT_IO_WRITE) |  (1 << WATCH_IO_WRITE))
+#endif
 
 static const char MODE0[] PROGMEM = "Mem Rd Brkpt";
 static const char MODE1[] PROGMEM = "Mem Rd Watch";
@@ -1228,7 +1232,11 @@ void clearBreakpoint(bknum_t n) {
 void genericBreakpoint(char *params, unsigned int mode) {
   bknum_t i;
   addr_t addr;
+#if defined(CPU_Z80)
+  addr_t mask = (mode & MASK_IO) ? 0xFF : 0xFFFF;
+#else
   addr_t mask = 0xFFFF;
+#endif
   trigger_t trigger = TRIGGER_UNDEFINED;
   params = parsehex4required(params, &addr);
   if (checkargs(params)) {