Changeset 70

Timestamp:

Oct 11, 2015, 6:50:33 PM (9 years ago)

Author:

chronos

Message:

• Fixed: Remember MemorySize and CellSize globally for all projects and targets.

Location:

trunk

Files:

• Forms/UFormMain.lfm (modified) (1 diff)
• Forms/UFormMain.pas (modified) (2 diffs)
• Forms/UFormOptions.lfm (modified) (1 diff)
• Forms/UFormOptions.pas (modified) (4 diffs)
• Target/UTargetInterpretter.pas (modified) (7 diffs)
• UBFTarget.pas (modified) (2 diffs)
• UCore.pas (modified) (5 diffs)
• UTarget.pas (modified) (1 diff)

trunk/Forms/UFormMain.lfm

@@ -12 +12 @@
   OnDestroy = FormDestroy
   OnShow = FormShow
-  LCLVersion = '1.3'
+  LCLVersion = '1.5'
   WindowState = wsMaximized
   object StatusBarMain: TStatusBar

trunk/Forms/UFormMain.pas

@@ -167 +167 @@
 uses
   UCore, UFormCPU, UFormOptions, UFormMessages, UFormTargets, UFormOutput, UFormInput,
-  UFormMemory, UFormSourceCode, UFormTargetCode, UTargetInterpretter, UFormLog;
+  UFormMemory, UFormSourceCode, UFormTargetCode, UTargetInterpretter, UFormLog,
+  UBFTarget;
 
 resourcestring
@@ -454 +455 @@
 begin
   OptionsForm.Load;
-  //OptionsForm.LoadFromInterpretter(CurrentTarget);
   if OptionsForm.ShowModal = mrOK then begin
-    //OptionsForm.SaveToInterpretter(CurrentTarget);
     OptionsForm.Save;
-    if Assigned(Core.CurrentTarget) then
+    if Assigned(Core.CurrentTarget) then begin
       Core.CurrentTarget.OptimizationLevel := Core.OptimizationLevel;
+      if Core.CurrentTarget is TBFTarget then begin
+        TBFTarget(Core.CurrentTarget).CellSize := Core.CellSize;
+        TBFTarget(Core.CurrentTarget).MemorySize := Core.MemorySize;
+      end;
+    end;
   end;
 end;

trunk/Forms/UFormOptions.lfm

@@ -8 +8 @@
   ClientWidth = 468
   OnShow = FormShow
-  LCLVersion = '1.3'
+  LCLVersion = '1.5'
   object ButtonOk: TButton
     Left = 389

trunk/Forms/UFormOptions.pas

@@ -39 +39 @@
     procedure Load;
     procedure Save;
-    procedure LoadFromInterpretter(Interpretter: TTargetInterpretter);
-    procedure SaveToInterpretter(Interpretter: TTargetInterpretter);
   end;
 
@@ -81 +79 @@
   CheckBoxDPIAuto.Checked := Core.ScaleDPI.AutoDetect;
   ComboBoxOptimizatipn.ItemIndex := Integer(Core.OptimizationLevel);
+  SpinEditCellSize.Value := Core.CellSize;
+  SpinEditMemorySize.Value := Core.MemorySize;
   UpdateInterface;
 end;
@@ -90 +90 @@
   Core.ScaleDPI.AutoDetect := CheckBoxDPIAuto.Checked;
   Core.OptimizationLevel := TCompilerOptimization(ComboBoxOptimizatipn.ItemIndex);
+  Core.CellSize := SpinEditCellSize.Value;
+  Core.MemorySize := SpinEditMemorySize.Value;
 end;
 
@@ -104 +106 @@
 end;
 
-procedure TOptionsForm.LoadFromInterpretter(Interpretter: TTargetInterpretter
-  );
-begin
-  SpinEditCellSize.Value := Interpretter.CellSize;
-  SpinEditMemorySize.Value := Interpretter.MemorySize;
-end;
-
-procedure TOptionsForm.SaveToInterpretter(Interpretter: TTargetInterpretter);
-begin
-  Interpretter.CellSize := SpinEditCellSize.Value;
-  Interpretter.MemorySize := SpinEditMemorySize.Value;
-end;
-
 end.
 

trunk/Target/UTargetInterpretter.pas

@@ -30 +30 @@
   TTargetInterpretter = class(TBFTarget)
   private
-    FCellSize: Integer;
     FThreadState: Boolean;
     FThread: TTargetInterpretterThread;
     FStepCount: Integer;
     FCommandTable: array[TMachineCommand] of TCommandHandler;
-    function GetMemorySize: Integer;
-    procedure SetMemorySize(AValue: Integer);
     procedure SetThread(State: Boolean);
     procedure PrepareJumpTable;
@@ -74 +71 @@
     constructor Create; override;
     destructor Destroy; override;
-    procedure LoadFromRegistry(Root: HKEY; Key: string); override;
-    procedure SaveToRegistry(Root: HKEY; Key: string); override;
     property StepCount: Integer read FStepCount;
-    property MemorySize: Integer read GetMemorySize write SetMemorySize;
-    property CellSize: Integer read FCellSize write FCellSize;
   end;
 
@@ -146 +139 @@
 end;
 
-function TTargetInterpretter.GetMemorySize: Integer;
-begin
-  Result := Length(Memory);
-end;
-
-procedure TTargetInterpretter.SetMemorySize(AValue: Integer);
-begin
-  SetLength(Memory, AValue);
-end;
-
 procedure TTargetInterpretter.SetThread(State: Boolean);
 begin
@@ -175 +158 @@
   I: Integer;
 begin
+  for I := 0 to Length(FProgram) - 1 do begin
+    case FProgram[I].Command of
+      cmLoopStart: FProgram[I].Parameter := 0;
+      cmLoopEnd: FProgram[I].Parameter := 0;
+    end;
+  end;
+
   SetLength(Loop, 0);
   for I := 0 to Length(FProgram) - 1 do begin
@@ -259 +249 @@
 begin
   inherited;
+  SetLength(Memory, MemorySize);
   PrepareJumpTable;
   FProgramIndex := 0;
@@ -412 +403 @@
   Capabilities := [tcRun, tcPause, tcStop, tcCompile, tcStepOut, tcStepInto,
     tcStepOver, tcRunToCursor];
-  MemorySize := 30000;
-  CellSize := 256;
   // Base commands
   FCommandTable[cmInc] := CommandInc;
@@ -434 +423 @@
 end;
 
-procedure TTargetInterpretter.LoadFromRegistry(Root: HKEY; Key: string);
-begin
-  inherited LoadFromRegistry(Root, Key);
-  with TRegistryEx.Create do
-  try
-    RootKey := Root;
-    OpenKey(Key, True);
-    CellSize := ReadIntegerWithDefault('CellSize', 256);
-    MemorySize := ReadIntegerWithDefault('MemorySize', 30000);
-  finally
-    Free;
-  end;
-end;
-
-procedure TTargetInterpretter.SaveToRegistry(Root: HKEY; Key: string);
-begin
-  inherited SaveToRegistry(Root, Key);
-  with TRegistryEx.Create do
-  try
-    RootKey := Root;
-    OpenKey(Key, True);
-    WriteInteger('CellSize', CellSize);
-    WriteInteger('MemorySize', MemorySize);
-  finally
-    Free;
-  end;
-end;
-
 end.
 

trunk/UBFTarget.pas

@@ -33 +33 @@
     procedure LoadProgram; override;
   public
+    MemorySize: Integer;
+    CellSize: Integer;
+    constructor Create; override;
     procedure OptimizeSource; override;
     property ProgramIndex: Integer read FProgramIndex;
@@ -314 +317 @@
 end;
 
+constructor TBFTarget.Create;
+begin
+  inherited Create;
+  MemorySize := 30000;
+  CellSize := 256;
+end;
+
 procedure TBFTarget.OptimizeSource;
 var

trunk/UCore.pas

@@ -28 +28 @@
     OpenProjectOnStart: Boolean;
     OptimizationLevel: TCompilerOptimization;
+    CellSize: Integer;
+    MemorySize: Integer;
     procedure LoadFromRegistry(Root: HKEY; Key: string);
     procedure SaveToRegistry(Root: HKEY; Key: string);
@@ -43 +45 @@
 uses
   UFormMain, UTargetJava, UTargetDelphi, UTargetPHP, UTargetC,
-  UTargetInterpretter, UTargetFPC;
+  UTargetInterpretter, UTargetFPC, UBFTarget;
 
 
@@ -86 +88 @@
     ScaleDPI.AutoDetect := ReadBoolWithDefault('DPIAuto', True);
     OptimizationLevel := TCompilerOptimization(ReadIntegerWithDefault('OptimizationLevel', Integer(coNormal)));
+    MemorySize := ReadIntegerWithDefault('MemorySize', 30000);
+    CellSize := ReadIntegerWithDefault('CellSize', 256);
   finally
     Free;
@@ -106 +110 @@
     WriteInteger('DPIY', ScaleDPI.DPI.Y);
     WriteInteger('OptimizationLevel', Integer(OptimizationLevel));
+    WriteInteger('MemorySize', MemorySize);
+    WriteInteger('CellSize', CellSize);
     if Assigned(CoolTranslator1.Language) and (CoolTranslator1.Language.Code <> '') then
       WriteString('LanguageCode', CoolTranslator1.Language.Code)
@@ -127 +133 @@
     FCurrentTarget.OptimizationLevel := OptimizationLevel;
     FCurrentTarget.Messages.OnChange := FormMain.MessagesChanged;
+    if FCurrentTarget is TBFTarget then begin
+      TBFTarget(FCurrentTarget).MemorySize := MemorySize;
+      TBFTarget(FCurrentTarget).CellSize := CellSize;
+    end;
   end;
   FormMain.UpdateTargetList;

trunk/UTarget.pas

@@ -131 +131 @@
   end;
 
-  TBFTarget = class
-
-  end;
-
   { TTargetList }