Changeset 44 for branches

Timestamp:

Oct 3, 2023, 12:09:51 AM (15 months ago)

Author:

chronos

Message:

• Added: More devices.

Location:

branches/templates

Files:

• . (modified) (1 prop)
• AddrChannel.inc (added)
• AddrChannel.pas (modified) (2 diffs)
• Cpu.inc (added)
• Cpu.pas (modified) (9 diffs)
• Device.pas (deleted)
• Devices (added)
• Devices/Device.inc (added)
• Devices/Device.pas (added)
• Devices/FrameBuffer.inc (added)
• Devices/FrameBuffer.pas (added)
• Devices/Memory.inc (added)
• Devices/Memory.pas (added)
• GenericCpu.inc (deleted)
• GenericDevice.inc (deleted)
• GenericMemory.inc (deleted)
• Memory.pas (deleted)
• UFormMain.lfm (modified) (1 diff)
• UFormMain.pas (modified) (1 diff)
• templates.lpi (modified) (3 diffs)
• templates.lpr (modified) (1 diff)

branches/templates/AddrChannel.pas

@@ -7 +7 @@
 
 type
+  {$MACRO ON}
   TBitWidth = (bw8, bw16, bw32, bw64);
 
-  TAddrChannel8 = class
-  type
-    TRead8 = function (Address: Byte): Byte of object;
-    TWrite8 = procedure (Address: Byte; Data: Byte) of object;
-  var
-    Read8: TRead8;
-    Write8: TWrite8;
-  end;
+  {$DEFINE TGAddrChannel := TAddrChannel8}
+  {$DEFINE TGAddrChannelAddress := Byte}
+  {$DEFINE TGAddrChannelWidth := 8}
+  {$DEFINE INTERFACE}
+  {$I 'AddrChannel.inc'}
 
-  TAddrChannel16 = class
-  type
-    TRead8 = function (Address: Word): Byte of object;
-    TRead16 = function (Address: Word): Word of object;
-    TWrite8 = procedure (Address: Word; Data: Byte) of object;
-    TWrite16 = procedure (Address: Word; Data: Word) of object;
-  var
-    Read8: TRead8;
-    Read16: TRead16;
-    Write8: TWrite8;
-    Write16: TWrite16;
-  end;
+  {$DEFINE TGAddrChannel := TAddrChannel16}
+  {$DEFINE TGAddrChannelAddress := Word}
+  {$DEFINE TGAddrChannelWidth := 16}
+  {$DEFINE INTERFACE}
+  {$I 'AddrChannel.inc'}
 
-  TAddrChannel32 = class
-  type
-    TRead8 = function (Address: DWord): Byte of object;
-    TRead16 = function (Address: DWord): Word of object;
-    TRead32 = function (Address: DWord): DWord of object;
-    TWrite8 = procedure (Address: DWord; Data: Byte) of object;
-    TWrite16 = procedure (Address: DWord; Data: Word) of object;
-    TWrite32 = procedure (Address: DWord; Data: DWord) of object;
-  var
-    Read8: TRead8;
-    Read16: TRead16;
-    Read32: TRead32;
-    Write8: TWrite8;
-    Write16: TWrite16;
-    Write32: TWrite32;
-  end;
+  {$DEFINE TGAddrChannel := TAddrChannel32}
+  {$DEFINE TGAddrChannelAddress := DWord}
+  {$DEFINE TGAddrChannelWidth := 32}
+  {$DEFINE INTERFACE}
+  {$I 'AddrChannel.inc'}
 
-  TAddrChannel64 = class
-  type
-    TRead8 = function (Address: QWord): Byte of object;
-    TRead16 = function (Address: QWord): Word of object;
-    TRead32 = function (Address: QWord): DWord of object;
-    TRead64 = function (Address: QWord): QWord of object;
-    TWrite8 = procedure (Address: QWord; Data: Byte) of object;
-    TWrite16 = procedure (Address: QWord; Data: Word) of object;
-    TWrite32 = procedure (Address: QWord; Data: DWord) of object;
-    TWrite64 = procedure (Address: QWord; Data: QWord) of object;
-  var
-    Read8: TRead8;
-    Read16: TRead16;
-    Read32: TRead32;
-    Read64: TRead64;
-    Write8: TWrite8;
-    Write16: TWrite16;
-    Write32: TWrite32;
-    Write64: TWrite64;
-  end;
+  {$DEFINE TGAddrChannel := TAddrChannel64}
+  {$DEFINE TGAddrChannelAddress := QWord}
+  {$DEFINE TGAddrChannelWidth := 64}
+  {$DEFINE INTERFACE}
+  {$I 'AddrChannel.inc'}
 
   { TAddrChannel }
@@ -92 +57 @@
     constructor Create(Channel: TAddrChannel64); overload;
   end;
-
 
 

branches/templates/Cpu.pas

@@ -9 +9 @@
   {$MACRO ON}
 
-  TOpcode = (opNop, opHalt,
+  TOpcode = (opNop, opHalt, opInt, opSetC, opResC,
     opLoadImmediate, opLoadImmediate8, opLoadImmediate16, opLoadImmediate32, opLoadImmediate64,
-    opOutput, opOutput8, opOutput16, opOutput32, opOutput64
+    opLoad, opLoad8, opLoad16, opLoad32, opLoad64,
+    opStore, opStore8, opStore16, opStore32, opStore64,
+    opLoadBase, opLoadBase8, opLoadBase16, opLoadBase32, opLoadBase64,
+    opStoreBase, opStoreBase8, opStoreBase16, opStoreBase32, opStoreBase64,
+    opInput, opInput8, opInput16, opInput32, opInput64,
+    opOutput, opOutput8, opOutput16, opOutput32, opOutput64,
+    opInc, opInc8, opInc16, opInc32, opInc64,
+    opDec, opDec8, opDec16, opDec32, opDec64,
+    opAdd, opAdd8, opAdd16, opAdd32, opAdd64,
+    opSub, opSub8, opSub16, opSub32, opSub64,
+    opMul, opMul8, opMul16, opMul32, opMul64,
+    opDiv, opDiv8, opDiv16, opDiv32, opDiv64,
+    opMod, opMod8, opMod16, opMod32, opMod64,
+    opShr, opShr8, opShr16, opShr32, opShr64,
+    opShl, opShl8, opShl16, opShl32, opShl64,
+    opRor,
+    opRol,
+    opJump,
+    opJumpRel,
+    opCall,
+    opRet,
+    opRetI,
+    opPush, opPush8, opPush16, opPush32, opPush64,
+    opPop, opPop8, opPop16, opPop32, opPop64,
+    opXor,
+    opOr,
+    opAnd,
+    opLoadSys,
+    opStoreSys
     );
 
@@ -19 +47 @@
   {$DEFINE TGCpuWidth := 8}
   {$DEFINE INTERFACE}
-  {$I 'GenericCpu.inc'}
+  {$I 'Cpu.inc'}
 
   {$DEFINE TGCpu := TCpu16}
@@ -26 +54 @@
   {$DEFINE TGCpuWidth := 16}
   {$DEFINE INTERFACE}
-  {$I 'GenericCpu.inc'}
+  {$I 'Cpu.inc'}
 
   {$DEFINE TGCpu := TCpu32}
@@ -33 +61 @@
   {$DEFINE TGCpuWidth := 32}
   {$DEFINE INTERFACE}
-  {$I 'GenericCpu.inc'}
+  {$I 'Cpu.inc'}
 
   {$DEFINE TGCpu := TCpu64}
@@ -40 +68 @@
   {$DEFINE TGCpuWidth := 64}
   {$DEFINE INTERFACE}
-  {$I 'GenericCpu.inc'}
+  {$I 'Cpu.inc'}
 
   { TCpu }
@@ -140 +168 @@
 {$DEFINE TGCpuWidth := 8}
 {$DEFINE IMPLEMENTATION}
-{$I 'GenericCpu.inc'}
+{$I 'Cpu.inc'}
 
 {$DEFINE TGCpu := TCpu16}
@@ -147 +175 @@
 {$DEFINE TGCpuWidth := 16}
 {$DEFINE IMPLEMENTATION}
-{$I 'GenericCpu.inc'}
+{$I 'Cpu.inc'}
 
 {$DEFINE TGCpu := TCpu32}
@@ -154 +182 @@
 {$DEFINE TGCpuWidth := 32}
 {$DEFINE IMPLEMENTATION}
-{$I 'GenericCpu.inc'}
+{$I 'Cpu.inc'}
 
 {$DEFINE TGCpu := TCpu64}
@@ -161 +189 @@
 {$DEFINE TGCpuWidth := 64}
 {$DEFINE IMPLEMENTATION}
-{$I 'GenericCpu.inc'}
+{$I 'Cpu.inc'}
 
 end.

branches/templates/UFormMain.lfm

@@ -1 +1 @@
 object FormMain: TFormMain
-  Left = 574
+  Left = 543
   Height = 880
-  Top = 222
+  Top = 237
   Width = 1144
   Caption = 'FormMain'

branches/templates/UFormMain.pas

@@ -97 +97 @@
     IO16.SetDataBus(IO);
     WriteOpcode(opLoadImmediate);
-    Write($12);
+    Write($1234);
+    WriteOpcode(opLoadImmediate8);
+    Write8($56);
     WriteOpcode(opOutput);
     Write(1);

branches/templates/templates.lpi

@@ -45 +45 @@
       </Unit>
       <Unit>
-        <Filename Value="GenericCpu.inc"/>
+        <Filename Value="Cpu.inc"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="Unit1"/>
@@ -54 +54 @@
       </Unit>
       <Unit>
-        <Filename Value="Memory.pas"/>
+        <Filename Value="Devices/Memory.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit>
       <Unit>
-        <Filename Value="GenericMemory.inc"/>
+        <Filename Value="Devices/Memory.inc"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="GenericMemory"/>
+      </Unit>
+      <Unit>
+        <Filename Value="Devices/Device.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit>
       <Unit>
-        <Filename Value="Device.pas"/>
+        <Filename Value="Devices/Device.inc"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="GenericDevice"/>
+      </Unit>
+      <Unit>
+        <Filename Value="Devices/FrameBuffer.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit>
       <Unit>
-        <Filename Value="GenericDevice.inc"/>
+        <Filename Value="Devices/FrameBuffer.inc"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="Unit1"/>
+      </Unit>
+      <Unit>
+        <Filename Value="AddrChannel.inc"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="Unit1"/>
       </Unit>
     </Units>
@@ -78 +94 @@
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
+      <OtherUnitFiles Value="Devices"/>
       <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>

branches/templates/templates.lpr

@@ -11 +11 @@
   {$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, UFormMain
+  Forms, UFormMain, FrameBuffer
   { you can add units after this };