d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC 295636,295637:

Browse Source 
Fix issues with tracing Linux/i386 binaries.

295636:
Sign extend the error value for failing Linux/i386 system calls.  This
restores the mapping of Linux errors to native FreeBSD errno values after
the refactoring in r288424.

295637:
Correct the ABI name for Linux/i386 binaries under FreeBSD/i386.

This allows truss to work for these binaries again after r288424.

Approved by:	re (marius)
This commit is contained in:
jhb 2016-02-24 22:01:45 +00:00
parent 972671f920
commit 266e77bc14
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.bin/truss/amd64-linux32.c
View File

@ -116,6 +116,8 @@ amd64_linux32_fetch_retval(struct trussinfo *trussinfo, long *retval,
retval[0] = regs.r_rax & 0xffffffff;
retval[1] = regs.r_rdx & 0xffffffff;
*errorp = !!(regs.r_rflags & PSL_C);
if (*errorp)
retval[0] = (int)retval[0];
if (*errorp) {
for (i = 0; i < nitems(bsd_to_linux_errno); i++) {

2
usr.bin/truss/i386-linux.c
View File

@ -130,7 +130,7 @@ i386_linux_fetch_retval(struct trussinfo *trussinfo, long *retval, int *errorp)
}
static struct procabi i386_linux = {
"Linux ELF32",
"Linux ELF",
linux_syscallnames,
nitems(linux_syscallnames),
i386_linux_fetch_args,