Changeset 17

Timestamp:

Mar 25, 2026, 8:52:34 PM (4 days ago)

Author:

chronos

Message:

• Fixed: Wrong PC register increment.

Location:

branches/test3

Files:

• Cpu.pas (modified) (1 diff)
• FormMain.pas (modified) (4 diffs)
• Project1.lpi (modified) (1 diff)

branches/test3/Cpu.pas

@@ -234 +234 @@
 begin
   Move(PMax(@Memory[PC])^, Result, Count);
-  Inc(PC, SizeOf(Count));
+  Inc(PC, Count);
 end;
 

branches/test3/FormMain.pas

@@ -17 +17 @@
   TCpu16A64 = TCpu<Word,QWord,QWord>;
   TCpu24 = TCpu<UInt24,UInt24,UInt24>;
+  TCpu32 = TCpu<DWord,DWord,DWord>;
   TCpu64 = TCpu<QWord,QWord,QWord>;
 
@@ -28 +29 @@
     procedure FormShow(Sender: TObject);
   private
-    Buffer: Word;
-    procedure CpuOutput(Addr: Word; Data: Word; Count: Byte);
-    function CpuInput(Addr: Word; Count: Byte): Word;
+    Buffer: QWord;
+    procedure CpuOutput8(Addr: Byte; Data: Byte; Count: Byte);
+    function CpuInput8(Addr: Byte; Count: Byte): Byte;
+    procedure CpuOutput16(Addr: Word; Data: Word; Count: Byte);
+    function CpuInput16(Addr: Word; Count: Byte): Word;
+    procedure CpuOutput32(Addr: DWord; Data: DWord; Count: Byte);
+    function CpuInput32(Addr: DWord; Count: Byte): DWord;
+    procedure CpuOutput64(Addr: QWord; Data: QWord; Count: Byte);
+    function CpuInput64(Addr: QWord; Count: Byte): QWord;
   public
-    Cpu: TCpu16;
+    Cpu8: TCpu8;
+    Cpu16: TCpu16;
+    Cpu32: TCpu32;
+    Cpu64: TCpu64;
   end;
 
@@ -47 +57 @@
 procedure TFormMain.FormCreate(Sender: TObject);
 begin
-  Cpu := TCpu16.Create;
-  Cpu.OnInput := CpuInput;
-  Cpu.OnOutput := CpuOutput;
+  Cpu8 := TCpu8.Create;
+  Cpu8.OnInput := CpuInput8;
+  Cpu8.OnOutput := CpuOutput8;
+  Cpu16 := TCpu16.Create;
+  Cpu16.OnInput := CpuInput16;
+  Cpu16.OnOutput := CpuOutput16;
+  Cpu32 := TCpu32.Create;
+  Cpu32.OnInput := CpuInput32;
+  Cpu32.OnOutput := CpuOutput32;
+  Cpu64 := TCpu64.Create;
+  Cpu64.OnInput := CpuInput64;
+  Cpu64.OnOutput := CpuOutput64;
 end;
 
 procedure TFormMain.FormDestroy(Sender: TObject);
 begin
-  FreeAndNil(Cpu);
+  FreeAndNil(Cpu8);
+  FreeAndNil(Cpu16);
+  FreeAndNil(Cpu32);
+  FreeAndNil(Cpu64);
 end;
 
 procedure TFormMain.FormShow(Sender: TObject);
 begin
-  with Cpu do begin
+  with Cpu8 do begin
+    AddConstN(1, 0, $ab);
+    AddOutputN(1, 0, 0);
+    AddHalt;
+    Run;
+    Memo1.Lines.Add(IntToHex(Buffer, 2));
+  end;
+  with Cpu16 do begin
     AddConstN(2, 0, $abcd);
     AddOutputN(2, 0, 0);
     AddHalt;
     Run;
-    Memo1.Lines.Add(IntToHex(Buffer));
+    Memo1.Lines.Add(IntToHex(Buffer, 4));
+  end;
+  with Cpu32 do begin
+    AddConstN(4, 0, $abcdef01);
+    AddOutputN(4, 0, 0);
+    AddHalt;
+    Run;
+    Memo1.Lines.Add(IntToHex(Buffer, 8));
+  end;
+  with Cpu64 do begin
+    AddConstN(8, 0, $abcdef0123456789);
+    AddOutputN(8, 0, 0);
+    AddHalt;
+    Run;
+    Memo1.Lines.Add(IntToHex(Buffer, 16));
   end;
 end;
 
-procedure TFormMain.CpuOutput(Addr: Word; Data: Word; Count: Byte);
+procedure TFormMain.CpuOutput8(Addr: Byte; Data: Byte; Count: Byte);
 begin
   case Addr of
@@ -75 +118 @@
 end;
 
-function TFormMain.CpuInput(Addr: Word; Count: Byte): Word;
+function TFormMain.CpuInput8(Addr: Byte; Count: Byte): Byte;
+begin
+  case Addr of
+    0: Result := Buffer;
+  end;
+end;
+
+procedure TFormMain.CpuOutput16(Addr: Word; Data: Word; Count: Byte);
+begin
+  case Addr of
+    0: Buffer := Data;
+  end;
+end;
+
+function TFormMain.CpuInput16(Addr: Word; Count: Byte): Word;
+begin
+  case Addr of
+    0: Result := Buffer;
+  end;
+end;
+
+procedure TFormMain.CpuOutput32(Addr: DWord; Data: DWord; Count: Byte);
+begin
+  case Addr of
+    0: Buffer := Data;
+  end;
+end;
+
+function TFormMain.CpuInput32(Addr: DWord; Count: Byte): DWord;
+begin
+  case Addr of
+    0: Result := Buffer;
+  end;
+end;
+
+procedure TFormMain.CpuOutput64(Addr: QWord; Data: QWord; Count: Byte);
+begin
+  case Addr of
+    0: Buffer := Data;
+  end;
+end;
+
+function TFormMain.CpuInput64(Addr: QWord; Count: Byte): QWord;
 begin
   case Addr of

branches/test3/Project1.lpi

@@ -38 +38 @@
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormMain"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
       </Unit>