return RVAL_DECODED;
}
-/*
- * data_size limits the cumulative size of printed data.
- * Example: recvmsg returing a short read.
- */
-void
-tprint_iov_upto(struct tcb *tcp, unsigned long len, unsigned long addr, int decode_iov, unsigned long data_size)
+struct print_iovec_config {
+ enum iov_decode decode_iov;
+ unsigned long data_size;
+};
+
+static bool
+print_iovec(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
{
-#if SUPPORTED_PERSONALITIES > 1
- union {
- struct { u_int32_t base; u_int32_t len; } iov32;
- struct { u_int64_t base; u_int64_t len; } iov64;
- } iov;
-#define sizeof_iov \
- (current_wordsize == 4 ? sizeof(iov.iov32) : sizeof(iov.iov64))
-#define iov_iov_base \
- (current_wordsize == 4 ? (uint64_t) iov.iov32.base : iov.iov64.base)
-#define iov_iov_len \
- (current_wordsize == 4 ? (uint64_t) iov.iov32.len : iov.iov64.len)
-#else
- struct iovec iov;
-#define sizeof_iov sizeof(iov)
-#define iov_iov_base iov.iov_base
-#define iov_iov_len iov.iov_len
-#endif
- unsigned long size, cur, end, abbrev_end;
+ const unsigned long *iov;
+ unsigned long iov_buf[2], len;
+ struct print_iovec_config *c = data;
- if (!len) {
- tprints("[]");
- return;
- }
- size = len * sizeof_iov;
- end = addr + size;
- if (!verbose(tcp) || (exiting(tcp) && syserror(tcp)) ||
- !addr || size / sizeof_iov != len || end < addr) {
- printaddr(addr);
- return;
- }
- if (abbrev(tcp)) {
- abbrev_end = addr + max_strlen * sizeof_iov;
- if (abbrev_end < addr)
- abbrev_end = end;
+ if (elem_size < sizeof(iov_buf)) {
+ iov_buf[0] = ((unsigned int *) elem_buf)[0];
+ iov_buf[1] = ((unsigned int *) elem_buf)[1];
+ iov = iov_buf;
} else {
- abbrev_end = end;
+ iov = elem_buf;
}
- tprints("[");
- for (cur = addr; cur < end; cur += sizeof_iov) {
- if (cur > addr)
- tprints(", ");
- if (cur >= abbrev_end) {
- tprints("...");
+
+ tprints("{iov_base=");
+
+ len = iov[1];
+
+ switch (c->decode_iov) {
+ case IOV_DECODE_STR:
+ if (len > c->data_size)
+ len = c->data_size;
+ if (c->data_size != -1UL)
+ c->data_size -= len;
+ printstr(tcp, iov[0], len);
break;
- }
- if (umoven_or_printaddr(tcp, cur, sizeof_iov, &iov))
+ case IOV_DECODE_NETLINK:
+ if (len > c->data_size)
+ len = c->data_size;
+ if (c->data_size != -1UL)
+ c->data_size -= len;
+ decode_netlink(tcp, iov[0], iov[1]);
+ break;
+ default:
+ printaddr(iov[0]);
break;
- tprints("{");
- if (decode_iov) {
- unsigned long len = iov_iov_len;
- if (len > data_size)
- len = data_size;
- data_size -= len;
- printstr(tcp, (long) iov_iov_base, len);
- } else
- printaddr((long) iov_iov_base);
- tprintf(", %lu}", (unsigned long)iov_iov_len);
}
- tprints("]");
-#undef sizeof_iov
-#undef iov_iov_base
-#undef iov_iov_len
+
+ tprintf(", iov_len=%lu}", iov[1]);
+
+ return true;
+}
+
+/*
+ * data_size limits the cumulative size of printed data.
+ * Example: recvmsg returing a short read.
+ */
+void
+tprint_iov_upto(struct tcb *tcp, unsigned long len, unsigned long addr,
+ enum iov_decode decode_iov, unsigned long data_size)
+{
+ unsigned long iov[2];
+ struct print_iovec_config config =
+ { .decode_iov = decode_iov, .data_size = data_size };
+
+ print_array(tcp, addr, len, iov, current_wordsize * 2,
+ umoven_or_printaddr_ignore_syserror, print_iovec, &config);
}
void
-tprint_iov(struct tcb *tcp, unsigned long len, unsigned long addr, int decode_iov)
+tprint_iov(struct tcb *tcp, unsigned long len, unsigned long addr,
+ enum iov_decode decode_iov)
{
- tprint_iov_upto(tcp, len, addr, decode_iov, (unsigned long) -1L);
+ tprint_iov_upto(tcp, len, addr, decode_iov, -1UL);
}
SYS_FUNC(readv)
printfd(tcp, tcp->u_arg[0]);
tprints(", ");
} else {
- tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], 1);
+ tprint_iov_upto(tcp, tcp->u_arg[2], tcp->u_arg[1],
+ syserror(tcp) ? IOV_DECODE_ADDR :
+ IOV_DECODE_STR, tcp->u_rval);
tprintf(", %lu", tcp->u_arg[2]);
}
return 0;
{
printfd(tcp, tcp->u_arg[0]);
tprints(", ");
- tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], 1);
+ tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], IOV_DECODE_STR);
tprintf(", %lu", tcp->u_arg[2]);
return RVAL_DECODED;
}
-/* The SH4 ABI does allow long longs in odd-numbered registers, but
- does not allow them to be split between registers and memory - and
- there are only four argument registers for normal functions. As a
- result pread takes an extra padding argument before the offset. This
- was changed late in the 2.4 series (around 2.4.20). */
-#if defined(SH)
-#define PREAD_OFFSET_ARG 4
-#else
-#define PREAD_OFFSET_ARG 3
-#endif
-
SYS_FUNC(pread)
{
if (entering(tcp)) {
else
printstr(tcp, tcp->u_arg[1], tcp->u_rval);
tprintf(", %lu, ", tcp->u_arg[2]);
- printllval(tcp, "%llu", PREAD_OFFSET_ARG);
+ printllval(tcp, "%lld", 3);
}
return 0;
}
tprints(", ");
printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
tprintf(", %lu, ", tcp->u_arg[2]);
- printllval(tcp, "%llu", PREAD_OFFSET_ARG);
+ printllval(tcp, "%lld", 3);
return RVAL_DECODED;
}
static void
-print_llu_from_low_high_val(struct tcb *tcp, int arg)
+print_lld_from_low_high_val(struct tcb *tcp, int arg)
{
-#if SIZEOF_LONG == SIZEOF_LONG_LONG
+#if SIZEOF_LONG > 4 && SIZEOF_LONG == SIZEOF_LONG_LONG
# if SUPPORTED_PERSONALITIES > 1
+# ifdef X86_64
+ if (current_personality != 1)
+# else
if (current_wordsize == sizeof(long))
+# endif
# endif
- tprintf("%lu", (unsigned long) tcp->u_arg[arg]);
+ tprintf("%ld", tcp->u_arg[arg]);
# if SUPPORTED_PERSONALITIES > 1
else
- tprintf("%lu",
- ((unsigned long) tcp->u_arg[arg + 1] << current_wordsize * 8)
- | (unsigned long) tcp->u_arg[arg]);
+ tprintf("%ld", (tcp->u_arg[arg + 1] << current_wordsize * 8)
+ | tcp->u_arg[arg]);
# endif
-#else
-# ifdef X32
- if (current_personality == 0)
- tprintf("%llu", (unsigned long long) tcp->ext_arg[arg]);
- else
+#elif SIZEOF_LONG > 4
+# error Unsupported configuration: SIZEOF_LONG > 4 && SIZEOF_LONG_LONG > SIZEOF_LONG
+#elif HAVE_STRUCT_TCB_EXT_ARG
+# if SUPPORTED_PERSONALITIES > 1
+ if (current_personality == 1) {
+ tprintf("%lld",
+ (zero_extend_signed_to_ull(tcp->u_arg[arg + 1]) << sizeof(long) * 8)
+ | zero_extend_signed_to_ull(tcp->u_arg[arg]));
+ } else
# endif
- tprintf("%llu",
- ((unsigned long long) (unsigned long) tcp->u_arg[arg + 1] << sizeof(long) * 8)
- | (unsigned long long) (unsigned long) tcp->u_arg[arg]);
+ {
+ tprintf("%lld", tcp->ext_arg[arg]);
+ }
+#else /* SIZEOF_LONG_LONG > SIZEOF_LONG && !HAVE_STRUCT_TCB_EXT_ARG */
+ tprintf("%lld",
+ (zero_extend_signed_to_ull(tcp->u_arg[arg + 1]) << sizeof(long) * 8)
+ | zero_extend_signed_to_ull(tcp->u_arg[arg]));
#endif
}
-SYS_FUNC(preadv)
+#include "xlat/rwf_flags.h"
+
+static int
+do_preadv(struct tcb *tcp, const int flags_arg)
{
if (entering(tcp)) {
printfd(tcp, tcp->u_arg[0]);
tprints(", ");
} else {
- tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], 1);
+ tprint_iov_upto(tcp, tcp->u_arg[2], tcp->u_arg[1],
+ syserror(tcp) ? IOV_DECODE_ADDR :
+ IOV_DECODE_STR, tcp->u_rval);
tprintf(", %lu, ", tcp->u_arg[2]);
- print_llu_from_low_high_val(tcp, 3);
+ print_lld_from_low_high_val(tcp, 3);
+ if (flags_arg >= 0) {
+ tprints(", ");
+ printflags(rwf_flags, tcp->u_arg[flags_arg], "RWF_???");
+ }
}
return 0;
}
-SYS_FUNC(pwritev)
+SYS_FUNC(preadv)
{
- printfd(tcp, tcp->u_arg[0]);
- tprints(", ");
- tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], 1);
- tprintf(", %lu, ", tcp->u_arg[2]);
- print_llu_from_low_high_val(tcp, 3);
-
- return RVAL_DECODED;
+ return do_preadv(tcp, -1);
}
-static void
-print_off_t(struct tcb *tcp, long addr)
+SYS_FUNC(preadv2)
{
- if (current_wordsize == sizeof(int))
- printnum_int(tcp, addr, "%u");
- else
- printnum_long(tcp, addr, "%lu");
+ return do_preadv(tcp, 5);
}
-SYS_FUNC(sendfile)
+static int
+do_pwritev(struct tcb *tcp, const int flags_arg)
{
printfd(tcp, tcp->u_arg[0]);
tprints(", ");
- printfd(tcp, tcp->u_arg[1]);
- tprints(", ");
- print_off_t(tcp, tcp->u_arg[2]);
- tprintf(", %lu", tcp->u_arg[3]);
+ tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], IOV_DECODE_STR);
+ tprintf(", %lu, ", tcp->u_arg[2]);
+ print_lld_from_low_high_val(tcp, 3);
+ if (flags_arg >= 0) {
+ tprints(", ");
+ printflags(rwf_flags, tcp->u_arg[flags_arg], "RWF_???");
+ }
return RVAL_DECODED;
}
-SYS_FUNC(sendfile64)
+SYS_FUNC(pwritev)
{
- printfd(tcp, tcp->u_arg[0]);
- tprints(", ");
- printfd(tcp, tcp->u_arg[1]);
- tprints(", ");
- printnum_int64(tcp, tcp->u_arg[2], "%" PRIu64);
- tprintf(", %lu", tcp->u_arg[3]);
+ return do_pwritev(tcp, -1);
+}
- return RVAL_DECODED;
+SYS_FUNC(pwritev2)
+{
+ return do_pwritev(tcp, 5);
}
#include "xlat/splice_flags.h"
printfd(tcp, tcp->u_arg[0]);
tprints(", ");
/* loff_t *off_in */
- printnum_int64(tcp, tcp->u_arg[1], "%" PRIu64);
+ printnum_int64(tcp, tcp->u_arg[1], "%" PRId64);
tprints(", ");
/* int fd_out */
printfd(tcp, tcp->u_arg[2]);
tprints(", ");
/* loff_t *off_out */
- printnum_int64(tcp, tcp->u_arg[3], "%" PRIu64);
+ printnum_int64(tcp, tcp->u_arg[3], "%" PRId64);
tprints(", ");
/* size_t len */
tprintf("%lu, ", tcp->u_arg[4]);
printfd(tcp, tcp->u_arg[0]);
tprints(", ");
/* const struct iovec *iov, unsigned long nr_segs */
- tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], 1);
+ tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], IOV_DECODE_STR);
tprintf(", %lu, ", tcp->u_arg[2]);
/* unsigned int flags */
printflags(splice_flags, tcp->u_arg[3], "SPLICE_F_???");
projects / strace / blobdiff