Changeset 238 for branches/CpuSingleSize/Core.pas

Timestamp:

Jul 15, 2023, 12:51:15 AM (16 months ago)

Author:

chronos

Message:

• Modified: Removed U prefix from unit names.
• Fixed: Memory leaks.

File:

• branches/CpuSingleSize/Core.pas (moved) (moved from branches/CpuSingleSize/UCore.pas ) (9 diffs)

branches/CpuSingleSize/Core.pas

@@ -1 @@
-unit UCore;
+unit Core;
 
 interface
 
 uses
-  Classes, SysUtils, ActnList, Controls, Forms, UMachine, UMemory, UMessages,
-  UDisassembler, UAssembler;
+  Classes, SysUtils, ActnList, Controls, Forms, Machine, Memory, Message,
+  Disassembler, Assembler, FormCpu, FormDevices, FormHelp, FormMessages,
+  FormMain, FormDisassembler;
 
 type
@@ -38 +39 @@
     procedure DataModuleDestroy(Sender: TObject);
   private
-
+    FormCpu: TFormCpu;
+    FormDevices: TFormDevices;
+    FormHelp: TFormHelp;
+    FormMain: TFormMain;
+    FormDisassembler: TFormDisassembler;
   public
     Assembler: TAssembler;
@@ -55 +60 @@
 
 uses
-  UFormScreen, UFormCpu, UFormAssembler, UFormConsole, UFormHelp,
-  UFormDisassembler, UFormMessages, UFormDevices;
+  FormScreen, FormAssembler, FormConsole;
 
 { TCore }
@@ -67 +71 @@
 procedure TCore.AHelpExecute(Sender: TObject);
 begin
+  if not Assigned(FormHelp) then
+    FormHelp := TFormHelp.Create(nil);
   FormHelp.Show;
 end;
@@ -87 +93 @@
   Assembler := TAssembler.Create;
   Disassembler := TDisassembler.Create;
+  FormMain := TFormMain.Create(nil);
+  FormMain.Show;
 end;
 
 procedure TCore.DataModuleDestroy(Sender: TObject);
 begin
+  if Assigned(FormCpu) then FreeAndNil(FormCpu);
+  if Assigned(FormDevices) then FreeAndNil(FormDevices);
+  if Assigned(FormHelp) then FreeAndNil(FormHelp);
+  if Assigned(FormDisassembler) then FreeAndNil(FormDisassembler);
+  FreeAndNil(FormMain);
   FreeAndNil(Disassembler);
   FreeAndNil(Assembler);
@@ -101 +114 @@
   AStop.Execute;
   with Assembler do begin
-    Compile(FormAssembler.SynEdit1.Lines.Text);
+    Compile(FormMain.FormAssembler.SynEdit1.Lines.Text);
     //Memory.SaveToFile('compiled.bin');
     CompiledProgram.Assign(Memory);
@@ -107 +120 @@
     Machine.Memory.WriteMemory(CompiledProgram);
   end;
-  if FormMessages.Visible then FormMessages.Reload;
+  if FormMain.FormMessages.Visible then
+    FormMain.FormMessages.Reload;
 end;
 
 procedure TCore.ACpuExecute(Sender: TObject);
 begin
+  if not Assigned(FormCpu) then
+    FormCpu := TFormCpu.Create(nil);
   FormCpu.Cpu := Machine.Cpu;
   FormCpu.Show;
@@ -118 +134 @@
 procedure TCore.ADevicesExecute(Sender: TObject);
 begin
+  if not Assigned(FormDevices) then
+    FormDevices := TFormDevices.Create(nil);
   FormDevices.Devices := Machine.Devices;
   FormDevices.Show;
@@ -124 +142 @@
 procedure TCore.ADisassemblerExecute(Sender: TObject);
 begin
+  if not Assigned(FormDisassembler) then
+    FormDisassembler := TFormDisassembler.Create(nil);
   with Disassembler do begin
     Memory := CompiledProgram;