Changeset 182 for branches/virtualcpu4/UCpu.pas

Timestamp:

Apr 13, 2019, 1:32:32 PM (6 years ago)

Author:

chronos

Message:

• Fixed: Allow to use multiple prefix instructions in row.

File:

• branches/virtualcpu4/UCpu.pas (modified) (12 diffs)

branches/virtualcpu4/UCpu.pas

@@ -41 +41 @@
   TCpu = class
   private
+    FAddrSizeBase: TBitWidth;
+    FDataSizeBase: TBitWidth;
     FOnInput: TInputEvent;
     FOnOutput: TOutputEvent;
@@ -46 +48 @@
     FTicks: Integer;
     Instructions: array[TOpcode] of TInstructionEvent;
-    DataSizeLast: TBitWidth;
-    DataSizePrefix: TBitWidth;
-    AddrSizeLast: TBitWidth;
-    AddrSizePrefix: TBitWidth;
+    Prefix: Boolean;
     Z: Boolean;
     Thread: TCpuThread;
@@ -101 +100 @@
     procedure InstAddrSize;
     procedure InitInstructions;
+    procedure SetAddrSizeBase(AValue: TBitWidth);
+    procedure SetDataSizeBase(AValue: TBitWidth);
   public
     Memory: Pointer;
@@ -107 +108 @@
     IP: TAddress;
     SP: TAddress;
+    DataSize: TBitWidth;
     AddrSize: TBitWidth;
-    DataSize: TBitWidth;
     procedure Run;
     procedure Step; inline;
@@ -121 +122 @@
     constructor Create;
     destructor Destroy; override;
+    property DataSizeBase: TBitWidth read FDataSizeBase write SetDataSizeBase;
+    property AddrSizeBase: TBitWidth read FAddrSizeBase write SetAddrSizeBase;
     property Ticks: Integer read FTicks;
     property Running: Boolean read FRunning;
@@ -140 +143 @@
     Param2: TOpcodeParam;
     Param3: TOpcodeParam;
+    Prefix: Boolean;
   end;
 
@@ -146 +150 @@
   BitWidthText: array[TBitWidth] of string = ('None', '8-bit', '16-bit', '32-bit', '64-bit');
   OpcodeDef: array[TOpcode] of TOpcodeDef = (
-    (Name: 'NOP'; Param1: prNone; Param2: prNone; Param3: prNone),
-    (Name: 'HALT'; Param1: prNone; Param2: prNone; Param3: prNone),
-    (Name: 'LD'; Param1: prReg; Param2: prReg; Param3: prNone),
-    (Name: 'LDI'; Param1: prReg; Param2: prData; Param3: prNone),
-    (Name: 'JP'; Param1: prAddr; Param2: prNone; Param3: prNone),
-    (Name: 'JPZ'; Param1: prAddr; Param2: prNone; Param3: prNone),
-    (Name: 'JPNZ'; Param1: prAddr; Param2: prNone; Param3: prNone),
-    (Name: 'JR'; Param1: prAddrRel; Param2: prNone; Param3: prNone),
-    (Name: 'JRZ'; Param1: prAddrRel; Param2: prNone; Param3: prNone),
-    (Name: 'JRNZ'; Param1: prAddrRel; Param2: prNone; Param3: prNone),
-    (Name: 'NEG'; Param1: prReg; Param2: prNone; Param3: prNone),
-    (Name: 'CLR'; Param1: prReg; Param2: prNone; Param3: prNone),
-    (Name: 'LDM'; Param1: prReg; Param2: prReg; Param3: prNone),
-    (Name: 'STM'; Param1: prReg; Param2: prReg; Param3: prNone),
-    (Name: 'EX'; Param1: prReg; Param2: prReg; Param3: prNone),
-    (Name: 'PUSH'; Param1: prReg; Param2: prNone; Param3: prNone),
-    (Name: 'POP'; Param1: prReg; Param2: prNone; Param3: prNone),
-    (Name: 'CALL'; Param1: prAddr; Param2: prNone; Param3: prNone),
-    (Name: 'RET'; Param1: prNone; Param2: prNone; Param3: prNone),
-    (Name: 'ADD'; Param1: prReg; Param2: prReg; Param3: prNone),
-    (Name: 'ADDI'; Param1: prReg; Param2: prData; Param3: prNone),
-    (Name: 'SUB'; Param1: prReg; Param2: prReg; Param3: prNone),
-    (Name: 'SUBI'; Param1: prReg; Param2: prData; Param3: prNone),
-    (Name: 'INC'; Param1: prReg; Param2: prNone; Param3: prNone),
-    (Name: 'DEC'; Param1: prReg; Param2: prNone; Param3: prNone),
-    (Name: 'IN'; Param1: prReg; Param2: prAddr; Param3: prNone),
-    (Name: 'OUT'; Param1: prAddr; Param2: prReg; Param3: prNone),
-    (Name: 'SHL'; Param1: prReg; Param2: prReg; Param3: prNone),
-    (Name: 'SHR'; Param1: prReg; Param2: prReg; Param3: prNone),
-    (Name: 'DP8'; Param1: prNone; Param2: prNone; Param3: prNone),
-    (Name: 'DP16'; Param1: prNone; Param2: prNone; Param3: prNone),
-    (Name: 'DP32'; Param1: prNone; Param2: prNone; Param3: prNone),
-    (Name: 'DP64'; Param1: prNone; Param2: prNone; Param3: prNone),
-    (Name: 'DS'; Param1: prNone; Param2: prNone; Param3: prNone),
-    (Name: 'AS'; Param1: prNone; Param2: prNone; Param3: prNone),
-    (Name: 'TEST'; Param1: prReg; Param2: prNone; Param3: prNone),
-    (Name: 'AND'; Param1: prReg; Param2: prReg; Param3: prNone),
-    (Name: 'OR'; Param1: prReg; Param2: prReg; Param3: prNone),
-    (Name: 'XOR'; Param1: prReg; Param2: prReg; Param3: prNone),
-    (Name: 'LDDR'; Param1: prReg; Param2: prReg; Param3: prReg),
-    (Name: 'LDDR'; Param1: prReg; Param2: prReg; Param3: prReg),
-    (Name: 'MUL'; Param1: prReg; Param2: prReg; Param3: prNone),
-    (Name: 'DIV'; Param1: prReg; Param2: prReg; Param3: prNone),
-    (Name: 'MOD'; Param1: prReg; Param2: prReg; Param3: prNone),
-    (Name: 'AP8'; Param1: prNone; Param2: prNone; Param3: prNone),
-    (Name: 'AP16'; Param1: prNone; Param2: prNone; Param3: prNone),
-    (Name: 'AP32'; Param1: prNone; Param2: prNone; Param3: prNone),
-    (Name: 'AP64'; Param1: prNone; Param2: prNone; Param3: prNone)
+    (Name: 'NOP'; Param1: prNone; Param2: prNone; Param3: prNone; Prefix: False),
+    (Name: 'HALT'; Param1: prNone; Param2: prNone; Param3: prNone; Prefix: False),
+    (Name: 'LD'; Param1: prReg; Param2: prReg; Param3: prNone; Prefix: False),
+    (Name: 'LDI'; Param1: prReg; Param2: prData; Param3: prNone; Prefix: False),
+    (Name: 'JP'; Param1: prAddr; Param2: prNone; Param3: prNone; Prefix: False),
+    (Name: 'JPZ'; Param1: prAddr; Param2: prNone; Param3: prNone; Prefix: False),
+    (Name: 'JPNZ'; Param1: prAddr; Param2: prNone; Param3: prNone; Prefix: False),
+    (Name: 'JR'; Param1: prAddrRel; Param2: prNone; Param3: prNone; Prefix: False),
+    (Name: 'JRZ'; Param1: prAddrRel; Param2: prNone; Param3: prNone; Prefix: False),
+    (Name: 'JRNZ'; Param1: prAddrRel; Param2: prNone; Param3: prNone; Prefix: False),
+    (Name: 'NEG'; Param1: prReg; Param2: prNone; Param3: prNone; Prefix: False),
+    (Name: 'CLR'; Param1: prReg; Param2: prNone; Param3: prNone; Prefix: False),
+    (Name: 'LDM'; Param1: prReg; Param2: prReg; Param3: prNone; Prefix: False),
+    (Name: 'STM'; Param1: prReg; Param2: prReg; Param3: prNone; Prefix: False),
+    (Name: 'EX'; Param1: prReg; Param2: prReg; Param3: prNone; Prefix: False),
+    (Name: 'PUSH'; Param1: prReg; Param2: prNone; Param3: prNone; Prefix: False),
+    (Name: 'POP'; Param1: prReg; Param2: prNone; Param3: prNone; Prefix: False),
+    (Name: 'CALL'; Param1: prAddr; Param2: prNone; Param3: prNone; Prefix: False),
+    (Name: 'RET'; Param1: prNone; Param2: prNone; Param3: prNone; Prefix: False),
+    (Name: 'ADD'; Param1: prReg; Param2: prReg; Param3: prNone; Prefix: False),
+    (Name: 'ADDI'; Param1: prReg; Param2: prData; Param3: prNone; Prefix: False),
+    (Name: 'SUB'; Param1: prReg; Param2: prReg; Param3: prNone; Prefix: False),
+    (Name: 'SUBI'; Param1: prReg; Param2: prData; Param3: prNone; Prefix: False),
+    (Name: 'INC'; Param1: prReg; Param2: prNone; Param3: prNone; Prefix: False),
+    (Name: 'DEC'; Param1: prReg; Param2: prNone; Param3: prNone; Prefix: False),
+    (Name: 'IN'; Param1: prReg; Param2: prAddr; Param3: prNone; Prefix: False),
+    (Name: 'OUT'; Param1: prAddr; Param2: prReg; Param3: prNone; Prefix: False),
+    (Name: 'SHL'; Param1: prReg; Param2: prReg; Param3: prNone; Prefix: False),
+    (Name: 'SHR'; Param1: prReg; Param2: prReg; Param3: prNone; Prefix: False),
+    (Name: 'DP8'; Param1: prNone; Param2: prNone; Param3: prNone; Prefix: True),
+    (Name: 'DP16'; Param1: prNone; Param2: prNone; Param3: prNone; Prefix: False),
+    (Name: 'DP32'; Param1: prNone; Param2: prNone; Param3: prNone; Prefix: True),
+    (Name: 'DP64'; Param1: prNone; Param2: prNone; Param3: prNone; Prefix: True),
+    (Name: 'DS'; Param1: prNone; Param2: prNone; Param3: prNone; Prefix: False),
+    (Name: 'AS'; Param1: prNone; Param2: prNone; Param3: prNone; Prefix: False),
+    (Name: 'TEST'; Param1: prReg; Param2: prNone; Param3: prNone; Prefix: False),
+    (Name: 'AND'; Param1: prReg; Param2: prReg; Param3: prNone; Prefix: False),
+    (Name: 'OR'; Param1: prReg; Param2: prReg; Param3: prNone; Prefix: False),
+    (Name: 'XOR'; Param1: prReg; Param2: prReg; Param3: prNone; Prefix: False),
+    (Name: 'LDDR'; Param1: prReg; Param2: prReg; Param3: prReg; Prefix: False),
+    (Name: 'LDDR'; Param1: prReg; Param2: prReg; Param3: prReg; Prefix: False),
+    (Name: 'MUL'; Param1: prReg; Param2: prReg; Param3: prNone; Prefix: False),
+    (Name: 'DIV'; Param1: prReg; Param2: prReg; Param3: prNone; Prefix: False),
+    (Name: 'MOD'; Param1: prReg; Param2: prReg; Param3: prNone; Prefix: False),
+    (Name: 'AP8'; Param1: prNone; Param2: prNone; Param3: prNone; Prefix: True),
+    (Name: 'AP16'; Param1: prNone; Param2: prNone; Param3: prNone; Prefix: True),
+    (Name: 'AP32'; Param1: prNone; Param2: prNone; Param3: prNone; Prefix: True),
+    (Name: 'AP64'; Param1: prNone; Param2: prNone; Param3: prNone; Prefix: True)
   );
 
@@ -991 +995 @@
 procedure TCpu.InstDataPrefix8;
 begin
-  DataSizePrefix := bw8;
+  DataSize := bw8;
+  Prefix := True;
 end;
 
 procedure TCpu.InstDataPrefix16;
 begin
-  DataSizePrefix := bw16;
+  DataSize := bw16;
+  Prefix := True;
 end;
 
 procedure TCpu.InstDataPrefix32;
 begin
-  DataSizePrefix := bw32;
+  DataSize := bw32;
+  Prefix := True;
 end;
 
 procedure TCpu.InstDataPrefix64;
 begin
-  DataSizePrefix := bw64;
+  DataSize := bw64;
+  Prefix := True;
 end;
 
 procedure TCpu.InstDataSize;
 begin
-  DataSize := TBitWidth(Read8);
+  DataSizeBase := TBitWidth(Read8);
+  DataSize := DataSizeBase;
 end;
 
 procedure TCpu.InstAddrPrefix8;
 begin
-  AddrSizePrefix := bw8;
+  AddrSize := bw8;
+  Prefix := True;
 end;
 
 procedure TCpu.InstAddrPrefix16;
 begin
-  AddrSizePrefix := bw16;
+  AddrSize := bw16;
+  Prefix := True;
 end;
 
 procedure TCpu.InstAddrPrefix32;
 begin
-  AddrSizePrefix := bw32;
+  AddrSize := bw32;
+  Prefix := True;
 end;
 
 procedure TCpu.InstAddrPrefix64;
 begin
-  AddrSizePrefix := bw64;
+  AddrSize := bw64;
+  Prefix := True;
 end;
 
 procedure TCpu.InstAddrSize;
 begin
-  AddrSize := TBitWidth(Read8);
+  AddrSizeBase := TBitWidth(Read8);
+  AddrSize := AddrSizeBase;
 end;
 
@@ -1091 +1105 @@
 end;
 
+procedure TCpu.SetAddrSizeBase(AValue: TBitWidth);
+begin
+  if FAddrSizeBase = AValue then Exit;
+  FAddrSizeBase := AValue;
+  AddrSize := AValue;
+end;
+
+procedure TCpu.SetDataSizeBase(AValue: TBitWidth);
+begin
+  if FDataSizeBase = AValue then Exit;
+  FDataSizeBase := AValue;
+  DataSize := AValue;
+end;
+
 procedure TCpu.Run;
 begin
+  DataSize := DataSizeBase;
+  AddrSize := AddrSizeBase;
   Terminated := False;
   FTicks := 0;
-  DataSizeLast := bwNone;
   IP := 0;
   SP := MemSize(Memory);
@@ -1106 +1135 @@
   Opcode: Byte;
 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;
+  Prefix := False;
   Opcode := Read8;
   if Opcode < Length(Instructions) then begin
@@ -1121 +1141 @@
       else raise Exception.Create('Missing instruction handler for opcode '+ IntToStr(Opcode));
   end else raise Exception.Create('Unsupported opcode ' + IntToStr(Opcode) + ' at address ' + IntToHex(IP - 1, 8) + '.');
-  if DataSizeLast <> bwNone then begin
-    DataSize := DataSizeLast;
-    DataSizeLast := bwNone;
-  end;
-  if AddrSizeLast <> bwNone then begin
-    AddrSize := AddrSizeLast;
-    AddrSizeLast := bwNone;
+  if not Prefix then begin
+    DataSize := DataSizeBase;
+    AddrSize := AddrSizeBase;
   end;
   IP := IP mod MemSize(Memory);
@@ -1201 +1217 @@
 constructor TCpu.Create;
 begin
-  DataSize := bw16;
-  AddrSize := bw16;
+  DataSizeBase := bw16;
+  AddrSizeBase := bw16;
   SetLength(Registers, 32);
   InitInstructions;