Changeset 164

Timestamp:

Aug 7, 2018, 5:30:22 PM (6 years ago)

Author:

chronos

Message:

• Added: More supported CPU instructions.

Location:

branches/virtcpu fixed int

Files:

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

branches/virtcpu fixed int/UFormMain.lfm

@@ -1 +1 @@
 object Form1: TForm1
-  Left = 449
+  Left = 456
   Height = 762
-  Top = 145
+  Top = 163
   Width = 1286
   Caption = 'Form1'

branches/virtcpu fixed int/UMachine.pas

@@ -1 +1 @@
 unit UMachine;
+
+{$DEFINE EXT_MEMORY}
+{$DEFINE EXT_IO}
+{$DEFINE EXT_ARITHMETIC}
+{$DEFINE EXT_CONDITIONAL}
+//{$DEFINE EXT_LOGICAL}
+{$DEFINE EXT_STACK}
+{$DEFINE EXT_SUBROUTINE}
+//{$DEFINE EXT_SHIFT}
+//{$DEFINE EXT_BLOCK}
+{$DEFINE EXT_GENERAL}
+//{$DEFINE EXT_BIT}
+
+// Extension dependencies
+{$IFDEF EXT_SUBROUTINE}
+{$DEFINE EXT_STACK}
+{$ENDIF}
+
 
 {$mode delphi}{$H+}
@@ -12 +30 @@
 
   TOpcode = (opNop, opLoad, opHalt, opLoadConst, opLoadMem, opStoreMem, opNeg,
-    opJump, opJumpRel, opPush, opPop, opCall, opCallRel, opRet, opInput,
-    opOutput, opInc, opDec);
+    opJump, opJumpRel, opCall, opCallRel, opRet, opInput,
+    opOutput, opInc, opDec, opAdd, opSub, opExchg,
+    {$IFDEF EXT_STACK}
+    opPush, opPop,
+    {$ENDIF}
+    {$IFDEF EXT_CONDITIONAL}
+    opJumpRelCond, opJumpCond, opTestEqual, opTestNotEqual, opTestLess,
+    opTestLessEqual, opGreater, opGreaterEqual
+    {$ENDIF}
+  );
 
   TOpcodeHandler = procedure of object;
@@ -31 +57 @@
     procedure OpcodeLoad;
     procedure OpcodeLoadConst;
+    {$IFDEF EXT_MEMORY}
     procedure OpcodeLoadMem;
     procedure OpcodeStoreMem;
+    {$ENDIF}
     procedure OpcodeNeg;
+    {$IFDEF EXT_GENERAL}
+    procedure OpcodeExchange;
+    {$ENDIF}
     procedure OpcodeJump;
     procedure OpcodeJumpRel;
+    {$IFDEF EXT_CONDITIONAL}
+    procedure OpcodeTestEqual;
+    procedure OpcodeTestNotEqual;
+    procedure OpcodeTestGreatEqual;
+    procedure OpcodeTestGreat;
+    procedure OpcodeTestLessEqual;
+    procedure OpcodeTestLess;
+    procedure OpcodeJumpCond;
+    procedure OpcodeJumpRelCond;
+    {$ENDIF}
+    {$IFDEF EXT_STACK}
     procedure OpcodePush;
     procedure OpcodePop;
+    {$ENDIF}
+    {$IFDEF EXT_SUBROUTINE}
     procedure OpcodeCall;
     procedure OpcodeCallRel;
     procedure OpcodeReturn;
+    {$ENDIF}
+    {$IFDEF EXT_IO}
     procedure OpcodeOutput;
     procedure OpcodeInput;
+    {$ENDIF}
     procedure OpcodeInc;
     procedure OpcodeDec;
+    {$IFDEF EXT_ARITHMETIC}
+    procedure OpcodeAdd;
+    procedure OpcodeSub;
+    {$ENDIF}
   public
     Registers: array of T;
     IP: T;
+    {$IFDEF EXT_CONDITIONAL}
+    Condition: Boolean;
+    {$ENDIF}
+    {$IFDEF EXT_STACK}
     SP: T;
+    {$ENDIF}
     Memory: array of T;
     Terminated: Boolean;
@@ -100 +156 @@
 end;
 
+{$IFDEF EXT_MEMORY}
 procedure TCPU.OpcodeLoadMem;
 var
@@ -119 +176 @@
   Memory[Registers[P1]] := Registers[P2];
 end;
+{$ENDIF}
 
 procedure TCPU.OpcodeNeg;
@@ -128 +186 @@
 end;
 
+{$IFDEF EXT_GENERAL}
+procedure TCPU.OpcodeExchange;
+var
+  P1, P2, Temp: T;
+begin
+  P1 := ReadNext;
+  P2 := ReadNext;
+  Temp := Registers[P1];
+  Registers[P1] := Registers[P2];
+  Registers[P2] := Temp;
+end;
+{$ENDIF}
+
 procedure TCPU.OpcodeJump;
 begin
@@ -138 +209 @@
 end;
 
+{$IFDEF EXT_CONDITIONAL}
+procedure TCPU.OpcodeTestEqual;
+begin
+  Condition := ReadNext = ReadNext;
+end;
+
+procedure TCPU.OpcodeTestNotEqual;
+begin
+  Condition := ReadNext <> ReadNext;
+end;
+
+procedure TCPU.OpcodeTestGreatEqual;
+begin
+  Condition := ReadNext >= ReadNext;
+end;
+
+procedure TCPU.OpcodeTestGreat;
+begin
+  Condition := ReadNext > ReadNext;
+end;
+
+procedure TCPU.OpcodeTestLessEqual;
+begin
+  Condition := ReadNext <= ReadNext;
+end;
+
+procedure TCPU.OpcodeTestLess;
+begin
+  Condition := ReadNext < ReadNext;
+end;
+
+procedure TCPU.OpcodeJumpCond;
+begin
+  if Condition then IP := ReadNext;
+end;
+
+procedure TCPU.OpcodeJumpRelCond;
+begin
+  if Condition then IP := IP + ReadNext;
+end;
+{$ENDIF}
+
+{$IFDEF EXT_STACK}
 procedure TCPU.OpcodePush;
 begin
@@ -149 +263 @@
   Registers[ReadNext] := Memory[SP];
 end;
-
+{$ENDIF}
+
+{$IFDEF EXT_SUBROUTINE}
 procedure TCPU.OpcodeCall;
 var
@@ -175 +291 @@
   IP := Memory[SP];
 end;
-
+{$ENDIF}
+
+{$IFDEF EXT_IO}
 procedure TCPU.OpcodeOutput;
 var
@@ -197 +315 @@
     Registers[R1] := FOnInput(Registers[R2]);
 end;
+{$ENDIF}
 
 procedure TCPU.OpcodeInc;
@@ -214 +333 @@
 end;
 
+{$IFDEF EXT_ARITHMETIC}
+procedure TCPU.OpcodeAdd;
+var
+  R1: T;
+  R2: T;
+begin
+  R1 := ReadNext;
+  R2 := ReadNext;
+  Registers[R1] := Registers[R1] + Registers[R2];
+end;
+
+procedure TCPU.OpcodeSub;
+var
+  R1: T;
+  R2: T;
+begin
+  R1 := ReadNext;
+  R2 := ReadNext;
+  Registers[R1] := Registers[R1] - Registers[R2];
+end;
+{$ENDIF}
+
 procedure TCPU.Start;
 var
@@ -220 +361 @@
   Terminated := False;
   IP := 0;
+  {$IFDEF EXT_STACK}
   SP := Length(Memory);
+  {$ENDIF}
   while not Terminated do begin
     Opcode := ReadNext;
@@ -243 +386 @@
   OpcodeHandlers[opHalt] := OpcodeHalt;
   OpcodeHandlers[opLoadConst] := OpcodeLoadConst;
+  {$IFDEF EXT_MEMORY}
   OpcodeHandlers[opLoadMem] := OpcodeLoadMem;
   OpcodeHandlers[opStoreMem] := OpcodeStoreMem;
+  {$ENDIF}
   OpcodeHandlers[opNeg] := OpcodeNeg;
   OpcodeHandlers[opJump] := OpcodeJump;
   OpcodeHandlers[opJumpRel] := OpcodeJumpRel;
+  {$IFDEF EXT_GENERAL}
+  OpcodeHandlers[opExchg] := OpcodeExchange;
+  {$ENDIF}
+  {$IFDEF EXT_STACK}
   OpcodeHandlers[opPush] := OpcodePush;
   OpcodeHandlers[opPop] := OpcodePop;
+  {$ENDIF}
+  {$IFDEF EXT_SUBROUTINE}
   OpcodeHandlers[opCall] := OpcodeCall;
   OpcodeHandlers[opCallRel] := OpcodeCallRel;
   OpcodeHandlers[opRet] := OpcodeReturn;
+  {$ENDIF}
+  {$IFDEF EXT_IO}
   OpcodeHandlers[opInput] := OpcodeInput;
   OpcodeHandlers[opOutput] := OpcodeOutput;
+  {$ENDIF}
   OpcodeHandlers[opInc] := OpcodeInc;
   OpcodeHandlers[opDec] := OpcodeDec;
+  {$IFDEF EXT_ARITHMETIC}
+  OpcodeHandlers[opAdd] := OpcodeAdd;
+  OpcodeHandlers[opSub] := OpcodeSub;
+  {$ENDIF}
+  {$IFDEF EXT_ARITHMETIC}
+  OpcodeHandlers[opJumpCond] := OpcodeJumpCond;
+  OpcodeHandlers[opJumpRelCond] := OpcodeJumpRelCond;
+  OpcodeHandlers[opTestEqual] := OpcodeTestEqual;
+  OpcodeHandlers[opTestNotEqual] := OpcodeTestNotEqual;
+  OpcodeHandlers[opTestLess] := OpcodeTestLess;
+  OpcodeHandlers[opTestLessEqual] := OpcodeTestLessEqual;
+  OpcodeHandlers[opGreater] := OpcodeTestGreat;
+  OpcodeHandlers[opGreaterEqual] := OpcodeTestGreatEqual;
+  {$ENDIF}
 end;