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

FpDebug: Improve target-mem-read on Linux. Issue #41161 Patch by Alexander (Rouse_) Bagel

Browse Source
This commit is contained in:
Martin 2024-09-27 22:26:31 +02:00
parent 0d63ab6747
commit 166db6365e
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
components/fpdebug/fpdbglinuxclasses.pas
View File

@ -400,6 +400,15 @@ var
GConsoleTty: string; GConsoleTty: string;
GSlavePTyFd: cint; GSlavePTyFd: cint;
type
Tprocess_vm_readv = function(pid: pid_t; const local_iov: piovec;
liovcnt: NativeUInt; const remote_iov: piovec; riovcnt: NativeUInt;
flags: NativeUInt): ssize_t; cdecl;
var
process_vm_lib: TLibHandle = 0;
process_vm_readv: Tprocess_vm_readv = nil;
Function WIFSTOPPED(Status: Integer): Boolean; Function WIFSTOPPED(Status: Integer): Boolean;
begin begin
WIFSTOPPED:=((Status and $FF)=$7F); WIFSTOPPED:=((Status and $FF)=$7F);
@ -1357,8 +1366,26 @@ var
AVal: TDbgPtr; AVal: TDbgPtr;
buf: pbyte; buf: pbyte;
AAdressAlign: TDBGPtr; AAdressAlign: TDBGPtr;
localiov, remoteiov: iovec;
begin begin
{$IFDEF FPDEBUG_THREAD_CHECK}AssertFpDebugThreadId('TDbgLinuxProcess.ReadData');{$ENDIF} {$IFDEF FPDEBUG_THREAD_CHECK}AssertFpDebugThreadId('TDbgLinuxProcess.ReadData');{$ENDIF}
// since kernel >= 3.2
// https://kernelnewbies.org/Linux_3.2#Cross_memory_attach
if Assigned(process_vm_readv) then
begin
localiov.iov_base := @AData;
localiov.iov_len := ASize;
remoteiov.iov_base := Pointer(AAdress);
remoteiov.iov_len := ASize;
Result := process_vm_readv(ProcessID, @localiov, 1, @remoteiov, 1, 0) = ASize;
if Result then
begin
MaskBreakpointsInReadData(AAdress, ASize, AData);
Exit;
end;
end;
result := false; result := false;
fpseterrno(0); fpseterrno(0);
BytesDone := 0; BytesDone := 0;
@ -2015,10 +2042,21 @@ initialization
DBG_WARNINGS := DebugLogger.FindOrRegisterLogGroup('DBG_WARNINGS' {$IFDEF DBG_WARNINGS} , True {$ENDIF} ); DBG_WARNINGS := DebugLogger.FindOrRegisterLogGroup('DBG_WARNINGS' {$IFDEF DBG_WARNINGS} , True {$ENDIF} );
FPDBG_LINUX := DebugLogger.FindOrRegisterLogGroup('FPDBG_LINUX' {$IFDEF DebuglnLinuxDebugEvents} , True {$ENDIF} ); FPDBG_LINUX := DebugLogger.FindOrRegisterLogGroup('FPDBG_LINUX' {$IFDEF DebuglnLinuxDebugEvents} , True {$ENDIF} );
process_vm_lib := LoadLibrary('libc.' + SharedSuffix);
if process_vm_lib = 0 then
process_vm_lib := LoadLibrary('libc.' + SharedSuffix + '.6');
if process_vm_lib <> 0 then
process_vm_readv := Tprocess_vm_readv(GetProcAddress(process_vm_lib, 'process_vm_readv'));
RegisterDbgOsClasses(TOSDbgClasses.Create( RegisterDbgOsClasses(TOSDbgClasses.Create(
TDbgLinuxProcess, TDbgLinuxProcess,
TDbgLinuxThread, TDbgLinuxThread,
TX86AsmDecoder TX86AsmDecoder
)); ));
finalization
if process_vm_lib <> 0 then
FreeLibrary(process_vm_lib);
end. end.

1
docs/Contributors.txt
View File

@ -3,6 +3,7 @@
A. J. Venter A. J. Venter
Алексей Лагунов Алексей Лагунов
Alexander Grau Alexander Grau
Alexander (Rouse_) Bagel
Alexander S. Klenin Alexander S. Klenin
Alexander Shiyan Alexander Shiyan
Alexandr Gridnev Alexandr Gridnev