Changeset 223 for branches/CpuSingleSize/UMachine.pas

Timestamp:

Jul 12, 2022, 10:43:40 PM (2 years ago)

Author:

chronos

Message:

• Modified: More instructions.
• Modified: Optimized instruction execution with procedure array instead case.

File:

• branches/CpuSingleSize/UMachine.pas (modified) (24 diffs)

branches/CpuSingleSize/UMachine.pas

@@ -1 +1 @@
 unit UMachine;
-
-{$mode delphi}
 
 interface
@@ -9 +7 @@
 
 type
-  TDeviceClass = (dcNone, dcKeyboard, dcMouse, dcStorage, dcScreen, dcConsole);
+  TDeviceClass = (dcNone, dcKeyboard, dcMouse, dcStorage, dcScreen, dcConsole,
+    dcTimer);
   TDeviceClassSet = set of TDeviceClass;
 
@@ -35 +34 @@
     InterruptVector: Integer;
     Form: TFormDevice;
+    procedure PulseInterrupt;
     procedure OutputHandler(Port, Data: TInteger); virtual;
     function InputHandler(Port: TInteger): TInteger; virtual;
@@ -64 +64 @@
   TConsoleOutputPort = (opConsoleWriteChar);
 
-  { TConsole }
-
-  TConsole = class(TDevice)
+  { TDeviceConsole }
+
+  TDeviceConsole = class(TDevice)
     Lock: TCriticalSection;
     InputBuffer: TQueue<TInteger>;
@@ -79 +79 @@
   TScreenOutputPort = (opScreenSetAddr, opScreenWrite);
 
-  { TScreen }
-
-  TScreen = class(TDevice)
+  { TDeviceScreen }
+
+  TDeviceScreen = class(TDevice)
   private
     FSize: TPoint;
@@ -97 +97 @@
   TKeyboardInputPort = (ipKeyboardRead);
 
-  { TKeyboard }
-
-  TKeyboard = class(TDevice)
+  { TDeviceKeyboard }
+
+  TDeviceKeyboard = class(TDevice)
     constructor Create;
     function ReadKey: TInteger;
@@ -108 +108 @@
   TStorageOutputPort = (opStorageSetAddr, opStorageWrite);
 
-  { TStorage }
-
-  TStorage = class(TDevice)
+  { TDeviceStorage }
+
+  TDeviceStorage = class(TDevice)
   public
     F: TFileStream;
@@ -119 +119 @@
   end;
 
-  { TMouse }
-
-  TMouse = class(TDevice)
-    constructor Create;
+  { TDeviceMouse }
+
+  TDeviceMouse = class(TDevice)
+    constructor Create;
+  end;
+
+  TTimerOutputPort = (opTimerSetInterval, opTimerSetEnabled);
+  { TDeviceTimer }
+
+  TDeviceTimer = class(TDevice)
+    Interval: Integer;
+    Enabled: Boolean;
+    constructor Create;
+    procedure OutputHandler(Port, Data: TInteger); override;
   end;
 
@@ -144 +154 @@
 
 const
-  DeviceClassText: array[TDeviceClass] of string = ('None', 'Keyboard', 'Mouse', 'Storage', 'Screen', 'Console');
+  DeviceClassText: array[TDeviceClass] of string = ('None', 'Keyboard', 'Mouse', 'Storage', 'Screen', 'Console', 'Timer');
 
 
 implementation
+
+{ TDeviceTimer }
+
+constructor TDeviceTimer.Create;
+begin
+  DeviceClass := dcTimer;
+end;
+
+procedure TDeviceTimer.OutputHandler(Port, Data: TInteger);
+begin
+  case TTimerOutputPort(Port) of
+    opTimerSetInterval: Interval := Data;
+    opTimerSetEnabled: Enabled := Data > 0;
+  end;
+end;
 
 { TDeviceManager }
@@ -225 +250 @@
 { TDevice }
 
+procedure TDevice.PulseInterrupt;
+begin
+  Cpu.Interrupt(InterruptVector);
+end;
+
 procedure TDevice.OutputHandler(Port, Data: TInteger);
 begin
@@ -234 +264 @@
 end;
 
-{ TMouse }
-
-constructor TMouse.Create;
+{ TDeviceMouse }
+
+constructor TDeviceMouse.Create;
 begin
   DeviceClass := dcMouse;
 end;
 
-{ TStorage }
-
-constructor TStorage.Create;
+{ TDeviceStorage }
+
+constructor TDeviceStorage.Create;
 begin
   DeviceClass := dcStorage;
 end;
 
-procedure TStorage.OutputHandler(Port, Data: TInteger);
+procedure TDeviceStorage.OutputHandler(Port, Data: TInteger);
 begin
   case TStorageOutputPort(Port) of
@@ -258 +288 @@
 end;
 
-function TStorage.InputHandler(Port: TInteger): TInteger;
+function TDeviceStorage.InputHandler(Port: TInteger): TInteger;
 begin
   case TStorageInputPort(Port) of
@@ -268 +298 @@
 end;
 
-{ TConsole }
-
-constructor TConsole.Create;
+{ TDeviceConsole }
+
+constructor TDeviceConsole.Create;
 begin
   DeviceClass := dcConsole;
@@ -278 +308 @@
 end;
 
-destructor TConsole.Destroy;
+destructor TDeviceConsole.Destroy;
 begin
   InputBuffer.Free;
@@ -286 +316 @@
 end;
 
-procedure TConsole.OutputHandler(Port, Data: TInteger);
+procedure TDeviceConsole.OutputHandler(Port, Data: TInteger);
 begin
   case TConsoleOutputPort(Port) of
@@ -300 +330 @@
 end;
 
-function TConsole.InputHandler(Port: TInteger): TInteger;
+function TDeviceConsole.InputHandler(Port: TInteger): TInteger;
 begin
   case TConsoleInputPort(Port) of
@@ -324 +354 @@
 end;
 
-{ TScreen }
-
-procedure TScreen.SetSize(AValue: TPoint);
+{ TDeviceScreen }
+
+procedure TDeviceScreen.SetSize(AValue: TPoint);
 begin
   if FSize = AValue then Exit;
@@ -333 +363 @@
 end;
 
-constructor TScreen.Create;
+constructor TDeviceScreen.Create;
 begin
   DeviceClass := dcScreen;
@@ -339 +369 @@
 end;
 
-procedure TScreen.OutputHandler(Port, Data: TInteger);
+procedure TDeviceScreen.OutputHandler(Port, Data: TInteger);
 begin
   case TScreenOutputPort(Port) of
@@ -351 +381 @@
 end;
 
-function TScreen.InputHandler(Port: TInteger): TInteger;
+function TDeviceScreen.InputHandler(Port: TInteger): TInteger;
 begin
   case TScreenInputPort(Port) of
@@ -359 +389 @@
 end;
 
-{ TKeyboard }
-
-function TKeyboard.ReadKey: TInteger;
+{ TDeviceKeyboard }
+
+function TDeviceKeyboard.ReadKey: TInteger;
 begin
   Result := 0;
 end;
 
-function TKeyboard.InputHandler(Port: TInteger): TInteger;
+function TDeviceKeyboard.InputHandler(Port: TInteger): TInteger;
 begin
   case TKeyboardInputPort(Port) of
@@ -373 +403 @@
 end;
 
-constructor TKeyboard.Create;
+constructor TDeviceKeyboard.Create;
 begin
   DeviceClass := dcKeyboard;
@@ -404 +434 @@
 procedure TMachine.InitDevices;
 var
-  Screen: TScreen;
-  Keyboard: TKeyboard;
-  Console: TConsole;
-  Storage: TStorage;
-  Mouse: TMouse;
+  Screen: TDeviceScreen;
+  Keyboard: TDeviceKeyboard;
+  Console: TDeviceConsole;
+  Storage: TDeviceStorage;
+  Mouse: TDeviceMouse;
   DeviceManager: TDeviceManager;
+  Timer: TDeviceTimer;
 begin
   DeviceManager := TDeviceManager.Create;
@@ -415 +446 @@
   RegisterDevice(DeviceManager);
 
-  Console := TConsole.Create;
+  Console := TDeviceConsole.Create;
   RegisterDevice(Console);
   Console.InterruptVector := 1;
 
-  Keyboard := TKeyboard.Create;
+  Keyboard := TDeviceKeyboard.Create;
+  Keyboard.InterruptVector := 4;
   RegisterDevice(Keyboard);
 
-  Screen := TScreen.Create;
+  Screen := TDeviceScreen.Create;
   RegisterDevice(Screen);
 
-  Storage := TStorage.Create;
+  Storage := TDeviceStorage.Create;
   RegisterDevice(Storage);
 
-  Storage := TStorage.Create;
+  Storage := TDeviceStorage.Create;
   RegisterDevice(Storage);
 
-  Mouse := TMouse.Create;
+  Mouse := TDeviceMouse.Create;
+  Mouse.InterruptVector := 3;
   RegisterDevice(Mouse);
+
+  Timer := TDeviceTimer.Create;
+  Timer.InterruptVector := 2;
+  RegisterDevice(Timer);
 end;
 
 procedure TMachine.PowerOn;
 begin
-  Cpu.Data := Memory.Data;
+  Cpu.Memory := Memory.Data;
   Cpu.Start;
 end;