Changeset 42 for branches/simple/Devices/Screen.pas

Timestamp:

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

Author:

chronos

Message:

• Modified: Improved simple virtual machine.

Location:

branches/simple/Devices

Files:

• . (added)
• Screen.pas (moved) (moved from branches/simple/Screen.pas ) (5 diffs)

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;