glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lseek: merge two different implementations of lseek syscall decoder

Browse Source 
After transition from long to kernel_ulong_t there are no mo
complications that required to keep a separate implementation
for x32 and mips n32.

* lseek.c (SYS_FUNC(lseek)): Merge two different implementations
into a single one.
This commit is contained in:
Дмитрий Левин 2016-12-26 11:10:41 +00:00
parent a1e94e9c7a
commit b6351bc2ce
1 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lseek.c
View File

@ -40,51 +40,30 @@
/* Linux kernel has exactly one version of lseek:
* fs/read_write.c::SYSCALL_DEFINE3(lseek, unsigned, fd, off_t, offset, unsigned, origin)
* In kernel, off_t is always the same as (kernel's) long
* (see include/uapi/asm-generic/posix_types.h),
* which means that on x32 we need to use tcp->ext_arg[N] to get offset argument.
* (see include/uapi/asm-generic/posix_types.h).
* Use test/x32_lseek.c to test lseek decoding.
*/
#if SIZEOF_KERNEL_LONG_T > SIZEOF_LONG
SYS_FUNC(lseek)
{
printfd(tcp, tcp->u_arg[0]);
long long offset;
kernel_long_t offset;
# ifndef current_klongsize
if (current_klongsize < sizeof(*tcp->u_arg)) {
offset = (long) tcp->u_arg[1];
if (current_klongsize < sizeof(kernel_long_t)) {
offset = (int) tcp->u_arg[1];
} else
# endif /* !current_klongsize */
{
offset = tcp->u_arg[1];
}
int whence = tcp->u_arg[2];
tprintf(", %lld, ", offset);
printxval(whence_codes, whence, "SEEK_???");
tprintf(", %" PRI_kld ", ", offset);
printxval(whence_codes, tcp->u_arg[2], "SEEK_???");
return RVAL_DECODED | RVAL_UDECIMAL;
}
#else
SYS_FUNC(lseek)
{
printfd(tcp, tcp->u_arg[0]);
long offset =
# ifndef current_klongsize
current_klongsize < sizeof(long) ?
(long) (int) tcp->u_arg[1] : (long) tcp->u_arg[1];
# else
tcp->u_arg[1];
# endif
int whence = tcp->u_arg[2];
tprintf(", %ld, ", offset);
printxval(whence_codes, whence, "SEEK_???");
return RVAL_DECODED | RVAL_UDECIMAL;
}
#endif
/* llseek syscall takes explicitly two ulong arguments hi, lo,
* rather than one 64-bit argument for which ULONG_LONG works