Changeset 59 for branches/ByteArray/Cpu.pas

Timestamp:

Nov 25, 2023, 11:47:52 PM (5 months ago)

Author:

chronos

Message:

• Fixed: Assembler and disassembler to work correctly with supported instructions.

File:

• branches/ByteArray/Cpu.pas (modified) (8 diffs)

branches/ByteArray/Cpu.pas

@@ -12 +12 @@
     inLoadMem, inLoadMemSize,
     inStoreMem, inStoreMemSize,
+    inLoadMemIndex, inLoadMemIndexSize,
+    inStoreMemIndex, inStoreMemIndexSize,
     inInput, inInputSize,
     inOutput, inOutputSize,
@@ -38 +40 @@
     inCompare);
 
-  TRegIndex = (riA, riB, riC, riD, riE, riF, riG, riH);
+  TRegIndex = Byte;
 
   TInstructionEvent = procedure of object;
@@ -64 +66 @@
     procedure InstructionStoreMem;
     procedure InstructionStoreMemSize;
+    procedure InstructionLoadMemIndex;
+    procedure InstructionLoadMemIndexSize;
+    procedure InstructionStoreMemIndex;
+    procedure InstructionStoreMemIndexSize;
     procedure InstructionJump;
     procedure InstructionJumpSize;
@@ -213 +219 @@
 procedure TCpu.InstructionLoadMem;
 var
-  Address: TBigInt;
-  RegIndex: TRegIndex;
-begin
-  RegIndex := ReadRegIndex;
-  Address := Read(AddressWidth);
-  Regs[RegIndex] := Memory.Read(Address, DataWidth);
+  RegIndex1: TRegIndex;
+  RegIndex2: TRegIndex;
+begin
+  RegIndex1 := ReadRegIndex;
+  RegIndex2 := ReadRegIndex;
+  Regs[RegIndex1] := Memory.Read(Regs[RegIndex2], DataWidth);
 end;
 
@@ -224 +230 @@
 var
   DataSize: TBigIntSize;
-  AddressSize: TBigIntSize;
-  Address: TBigInt;
-  RegIndex: TRegIndex;
-begin
-  DataSize := ReadSize;
-  AddressSize := Read(SizeOf(TBigIntSize));
-  RegIndex := ReadRegIndex;
-  Address := Read(AddressSize);
-  Regs[RegIndex] := Memory.Read(Address, DataSize);
+  RegIndex1: TRegIndex;
+  RegIndex2: TRegIndex;
+begin
+  DataSize := ReadSize;
+  RegIndex1 := ReadRegIndex;
+  RegIndex2 := ReadRegIndex;
+  Regs[RegIndex1] := Memory.Read(Regs[RegIndex2], DataSize);
 end;
 
 procedure TCpu.InstructionStoreMem;
 var
-  Address: TBigInt;
-  RegIndex: TRegIndex;
-begin
-  Address := Read(AddressWidth);
-  RegIndex := ReadRegIndex;
-  Memory.Write(Address, DataWidth, Regs[RegIndex]);
+  RegIndex1: TRegIndex;
+  RegIndex2: TRegIndex;
+begin
+  RegIndex1 := ReadRegIndex;
+  RegIndex2 := ReadRegIndex;
+  Memory.Write(Regs[RegIndex1], DataWidth, Regs[RegIndex2]);
 end;
 
@@ -248 +252 @@
 var
   DataSize: TBigIntSize;
-  AddressSize: TBigIntSize;
-  Address: TBigInt;
-  RegIndex: TRegIndex;
-begin
-  DataSize := ReadSize;
-  AddressSize := Read(SizeOf(TBigIntSize));
-  Address := Read(AddressSize);
-  RegIndex := ReadRegIndex;
-  Memory.Write(Address, DataSize, Regs[RegIndex]);
+  RegIndex1: TRegIndex;
+  RegIndex2: TRegIndex;
+begin
+  DataSize := ReadSize;
+  RegIndex1 := ReadRegIndex;
+  RegIndex2 := ReadRegIndex;
+  Memory.Write(Regs[RegIndex1], DataSize, Regs[RegIndex2]);
+end;
+
+procedure TCpu.InstructionLoadMemIndex;
+var
+  RegIndex1: TRegIndex;
+  RegIndex2: TRegIndex;
+  RelativeAddress: TBigInt;
+begin
+  RegIndex1 := ReadRegIndex;
+  RegIndex2 := ReadRegIndex;
+  RelativeAddress := Read(AddressWidth);
+  Regs[RegIndex1] := Memory.Read(Regs[RegIndex2] + RelativeAddress, DataWidth);
+end;
+
+procedure TCpu.InstructionLoadMemIndexSize;
+var
+  DataSize: TBigIntSize;
+  RegIndex1: TRegIndex;
+  RegIndex2: TRegIndex;
+  RelativeAddress: TBigInt;
+begin
+  DataSize := ReadSize;
+  RegIndex1 := ReadRegIndex;
+  RegIndex2 := ReadRegIndex;
+  RelativeAddress := Read(AddressWidth);
+  Regs[RegIndex1] := Memory.Read(Regs[RegIndex2] + RelativeAddress, DataSize);
+end;
+
+procedure TCpu.InstructionStoreMemIndex;
+var
+  RegIndex1: TRegIndex;
+  RegIndex2: TRegIndex;
+  RelativeAddress: TBigInt;
+begin
+  RegIndex1 := ReadRegIndex;
+  RegIndex2 := ReadRegIndex;
+  RelativeAddress := Read(AddressWidth);
+  Memory.Write(Regs[RegIndex1] + RelativeAddress, DataWidth, Regs[RegIndex2]);
+end;
+
+procedure TCpu.InstructionStoreMemIndexSize;
+var
+  DataSize: TBigIntSize;
+  RegIndex1: TRegIndex;
+  RegIndex2: TRegIndex;
+  RelativeAddress: TBigInt;
+begin
+  DataSize := ReadSize;
+  RegIndex1 := ReadRegIndex;
+  RegIndex2 := ReadRegIndex;
+  RelativeAddress := Read(AddressWidth);
+  Memory.Write(Regs[RegIndex1] + RelativeAddress, DataSize, Regs[RegIndex2]);
 end;
 
@@ -603 +657 @@
   FInstructions[inStoreMem] := InstructionStoreMem;
   FInstructions[inStoreMemSize] := InstructionStoreMemSize;
+  FInstructions[inLoadMemIndex] := InstructionLoadMemIndex;
+  FInstructions[inLoadMemIndexSize] := InstructionLoadMemIndexSize;
+  FInstructions[inStoreMemIndex] := InstructionStoreMemIndex;
+  FInstructions[inStoreMemIndexSize] := InstructionStoreMemIndexSize;
   FInstructions[inJump] := InstructionJump;
   FInstructions[inJumpSize] := InstructionJumpSize;
@@ -802 +860 @@
 - bit index 2048 (256 * 8) (8 + 3) bits = 2^11
 
+LD   R0, R1
+LD2  R0, R1
+LD.2 R0, R1
+LD:2 R0, R1
+LD   D2, R0, R1
+LD   D2, A16, R0, (R1)
+LD   D2:A16: R0, (R1)
+RET
+RET2
+RET.2
+RET:2
+RET  A2
+PUSH   R0
+PUSH2  R0
+PUSH.2 R0
+PUSH:2 R0
+PUSH   D2, R0
+PUSH   D2:R0
+PUSH   R0.2
+PUSH   R0:2
+LD     (R0), (R2)
+LD     D1, A2, (R0), (R2)
+LDIR   (R0), (R1), R2
+LDIR   D1, A2, (R0), (R1), R2
+LDI
+OUT    (R0), R1
+OUT    D1, (R0), R1
+OUT    D1, A2, (R0), R1