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

FpDebug, IDE: show address for RIP relative asm operand

Browse Source
This commit is contained in:
Martin 2024-07-11 01:10:18 +02:00
parent a7345859cd
commit 15b8b4893e
4 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/debuggerintf/dbgintfdebuggerbase.pp
View File

@ -1015,6 +1015,7 @@ type
TargetAddr: TDbgPtr; // Absolute Addr for relative jump/call
TargetName, TargetFile: String;
TargetLine: Integer;
IsJump: boolean;
end;
TDisassemblerAddressValidity =

19
components/fpdebug/fpdbgdisasx86.pp
View File

@ -5126,9 +5126,26 @@ begin
AnInfo.InstrTargetOffs := Int64(TDbgPtr(AAddress) - TDbgPtr(Code)) + TargetAddrOffs;
{$POP}
end;
end
else
if (Instr.OperCnt = 2) and (ofMemory in Instr.Operand[n].Flags) and (Instr.Segment = '') and
( (Instr.Operand[2].Value = 'rip%s') or (Instr.Operand[2].Value = 'eip%s') )
then begin
TargetAddrOffs := 1;
case Instr.Operand[2].ByteCount of
1: TargetAddrOffs := shortint(PByte(@Code[Instr.Operand[2].CodeIndex])^);
2: TargetAddrOffs := smallint(PWord(@Code[Instr.Operand[2].CodeIndex])^);
4: TargetAddrOffs := Integer(PDWord(@Code[Instr.Operand[2].CodeIndex])^);
8: TargetAddrOffs := Int64(PQWord(@Code[Instr.Operand[2].CodeIndex])^);
end;
if TargetAddrOffs <> 1 then begin
AnInfo.InstrType := itAny;
{$PUSH}{$R-}{$Q-}
AnInfo.InstrTargetOffs := Int64(TDbgPtr(AAddress) - TDbgPtr(Code)) + TargetAddrOffs;
{$POP}
end;
end;
OpcodeName := OPCODE_PREFIX[Instr.OpCode.Prefix];
OpcodeName := OpcodeName + OPCODE_NAME[Instr.OpCode.Opcode];
OpcodeName := OpcodeName + OPCODE_SUFFIX[Instr.OpCode.Suffix];

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

@ -2216,6 +2216,7 @@ var
AnEntry.TargetFile := '';
AnEntry.TargetLine := 0;
if AnInfo.InstrType = itJump then begin
AnEntry.IsJump := True;
{$PUSH}{$R-}{$Q-}
AnEntry.TargetAddr := ALineAddr + AnInfo.InstrTargetOffs;
{$POP}
@ -2231,6 +2232,12 @@ var
AnEntry.TargetName := AnEntry.TargetName + '+' + IntToStr(AOffset);
Sym.ReleaseReference;
end;
end
else
if AnInfo.InstrTargetOffs <> 0 then begin
{$PUSH}{$R-}{$Q-}
AnEntry.TargetAddr := ALineAddr + AnInfo.InstrTargetOffs;
{$POP}
end;
ATargetRange.Append(@AnEntry);
inc(StatIndex);

5
ide/packages/idedebugger/assemblerdlg.pp
View File

@ -49,6 +49,7 @@ type
SourceLine: Integer;
ImageIndex: Integer;
TargetAddr: TDbgPtr; // Absolute Addr for relative jump/call
IsJump: Boolean;
end;
TAsmDlgLineEntries = Array of TAsmDlgLineEntry;
@ -693,6 +694,7 @@ begin
end
else
if (y >= 0) and (y <= FLineCount) and
FLineMap[y].IsJump and
(FLineMap[y].TargetAddr <> 0) and (FDebugger <> nil)
then begin
FLinkLine := y;
@ -719,6 +721,7 @@ begin
if (ssCtrl in Shift) and
(Y >= 0) and (y <= FLineCount) and
(FLineMap[y].TargetAddr <> 0) and (FDebugger <> nil) and
FLineMap[y].IsJump and
(X > FGutterWidth)
then begin
if (FLinkLine <> y) then
@ -745,6 +748,7 @@ begin
if (ssCtrl in Shift) and (FLinkLine = y div FLineHeight) and
(FLinkLine >= 0) and (FLinkLine <= FLineCount) and
(FLineMap[FLinkLine].TargetAddr <> 0) and (FDebugger <> nil) and
FLineMap[FLinkLine].IsJump and
(X > FGutterWidth) and (FMouseDownX > FGutterWidth)
then begin
SetLocation(FDebugger, FLineMap[FLinkLine].TargetAddr);
@ -1519,6 +1523,7 @@ begin
ALineMap[Line].SourceLine := Itm^.SrcFileLine;
ALineMap[Line].ImageIndex := -1;
ALineMap[Line].TargetAddr := Itm^.TargetAddr;
ALineMap[Line].IsJump := Itm^.IsJump;
s := StringOfChar(' ', min(4, 40 - Length(ALineMap[Line].Statement))) + '#';
if Itm^.TargetAddr <> 0 then begin