Changeset 9 for branches/ByteArray/Devices/DeviceMapper.pas

Timestamp:

Aug 6, 2024, 10:31:16 PM (2 months ago)

Author:

chronos

Message:

• Modified: Optimized DeviceMapper read/write handlers calls without case statement.
• Modified: Use TInt as base data type which can be redefined to different higher integer type. For start it is Int64.

Location:

branches/ByteArray

Files:

• . (modified) (1 prop)
• Devices/DeviceMapper.pas (modified) (7 diffs)

branches/ByteArray/Devices/DeviceMapper.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Device, Channel, Generics.Collections, BigInt;
+  Classes, SysUtils, Device, Channel, Generics.Collections, Int, Math;
 
 type
@@ -12 +12 @@
   TMappedDevice = class
     Device: TDevice;
-    Count: Integer;
-    Channel: TChannel;
+    ReadCount: Integer;
+    WriteCount: Integer;
+    ReadBase: Integer;
+    WriteBase: Integer;
     constructor Create;
     destructor Destroy; override;
@@ -20 +22 @@
   { TDeviceMapper }
 
-  TDeviceMapper = class
-    FreeBaseAddress: Integer;
+  TDeviceMapper = class(TChannelDevice)
+  private
+    function ChannelRead(Address: TInt; Size: TIntSize): TInt;
+    procedure ChannelWrite(Address: TInt; Size: TIntSize; Value: TInt);
+    function ChannelGetSize: TInt;
+  public
+    ReadHandlers: TList<TReadEvent>;
+    WriteHandlers: TList<TWriteEvent>;
     MappedDevices: TObjectList<TMappedDevice>;
     procedure RegisterDevice(Device: TDevice);
     procedure UnregisterDevice(Device: TDevice);
-    function Read(Address: TBigInt; Size: TBigIntSize): TBigInt;
-    procedure Write(Address: TBigInt; Size: TBigIntSize; Value: TBigInt);
-    procedure SetChannel(Channel: TChannel);
+    procedure SetChannel(Channel: TChannel); override;
     constructor Create;
     destructor Destroy; override;
@@ -39 +45 @@
 constructor TMappedDevice.Create;
 begin
-  Channel := TChannel.Create;
 end;
 
 destructor TMappedDevice.Destroy;
 begin
-  FreeAndNil(Channel);
   inherited;
 end;
@@ -53 +57 @@
 var
   NewMappedDevice: TMappedDevice;
+  Handlers: THandlers;
 begin
+  Handlers := Device.GetHandlers;
+
   NewMappedDevice := TMappedDevice.Create;
   NewMappedDevice.Device := Device;
-  NewMappedDevice.Device.BaseAddress := FreeBaseAddress;
-  NewMappedDevice.Count := Device.GetAddressCount;
-  Device.SetChannel(NewMappedDevice.Channel);
+  NewMappedDevice.ReadBase := ReadHandlers.Count;
+  NewMappedDevice.WriteBase := WriteHandlers.Count;
+  NewMappedDevice.ReadCount := Handlers.ReadHandlers.Count;
+  NewMappedDevice.WriteCount := Handlers.WriteHandlers.Count;
   MappedDevices.Add(NewMappedDevice);
-  Inc(FreeBaseAddress, NewMappedDevice.Count);
+
+  ReadHandlers.AddRange(Handlers.ReadHandlers);
+  WriteHandlers.AddRange(Handlers.WriteHandlers);
+  Handlers.Free;
 end;
 
@@ -74 +85 @@
 end;
 
-function TDeviceMapper.Read(Address: TBigInt; Size: TBigIntSize): TBigInt;
+function TDeviceMapper.ChannelRead(Address: TInt; Size: TIntSize): TInt;
+begin
+  if Address < ReadHandlers.Count then
+    Result := ReadHandlers[Address](Size)
+    else Result := 0;
+end;
+
+procedure TDeviceMapper.ChannelWrite(Address: TInt; Size: TIntSize; Value: TInt);
 var
   I: Integer;
 begin
-  for I := 0 to MappedDevices.Count - 1 do
-    if (Integer(Address) >= MappedDevices[I].Device.BaseAddress) and (Integer(Address) >= MappedDevices[I].Device.BaseAddress + MappedDevices[I].Count) then begin
-      Result := MappedDevices[I].Channel.Read(Integer(Address) - MappedDevices[I].Device.BaseAddress, Size);
-      Break;
-    end;
+  if Address < WriteHandlers.Count then
+    WriteHandlers[Address](Size, Value);
 end;
 
-procedure TDeviceMapper.Write(Address: TBigInt; Size: TBigIntSize; Value: TBigInt);
-var
-  I: Integer;
+function TDeviceMapper.ChannelGetSize: TInt;
 begin
-  for I := 0 to MappedDevices.Count - 1 do
-    if (Integer(Address) >= MappedDevices[I].Device.BaseAddress) and
-    (Integer(Address) < MappedDevices[I].Device.BaseAddress + MappedDevices[I].Count) then begin
-      MappedDevices[I].Channel.Write(Integer(Address) - MappedDevices[I].Device.BaseAddress, Size, Value);
-      Break;
-    end;
+  Result := Max(ReadHandlers.Count, WriteHandlers.Count);
 end;
 
 procedure TDeviceMapper.SetChannel(Channel: TChannel);
 begin
-  Channel.Read := Read;
-  Channel.Write := Write;
+  Channel.Read := ChannelRead;
+  Channel.Write := ChannelWrite;
+  Channel.GetSize := ChannelGetSize;
 end;
 
@@ -106 +115 @@
 begin
   MappedDevices := TObjectList<TMappedDevice>.Create;
+  ReadHandlers := TList<TReadEvent>.Create;
+  WriteHandlers := TList<TWriteEvent>.Create;
 end;
 
 destructor TDeviceMapper.Destroy;
 begin
+  FreeAndNil(ReadHandlers);
+  FreeAndNil(WriteHandlers);
   FreeAndNil(MappedDevices);
   inherited;