Changeset 12 for trunk/Z80/Z80.pas

Timestamp:

Apr 21, 2026, 11:04:26 AM (6 days ago)

Author:

chronos

Message:

• Added: Implemented breakpoints and run to cursor action.

File:

• trunk/Z80/Z80.pas (modified) (7 diffs)

trunk/Z80/Z80.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Memory, Base, Z80Instructions;
+  Classes, SysUtils, Memory, Base, Z80Instructions, Generics.Collections,
+  Generics.Defaults;
 
 type
@@ -41 +42 @@
 
   TDebugMode = (dmNone, dmStepIn, dmStepOut, dmStepOver, dmStopAddress);
+
+  { TBreakPoints }
+
+  TBreakPoints = class(TList<Word>)
+  private
+    function Comparer(constref Left, Right: Word): Integer;
+  public
+    function Contains(Address: Word): Boolean;
+    procedure AddNew(Address: Word);
+  end;
 
   { TCpuZ80 }
@@ -821 +832 @@
     InterruptEnabled: Boolean;
     InterruptMode: Byte;
+    BreakPoints: TBreakPoints;
     DebugMode: TDebugMode;
     DebugStopAddress: Word;
@@ -851 +863 @@
   while not Terminated do begin
     Cpu.Step;
-    if Cpu.DebugMode <> dmNone then begin
-      if Cpu.DebugMode = dmStepIn then begin
-        Cpu.DebugMode := dmNone;
-        Terminate;
-      end;
-      if (Cpu.DebugMode = dmStopAddress) and (Cpu.DebugStopAddress = Cpu.PC) then begin
-        Cpu.DebugMode := dmNone;
-        Terminate;
-      end;
-      if Cpu.DebugMode = dmStepOver then begin
-        Cpu.DebugMode := dmNone;
-        Terminate;
-      end;
-    end;
   end;
   Cpu.FRunning := False;
+end;
+
+{ TBreakPoints }
+
+function TBreakPoints.Comparer(constref Left, Right: Word): Integer;
+begin
+  if Left > Right then Result := 1
+  else if Left < Right then Result := -1
+  else Result := 0;
+end;
+
+function TBreakPoints.Contains(Address: Word): Boolean;
+var
+  Index: SizeInt;
+begin
+  if (Count > 0) and BinarySearch(Address, Index, TComparer<Word>.Construct(Comparer)) then begin
+    Result := True;
+  end else Result := False;
+end;
+
+procedure TBreakPoints.AddNew(Address: Word);
+begin
+  Add(Address);
+  Sort;
 end;
 
@@ -5533 +5555 @@
   end;
   Ticks := Cardinal(Ticks + 1);
+
+  // Debugging
+  if DebugMode <> dmNone then begin
+    if DebugMode = dmStepIn then begin
+      DebugMode := dmNone;
+      FThread.Terminate;
+    end;
+    if (DebugMode = dmStopAddress) and (DebugStopAddress = PC) then begin
+      DebugMode := dmNone;
+      FThread.Terminate;
+    end;
+    if DebugMode = dmStepOver then begin
+      DebugMode := dmNone;
+      FThread.Terminate;
+    end;
+  end;
+  if BreakPoints.Contains(PC) then begin
+    DebugMode := dmNone;
+    FThread.Terminate;
+  end;
 end;
 
@@ -5550 +5592 @@
 constructor TCpuZ80.Create;
 begin
+  BreakPoints := TBreakPoints.Create;
   InitInstructions;
   Reset;
@@ -5557 +5600 @@
 begin
   Running := False;
+  FreeAndNil(BreakPoints);
   inherited;
 end;