From 4ec2779bc95ddf43a2ca916f5c93dce357134e94 Mon Sep 17 00:00:00 2001
From: tudnai <tamas.rudnai@gmail.com>
Date: Sun, 20 Nov 2022 10:01:40 -0800
Subject: [PATCH] BugFix: BP Exists searches from index 0

---
 .../trudnai.xcuserdatad/xcdebugger/Expressions.xcexplist  | 8 ++++++++
 src/cpu/6502_bp.c                                         | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/A2Mac.xcodeproj/project.xcworkspace/xcuserdata/trudnai.xcuserdatad/xcdebugger/Expressions.xcexplist b/A2Mac.xcodeproj/project.xcworkspace/xcuserdata/trudnai.xcuserdatad/xcdebugger/Expressions.xcexplist
index f735e85..22424b3 100644
--- a/A2Mac.xcodeproj/project.xcworkspace/xcuserdata/trudnai.xcuserdatad/xcdebugger/Expressions.xcexplist
+++ b/A2Mac.xcodeproj/project.xcworkspace/xcuserdata/trudnai.xcuserdatad/xcdebugger/Expressions.xcexplist
@@ -420,6 +420,14 @@
             </PersistentString>
          </PersistentStrings>
       </ContextState>
+      <ContextState
+         contextName = "_addr_zp_dbg:mmio.c">
+         <PersistentStrings>
+            <PersistentString
+               value = "mem_wr_bp">
+            </PersistentString>
+         </PersistentStrings>
+      </ContextState>
       <ContextState
          contextName = "closure #1 in AppDelegate.saveFile(_:):AppDelegate.swift">
          <PersistentStrings>
diff --git a/src/cpu/6502_bp.c b/src/cpu/6502_bp.c
index db173a7..4425b4c 100644
--- a/src/cpu/6502_bp.c
+++ b/src/cpu/6502_bp.c
@@ -215,7 +215,7 @@ int m6502_dbg_bp_compact(uint16_t * bp) {
 /// @return 1 (true) if exists, 0 (false) if not
 _Bool m6502_dbg_bp_exists(uint16_t * bp, uint16_t addr) {
     if (addr) {
-        int i = m6502_dbg_bp_search(bp, 0, LAST_IDX(bp), addr);
+        int i = m6502_dbg_bp_search(bp, 1, LAST_IDX(bp), addr);
         return i >= 0;
     }
 
@@ -241,7 +241,7 @@ int m6502_dbg_bp_add(uint16_t * bp, uint16_t addr) {
 /// Remove a breakpoint
 /// @param addr address to remove
 int m6502_dbg_bp_del(uint16_t * bp, uint16_t addr) {
-    int i = m6502_dbg_bp_search(bp, 0, LAST_IDX(bp), addr);
+    int i = m6502_dbg_bp_search(bp, 1, LAST_IDX(bp), addr);
     if (i >= 0) {
         bp[i] = 0;
         m6502_dbg_bp_sort(breakpoints, 1, LAST_IDX(bp));