Changeset 70 for trunk/Target

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.

File:

• trunk/Target/UTargetInterpretter.pas (modified) (7 diffs)

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.