Changeset 35 for branches

Timestamp:

Jul 14, 2022, 11:29:01 PM (2 years ago)

Author:

chronos

Message:

• Added: Cpu state window.

Location:

branches/UltimatOS

Files:

• Forms/UFormCpu.lfm (added)
• Forms/UFormCpu.pas (added)
• Forms/UFormMain.lfm (modified) (1 diff)
• Forms/UFormMain.pas (modified) (7 diffs)
• UCpu.pas (modified) (4 diffs)
• UltimatOS.lpi (modified) (1 diff)
• UltimatOS.lpr (modified) (2 diffs)

branches/UltimatOS/Forms/UFormMain.lfm

@@ -90 +90 @@
     ParentColor = False
   end
+  object ButtonCpu: TButton
+    Left = 512
+    Height = 38
+    Top = 571
+    Width = 113
+    Caption = 'CPU'
+    OnClick = ButtonCpuClick
+    TabOrder = 6
+  end
   object Timer1: TTimer
     Interval = 20

branches/UltimatOS/Forms/UFormMain.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ExtCtrls, StdCtrls,
-  UMachine;
+  UMachine, Math;
 
 type
@@ -14 +14 @@
     ButtonMemory: TButton;
     ButtonCompile: TButton;
+    ButtonCpu: TButton;
     ButtonStart: TButton;
     ButtonStop: TButton;
@@ -24 +25 @@
     Timer2: TTimer;
     procedure ButtonCompileClick(Sender: TObject);
+    procedure ButtonCpuClick(Sender: TObject);
     procedure ButtonMemoryClick(Sender: TObject);
     procedure ButtonRestartClick(Sender: TObject);
@@ -54 +56 @@
 
 uses
-  UAssembler, UFormMemory;
+  UAssembler, UFormMemory, UFormCpu;
 
 { TFormMain }
@@ -80 +82 @@
 procedure TFormMain.ButtonMemoryClick(Sender: TObject);
 begin
+  if not Assigned(FormMemory) then FormMemory := TFormMemory.Create(nil);
   FormMemory.Memory := Machine.Memory;
   FormMemory.Show;
@@ -93 +96 @@
     Free;
   end;
+end;
+
+procedure TFormMain.ButtonCpuClick(Sender: TObject);
+begin
+  if not Assigned(FormCpu) then FormCpu := TFormCpu.Create(nil);
+  FormCpu.Cpu := Machine.Cpu;
+  FormCpu.Show;
 end;
 
@@ -143 +153 @@
     PaintBox1.Repaint;
   end;
-  Label1.Caption := 'Executed instructions: ' + IntToStr(Machine.Cpu.ExecutedCount) + LineEnding +
+  Label1.Caption := 'Executed instructions: ' + IntToStr(Machine.Cpu.Ticks) + LineEnding +
     'Interrupts: ' + IntToStr(Machine.Cpu.InterruptCount);
 end;
 
 procedure TFormMain.Timer2Timer(Sender: TObject);
+var
+  TicksPerSecond: Int64;
 begin
-  Label2.Caption := 'Ticks/s: ' + IntToStr(Machine.Cpu.ExecutedCount - LastTicks);
-  LastTicks := Machine.Cpu.ExecutedCount;
+  if Machine.Cpu.Ticks > LastTicks then TicksPerSecond := Machine.Cpu.Ticks - LastTicks
+    else TicksPerSecond := Machine.Cpu.Ticks;
+  Label2.Caption := 'Ticks/s: ' + IntToStr(TicksPerSecond);
+  LastTicks := Machine.Cpu.Ticks;
 end;
 

branches/UltimatOS/UCpu.pas

@@ -82 +82 @@
     procedure InstructionDisableInt;
   public
-    ExecutedCount: Integer;
+    Ticks: Int64;
     InterruptCount: Integer;
     Terminated: Boolean;
@@ -159 +159 @@
   if AValue and not Assigned(FCpuThread) then begin
     FCpuThread := TCpuThread.Create(True);
-    FCpuThread.FreeOnTerminate := True;
+    FCpuThread.FreeOnTerminate := False;
     FCpuThread.Cpu := Self;
     FCpuThread.Start;
@@ -488 +488 @@
     FInstructionHandlers[Instruction]
     else raise Exception.Create('Missing handler for instruction ' + IntToStr(Integer(Instruction)));
-  Inc(ExecutedCount);
+  Inc(Ticks);
 end;
 
@@ -496 +496 @@
   IP := 0;
   SP := 0;
-  ExecutedCount := 0;
+  Ticks := 0;
   InterruptEnabled := True;
   InterruptPending := False;

branches/UltimatOS/UltimatOS.lpi

@@ -107 +107 @@
         <ResourceBaseClass Value="Form"/>
       </Unit>
+      <Unit>
+        <Filename Value="Forms/UFormCpu.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="FormCpu"/>
+        <ResourceBaseClass Value="Form"/>
+      </Unit>
     </Units>
   </ProjectOptions>

branches/UltimatOS/UltimatOS.lpr

@@ -11 +11 @@
   {$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, UFormMain, UMachine, UCpu, UMemory, UAssembler, UFormMemory
-  { you can add units after this };
+  Forms, UFormMain, UMachine, UCpu, UMemory, UAssembler, UFormMemory, UFormCpu;
 
 {$R *.res}
@@ -21 +20 @@
   Application.Initialize;
   Application.CreateForm(TFormMain, FormMain);
-  Application.CreateForm(TFormMemory, FormMemory);
   Application.Run;
 end.