Changeset 42 for branches/simple/Forms

Timestamp:

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

Author:

chronos

Message:

• Modified: Improved simple virtual machine.

Location:

branches/simple/Forms

Files:

• FormAssembler.lfm (added)
• FormAssembler.pas (added)
• FormConsole.pas (modified) (2 diffs)
• FormDevice.pas (added)
• FormDevices.lfm (added)
• FormDevices.pas (added)
• FormDisassembler.lfm (added)
• FormDisassembler.pas (added)
• FormMain.pas (modified) (7 diffs)
• FormMessages.lfm (added)
• FormMessages.pas (added)
• FormScreen.pas (modified) (5 diffs)
• FormStorage.lfm (added)
• FormStorage.pas (added)

branches/simple/Forms/FormConsole.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls;
+  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, Device;
 
 type
@@ -10 +10 @@
   { TFormConsole }
 
-  TFormConsole = class(TForm)
+  TFormConsole = class(TFormDevice)
     Memo1: TMemo;
   public

branches/simple/Forms/FormMain.pas

@@ -43 +43 @@
 {$R *.lfm}
 
+uses
+  Screen, Channel;
+
 { TFormMain }
 
@@ -49 +52 @@
   FormScreen := TFormScreen.Create(nil);
   FormConsole := TFormConsole.Create(nil);
-  InitMachine16;
+  InitMachine8;
 end;
 
@@ -66 +69 @@
   FreeAndNil(FormScreen);
   FreeAndNil(FormConsole);
-  FreeAndNil(Machine8);
+  if Assigned(Machine8) then FreeAndNil(Machine8);
+  if Assigned(Machine16) then FreeAndNil(Machine16);
 end;
 
@@ -80 +84 @@
     Console.OnWrite := FormConsole.ConsoleWrite;
     Screen.OnChange := FormScreen.ScreenChange;
-    FormScreen.Machine := Machine8;
+    FormScreen.Screen := TScreen.Create(bw8, Machine8.Screen, nil);
     with Memory do begin
       // LD A8, 'A'
@@ -90 +94 @@
       // LD A8, 'A'
       WritePos8(Byte(inLoadImmediate8));
-      WritePos8(Ord('H'));
-      // OUT (0), A8
-      WritePos8(Byte(inOutput8));
-      WritePos8(1);
+      WritePos8(Ord('B'));
       // OUT (0), A8
       WritePos8(Byte(inOutput8));
@@ -110 +111 @@
     Console.OnWrite := FormConsole.ConsoleWrite;
     Screen.OnChange := FormScreen.ScreenChange;
-    FormScreen.Machine := Machine16;
+    FormScreen.Screen := TScreen.Create(bw16, nil, Machine16.Screen);
     with Memory do begin
       // LD A8, 'A'
@@ -122 +123 @@
       WritePos16(Ord('H'));
       // OUT8 (0), A8
-      WritePos8(Byte(inOutput8));
+      WritePos8(Byte(inOutput16));
       WritePos16(1);
       // HALT

branches/simple/Forms/FormScreen.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ExtCtrls, Machine;
+  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ExtCtrls, Screen,
+  Channel, Device;
 
 type
@@ -10 +11 @@
   { TFormScreen }
 
-  TFormScreen = class(TForm)
+  TFormScreen = class(TFormDevice)
     Image1: TImage;
     TimerDraw: TTimer;
@@ -17 +18 @@
     DrawPending: Boolean;
   public
-    Machine: TMachine;
+    Screen: TScreen;
     procedure ScreenChange(Sender: TObject);
   end;
@@ -36 +37 @@
   if DrawPending then begin
     DrawPending := False;
-    if Machine is TMachine16 then
-    with TMachine16(Machine).Screen do begin
+    if Screen.BitWidth = bw8 then
+    with Screen.Screen8 do begin
       Image1.Picture.Bitmap.SetSize(Width * CharSize, Height * CharSize);
       Image1.Picture.Bitmap.Canvas.FillRect(0, 0, Image1.Picture.Bitmap.Width,
@@ -46 +47 @@
             Chr(Memory.Read8(Y * Width + X)));
     end else
-    if Machine is TMachine8 then
-    with TMachine8(Machine).Screen do begin
+    if Screen.BitWidth = bw16 then
+    with Screen.Screen16 do begin
       Image1.Picture.Bitmap.SetSize(Width * CharSize, Height * CharSize);
       Image1.Picture.Bitmap.Canvas.FillRect(0, 0, Image1.Picture.Bitmap.Width,