Changeset 154

Timestamp:

Apr 23, 2018, 2:13:10 PM (6 years ago)

Author:

chronos

Message:

• Added: More opcodes with handlers.

Location:

branches/virtualcpu2

Files:

• UFormMain.lfm (modified) (1 diff)
• UFormMain.pas (modified) (3 diffs)
• UMachine.pas (modified) (18 diffs)

branches/virtualcpu2/UFormMain.lfm

@@ -7 +7 @@
   ClientHeight = 732
   ClientWidth = 1504
+  DesignTimePPI = 120
   OnCreate = FormCreate
   OnDestroy = FormDestroy
   OnShow = FormShow
-  LCLVersion = '1.8.0.4'
+  LCLVersion = '1.8.2.0'
   object ButtonRun: TButton
     Left = 32

branches/virtualcpu2/UFormMain.pas

@@ -95 +95 @@
   Counter = 3;
   Temp = 4;
+  Jump = 5;
 var
   Writer: TInstructionWriter;
@@ -103 +104 @@
     Machine := Self.Machine;
     AddGetDataSize(Temp);
-    AddCopyConst(Temp, 1);
+    AddCopyConst8(Temp, 1);
 
     AddCopyConst(Counter, 8);
@@ -116 +117 @@
     AddDec(Counter);
     AddTestNotZero(Counter);
-    AddJumpRelCond8(LoopAddr - Addr);
+    AddCopyConst8(Jump, LoopAddr - (Addr + 3));
+    AddJumpRelCond8(Jump);
     AddHalt;
   end;

branches/virtualcpu2/UMachine.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Math;
+  Classes, SysUtils;
 
 type
- Int8    = ShortInt;
- Int16   = SmallInt;
- Int32   = Longint;
- PInt8 = ^Int8;
- PInt16 = ^Int16;
- PInt32 = ^Int32;
- UInt8   = Byte;
- UInt16  = Word;
- UInt32  = Cardinal;
- PUInt8   = ^UInt8;
- PUInt16  = ^UInt16;
- PUInt32  = ^UInt16;
+  Int8 = ShortInt;
+  Int16 = SmallInt;
+  Int32 = Longint;
+  PInt8 = ^Int8;
+  PInt16 = ^Int16;
+  PInt32 = ^Int32;
+  UInt8 = Byte;
+  UInt16 = Word;
+  UInt32 = Cardinal;
+  PUInt8 = ^UInt8;
+  PUInt16 = ^UInt16;
+  PUInt32 = ^UInt16;
 
 
@@ -38 +38 @@
 
   TOpcode = (
+    // Special
+    opNop,
+    opHalt,
+    opGetSize,
+    opSetSize, opSetSize8, opSetSize16, opSetSize32, opSetSize64,
     // Data move
     opCopy,
@@ -82 +87 @@
     // Block operations
     opLdir,
-    opLddr,
-    // Special
-    opNop,
-    opHalt,
-    opGetSize,
-    opSetSize, opSetSize8, opSetSize16, opSetSize32, opSetSize64
+    opLddr
   );
 
@@ -121 +121 @@
     procedure OpcodeXor;
     procedure OpcodePop;
+    procedure OpcodePop8;
+    procedure OpcodePop16;
+    procedure OpcodePop32;
+    procedure OpcodePop64;
     procedure OpcodePush;
     procedure OpcodePush8;
@@ -133 +137 @@
     procedure OpcodeInc64;
     procedure OpcodeDec;
+    procedure OpcodeDec8;
+    procedure OpcodeDec16;
+    procedure OpcodeDec32;
+    procedure OpcodeDec64;
     procedure OpcodeTestNotZero;
     procedure OpcodeTestZero;
     procedure OpcodeJumpRel;
+    procedure OpcodeJumpRel8;
+    procedure OpcodeJumpRel16;
+    procedure OpcodeJumpRel32;
+    procedure OpcodeJumpRel64;
     procedure OpcodeJumpAbs;
+    procedure OpcodeJumpAbs8;
+    procedure OpcodeJumpAbs16;
+    procedure OpcodeJumpAbs32;
+    procedure OpcodeJumpAbs64;
     procedure OpcodeJumpRelCond;
     procedure OpcodeJumpRelCond8;
+    procedure OpcodeJumpRelCond16;
+    procedure OpcodeJumpRelCond32;
+    procedure OpcodeJumpRelCond64;
     procedure OpcodeJumpAbsCond;
+    procedure OpcodeJumpAbsCond8;
+    procedure OpcodeJumpAbsCond16;
+    procedure OpcodeJumpAbsCond32;
+    procedure OpcodeJumpAbsCond64;
     procedure OpcodeCallRel;
     procedure OpcodeCallAbs;
@@ -151 +174 @@
     procedure OpcodeSetSize64;
     function ReadNext: TDataInt;
+    function ReadNext8: UInt8;
+    function ReadNext16: UInt16;
+    function ReadNext32: UInt32;
+    function ReadNext64: UInt64;
     function ReadNextS: TDataInt;
-    function ReadNext8: Byte;
-    function ReadNextS8: ShortInt;
-    function ReadNext16: Word;
-    function ReadNext32: Cardinal;
-    function ReadNext64: QWord;
+    function ReadNextS8: Int8;
+    function ReadNextS16: Int16;
+    function ReadNextS32: Int32;
+    function ReadNextS64: Int64;
     procedure SetOpcode(Opcode: TOpcode; Handler: TOpcodeHandler; DataSize: TDataSize = dsNative);
     procedure InitOpcode;
@@ -192 +218 @@
     procedure AddHalt;
     procedure AddTestNotZero(Reg: TRegIndex);
-    procedure AddJumpRelCond(RelAddr: Integer);
-    procedure AddJumpRelCond8(RelAddr: ShortInt);
+    procedure AddJumpRelCond(Reg: Integer);
+    procedure AddJumpRelCond8(Reg: TRegIndex);
     constructor Create;
   end;
@@ -244 +270 @@
   SetOpcode(opInc, OpcodeInc64, ds64);
   SetOpcode(opDec, OpcodeDec);
+  SetOpcode(opDec, OpcodeDec8, ds8);
+  SetOpcode(opDec, OpcodeDec16, ds16);
+  SetOpcode(opDec, OpcodeDec32, ds32);
+  SetOpcode(opDec, OpcodeDec64, ds64);
   SetOpcode(opTestZero, OpcodeTestZero);
   SetOpcode(opTestNotZero, OpcodeTestNotZero);
   SetOpcode(opJumpRel, OpcodeJumpRel);
+  SetOpcode(opJumpRel, OpcodeJumpRel8, ds8);
+  SetOpcode(opJumpRel, OpcodeJumpRel16, ds16);
+  SetOpcode(opJumpRel, OpcodeJumpRel32, ds32);
+  SetOpcode(opJumpRel, OpcodeJumpRel64, ds64);
   SetOpcode(opJumpAbs, OpcodeJumpAbs);
+  SetOpcode(opJumpAbs, OpcodeJumpAbs8, ds8);
+  SetOpcode(opJumpAbs, OpcodeJumpAbs16, ds16);
+  SetOpcode(opJumpAbs, OpcodeJumpAbs32, ds32);
+  SetOpcode(opJumpAbs, OpcodeJumpAbs64, ds64);
   SetOpcode(opJumpRelCond, OpcodeJumpRelCond);
   SetOpcode(opJumpRelCond, OpcodeJumpRelCond8, ds8);
+  SetOpcode(opJumpRelCond, OpcodeJumpRelCond16, ds16);
+  SetOpcode(opJumpRelCond, OpcodeJumpRelCond32, ds32);
+  SetOpcode(opJumpRelCond, OpcodeJumpRelCond64, ds64);
   SetOpcode(opJumpAbsCond, OpcodeJumpAbsCond);
-  SetOpcode(opCallRel, OpcodeCAllRel);
+  SetOpcode(opJumpAbsCond, OpcodeJumpAbsCond8, ds8);
+  SetOpcode(opJumpAbsCond, OpcodeJumpAbsCond16, ds16);
+  SetOpcode(opJumpAbsCond, OpcodeJumpAbsCond32, ds32);
+  SetOpcode(opJumpAbsCond, OpcodeJumpAbsCond64, ds64);
+  SetOpcode(opCallRel, OpcodeCallRel);
   SetOpcode(opCallAbs, OpcodeCallAbs);
   SetOpcode(opCallRelCond, OpcodeCallRelCond);
@@ -267 +312 @@
   SetOpcode(opPush, OpcodePush64, ds64);
   SetOpcode(opPop, OpcodePop);
+  SetOpcode(opPop, OpcodePop8, ds8);
+  SetOpcode(opPop, OpcodePop16, ds16);
+  SetOpcode(opPop, OpcodePop32, ds32);
+  SetOpcode(opPop, OpcodePop64, ds64);
+  SetOpcode(opSetSize, OpcodeSetSize);
   SetOpcode(opSetSize8, OpcodeSetSize8);
+  SetOpcode(opSetSize16, OpcodeSetSize16);
+  SetOpcode(opSetSize32, OpcodeSetSize32);
+  SetOpcode(opSetSize64, OpcodeSetSize64);
 end;
 
@@ -495 +548 @@
 procedure TMachine.OpcodePop;
 var
-  Dest: TRegIndex;
-begin
-  Dest := ReadNext8;
-  PDataInt(@Registers[Dest])^ := PDataInt(@Memory[SP])^;
+  Reg: TRegIndex;
+begin
+  Reg := ReadNext8;
+  PDataInt(@Registers[Reg])^ := PDataInt(@Memory[SP])^;
   Inc(SP, SizeOf(TDataInt));
+end;
+
+procedure TMachine.OpcodePop8;
+var
+  Reg: TRegIndex;
+begin
+  Reg := ReadNext8;
+  PUInt8(@Registers[Reg])^ := PUInt8(@Memory[SP])^;
+  Inc(SP, SizeOf(UInt8));
+end;
+
+procedure TMachine.OpcodePop16;
+var
+  Reg: TRegIndex;
+begin
+  Reg := ReadNext8;
+  PUInt16(@Registers[Reg])^ := PUInt16(@Memory[SP])^;
+  Inc(SP, SizeOf(UInt16));
+end;
+
+procedure TMachine.OpcodePop32;
+var
+  Reg: TRegIndex;
+begin
+  Reg := ReadNext8;
+  PUInt32(@Registers[Reg])^ := PUInt32(@Memory[SP])^;
+  Inc(SP, SizeOf(UInt32));
+end;
+
+procedure TMachine.OpcodePop64;
+var
+  Reg: TRegIndex;
+begin
+  Reg := ReadNext8;
+  PUInt64(@Registers[Reg])^ := PUInt64(@Memory[SP])^;
+  Inc(SP, SizeOf(UInt64));
 end;
 
@@ -612 +701 @@
 end;
 
+procedure TMachine.OpcodeDec8;
+var
+  Reg: TRegIndex;
+begin
+  Reg := ReadNext8;
+  PUInt8(@Registers[Reg])^ := PUInt8(@Registers[Reg])^ - 1;
+end;
+
+procedure TMachine.OpcodeDec16;
+var
+  Reg: TRegIndex;
+begin
+  Reg := ReadNext8;
+  PUInt16(@Registers[Reg])^ := PUInt16(@Registers[Reg])^ - 1;
+end;
+
+procedure TMachine.OpcodeDec32;
+var
+  Reg: TRegIndex;
+begin
+  Reg := ReadNext8;
+  PUInt32(@Registers[Reg])^ := PUInt32(@Registers[Reg])^ - 1;
+end;
+
+procedure TMachine.OpcodeDec64;
+var
+  Reg: TRegIndex;
+begin
+  Reg := ReadNext8;
+  PUInt64(@Registers[Reg])^ := PUInt64(@Registers[Reg])^ - 1;
+end;
+
 procedure TMachine.OpcodeTestNotZero;
 var
@@ -630 +751 @@
 procedure TMachine.OpcodeJumpRel;
 var
-  RelAddr: TAddrInt;
-begin
-  RelAddr := ReadNextS;
-  IP := IP + RelAddr;
+  Reg: TRegIndex;
+begin
+  Reg := ReadNext8;
+  IP := IP + PDataInt(@Registers[Reg])^;
+end;
+
+procedure TMachine.OpcodeJumpRel8;
+var
+  Reg: TRegIndex;
+begin
+  Reg := ReadNext8;
+  IP := IP + PInt8(@Registers[Reg])^;
+end;
+
+procedure TMachine.OpcodeJumpRel16;
+var
+  Reg: TRegIndex;
+begin
+  Reg := ReadNext8;
+  IP := IP + PInt16(@Registers[Reg])^;
+end;
+
+procedure TMachine.OpcodeJumpRel32;
+var
+  Reg: TRegIndex;
+begin
+  Reg := ReadNext8;
+  IP := IP + PInt32(@Registers[Reg])^;
+end;
+
+procedure TMachine.OpcodeJumpRel64;
+var
+  Reg: TRegIndex;
+begin
+  Reg := ReadNext8;
+  IP := IP + PInt64(@Registers[Reg])^;
 end;
 
 procedure TMachine.OpcodeJumpAbs;
 var
-  Addr: TAddrInt;
-begin
-  Addr := ReadNext;
-  IP := Addr;
+  Reg: TRegIndex;
+begin
+  Reg := ReadNext8;
+  IP := PDataInt(@Registers[Reg])^;
+end;
+
+procedure TMachine.OpcodeJumpAbs8;
+var
+  Reg: TRegIndex;
+begin
+  Reg := ReadNext8;
+  IP := PByte(@Registers[Reg])^;
+end;
+
+procedure TMachine.OpcodeJumpAbs16;
+var
+  Reg: TRegIndex;
+begin
+  Reg := ReadNext8;
+  IP := PWord(@Registers[Reg])^;
+end;
+
+procedure TMachine.OpcodeJumpAbs32;
+var
+  Reg: TRegIndex;
+begin
+  Reg := ReadNext8;
+  IP := PCardinal(@Registers[Reg])^;
+end;
+
+procedure TMachine.OpcodeJumpAbs64;
+var
+  Reg: TRegIndex;
+begin
+  Reg := ReadNext8;
+  IP := PQWord(@Registers[Reg])^;
 end;
 
 procedure TMachine.OpcodeJumpRelCond;
 var
-  RelAddr: TAddrInt;
-begin
-  RelAddr := ReadNextS;
-  if Condition then IP := IP + RelAddr;
+  Reg: TRegIndex;
+begin
+  Reg := ReadNext8;
+  if Condition then IP := IP + PDataInt(@Registers[Reg])^;
 end;
 
 procedure TMachine.OpcodeJumpRelCond8;
 var
-  RelAddr: Int8;
-begin
-  RelAddr := ReadNextS8;
-  if Condition then IP := IP + RelAddr;
+  Reg: TRegIndex;
+begin
+  Reg := ReadNext8;
+  if Condition then IP := IP + PInt8(@Registers[Reg])^;
+end;
+
+procedure TMachine.OpcodeJumpRelCond16;
+var
+  Reg: TRegIndex;
+begin
+  Reg := ReadNext8;
+  if Condition then IP := IP + PInt16(@Registers[Reg])^;
+end;
+
+procedure TMachine.OpcodeJumpRelCond32;
+var
+  Reg: TRegIndex;
+begin
+  Reg := ReadNext8;
+  if Condition then IP := IP + PInt32(@Registers[Reg])^;
+end;
+
+procedure TMachine.OpcodeJumpRelCond64;
+var
+  Reg: TRegIndex;
+begin
+  Reg := ReadNext8;
+  if Condition then IP := IP + PInt64(@Registers[Reg])^;
 end;
 
 procedure TMachine.OpcodeJumpAbsCond;
 var
-  Addr: TAddrInt;
-begin
-  Addr := ReadNext;
-  if Condition then IP := Addr;
+  Reg: TRegIndex;
+begin
+  Reg := ReadNext8;
+  if Condition then IP := PDataInt(@Registers[Reg])^;
+end;
+
+procedure TMachine.OpcodeJumpAbsCond8;
+var
+  Reg: TRegIndex;
+begin
+  Reg := ReadNext8;
+  if Condition then IP := PByte(@Registers[Reg])^;
+end;
+
+procedure TMachine.OpcodeJumpAbsCond16;
+var
+  Reg: TRegIndex;
+begin
+  Reg := ReadNext8;
+  if Condition then IP := PWord(@Registers[Reg])^;
+end;
+
+procedure TMachine.OpcodeJumpAbsCond32;
+var
+  Reg: TRegIndex;
+begin
+  Reg := ReadNext8;
+  if Condition then IP := PCardinal(@Registers[Reg])^;
+end;
+
+procedure TMachine.OpcodeJumpAbsCond64;
+var
+  Reg: TRegIndex;
+begin
+  Reg := ReadNext8;
+  if Condition then IP := PQWord(@Registers[Reg])^;
 end;
 
@@ -762 +1003 @@
 end;
 
-function TMachine.ReadNext8: Byte;
+function TMachine.ReadNext8: UInt8;
 begin
   CheckIP;
@@ -769 +1010 @@
 end;
 
-function TMachine.ReadNextS8: ShortInt;
+function TMachine.ReadNextS8: Int8;
 begin
   CheckIP;
@@ -776 +1017 @@
 end;
 
-function TMachine.ReadNext16: Word;
+function TMachine.ReadNextS16: Int16;
+begin
+  CheckIP;
+  Result := PInt16(@Memory[IP])^;
+  Inc(IP, SizeOf(Int16));
+end;
+
+function TMachine.ReadNextS32: Int32;
+begin
+  CheckIP;
+  Result := PInt32(@Memory[IP])^;
+  Inc(IP, SizeOf(Int32));
+end;
+
+function TMachine.ReadNextS64: Int64;
+begin
+  CheckIP;
+  Result := PInt64(@Memory[IP])^;
+  Inc(IP, SizeOf(Int64));
+end;
+
+function TMachine.ReadNext16: UInt16;
 begin
   CheckIP;
@@ -783 +1045 @@
 end;
 
-function TMachine.ReadNext32: Cardinal;
+function TMachine.ReadNext32: UInt32;
 begin
   CheckIP;
@@ -790 +1052 @@
 end;
 
-function TMachine.ReadNext64: QWord;
+function TMachine.ReadNext64: UInt64;
 begin
   CheckIP;
@@ -881 +1143 @@
 end;
 
-procedure TInstructionWriter.AddJumpRelCond(RelAddr: Integer);
+procedure TInstructionWriter.AddJumpRelCond(Reg: Integer);
 begin
   AddData8(Integer(opJumpRelCond));
-  AddDataS(RelAddr - SizeOf(Byte) - SizeOf(TDataInt));
-end;
-
-procedure TInstructionWriter.AddJumpRelCond8(RelAddr: ShortInt);
+  AddDataS(Reg);
+end;
+
+procedure TInstructionWriter.AddJumpRelCond8(Reg: TRegIndex);
 begin
   AddData8(Integer(opSetSize8));
   AddData8(Integer(opJumpRelCond));
-  AddDataS8(RelAddr - SizeOf(Byte) - SizeOf(TDataInt));
+  AddData8(Reg);
 end;