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

LazDebuggerFpLLDB/Gdbmi: Fix cached context

Browse Source 
(cherry picked from commit 6cded56ae9)
This commit is contained in:
Martin 2022-02-10 23:14:52 +01:00
parent 672e289ef3
commit 2187550bd5
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -932,6 +932,7 @@ function TFpGDBMIDebugger.GetInfoContextForContext(AThreadId,
var var
Addr: TDBGPtr; Addr: TDBGPtr;
i, sa: Integer; i, sa: Integer;
LocCtx: TFpDbgSimpleLocationContext;
begin begin
Result := nil; Result := nil;
if FDwarfInfo = nil then if FDwarfInfo = nil then
@ -968,10 +969,9 @@ begin
sa := 4 sa := 4
else else
sa := 8; sa := 8;
Result := FDwarfInfo.FindSymbolScope( LocCtx := TFpDbgSimpleLocationContext.Create(FMemManager, Addr, sa, AThreadId, AStackFrame);
TFpDbgSimpleLocationContext.Create(FMemManager, Addr, sa, AThreadId, AStackFrame), Result := FDwarfInfo.FindSymbolScope(LocCtx, Addr);
Addr LocCtx.ReleaseReference;
);
if Result = nil then begin if Result = nil then begin
debugln(DBG_VERBOSE, ['GetInfoContextForContext CTX NOT FOUND for ', AThreadId, ', ', AStackFrame]); debugln(DBG_VERBOSE, ['GetInfoContextForContext CTX NOT FOUND for ', AThreadId, ', ', AStackFrame]);
@ -979,7 +979,7 @@ begin
end; end;
ReleaseRefAndNil(FLastContext[MAX_CTX_CACHE-1]); ReleaseRefAndNil(FLastContext[MAX_CTX_CACHE-1]);
move(FLastContext[0], FLastContext[1], (MAX_CTX_CACHE-1) + SizeOf(FLastContext[0])); move(FLastContext[0], FLastContext[1], (MAX_CTX_CACHE-1) * SizeOf(FLastContext[0]));
FLastContext[0] := Result; FLastContext[0] := Result;
// TODO Result.AddReference; // TODO Result.AddReference;
end; end;

11
components/lazdebuggers/lazdebuggerfplldb/fplldbdebugger.pas
View File

@ -1398,6 +1398,7 @@ function TFpLldbDebugger.GetInfoContextForContext(AThreadId,
var var
Addr: TDBGPtr; Addr: TDBGPtr;
i, sa: Integer; i, sa: Integer;
LocCtx: TFpDbgSimpleLocationContext;
begin begin
Result := nil; Result := nil;
if FDwarfInfo = nil then if FDwarfInfo = nil then
@ -1435,11 +1436,9 @@ begin
sa := 4 sa := 4
else else
sa := 8; sa := 8;
Result := FDwarfInfo.FindSymbolScope( LocCtx := TFpDbgSimpleLocationContext.Create(FMemManager, Addr, sa, AThreadId, AStackFrame);
TFpDbgSimpleLocationContext.Create(FMemManager, Addr, sa, AThreadId, AStackFrame), Result := FDwarfInfo.FindSymbolScope(LocCtx, Addr);
Addr LocCtx.ReleaseReference;
);
Result.LocationContext.ReleaseReference;
if Result = nil then begin if Result = nil then begin
debugln(DBG_VERBOSE, ['GetInfoContextForContext CTX NOT FOUND for ', AThreadId, ', ', AStackFrame]); debugln(DBG_VERBOSE, ['GetInfoContextForContext CTX NOT FOUND for ', AThreadId, ', ', AStackFrame]);
@ -1447,7 +1446,7 @@ begin
end; end;
ReleaseRefAndNil(FLastContext[MAX_CTX_CACHE-1]); ReleaseRefAndNil(FLastContext[MAX_CTX_CACHE-1]);
move(FLastContext[0], FLastContext[1], (MAX_CTX_CACHE-1) + SizeOf(FLastContext[0])); move(FLastContext[0], FLastContext[1], (MAX_CTX_CACHE-1) * SizeOf(FLastContext[0]));
FLastContext[0] := Result; FLastContext[0] := Result;
Result.AddReference; Result.AddReference;
end; end;