PAUSE notification returns breakpoint address instead of breakpoint ID.

Priorization of temp breakpoints increased.
maziac · Apr 24, 2020 · d82153f · d82153f
1 parent 521e033
commit d82153f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 25 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,6 +1,7 @@
 # Changelog
 
 ## 0.7.0
+- DZRP v0.2.0: PAUSE notification returns breakpoint address instead breakpoint ID.
 
 ## 0.6.0
 - Getting sprites clip window fixed.

diff --git a/Commands.cs b/Commands.cs
@@ -196,30 +196,21 @@ protected static void DebuggerStopped()
             // Guess break reason
             BreakReason reason = BreakReason.MANUAL_BREAK;
             string reasonString = "";
-            int bpId = 0;
+            ushort bpAddress = 0;
             var regs = cspect.GetRegs();
             var pc = regs.PC;
-            if (BreakpointMap.ContainsValue(pc))
+            //  First check for temporary breakpoints
+            if (pc == TmpBreakpoint1 || pc == TmpBreakpoint2)
             {
-                // Breakpoint hit
-                reason = BreakReason.BREAKPOINT_HIT;
-                // Get ID
-                foreach (var pair in BreakpointMap)
-                {
-                    if(pair.Value == pc)
-                    {
-                        bpId = pair.Key;
-                        if (Log.Enabled)
-                            Log.WriteLine("Found BpID={0} for PC={1}", bpId, pc);
-                        break;
-                    }
-                }
+                reason = BreakReason.NO_REASON;
+                bpAddress = pc;
             }
-            else
+            // Check for breakpoint
+            else if (BreakpointMap.ContainsValue(pc))
             {
-                // Check temporary breakpoints
-                if (pc == TmpBreakpoint1 || pc == TmpBreakpoint2)
-                    reason = BreakReason.NO_REASON;
+                // Breakpoint hit
+                reason = BreakReason.BREAKPOINT_HIT;
+                bpAddress = pc;
             }
 
             // Note: Watchpoint reasons cannot be safely recognized.
@@ -245,7 +236,7 @@ protected static void DebuggerStopped()
                 }
             }
             // Send break notification
-            SendPauseNotification(reason, bpId, reasonString);
+            SendPauseNotification(reason, bpAddress, reasonString);
 
             // "Undefine" temporary breakpoints
             TmpBreakpoint1 = -1;
@@ -839,7 +830,7 @@ public static void SetBorder()
         /**
          * Sends the pause notification.
          */
-        protected static void SendPauseNotification(BreakReason reason, int bpId, string reasonString)
+        protected static void SendPauseNotification(BreakReason reason, ushort bpAddress, string reasonString)
         {
             // Convert strign to byte array
             System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding();
@@ -861,9 +852,9 @@ protected static void SendPauseNotification(BreakReason reason, int bpId, string
                 (byte)DZRP_NTF.NTF_PAUSE,
                 // Reason
                 (byte)reason,
-                // Breakpoint ID
-                (byte)(bpId & 0xFF),
-                (byte)((bpId >> 8) & 0xFF),
+                // Breakpoint address
+                (byte)(bpAddress & 0xFF),
+                (byte)((bpAddress >> 8) & 0xFF),
             };
             int firstLen = dataWoString.Length;
             byte[] data = new byte[firstLen + stringLen];

diff --git a/Main.cs b/Main.cs
@@ -10,7 +10,7 @@
 namespace DeZogPlugin
 {
     /**
-     * The plugin implements a socket to communitate with [DeZog](https://github.com/maziac/DeZog).
+     * The plugin implements a socket to communicate with [DeZog](https://github.com/maziac/DeZog).
      * The received commands are executed and control the CSpect debugger.
      */
     public class Main : iPlugin