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

FpDebug: Load libraries on Linux, and skip incompatible binaries. Also on Windows, for consistency and stability

Browse Source
This commit is contained in:
Joost van der Sluis 2021-12-08 22:17:45 +01:00
parent baa12a8519
commit e9f1ffb855
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
components/fpdebug/fpdbglinuxclasses.pas
View File

@ -371,6 +371,8 @@ type
{ tDbgLinuxLibrary } { tDbgLinuxLibrary }
tDbgLinuxLibrary = class(TDbgLibrary) tDbgLinuxLibrary = class(TDbgLibrary)
protected
procedure InitializeLoaders; override;
public public
constructor Create(const AProcess: TDbgProcess; const AFileName: string; const AModuleHandle: THandle; const ABaseAddr: TDbgPtr); constructor Create(const AProcess: TDbgProcess; const AFileName: string; const AModuleHandle: THandle; const ABaseAddr: TDbgPtr);
end; end;
@ -390,6 +392,21 @@ end;
{ tDbgLinuxLibrary } { tDbgLinuxLibrary }
procedure tDbgLinuxLibrary.InitializeLoaders;
var
Loader: TDbgImageLoader;
begin
Loader := TDbgImageLoader.Create(Name, nil, BaseAddr);
// The dynamic-loader (dl) on Linux also loads other stuff then ELF-
// formatted libraries.
// So it is reasonable likely that the loaded 'library' can not be handled
// by the detault readers from the loader.
if Loader.IsValid then
Loader.AddToLoaderList(LoaderList)
else
Loader.Free;
end;
constructor tDbgLinuxLibrary.Create(const AProcess: TDbgProcess; const AFileName: string; const AModuleHandle: THandle; const ABaseAddr: TDbgPtr); constructor tDbgLinuxLibrary.Create(const AProcess: TDbgProcess; const AFileName: string; const AModuleHandle: THandle; const ABaseAddr: TDbgPtr);
begin begin
Inherited Create(AProcess, AFileName, AModuleHandle, ABaseAddr); Inherited Create(AProcess, AFileName, AModuleHandle, ABaseAddr);
@ -867,8 +884,14 @@ begin
end; end;
procedure TDbgLinuxProcess.InitializeLoaders; procedure TDbgLinuxProcess.InitializeLoaders;
var
Loader: TDbgImageLoader;
begin begin
TDbgImageLoader.Create(Name).AddToLoaderList(LoaderList); Loader := TDbgImageLoader.Create(Name);
if Loader.IsValid then
Loader.AddToLoaderList(LoaderList)
else
Loader.Free;
end; end;
function TDbgLinuxProcess.CreateThread(AthreadIdentifier: THandle; out IsMainThread: boolean): TDbgThread; function TDbgLinuxProcess.CreateThread(AthreadIdentifier: THandle; out IsMainThread: boolean): TDbgThread;

8
components/fpdebug/fpdbgwinclasses.pas
View File

@ -478,8 +478,14 @@ begin
end; end;
procedure TDbgWinProcess.InitializeLoaders; procedure TDbgWinProcess.InitializeLoaders;
var
Loader: TDbgImageLoader;
begin begin
TDbgImageLoader.Create(FInfo.hFile).AddToLoaderList(LoaderList); Loader := TDbgImageLoader.Create(FInfo.hFile);
if Loader.IsValid then
AddToLoaderList(LoaderList)
else
Loader.Free;
end; end;
function TDbgWinProcess.CreateWatchPointData: TFpWatchPointData; function TDbgWinProcess.CreateWatchPointData: TFpWatchPointData;