Changeset 136 for trunk/Target/UTargetInterpretter.pas

Timestamp:

Mar 5, 2022, 4:14:27 PM (3 years ago)

Author:

chronos

Message:

• Modified: Update recent files list in registry immediately.
• Fixed: Regresion in debugging step in and step out.
• Fixed: Of by one index in loop start command interpretation.
• Fixed: Correctly load directory and file name into open and save dialogs.
• Modified: Faster interval for program output refresh.

File:

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

trunk/Target/UTargetInterpretter.pas

@@ -16 +16 @@
   private
     FNewState: TRunState;
+    FMessage: string;
+    procedure DoMessage;
     procedure DoSetState;
     procedure SetStateSafe(State: TRunState);
@@ -81 +83 @@
 
 resourcestring
-  SProgramLowerLimit = 'Program run over lower limit';
-  SProgramUpperLimit = 'Program run over upper limit';
+  SProgramLowerMemoryLimit = 'Program run over lower memory limit';
+  SProgramUpperMemoryLimit = 'Program run over upper memory limit';
   SJumpTableInconsistent = 'Jump table is inconsistent';
   SJumpTableCollision = 'Jump table collision';
   SProgramNotRunning = 'Program not running';
   SUnsupportedCommand = 'Unsupported command';
+  SBreakPointIndexError = 'Break point index error: %d';
 
 { TTargetInterpretterThread }
@@ -93 +96 @@
 var
   BreakPoint: TBreakPoint;
-begin
+  Index: Integer;
+begin
+  try
   with Parent do
   repeat
@@ -100 +105 @@
         if FProgramBreakpoints[FProgramIndex] then begin
           BreakPoint := BreakPoints.SearchByTargetPos(FProgramIndex);
-          if BreakPoint.System then BreakPoints.Delete(BreakPoints.IndexOf(BreakPoint));
+          if BreakPoint.System then begin
+            Index := BreakPoints.IndexOf(BreakPoint);
+            if Index <> -1 then BreakPoints.Delete(Index)
+            else raise Exception.Create(Format(SBreakPointIndexError, [Index]));
+          end;
           SetStateSafe(rsPaused);
         end else begin
@@ -114 +123 @@
     if State <> rsStopped then SetStateSafe(rsStopped);
   until Terminated or (State = rsStopped);
+
+  except
+    on E: Exception do begin
+      FMessage := E.Message;
+      Synchronize(DoMessage);
+    end;
+  end;
+end;
+
+procedure TTargetInterpretterThread.DoMessage;
+begin
+  Parent.SendMessage(FMessage);
 end;
 
@@ -123 +144 @@
 procedure TTargetInterpretterThread.SetStateSafe(State: TRunState);
 begin
+  if Parent.State = State then Exit;
   FNewState := State;
   Synchronize(DoSetState);
@@ -212 +234 @@
 begin
   if Memory[MemoryPosition + FProgram[FProgramIndex].RelIndex] = 0 then
-    FProgramIndex := FProgram[FProgramIndex].Parameter;
+    FProgramIndex := FProgram[FProgramIndex].Parameter - 1;
 end;
 
@@ -245 +267 @@
   if MemoryPosition < MemorySize then
     Inc(MemoryPosition, FProgram[FProgramIndex].Parameter)
-    else raise Exception.Create(SProgramUpperLimit);
+    else raise Exception.Create(SProgramUpperMemoryLimit);
 end;
 
@@ -252 +274 @@
   if MemoryPosition > 0 then
     Dec(MemoryPosition, FProgram[FProgramIndex].Parameter)
-    else raise Exception.Create(SProgramLowerLimit);
+    else raise Exception.Create(SProgramLowerMemoryLimit);
 end;
 
@@ -319 +341 @@
 procedure TTargetInterpretter.CheckMemoryBounds(Address: Integer);
 begin
-  if Address < 0 then raise Exception.Create(SProgramLowerLimit);
-  if Address >= MemorySize then raise Exception.Create(SProgramUpperLimit);
+  if Address < 0 then raise Exception.Create(SProgramLowerMemoryLimit);
+  if Address >= MemorySize then raise Exception.Create(SProgramUpperMemoryLimit);
 end;
 
@@ -428 +450 @@
     Nesting := 1;
     while (StepIndex < DebugSteps.Count) and (Nesting > 0) do begin
-      if TDebugStep(DebugSteps[StepIndex]).Operation = soStepIn then Inc(Nesting);
-      if TDebugStep(DebugSteps[StepIndex]).Operation = soStepOut then Dec(Nesting);
+      if DebugSteps[StepIndex].Operation = soStepIn then Inc(Nesting);
+      if DebugSteps[StepIndex].Operation = soStepOut then Dec(Nesting);
       Inc(StepIndex);
     end;
     if StepIndex < DebugSteps.Count then begin
-      Breakpoints.SetSystem(TDebugStep(DebugSteps[StepIndex]).ProgramPosition);
+      Breakpoints.SetSystem(DebugSteps[StepIndex].ProgramPosition);
     end;
     Run;