paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-18 22:29:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

FpDebug, LazDebuggerFp: call FOnThreadProcessLoopCycleEvent for deProcessExits / Ensure breakpoints are handled in the loop-thread / some breakpoint fixes

Browse Source 
git-svn-id: trunk@64538 -
This commit is contained in:
martin 2021-02-11 22:40:21 +00:00
parent f6d3eca79a
commit fa5c3112f3
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/fpdebug/fpdbgcontroller.pas
View File

@ -1662,6 +1662,10 @@ begin
IsFinished:=false;
if FPDEvent=deExitProcess then begin
FreeAndNil(FCommand);
if assigned(FOnThreadProcessLoopCycleEvent) then begin
FOnThreadProcessLoopCycleEvent(AExit, FPDEvent, CurCmd, IsFinished);
FPDEvent := deExitProcess;
end;
break;
end
else

23
components/lazdebuggers/lazdebuggerfp/fpdebugdebugger.pas
View File

@ -2332,7 +2332,23 @@ var
EFlags, Cnt: Cardinal;
Frames: TFrameList;
FinallyData: Array of array [0..3] of DWORD;
n: String;
begin
case AnEventType of
deExitProcess: begin
FDebugger.FExceptionStepper.DoDbgStopped;
exit;
end;
deLoadLibrary: begin
if (CurrentProcess <> nil) and (CurrentProcess.LastLibraryLoaded <> nil) then begin
n := ExtractFileName(CurrentProcess.LastLibraryLoaded.Name);
if n = 'ntdll.dll' then
FDebugger.FExceptionStepper.DoNtDllLoaded(CurrentProcess.LastLibraryLoaded);
end;
exit;
end;
end;
if CurrentThread = nil then
exit;
if (FState = esSteppingFpcSpecialHandler) and AnIsFinished and
@ -2517,6 +2533,7 @@ begin
AFinishLoopAndSendEvents := False;
FBreakPoints[bplSehW64Finally].RemoveAllAddresses;
o := FAddressFrameList.IndexOf(PC);
Rdx := CurrentThread.RegisterValueList.FindRegisterByDwarfIndex(1).NumValue;
if o >= 0 then begin
Frames := FAddressFrameList.Data[o];
Frames.Remove(CurrentThread.GetStackPointerRegisterValue);
@ -2570,7 +2587,7 @@ begin
if FState in [esAtWSehExcept] then begin
FDebugger.EnterPause(FDebugger.GetLocation);
FState := esNone;
exit;
exit(True);
end;
Result := Assigned(Breakpoint);
@ -2652,7 +2669,6 @@ begin
LockRelease;
try
SetState(dsStop);
FExceptionStepper.DoDbgStopped;
StopAllWorkers;
FreeDebugThread;
finally
@ -2732,9 +2748,6 @@ var
begin
n := ExtractFileName(ALib.Name);
DoDbgEvent(ecModule, etModuleLoad, 'Loaded: ' + n + ' (' + ALib.Name +')');
if n = 'ntdll.dll' then
FExceptionStepper.DoNtDllLoaded(ALib);
end;
procedure TFpDebugDebugger.FDbgControllerLibraryUnloaded(var continue: boolean;