paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-29 09:50:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

FpDebug: Ensure internal breakpoint is freed, if cmd is finished. Add asserts

Browse Source 
(cherry picked from commit 2333696004)
This commit is contained in:
Martin 2022-02-10 21:15:08 +01:00
parent 81d940d51d
commit 9e889b7a40
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/fpdebug/fpdbgcontroller.pas
View File

@ -200,6 +200,7 @@ type
procedure RestoreRegisters;
public
constructor Create(AController: TDbgController; ARoutineAddress: TFpDbgMemLocation; ACallContext:TFpDbgInfoCallContext);
destructor Destroy; override;
procedure DoContinue(AProcess: TDbgProcess; AThread: TDbgThread); override;
end;
@ -439,6 +440,12 @@ begin
StoreRegisters;
end;
destructor TDbgControllerCallRoutineCmd.Destroy;
begin
RemoveHiddenBreakpointAtReturnAddress;
inherited Destroy;
end;
procedure TDbgControllerCallRoutineCmd.Init;
begin
inherited Init;
@ -563,6 +570,8 @@ end;
procedure TDbgControllerCallRoutineCmd.SetHiddenBreakpointAtReturnAddress(AnAddress: TDBGPtr);
begin
assert(FHiddenBreakpoint = nil, 'TDbgControllerCallRoutineCmd.SetHiddenBreakpointAtReturnAddress: FHiddenBreakpoint = nil');
FHiddenBreakpoint.Free;
FHiddenBreakpoint := FProcess.AddInternalBreak(AnAddress);
end;
@ -595,7 +604,7 @@ end;
procedure TDbgControllerCallRoutineCmd.RemoveHiddenBreakpointAtReturnAddress();
begin
FHiddenBreakpoint.Free;
FreeAndNil(FHiddenBreakpoint);
end;
procedure TDbgControllerCallRoutineCmd.StoreRegisters;
@ -743,6 +752,8 @@ end;
procedure TDbgControllerHiddenBreakStepBaseCmd.SetHiddenBreak(AnAddr: TDBGPtr);
begin
assert(FHiddenBreakpoint = nil, 'TDbgControllerHiddenBreakStepBaseCmd.SetHiddenBreak: FHiddenBreakpoint = nil');
FHiddenBreakpoint.Free;
// The callee may not setup a stackfram (StackBasePtr unchanged). So we use SP to detect recursive hits
FHiddenBreakStackPtrAddr := FThread.GetStackPointerRegisterValue;
FHiddenBreakInstrPtr := FThread.GetInstructionPointerRegisterValue;