From 910afda1b317446766011a7898a8e795d362b3be Mon Sep 17 00:00:00 2001 From: Martin Date: Sun, 21 Jan 2024 00:31:18 +0100 Subject: [PATCH] LazDebuggerFpLldb: fixed watch-eval for Mac-M2, if stackwindow is closed. (register PC for M2) (cherry picked from commit c4483bf7f46248f0384063e4e2ba4b11b1480cf5) --- components/lazdebuggers/lazdebuggerfplldb/fplldbdebugger.pas | 3 +++ 1 file changed, 3 insertions(+) diff --git a/components/lazdebuggers/lazdebuggerfplldb/fplldbdebugger.pas b/components/lazdebuggers/lazdebuggerfplldb/fplldbdebugger.pas index e127c0da9e..e097073330 100644 --- a/components/lazdebuggers/lazdebuggerfplldb/fplldbdebugger.pas +++ b/components/lazdebuggers/lazdebuggerfplldb/fplldbdebugger.pas @@ -1546,6 +1546,9 @@ begin r := Registers.CurrentRegistersList[AThreadId, AStackFrame]; if (r <> nil) and (r.DataValidity = ddsValid) then begin try + if FDwarfInfo.TargetInfo.machineType in [mtARM, mtARM64] then + v := r.EntriesByName['PC'].ValueObjFormat[rdDefault].Value[rdDefault] + else if TargetWidth = 64 then v := r.EntriesByName['RIP'].ValueObjFormat[rdDefault].Value[rdDefault] else