Changeset 13 for trunk/Z80/Z80.pas

Timestamp:

Apr 21, 2026, 2:55:51 PM (6 days ago)

Author:

chronos

Message:

• Added: Call stack window.
• Modified: Use reload pending boolean variable and reload from timer instead of Thread.Synchronize to not delay CPU execution.

File:

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

trunk/Z80/Z80.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Memory, Base, Z80Instructions, Generics.Collections,
+  Classes, SysUtils, MemoryTypes, Base, Z80Instructions, Generics.Collections,
   Generics.Defaults;
 
@@ -41 +41 @@
   end;
 
-  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 }
 
   TCpuZ80 = class
   private
+    FOnCall: TAddressEvent;
     FOnInput: TReadEvent;
     FOnMessage: TMessageEvent;
     FOnOutput: TWriteEvent;
     FOnRead: TReadEvent;
+    FOnReturn: TBaseEvent;
+    FOnStep: TBaseEvent;
     FOnWrite: TWriteEvent;
     FRunning: Boolean;
@@ -85 +76 @@
     procedure DoMessage(Text: string);
     procedure DoMessageSync;
+    procedure DoOnCall(Address: Word);
+    procedure DoOnReturn;
+    procedure DoOnStep;
     function ReadByte: Byte;
     function ReadWord: Word;
@@ -832 +826 @@
     InterruptEnabled: Boolean;
     InterruptMode: Byte;
-    BreakPoints: TBreakPoints;
-    DebugMode: TDebugMode;
-    DebugStopAddress: Word;
     Instructions: TInstructionMethods;
     procedure Step;
@@ -852 +843 @@
     property OnOutput: TWriteEvent read FOnOutput write FOnOutput;
     property OnMessage: TMessageEvent read FOnMessage write FOnMessage;
+    property OnCall: TAddressEvent read FOnCall write FOnCall;
+    property OnReturn: TBaseEvent read FOnReturn write FOnReturn;
+    property OnStep: TBaseEvent read FOnStep write FOnStep;
   end;
 
@@ -865 +859 @@
   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;
 
@@ -992 +962 @@
 begin
   MessageText := Text;
-  FThread.Synchronize(DoMessageSync);
+  DoMessageSync;
   MessageText := '';
 end;
@@ -999 +969 @@
 begin
   if Assigned(FOnMessage) then FOnMessage(MessageText);
+end;
+
+procedure TCpuZ80.DoOnCall(Address: Word);
+begin
+  if Assigned(FOnCall) then FOnCall(Address);
+end;
+
+procedure TCpuZ80.DoOnReturn;
+begin
+  if Assigned(FOnReturn) then FOnReturn;
+end;
+
+procedure TCpuZ80.DoOnStep;
+begin
+  if Assigned(FOnStep) then FOnStep;
 end;
 
@@ -1028 +1013 @@
 procedure TCpuZ80.Call(Address: Word);
 begin
-  if DebugMode = dmStepOver then begin
-    DebugStopAddress := PC;
-    DebugMode := dmStopAddress;
-  end;
+  DoOnCall(Address);
   PushWord(PC);
   PC := Address;
@@ -1038 +1020 @@
 procedure TCpuZ80.CallCond(Address: Word; Condition: Boolean);
 begin
-  if DebugMode = dmStepOver then begin
-    DebugStopAddress := PC;
-    DebugMode := dmStopAddress;
-  end;
+  DoOnCall(Address);
   if Condition then begin
     PushWord(PC);
@@ -1077 +1056 @@
   if Condition then begin
     PC := PopWord;
-    if DebugMode = dmStepOut then begin
-      FThread.Terminate;
-      DebugMode := dmNone;
-    end;
+    DoOnReturn;
   end;
 end;
@@ -5555 +5531 @@
   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;
+  DoOnStep;
 end;
 
@@ -5592 +5549 @@
 constructor TCpuZ80.Create;
 begin
-  BreakPoints := TBreakPoints.Create;
   InitInstructions;
   Reset;
@@ -5600 +5556 @@
 begin
   Running := False;
-  FreeAndNil(BreakPoints);
   inherited;
 end;