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

FpDebugger: amend address/line for exceptions (addr was line after caller)

Browse Source 
git-svn-id: trunk@63866 -
This commit is contained in:
martin 2020-09-05 00:14:38 +00:00
parent 524b0c28ed
commit 03920381a6
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/lazdebuggers/lazdebuggerfp/fpdebugdebugger.pas
View File

@ -384,7 +384,7 @@ type
public
constructor Create(const AExternalDebugger: String); override;
destructor Destroy; override;
function GetLocationRec(AnAddress: TDBGPtr=0): TDBGLocationRec;
function GetLocationRec(AnAddress: TDBGPtr=0; AnAddrOffset: Integer = 0): TDBGLocationRec;
function GetLocation: TDBGLocationRec; override;
class function Caption: String; override;
class function NeedsExePath: boolean; override;
@ -2904,7 +2904,7 @@ begin
SizeVal(SizeOf(ExceptIP)), ExceptIP, FDbgController.DefaultContext)
then
ExceptIP := 0;
AnExceptionLocation:=GetLocationRec(ExceptIP);
AnExceptionLocation:=GetLocationRec(ExceptIP, -1);
if not FMemManager.ReadUnsignedInt(FDbgController.CurrentProcess.CallParamDefaultLocation(0),
SizeVal(SizeOf(AnExceptionObjectLocation)), AnExceptionObjectLocation, FDbgController.DefaultContext)
@ -2948,7 +2948,7 @@ begin
SizeVal(SizeOf(ExceptIP)), ExceptIP, FDbgController.DefaultContext)
then
ExceptIP := 0;
ExceptionLocation:=GetLocationRec(ExceptIP);
ExceptionLocation:=GetLocationRec(ExceptIP, -1);
if FMemManager.ReadUnsignedInt(FDbgController.CurrentProcess.CallParamDefaultLocation(0),
SizeVal(SizeOf(LongInt)), ErrNo, FDbgController.DefaultContext)
@ -3838,7 +3838,8 @@ begin
inherited Destroy;
end;
function TFpDebugDebugger.GetLocationRec(AnAddress: TDBGPtr): TDBGLocationRec;
function TFpDebugDebugger.GetLocationRec(AnAddress: TDBGPtr;
AnAddrOffset: Integer): TDBGLocationRec;
var
sym, symproc: TFpSymbol;
begin
@ -3854,7 +3855,9 @@ begin
else
result.Address := AnAddress;
sym := FDbgController.CurrentProcess.FindProcSymbol(result.Address);
{$PUSH}{$R-}{$Q-}
sym := FDbgController.CurrentProcess.FindProcSymbol(result.Address + AnAddrOffset);
{$POP}
if sym = nil then
Exit;