Changeset 11

Timestamp:

Apr 20, 2026, 11:55:57 PM (6 days ago)

Author:

chronos

Message:

• Added: Show comments in disassembled addresses.
• Fixed: Stepping in code.
• Modified: Show more registers in CPU view.

Location:

trunk

Files:

• Core.pas (modified) (3 diffs)
• Disassembler.pas (modified) (4 diffs)
• Forms/FormCpu.lfm (modified) (1 diff)
• Forms/FormCpu.pas (modified) (1 diff)
• Forms/FormDisassembler.lfm (modified) (2 diffs)
• Forms/FormDisassembler.pas (modified) (5 diffs)
• Z80/Z80.pas (modified) (2 diffs)

trunk/Core.pas

@@ -51 +51 @@
   private
     LastPc: Word;
+    procedure DoChangePC(Address: Word);
   public
     FormMain: TFormMain;
@@ -180 +181 @@
     FormDisassembler := TFormDisassembler.Create(nil);
     FormDisassembler.Disassembler.Memory := SharpMz800.MappedMemory;
+    FormDisassembler.OnChangePC := DoChangePC;
     SharpMz800.OnMemoryMappingChange := FormDisassembler.Disassemble;
   end;
@@ -234 +236 @@
 end;
 
+procedure TCore.DoChangePC(Address: Word);
+begin
+  SharpMz800.Cpu.PC := Address;
+end;
+
 procedure TCore.UpdateDisassemblerPos;
 begin

trunk/Disassembler.pas

@@ -16 +16 @@
     Name: string;
     Parameters: string;
+    Comment: string;
     constructor Create;
     procedure AddOpcode(Data: Byte);
@@ -41 +42 @@
   end;
 
+  TComment = record
+    Address: Word;
+    Text: string;
+  end;
+
 
 implementation
+
+const
+  Comments: array[0..16] of TComment = (
+    (Address: $6; Text: 'LETNL (Moves the cursor to the beginning of the next line.)'),
+    (Address: $c; Text: 'PRNTS (Display a space at the cursor position.)'),
+    (Address: $12; Text: 'PRNTS (Display a character.)'),
+    (Address: $15; Text: 'MSG (Displays a message.)'),
+    (Address: $30; Text: 'MELDY'),
+    (Address: $3e; Text: 'BELL'),
+    (Address: $41; Text: 'XTEMP (Sets the music tempo.)'),
+    (Address: $44; Text: 'MSTA (Generates a continuous sound of the specified frequency.)'),
+    (Address: $309; Text: 'Init 8253 counters.'),
+    (Address: $3da; Text: 'ASC (Loads the ASCII character.)'),
+    (Address: $3f9; Text: 'HEX (Converts the 8 data bits stored in the ACC into a hexadecimal number.)'),
+    (Address: $410; Text: 'HLHEX (Converts a string of 4 ASCII characters into a hexadecimal number and loads it in the HL register.)'),
+    (Address: $41f; Text: '2HEX (Converts a string of 2 ASCII characters into a hexadecimal number and loads it into the ACC.)'),
+    (Address: $73e; Text: 'Init 8255 PIO.'),
+    (Address: $e414; Text: 'Delay'),
+    (Address: $e800; Text: 'Cold start'),
+    (Address: $e813; Text: 'Base init.')
+  );
+
+function SearchComment(Address: Word): string;
+var
+  I: Integer;
+begin
+  I := 0;
+  while (I <= High(Comments)) and (Comments[I].Address <> Address) do Inc(I);
+  if I <= High(Comments) then Result := Comments[I].Text
+    else Result := '';
+end;
 
 { TDecodedInstructions }
@@ -96 +133 @@
   InstructionInfo: TInstructionInfo;
   DecodedInstruction: TDecodedInstruction;
+  DestAddress: Longint;
 begin
   Memory.Position := 0;
@@ -180 +218 @@
       end;
     end;
+
+    DecodedInstruction.Comment := SearchComment(DecodedInstruction.Address);
+    if DecodedInstruction.Comment = '' then begin
+      if DecodedInstruction.Name = 'JP' then
+        if TryStrToInt('$' + DecodedInstruction.Parameters, DestAddress) then begin
+          DecodedInstruction.Comment := SearchComment(DestAddress);
+          if DecodedInstruction.Comment <> '' then DecodedInstruction.Comment := 'Jump to ' + DecodedInstruction.Comment;
+        end;
+      if DecodedInstruction.Name = 'CALL' then
+        if TryStrToInt('$' + DecodedInstruction.Parameters, DestAddress) then begin
+          DecodedInstruction.Comment := SearchComment(DestAddress);
+          if DecodedInstruction.Comment <> '' then DecodedInstruction.Comment := 'Call to ' + DecodedInstruction.Comment;
+        end;
+    end;
     DecodedInstructions.Add(DecodedInstruction);
   end;

trunk/Forms/FormCpu.lfm

@@ -1 +1 @@
 object FormCpu: TFormCpu
   Left = 834
-  Height = 438
+  Height = 657
   Top = 501
-  Width = 476
+  Width = 274
   Caption = 'CPU'
-  ClientHeight = 438
-  ClientWidth = 476
+  ClientHeight = 657
+  ClientWidth = 274
   DesignTimePPI = 144
-  LCLVersion = '2.2.6.0'
+  LCLVersion = '4.6.0.0'
   object GroupBox1: TGroupBox
     Left = 22
-    Height = 370
+    Height = 546
     Top = 22
     Width = 230
     Caption = 'Registers'
-    ClientHeight = 343
+    ClientHeight = 519
     ClientWidth = 228
     TabOrder = 0
     object ValueListEditor1: TValueListEditor
       Left = 16
-      Height = 323
+      Height = 499
       Top = 5
       Width = 192
-      FixedCols = 0
+      Anchors = [akTop, akLeft, akRight, akBottom]
       RowCount = 2
       TabOrder = 0

trunk/Forms/FormCpu.pas

@@ -35 +35 @@
   ValueListEditor1.Values['PC'] := IntToHex(Cpu.PC, 4);
   ValueListEditor1.Values['SP'] := IntToHex(Cpu.SP, 4);
+  ValueListEditor1.Values['IX'] := IntToHex(Cpu.IX, 4);
+  ValueListEditor1.Values['IY'] := IntToHex(Cpu.IY, 4);
+  ValueListEditor1.Values['R'] := IntToHex(Cpu.RegR, 2);
+  ValueListEditor1.Values['I'] := IntToHex(Cpu.RegI, 2);
+  ValueListEditor1.Values['IM'] := IntToStr(Cpu.InterruptMode);
+  ValueListEditor1.Values['EI'] := IntToStr(Byte(Cpu.InterruptEnabled));
+  ValueListEditor1.Values['Cycles'] := IntToStr(Cpu.Cycles);
   ValueListEditor1.Values['Ticks'] := IntToStr(Cpu.Ticks);
 end;

trunk/Forms/FormDisassembler.lfm

@@ -34 +34 @@
       item
         Caption = 'Parameters'
-        Width = 691
+        Width = 100
+      end    
+      item
+        Caption = 'Comment'
+        Width = 591
       end>
     OwnerData = True
+    PopupMenu = PopupMenu1
     ReadOnly = True
     RowSelect = True
@@ -43 +48 @@
     OnData = ListView1Data
   end
+  object PopupMenu1: TPopupMenu
+    Left = 433
+    Top = 343
+    object MenuItemSetAddress: TMenuItem
+      Caption = 'Set PC to address'
+      OnClick = MenuItemSetAddressClick
+    end
+  end
 end

trunk/Forms/FormDisassembler.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ComCtrls,
-  ExtCtrls, Disassembler;
+  ExtCtrls, Menus, Disassembler;
 
 type
+  TChangePCEvent = procedure (Address: Word) of object;
 
   { TFormDisassembler }
@@ -13 +14 @@
   TFormDisassembler = class(TForm)
     ListView1: TListView;
+    MenuItemSetAddress: TMenuItem;
+    PopupMenu1: TPopupMenu;
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -18 +21 @@
     procedure FormShow(Sender: TObject);
     procedure ListView1Data(Sender: TObject; Item: TListItem);
+    procedure MenuItemSetAddressClick(Sender: TObject);
+  private
+    FOnChangePC: TChangePCEvent;
+    procedure DoChangePC(Address: Word);
   public
     Disassembler: TDisassembler;
@@ -23 +30 @@
     procedure SelectAddress(Address: Word);
     procedure ReloadList;
+    property OnChangePC: TChangePCEvent read FOnChangePC write FOnChangePC;
   end;
 
@@ -64 +72 @@
     Item.SubItems.Add(Name);
     Item.SubItems.Add(Parameters);
+    Item.SubItems.Add(Comment);
   end;
 end;
 
-procedure TFormDisassembler.Disassemble;
+procedure TFormDisassembler.MenuItemSetAddressClick(Sender: TObject);
+begin
+  if Assigned(ListView1.Selected) then begin
+    DoChangePC(TDecodedInstruction(ListView1.Selected.Data).Address);
+    SelectAddress(TDecodedInstruction(ListView1.Selected.Data).Address);
+  end;
+end;
+
+procedure TFormDisassembler.Disassemble(Sender: TObject);
 begin
   Disassembler.Disassemble;
   ReloadList;
+end;
+
+procedure TFormDisassembler.DoChangePC(Address: Word);
+begin
+  if Assigned(FOnChangePC) then FOnChangePC(Address);
 end;
 

trunk/Z80/Z80.pas

@@ -818 +818 @@
     Memory: TMemory;
     Ticks: Cardinal;
+    Cycles: Cardinal;
     InterruptEnabled: Boolean;
     InterruptMode: Byte;
@@ -851 +852 @@
     Cpu.Step;
     if Cpu.DebugMode <> dmNone then begin
-      if Cpu.DebugMode = dmStepIn then Terminate;
-      if (Cpu.DebugMode = dmStopAddress) and (Cpu.DebugStopAddress = Cpu.PC) then
+      if Cpu.DebugMode = dmStepIn then begin
+        Cpu.DebugMode := dmNone;
         Terminate;
-      Cpu.DebugMode := dmNone;
+      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;