Changeset 91 for trunk/Forms/UFormMain.pas

Timestamp:

Jul 20, 2018, 9:41:37 AM (6 years ago)

Author:

chronos

Message:

• Added: Allow to enable individual code optimization from settings dialog.
• Added: Actions to format or shrink target BF code.

Location:

trunk/Forms

Files:

• . (modified) (1 prop)
• UFormMain.pas (modified) (5 diffs)

trunk/Forms/UFormMain.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, SynEdit, Forms, Controls, Graphics, Dialogs,
-  Menus, ActnList, ComCtrls, ExtCtrls, UTarget, Registry, URegistry, Process,
+  Menus, ActnList, ComCtrls, ExtCtrls, UTarget, Registry, URegistry,
   LazFileUtils;
 
@@ -305 +305 @@
     if not Assigned(Core.CurrentTarget) then
       Core.CurrentTarget := TTarget(Core.Targets[0]);
+    Core.Optimizations.AddSub := ReadBoolWithDefault('OptimizationAddSubEnabled', True);
+    Core.Optimizations.Merge := ReadBoolWithDefault('OptimizationMerge', True);
+    Core.Optimizations.CopyMultiply := ReadBoolWithDefault('OptimizationCopyMultiplyEnabled', True);
+    Core.Optimizations.RelativeIndexes := ReadBoolWithDefault('OptimizationRelativeIndexesEnabled', True);
   finally
     Free;
@@ -317 +321 @@
     OpenKey(Key, True);
     WriteString('TargetName', Core.CurrentTarget.Name);
+    WriteBool('OptimizationAddSubEnabled', Core.Optimizations.AddSub);
+    WriteBool('OptimizationMerge', Core.Optimizations.Merge);
+    WriteBool('OptimizationCopyMultiplyEnabled', Core.Optimizations.CopyMultiply);
+    WriteBool('OptimizationRelativeIndexesEnabled', Core.Optimizations.RelativeIndexes);
   finally
     Free;
@@ -458 +466 @@
 procedure TFormMain.AOptionsExecute(Sender: TObject);
 begin
-  OptionsForm.Load;
-  if OptionsForm.ShowModal = mrOK then begin
-    OptionsForm.Save;
-    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;
+  FormOptions := TFormOptions.Create(nil);
+  try
+    FormOptions.Load;
+    if FormOptions.ShowModal = mrOK then begin
+      FormOptions.Save;
+      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;
+  finally
+    FormOptions.Free;
   end;
 end;
@@ -479 +492 @@
     ProjectFileName := Core.Project.FileName;
     ProgramName := ExtractFileNameOnly(Core.Project.FileName);
+    if Core.CurrentTarget is TBFTarget then
+      TBFTarget(Core.CurrentTarget).Optimizations := Core.Optimizations;
     Core.CurrentTarget.Messages.AddMessage(SCompileStart);
     Application.ProcessMessages;