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

LazDebuggerFpLldb: retrieve register for other stackframes, while evaluation is running (required for nested procedures)

Browse Source 
git-svn-id: trunk@60008 -
This commit is contained in:
martin 2019-01-05 16:21:44 +00:00
parent 5dc6bda9b0
commit 89171482cc
2 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -158,6 +158,7 @@ type
EvalFlags: TDBGEvaluateFlags = []): Boolean; EvalFlags: TDBGEvaluateFlags = []): Boolean;
property CurrentThreadId; property CurrentThreadId;
property CurrentStackFrame; property CurrentStackFrame;
property CommandQueue;
public public
class function Caption: String; override; class function Caption: String; override;
class function RequiredCompilerOpts(ATargetCPU, ATargetOS: String): TDebugCompilerRequirements; override; class function RequiredCompilerOpts(ATargetCPU, ATargetOS: String): TDebugCompilerRequirements; override;
@ -572,6 +573,8 @@ var
i: Integer; i: Integer;
Reg: TRegisters; Reg: TRegisters;
RegVObj: TRegisterDisplayValue; RegVObj: TRegisterDisplayValue;
CmdQueue: TLldbDebuggerCommandQueue;
QItem: TLldbDebuggerCommand;
begin begin
Result := False; Result := False;
@ -618,6 +621,29 @@ begin
assert(AContext <> nil, 'TFpLldbDbgMemReader.ReadRegister: AContext <> nil'); assert(AContext <> nil, 'TFpLldbDbgMemReader.ReadRegister: AContext <> nil');
Reg := FDebugger.Registers.CurrentRegistersList[AContext.ThreadId, AContext.StackFrame]; Reg := FDebugger.Registers.CurrentRegistersList[AContext.ThreadId, AContext.StackFrame];
Reg.Count; // trigger
if (reg.DataValidity = ddsRequested) then begin
CmdQueue := FDebugger.CommandQueue;
if CmdQueue.Count > 0 then begin;
QItem := CmdQueue.Items[CmdQueue.Count - 1];
if (QItem is TLldbDebuggerCommandRegister) and (TLldbDebuggerCommandRegister(QItem).Registers = Reg) then begin
QItem.AddReference;
CmdQueue.Delete(CmdQueue.Count - 1);
QItem.Execute;
while Reg.DataValidity = ddsRequested do begin
Application.ProcessMessages;
CheckSynchronize(25);
end;
QItem.ReleaseReference;
end;
end;
end;
if (reg.Count = 0) or (reg.DataValidity <> ddsValid) then begin
DebugLn(DBG_VERBOSE, ['Cant get Registers for context ', AContext.ThreadId, ', ', AContext.StackFrame, ', ', dbgs(Reg.DataValidity), ' Reg:', rname]);
exit;
end;
for i := 0 to Reg.Count - 1 do for i := 0 to Reg.Count - 1 do
if UpperCase(Reg[i].Name) = rname then if UpperCase(Reg[i].Name) = rname then
begin begin

28
components/lazdebuggers/lazdebuggerlldb/lldbdebugger.pas
View File

@ -241,6 +241,20 @@ type
property OnFinish: TNotifyEvent read FOnFinish write FOnFinish; property OnFinish: TNotifyEvent read FOnFinish write FOnFinish;
end; end;
{ TLldbDebuggerCommandRegister }
TLldbDebuggerCommandRegister = class(TLldbDebuggerCommand)
private
FRegisters: TRegisters;
procedure RegisterInstructionFinished(Sender: TObject);
protected
procedure DoExecute; override;
public
constructor Create(AOwner: TLldbDebugger; ARegisters: TRegisters);
destructor Destroy; override;
property Registers: TRegisters read FRegisters;
end;
(* (*
* Debugger * Debugger
*) *)
@ -485,20 +499,6 @@ type
***** Register ***** Register
***** } ***** }
{ TLldbDebuggerCommandRegister }
TLldbDebuggerCommandRegister = class(TLldbDebuggerCommand)
private
FRegisters: TRegisters;
procedure RegisterInstructionFinished(Sender: TObject);
protected
procedure DoExecute; override;
public
constructor Create(AOwner: TLldbDebugger; ARegisters: TRegisters);
destructor Destroy; override;
property Registers: TRegisters read FRegisters;
end;
{ TLldbRegisterSupplier } { TLldbRegisterSupplier }
TLldbRegisterSupplier = class(TRegisterSupplier) TLldbRegisterSupplier = class(TRegisterSupplier)