Changeset 42 for branches/simple/Devices

Timestamp:

Sep 8, 2023, 11:20:27 PM (15 months ago)

Author:

chronos

Message:

• Modified: Improved simple virtual machine.

Location:

branches/simple/Devices

Files:

• . (added)
• Console.pas (moved) (moved from branches/simple/Console.pas ) (4 diffs)
• Device.pas (moved) (moved from branches/simple/Device.pas ) (2 diffs)
• Screen.pas (moved) (moved from branches/simple/Screen.pas ) (5 diffs)
• Storage.pas (added)

branches/simple/Devices/Console.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Device, DeviceMapper;
+  Classes, SysUtils, Device, DeviceManager, Channel;
 
 type
-  { TConsole }
 
-  TConsole = class(TDevice16)
+  { TConsole8 }
+
+  TConsole8 = class(TDevice8)
   private
     FOnRead: TReadEvent8;
@@ -16 +17 @@
     function Read8: Byte;
   public
-    procedure RegisterMapper8(Mapper: TDeviceMapper8); override;
-    procedure RegisterMapper16(Mapper: TDeviceMapper16); override;
+    function GetHandlerCount: Integer; override;
+    function GetHandler(Address: Integer): TChannel8; override;
+    property OnWrite: TWriteEvent8 read FOnWrite write FOnWrite;
+    property OnRead: TReadEvent8 read FOnRead write FOnRead;
+  end;
+
+  { TConsole16 }
+
+  TConsole16 = class(TDevice16)
+  private
+    FOnRead: TReadEvent8;
+    FOnWrite: TWriteEvent8;
+    procedure Write8(Data: Byte);
+    function Read8: Byte;
+  public
+    function GetHandlerCount: Integer; override;
+    function GetHandler(Address: Integer): TChannel16; override;
     property OnWrite: TWriteEvent8 read FOnWrite write FOnWrite;
     property OnRead: TReadEvent8 read FOnRead write FOnRead;
@@ -25 +41 @@
 implementation
 
-{ TConsole }
+{ TConsole8 }
 
-procedure TConsole.RegisterMapper8(Mapper: TDeviceMapper8);
-begin
-  Mapper.RegisterReadHandler(Read8);
-  Mapper.RegisterWriteHandler(Write8);
-end;
-
-procedure TConsole.RegisterMapper16(Mapper: TDeviceMapper16);
-begin
-  Mapper.RegisterReadHandler(Read8, nil);
-  Mapper.RegisterWriteHandler(Write8, nil);
-end;
-
-procedure TConsole.Write8(Data: Byte);
+procedure TConsole8.Write8(Data: Byte);
 begin
   if Assigned(FOnWrite) then FOnWrite(Data);
 end;
 
-function TConsole.Read8: Byte;
+function TConsole8.Read8: Byte;
 begin
   if Assigned(FOnRead) then Result := FOnRead
@@ -50 +54 @@
 end;
 
+function TConsole8.GetHandlerCount: Integer;
+begin
+  Result := 1;
+end;
+
+function TConsole8.GetHandler(Address: Integer): TChannel8;
+begin
+  if Address = 0 then begin
+    Result := TChannel8.Create;
+    Result.Read8 := Read8;
+    Result.Write8 := Write8;
+  end;
+end;
+
+{ TConsole16 }
+
+procedure TConsole16.Write8(Data: Byte);
+begin
+  if Assigned(FOnWrite) then FOnWrite(Data);
+end;
+
+function TConsole16.Read8: Byte;
+begin
+  if Assigned(FOnRead) then Result := FOnRead
+    else Result := 0;
+end;
+
+function TConsole16.GetHandlerCount: Integer;
+begin
+  Result := 1;
+end;
+
+function TConsole16.GetHandler(Address: Integer): TChannel16;
+begin
+  if Address = 0 then begin
+    Result := TChannel16.Create;
+    Result.Read8 := Read8;
+    Result.Write8 := Write8;
+  end;
+end;
 
 end.

branches/simple/Devices/Device.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, DeviceMapper;
+  Classes, SysUtils, Channel, Generics.Collections, Forms;
 
 type
+  TDeviceClass = (dcNone, dcKeyboard, dcMouse, dcStorage, dcScreen, dcConsole,
+    dcTimer);
+  TDeviceClassSet = set of TDeviceClass;
+
   { TDevice8 }
 
   TDevice8 = class
-    procedure RegisterMapper8(Mapper: TDeviceMapper8); virtual; abstract;
+    BaseAddress: Byte;
+    procedure SetDataBus(Channel: TAddressableChannel8); virtual;
+    function GetHandlerCount: Integer; virtual;
+    function GetHandler(Address: Integer): TChannel8; virtual;
   end;
 
@@ -16 +23 @@
 
   TDevice16 = class
-    procedure RegisterMapper8(Mapper: TDeviceMapper8); virtual; abstract;
-    procedure RegisterMapper16(Mapper: TDeviceMapper16); virtual; abstract;
+    BaseAddress: Word;
+    procedure SetDataBus(Channel: TAddressableChannel16); virtual;
+    function GetHandlerCount: Integer; virtual;
+    function GetHandler(Address: Integer): TChannel16; virtual;
   end;
+
+  { TDevice32 }
+
+  TDevice32 = class
+    BaseAddress: DWord;
+    procedure SetDataBus(Channel: TAddressableChannel32); virtual;
+    function GetHandlerCount: Integer; virtual;
+    function GetHandler(Address: Integer): TChannel32; virtual;
+  end;
+
+  { TDevice64 }
+
+  TDevice64 = class
+    BaseAddress: QWord;
+    procedure SetDataBus(Channel: TAddressableChannel64); virtual;
+    function GetHandlerCount: Integer; virtual;
+    function GetHandler(Address: Integer): TChannel64; virtual;
+  end;
+
+  TDevice = class;
+
+  { TFormDevice }
+
+  TFormDevice = class(TForm)
+  protected
+    function GetDevice: TDevice; virtual;
+    procedure SetDevice(AValue: TDevice); virtual;
+  public
+    property Device: TDevice read GetDevice write SetDevice;
+  end;
+
+  TFormDeviceClass = class of TFormDevice;
+
+  { TDevice }
+
+  TDevice = class
+    Name: string;
+    DeviceClass: TDeviceClass;
+    Form: TFormDevice;
+  end;
+
+  { TDevices }
+
+  TDevices = class(TObjectList<TDevice>)
+    function GetDevicesCountByClass(DeviceClass: TDeviceClass): Integer;
+    function GetDevicesByClass(DeviceClass: TDeviceClass): TDevices;
+    function GetClasses: TDeviceClassSet;
+  end;
+
+const
+  DeviceClassText: array[TDeviceClass] of string = ('None', 'Keyboard', 'Mouse', 'Storage', 'Screen', 'Console', 'Timer');
 
 
 implementation
 
+{ TFormDevice }
+
+function TFormDevice.GetDevice: TDevice;
+begin
+  Result := nil;
+end;
+
+procedure TFormDevice.SetDevice(AValue: TDevice);
+begin
+end;
+
+{ TDevices }
+
+function TDevices.GetDevicesCountByClass(DeviceClass: TDeviceClass): Integer;
+var
+  I: Integer;
+begin
+  Result := 0;
+  for I := 0 to Count - 1 do
+    if Items[I].DeviceClass = DeviceClass then Inc(Result);
+end;
+
+function TDevices.GetDevicesByClass(DeviceClass: TDeviceClass): TDevices;
+var
+  I: Integer;
+begin
+  Result := TDevices.Create(False);
+  for I := 0 to Count - 1 do
+    if Items[I].DeviceClass = DeviceClass then Result.Add(Items[I])
+end;
+
+function TDevices.GetClasses: TDeviceClassSet;
+var
+  I: Integer;
+begin
+  Result := [];
+  for I := 0 to Count - 1 do
+    if not (Items[I].DeviceClass in Result) then
+      Result := Result + [Items[I].DeviceClass];
+end;
+
+{ TDevice32 }
+
+procedure TDevice32.SetDataBus(Channel: TAddressableChannel32);
+begin
+end;
+
+function TDevice32.GetHandlerCount: Integer;
+begin
+  Result := 0;
+end;
+
+function TDevice32.GetHandler(Address: Integer): TChannel32;
+begin
+end;
+
+{ TDevice64 }
+
+procedure TDevice64.SetDataBus(Channel: TAddressableChannel64);
+begin
+end;
+
+function TDevice64.GetHandlerCount: Integer;
+begin
+  Result := 0;
+end;
+
+function TDevice64.GetHandler(Address: Integer): TChannel64;
+begin
+end;
+
+{ TDevice8 }
+
+procedure TDevice8.SetDataBus(Channel: TAddressableChannel8);
+begin
+end;
+
+function TDevice8.GetHandlerCount: Integer;
+begin
+  Result := 0;
+end;
+
+function TDevice8.GetHandler(Address: Integer): TChannel8;
+begin
+end;
+
+{ TDevice16 }
+
+procedure TDevice16.SetDataBus(Channel: TAddressableChannel16);
+begin
+end;
+
+function TDevice16.GetHandlerCount: Integer;
+begin
+  Result := 0;
+end;
+
+function TDevice16.GetHandler(Address: Integer): TChannel16;
+begin
+end;
+
 end.
 

branches/simple/Devices/Screen.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Device, DeviceMapper, Memory;
+  Classes, SysUtils, Device, DeviceManager, Memory, Channel;
 
 type
@@ -31 +31 @@
     constructor Create;
     destructor Destroy; override;
-    procedure RegisterMapper8(Mapper: TDeviceMapper8); override;
+    function GetHandlerCount: Integer; override;
+    function GetHandler(Address: Integer): TChannel8; override;
     property OnChange: TNotifyEvent read FOnChange write FOnChange;
   end;
@@ -59 +60 @@
     constructor Create;
     destructor Destroy; override;
-    procedure RegisterMapper8(Mapper: TDeviceMapper8); override;
-    procedure RegisterMapper16(Mapper: TDeviceMapper16); override;
+    function GetHandlerCount: Integer; override;
+    function GetHandler(Address: Integer): TChannel16; override;
     property OnChange: TNotifyEvent read FOnChange write FOnChange;
   end;
 
+  TScreen = class(TDevice)
+    BitWidth: TBitWidth;
+    Screen8: TScreen8;
+    Screen16: TScreen16;
+    constructor Create(BitWidth: TBitWidth; Screen8: TScreen8; Screen16: TScreen16);
+  end;
+
 
 implementation
+
+{ TScreen }
+
+constructor TScreen.Create(BitWidth: TBitWidth; Screen8: TScreen8;
+  Screen16: TScreen16);
+begin
+  Self.BitWidth := BitWidth;
+  Self.Screen8 := Screen8;
+  Self.Screen16 := Screen16;
+end;
 
 { TScreen16 }
@@ -149 +167 @@
 end;
 
-procedure TScreen16.RegisterMapper8(Mapper: TDeviceMapper8);
-begin
-end;
-
-procedure TScreen16.RegisterMapper16(Mapper: TDeviceMapper16);
-begin
-  Mapper.RegisterReadHandler(ReadData8, ReadData16);
-  Mapper.RegisterWriteHandler(WriteData8, WriteData16);
-  Mapper.RegisterReadHandler(nil, ReadAddr16);
-  Mapper.RegisterWriteHandler(nil, WriteAddr16);
-  Mapper.RegisterReadHandler(nil, ReadWidth16);
-  Mapper.RegisterWriteHandler(nil, WriteWidth16);
-  Mapper.RegisterReadHandler(nil, ReadHeight16);
-  Mapper.RegisterWriteHandler(nil, WriteHeight16);
+function TScreen16.GetHandlerCount: Integer;
+begin
+  Result := 4;
+end;
+
+function TScreen16.GetHandler(Address: Integer): TChannel16;
+begin
+  if Address = 0 then begin
+    Result := TChannel16.Create;
+    Result.Read16 := ReadData16;
+    Result.Write16 := WriteData16;
+  end else
+  if Address = 1 then begin
+    Result := TChannel16.Create;
+    Result.Read16 := ReadAddr16;
+    Result.Write16 := WriteAddr16;
+  end else
+  if Address = 2 then begin
+    Result := TChannel16.Create;
+    Result.Read16 := ReadWidth16;
+    Result.Write16 := WriteWidth16;
+  end else
+  if Address = 3 then begin
+    Result := TChannel16.Create;
+    Result.Read16 := ReadHeight16;
+    Result.Write16 := WriteHeight16;
+  end;
 end;
 
@@ -236 +267 @@
 end;
 
-procedure TScreen8.RegisterMapper8(Mapper: TDeviceMapper8);
-begin
-  Mapper.RegisterReadHandler(ReadData8);
-  Mapper.RegisterWriteHandler(WriteData8);
-  Mapper.RegisterReadHandler(ReadAddr8);
-  Mapper.RegisterWriteHandler(WriteAddr8);
-  Mapper.RegisterReadHandler(ReadWidth8);
-  Mapper.RegisterWriteHandler(WriteWidth8);
-  Mapper.RegisterReadHandler(ReadHeight8);
-  Mapper.RegisterWriteHandler(WriteHeight8);
+function TScreen8.GetHandlerCount: Integer;
+begin
+  Result := 4;
+end;
+
+function TScreen8.GetHandler(Address: Integer): TChannel8;
+begin
+  if Address = 0 then begin
+    Result := TChannel8.Create;
+    Result.Read8 := ReadData8;
+    Result.Write8 := WriteData8;
+  end else
+  if Address = 1 then begin
+    Result := TChannel8.Create;
+    Result.Read8 := ReadAddr8;
+    Result.Write8 := WriteAddr8;
+  end else
+  if Address = 2 then begin
+    Result := TChannel8.Create;
+    Result.Read8 := ReadWidth8;
+    Result.Write8 := WriteWidth8;
+  end else
+  if Address = 3 then begin
+    Result := TChannel8.Create;
+    Result.Read8 := ReadHeight8;
+    Result.Write8 := WriteHeight8;
+  end;
 end;