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

LazDebuggerFpGdbmi: Fixed compilation after r48638 #8f9d2106db

Browse Source 
git-svn-id: trunk@48680 -
This commit is contained in:
joost 2015-04-08 15:01:31 +00:00
parent 6ccaef90d4
commit 75eb7cb004
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
components/lazdebuggers/lazdebuggerfpgdbmi/fpgdbmidebugger.pp
View File

@ -67,7 +67,7 @@ type
TFpGDBMIDebugger = class(TGDBMIDebugger) TFpGDBMIDebugger = class(TGDBMIDebugger)
private private
FWatchEvalList: TList; FWatchEvalList: TList;
FImageLoader: TDbgImageLoader; FImageLoaderList: TDbgImageLoaderList;
FDwarfInfo: TFpDwarfInfo; FDwarfInfo: TFpDwarfInfo;
FPrettyPrinter: TFpPascalPrettyPrinter; FPrettyPrinter: TFpPascalPrettyPrinter;
FMemReader: TFpGDBMIDbgMemReader; FMemReader: TFpGDBMIDbgMemReader;
@ -739,14 +739,18 @@ begin
end; end;
procedure TFpGDBMIDebugger.LoadDwarf; procedure TFpGDBMIDebugger.LoadDwarf;
var
AnImageLoader: TDbgImageLoader;
begin begin
UnLoadDwarf; UnLoadDwarf;
debugln(FPGDBDBG_VERBOSE, ['TFpGDBMIDebugger.LoadDwarf ']); debugln(FPGDBDBG_VERBOSE, ['TFpGDBMIDebugger.LoadDwarf ']);
FImageLoader := TDbgImageLoader.Create(FileName); AnImageLoader := TDbgImageLoader.Create(FileName);
if not FImageLoader.IsValid then begin if not AnImageLoader.IsValid then begin
FreeAndNil(FImageLoader); FreeAndNil(AnImageLoader);
exit; exit;
end; end;
FImageLoaderList := TDbgImageLoaderList.Create(True);
FImageLoaderList.Add(AnImageLoader);
{$IFdef WithWinMemReader} {$IFdef WithWinMemReader}
FMemReader := TFpGDBMIAndWin32DbgMemReader.Create(Self); FMemReader := TFpGDBMIAndWin32DbgMemReader.Create(Self);
{$Else} {$Else}
@ -754,7 +758,7 @@ begin
{$ENDIF} {$ENDIF}
FMemManager := TFpDbgMemManager.Create(FMemReader, TFpDbgMemConvertorLittleEndian.Create); FMemManager := TFpDbgMemManager.Create(FMemReader, TFpDbgMemConvertorLittleEndian.Create);
FDwarfInfo := TFpDwarfInfo.Create(FImageLoader); FDwarfInfo := TFpDwarfInfo.Create(FImageLoaderList);
FDwarfInfo.MemManager := FMemManager; FDwarfInfo.MemManager := FMemManager;
FDwarfInfo.LoadCompilationUnits; FDwarfInfo.LoadCompilationUnits;
FPrettyPrinter := TFpPascalPrettyPrinter.Create(SizeOf(Pointer)); FPrettyPrinter := TFpPascalPrettyPrinter.Create(SizeOf(Pointer));
@ -764,7 +768,7 @@ procedure TFpGDBMIDebugger.UnLoadDwarf;
begin begin
debugln(FPGDBDBG_VERBOSE, ['TFpGDBMIDebugger.UnLoadDwarf ']); debugln(FPGDBDBG_VERBOSE, ['TFpGDBMIDebugger.UnLoadDwarf ']);
FreeAndNil(FDwarfInfo); FreeAndNil(FDwarfInfo);
FreeAndNil(FImageLoader); FreeAndNil(FImageLoaderList);
FreeAndNil(FMemReader); FreeAndNil(FMemReader);
if FMemManager <> nil then if FMemManager <> nil then
FMemManager.TargetMemConvertor.Free; FMemManager.TargetMemConvertor.Free;