Changeset 5 for trunk/CpuZ80.pas

Timestamp:

Apr 18, 2026, 7:24:02 PM (9 days ago)

Author:

chronos

Message:

• Added: Some I/O ports handling.
• Added: Messages form for capturing error messages.
• Added: Go to address action.
• Added: Allow to view all used memory areas in Memory window.
• Added: Allow to reset CPU execution.
• Modified: Improved memory mapping for MZ-700 and MZ-800 modes.
• Fixed: Focusing currently executed instruction position.
• Fixed: Wrong order or 8-bit registers in 16-bit pair.

File:

• trunk/CpuZ80.pas (modified) (13 diffs)

trunk/CpuZ80.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Memory;
+  Classes, SysUtils, Memory, Base;
 
 type
-  TReadEvent = function (Address: Word): Byte of object;
-  TWriteEvent = procedure (Address: Word; Data: Byte) of object;
-
   TInstruction = (inNop = 0, inLdBcNn = $1, inLdBcIndirectA = $2,
     inIncBc = $3, inIncB = $4, inDecB = $5, inLdBN = $6, inRlca = $7,
@@ -38 +35 @@
   TRegBC = record
     case Byte of
-      0: (B, C: Byte);
+      0: (C, B: Byte);
       1: (Value: Word);
   end;
@@ -44 +41 @@
   TRegDE = record
     case Byte of
-      0: (D, E: Byte);
+      0: (E, D: Byte);
       1: (Value: Word);
   end;
@@ -50 +47 @@
   TRegHL = record
     case Byte of
-      0: (H, L: Byte);
+      0: (L, H: Byte);
       1: (Value: Word);
   end;
@@ -61 +58 @@
   private
     FOnInput: TReadEvent;
+    FOnMessage: TMessageEvent;
     FOnOutput: TWriteEvent;
     FOnRead: TReadEvent;
@@ -67 +65 @@
     FThread: TCpuThread;
     Instruction: TInstruction;
+    MessageText: string;
     procedure SetRunning(AValue: Boolean);
     function DoRead(Address: Word): Byte;
@@ -72 +71 @@
     function DoInput(Address: Word): Byte;
     procedure DoOutput(Address: Word; Data: Byte);
+    procedure DoMessage(Text: string);
+    procedure DoMessageSync;
     function ReadByte: Byte;
     function ReadWord: Word;
-    procedure PushWord(Data: Word); inline;
-    function PopWord: Word; inline;
-    procedure Call(Address: Word); inline;
-    procedure Cp(Data: Byte); inline;
-    procedure Jr(Condition: Boolean); inline;
-    procedure Jp(Condition: Boolean); inline;
+    procedure PushWord(Data: Word);
+    function PopWord: Word;
+    procedure Call(Address: Word);
+    procedure Cp(Data: Byte);
+    procedure Jr(Condition: Boolean);
+    procedure Jp(Condition: Boolean);
+    procedure Halt;
   public
     A: Byte;
@@ -104 +106 @@
     property OnInput: TReadEvent read FOnInput write FOnInput;
     property OnOutput: TWriteEvent read FOnOutput write FOnOutput;
-  end;
+    property OnMessage: TMessageEvent read FOnMessage write FOnMessage;
+  end;
+
 
 implementation
@@ -164 +168 @@
 end;
 
+procedure TCpuZ80.DoMessage(Text: string);
+begin
+  MessageText := Text;
+  FThread.Synchronize(DoMessageSync);
+  MessageText := '';
+end;
+
+procedure TCpuZ80.DoMessageSync;
+begin
+  if Assigned(FOnMessage) then FOnMessage(MessageText);
+end;
+
 function TCpuZ80.ReadByte: Byte;
 begin
@@ -206 +222 @@
 procedure TCpuZ80.Jr(Condition: Boolean);
 var
-  Temp: Byte;
-begin
-  Temp := ReadByte;
+  Temp: ShortInt;
+begin
+  Temp := ShortInt(ReadByte);
   if Condition then
-    PC := PC + ShortInt(Temp);
+    PC := PC + Temp;
 end;
 
@@ -219 +235 @@
   Temp := ReadWord;
   if Condition then PC := Temp;
+end;
+
+procedure TCpuZ80.Halt;
+begin
+  FThread.Terminate;
 end;
 
@@ -293 +314 @@
     inRst28: Call($28);
     inRst30: Call($30);
-    inRst38: Call($08);
+    inRst38: Call($38);
     inDi: InterruptEnabled := False;
     inEi: InterruptEnabled := True;
@@ -315 +336 @@
     inJrNzD: Jr(not Zero);
     inJrNcD: Jr(not Carry);
-    else raise Exception.Create('Unsupported instruction ' + IntToHex(Word(Instruction), 4));
+    else begin
+      Dec(PC);
+      DoMessage('Unsupported instruction ' + IntToHex(Word(Instruction), 4) + ' on address ' + IntToHex(Word(PC), 4));
+      Halt;
+    end;
   end;
   Ticks := Cardinal(Ticks + 1);