Changeset 177 for branches/virtualcpu4/UInstructionWriter.pas

Timestamp:

Apr 12, 2019, 2:03:51 PM (6 years ago)

Author:

chronos

Message:

• Modified: Better use data and address prefix opcodes.
• Added: More instructions.

File:

• branches/virtualcpu4/UInstructionWriter.pas (modified) (11 diffs)

branches/virtualcpu4/UInstructionWriter.pas

@@ -13 +13 @@
 
   TInstructionWriter = class
+  private
+    DataSizeLast: TBitWidth;
+    DataSizePrefix: TBitWidth;
+    AddrSizeLast: TBitWidth;
+    AddrSizePrefix: TBitWidth;
+    procedure PrefixBegin;
+    procedure PrefixEnd;
+  public
     Cpu: TCpu;
     IP: Integer;
+    DataSize: TBitWidth;
+    AddrSize: TBitWidth;
+    procedure Init;
     procedure Write8(Value: Byte);
     procedure Write16(Value: Word);
@@ -20 +31 @@
     procedure Write64(Value: QWord);
     procedure WriteAddress(Value: TAddress);
+    procedure WriteAddressSigned(Value: TAddressSigned);
     procedure WriteData(Value: QWord);
     procedure WriteString(Text: string);
@@ -27 +39 @@
     procedure Increment(Reg: TRegIndex);
     procedure Decrement(Reg: TRegIndex);
-    procedure Jump(Value: QWord);
-    procedure JumpNotZero(Value: QWord);
+    procedure Jump(Addr: QWord);
+    procedure JumpNotZero(Addr: QWord);
+    procedure JumpZero(Addr: QWord);
+    procedure JumpRel(Addr: QWord);
+    procedure JumpRelNotZero(Addr: QWord);
+    procedure JumpRelZero(Addr: QWord);
     procedure DataPrefix8;
     procedure DataPrefix16;
     procedure DataPrefix32;
     procedure DataPrefix64;
+    procedure AddrPrefix8;
+    procedure AddrPrefix16;
+    procedure AddrPrefix32;
+    procedure AddrPrefix64;
     procedure StoreMem(RegAddr, RegSrc: TRegIndex);
     procedure LoadMem(RegDst, RegAddr: TRegIndex);
@@ -40 +60 @@
   end;
 
+  { TAssembler }
+
+  TAssembler = class
+    Source: TStringList;
+    Dest: array of Byte;
+    procedure Compile;
+  end;
+
+  TDisassembler = class
+
+  end;
+
+const
+  OpcodeName: array[TOpcode] of string = ('NOP', 'HALT', 'LD', 'LDI', 'JP', 'JPZ',
+    'JPNZ', 'JR', 'JRZ', 'JRNZ', 'NEG', 'CLR', 'LDM', 'STM', 'EX', 'PUSH', 'POP',
+    'CALL', 'RET', 'ADD', 'ADDI', 'SUB', 'SUBI', 'INC', 'DEC', 'IN', 'OUT',
+    'SHL', 'SHR', 'DP8', 'DP16', 'DP32', 'DP64', 'DS', 'AS', 'TEST', 'AND', 'OR',
+    'XOR', 'LDDR', 'LDIR', 'MUL', 'DIV', 'MOD', 'AP8', 'AP16', 'AP32', 'AP64');
 
 implementation
 
+{ TAssembler }
+
+procedure TAssembler.Compile;
+begin
+
+end;
+
 { TInstructionWriter }
 
 procedure TInstructionWriter.Nop;
 begin
+  PrefixBegin;
   Write8(Byte(opNop));
+  PrefixEnd;
 end;
 
 procedure TInstructionWriter.Halt;
 begin
+  PrefixBegin;
   Write8(Byte(opHalt));
+  PrefixEnd;
 end;
 
 procedure TInstructionWriter.Loadi(Reg: TRegIndex; Value: QWord);
 begin
+  PrefixBegin;
   Write8(Byte(opLoadi));
   Write8(Reg);
   WriteData(Value);
+  PrefixEnd;
 end;
 
 procedure TInstructionWriter.Increment(Reg: TRegIndex);
 begin
+  PrefixBegin;
   Write8(Byte(opInc));
   Write8(Reg);
+  PrefixEnd;
 end;
 
 procedure TInstructionWriter.Decrement(Reg: TRegIndex);
 begin
+  PrefixBegin;
   Write8(Byte(opDec));
   Write8(Reg);
-end;
-
-procedure TInstructionWriter.Jump(Value: QWord);
-begin
+  PrefixEnd;
+end;
+
+procedure TInstructionWriter.Jump(Addr: QWord);
+begin
+  PrefixBegin;
   Write8(Byte(opJump));
-  WriteAddress(Value);
-end;
-
-procedure TInstructionWriter.JumpNotZero(Value: QWord);
-begin
+  WriteAddress(Addr);
+  PrefixEnd;
+end;
+
+procedure TInstructionWriter.JumpNotZero(Addr: QWord);
+begin
+  PrefixBegin;
   Write8(Byte(opJumpNotZero));
-  WriteAddress(Value);
+  WriteAddress(Addr);
+  PrefixEnd;
+end;
+
+procedure TInstructionWriter.JumpZero(Addr: QWord);
+begin
+  PrefixBegin;
+  Write8(Byte(opJumpZero));
+  WriteAddress(Addr);
+  PrefixEnd;
+end;
+
+procedure TInstructionWriter.JumpRel(Addr: QWord);
+var
+  NextIP: QWord;
+begin
+  PrefixBegin;
+  NextIP := IP + 1 + BitWidthBytes[Cpu.AddrSize];
+  Write8(Byte(opJumpRel));
+  WriteAddressSigned(Int64(Addr) - Int64(NextIP));
+  PrefixEnd;
+end;
+
+procedure TInstructionWriter.JumpRelNotZero(Addr: QWord);
+var
+  NextIP: QWord;
+begin
+  PrefixBegin;
+  NextIP := IP + 1 + BitWidthBytes[Cpu.AddrSize];
+  Write8(Byte(opJumpRelNotZero));
+  WriteAddressSigned(Int64(Addr) - Int64(NextIP));
+  PrefixEnd;
+end;
+
+procedure TInstructionWriter.JumpRelZero(Addr: QWord);
+var
+  NextIP: QWord;
+begin
+  PrefixBegin;
+  NextIP := IP + 1 + BitWidthBytes[Cpu.AddrSize];
+  Write8(Byte(opJumpRelZero));
+  WriteAddressSigned(Int64(Addr) - Int64(NextIP));
+  if AddrSizeLast <> bwNone then AddrSize := AddrSizeLast;
+  PrefixEnd;
 end;
 
 procedure TInstructionWriter.DataPrefix8;
 begin
+  DataSizePrefix := bw8;
   Write8(Byte(opDataPrefix8));
 end;
@@ -93 +195 @@
 procedure TInstructionWriter.DataPrefix16;
 begin
+  DataSizePrefix := bw16;
   Write8(Byte(opDataPrefix16));
 end;
@@ -98 +201 @@
 procedure TInstructionWriter.DataPrefix32;
 begin
+  DataSizePrefix := bw32;
   Write8(Byte(opDataPrefix32));
 end;
@@ -103 +207 @@
 procedure TInstructionWriter.DataPrefix64;
 begin
+  DataSizePrefix := bw64;
   Write8(Byte(opDataPrefix64));
+end;
+
+procedure TInstructionWriter.AddrPrefix8;
+begin
+  AddrSizePrefix := bw8;
+  Write8(Byte(opAddrPrefix8));
+end;
+
+procedure TInstructionWriter.AddrPrefix16;
+begin
+  AddrSizePrefix := bw16;
+  Write8(Byte(opAddrPrefix16));
+end;
+
+procedure TInstructionWriter.AddrPrefix32;
+begin
+  AddrSizePrefix := bw32;
+  Write8(Byte(opAddrPrefix32));
+end;
+
+procedure TInstructionWriter.AddrPrefix64;
+begin
+  AddrSizePrefix := bw64;
+  Write8(Byte(opAddrPrefix64));
 end;
 
@@ -115 +244 @@
 procedure TInstructionWriter.LoadMem(RegDst, RegAddr: TRegIndex);
 begin
+  PrefixBegin;
   Write8(Byte(opLoadMem));
   Write8(RegDst);
   Write8(RegAddr);
+  PrefixEnd;
 end;
 
 procedure TInstructionWriter.Output(Port: TAddress; Reg: TRegIndex);
 begin
+  PrefixBegin;
   Write8(Byte(opOut));
   WriteAddress(Port);
   Write8(Reg);
+  PrefixEnd;
 end;
 
 procedure TInstructionWriter.Input(Reg: TRegIndex; Port: TAddress);
 begin
+  PrefixBegin;
   Write8(Byte(opIn));
   Write8(Reg);
   WriteAddress(Port);
+  PrefixEnd;
 end;
 
 procedure TInstructionWriter.Test(Reg: TRegIndex);
 begin
+  PrefixBegin;
   Write8(Byte(opTest));
   Write8(Reg);
+  Prefixend;
 end;
 
@@ -148 +285 @@
 end;
 
+procedure TInstructionWriter.PrefixBegin;
+begin
+  if DataSizePrefix <> bwNone then begin
+    DataSizeLast := DataSize;
+    DataSize := DataSizePrefix;
+    DataSizePrefix := bwNone;
+  end;
+  if AddrSizePrefix <> bwNone then begin
+    AddrSizeLast := AddrSize;
+    AddrSize := AddrSizePrefix;
+    AddrSizePrefix := bwNone;
+  end;
+end;
+
+procedure TInstructionWriter.PrefixEnd;
+begin
+  if DataSizeLast <> bwNone then begin
+    DataSize := DataSizeLast;
+    DataSizeLast := bwNone;
+  end;
+  if AddrSizeLast <> bwNone then begin
+    AddrSize := AddrSizeLast;
+    AddrSizeLast := bwNone;
+  end;
+end;
+
+procedure TInstructionWriter.Init;
+begin
+  DataSize := Cpu.DataSize;
+  AddrSize := Cpu.AddrSize;
+end;
+
 procedure TInstructionWriter.Write8(Value: Byte);
 begin
@@ -174 +343 @@
 procedure TInstructionWriter.WriteAddress(Value: TAddress);
 begin
-  case Cpu.AddressSize of
+  case AddrSize of
     bw8: Write8(Value);
     bw16: Write16(Value);
@@ -182 +351 @@
 end;
 
+procedure TInstructionWriter.WriteAddressSigned(Value: TAddressSigned);
+begin
+  case AddrSize of
+    bw8: Write8(Byte(Value));
+    bw16: Write16(Word(Value));
+    bw32: Write32(DWord(Value));
+    bw64: Write64(QWord(Value));
+  end;
+end;
+
 procedure TInstructionWriter.WriteData(Value: QWord);
 begin
-  case Cpu.DataSize of
+  case DataSize of
     bw8: Write8(Value);
     bw16: Write16(Value);