X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;ds=sidebyside;f=io.c;h=0cdc469fc30b1ca5018cde7422a13c54477efc5f;hb=a2df1c12dee06041ef7eac540bb2e471d77b0d7e;hp=b5e69d5c2178bac174a3e367ee4d4448b7667f34;hpb=dd5f0cef93db377bc7bc0f4abc7c1003d67c2c95;p=strace

diff --git a/io.c b/io.c
index b5e69d5c..0cdc469f 100644
--- a/io.c
+++ b/io.c
@@ -49,13 +49,12 @@ SYS_FUNC(read)
 
 SYS_FUNC(write)
 {
-	if (entering(tcp)) {
-		printfd(tcp, tcp->u_arg[0]);
-		tprints(", ");
-		printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-		tprintf(", %lu", tcp->u_arg[2]);
-	}
-	return 0;
+	printfd(tcp, tcp->u_arg[0]);
+	tprints(", ");
+	printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
+	tprintf(", %lu", tcp->u_arg[2]);
+
+	return RVAL_DECODED;
 }
 
 /*
@@ -65,24 +64,9 @@ SYS_FUNC(write)
 void
 tprint_iov_upto(struct tcb *tcp, unsigned long len, unsigned long addr, int decode_iov, unsigned long data_size)
 {
-#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 iov[2];
 	unsigned long size, cur, end, abbrev_end;
+	const unsigned long sizeof_iov = current_wordsize * 2;
 
 	if (!len) {
 		tprints("[]");
@@ -110,23 +94,21 @@ tprint_iov_upto(struct tcb *tcp, unsigned long len, unsigned long addr, int deco
 			tprints("...");
 			break;
 		}
-		if (umoven_or_printaddr(tcp, cur, sizeof_iov, &iov))
+		if (umove_ulong_array_or_printaddr(tcp, cur, iov,
+						   ARRAY_SIZE(iov)))
 			break;
 		tprints("{");
 		if (decode_iov) {
-			unsigned long len = iov_iov_len;
+			unsigned long len = iov[1];
 			if (len > data_size)
 				len = data_size;
 			data_size -= len;
-			printstr(tcp, (long) iov_iov_base, len);
+			printstr(tcp, iov[0], len);
 		} else
-			printaddr((long) iov_iov_base);
-		tprintf(", %lu}", (unsigned long)iov_iov_len);
+			printaddr(iov[0]);
+		tprintf(", %lu}", iov[1]);
 	}
 	tprints("]");
-#undef sizeof_iov
-#undef iov_iov_base
-#undef iov_iov_len
 }
 
 void
@@ -149,13 +131,12 @@ SYS_FUNC(readv)
 
 SYS_FUNC(writev)
 {
-	if (entering(tcp)) {
-		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]);
-	}
-	return 0;
+	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]);
+
+	return RVAL_DECODED;
 }
 
 /* The SH4 ABI does allow long longs in odd-numbered registers, but
@@ -187,14 +168,13 @@ SYS_FUNC(pread)
 
 SYS_FUNC(pwrite)
 {
-	if (entering(tcp)) {
-		printfd(tcp, tcp->u_arg[0]);
-		tprints(", ");
-		printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-		tprintf(", %lu, ", tcp->u_arg[2]);
-		printllval(tcp, "%llu", PREAD_OFFSET_ARG);
-	}
-	return 0;
+	printfd(tcp, tcp->u_arg[0]);
+	tprints(", ");
+	printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
+	tprintf(", %lu, ", tcp->u_arg[2]);
+	printllval(tcp, "%llu", PREAD_OFFSET_ARG);
+
+	return RVAL_DECODED;
 }
 
 static void
@@ -238,104 +218,65 @@ SYS_FUNC(preadv)
 
 SYS_FUNC(pwritev)
 {
-	if (entering(tcp)) {
-		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 0;
-}
+	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);
 
-static void
-print_off_t(struct tcb *tcp, long addr)
-{
-	if (current_wordsize == sizeof(int))
-		printnum_int(tcp, addr, "%u");
-	else
-		printnum_long(tcp, addr, "%lu");
-}
-
-SYS_FUNC(sendfile)
-{
-	if (entering(tcp)) {
-		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]);
-	}
-	return 0;
-}
-
-SYS_FUNC(sendfile64)
-{
-	if (entering(tcp)) {
-		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 0;
+	return RVAL_DECODED;
 }
 
 #include "xlat/splice_flags.h"
 
 SYS_FUNC(tee)
 {
-	if (entering(tcp)) {
-		/* int fd_in */
-		printfd(tcp, tcp->u_arg[0]);
-		tprints(", ");
-		/* int fd_out */
-		printfd(tcp, tcp->u_arg[1]);
-		tprints(", ");
-		/* size_t len */
-		tprintf("%lu, ", tcp->u_arg[2]);
-		/* unsigned int flags */
-		printflags(splice_flags, tcp->u_arg[3], "SPLICE_F_???");
-	}
-	return 0;
+	/* int fd_in */
+	printfd(tcp, tcp->u_arg[0]);
+	tprints(", ");
+	/* int fd_out */
+	printfd(tcp, tcp->u_arg[1]);
+	tprints(", ");
+	/* size_t len */
+	tprintf("%lu, ", tcp->u_arg[2]);
+	/* unsigned int flags */
+	printflags(splice_flags, tcp->u_arg[3], "SPLICE_F_???");
+
+	return RVAL_DECODED;
 }
 
 SYS_FUNC(splice)
 {
-	if (entering(tcp)) {
-		/* int fd_in */
-		printfd(tcp, tcp->u_arg[0]);
-		tprints(", ");
-		/* loff_t *off_in */
-		printnum_int64(tcp, tcp->u_arg[1], "%" PRIu64);
-		tprints(", ");
-		/* int fd_out */
-		printfd(tcp, tcp->u_arg[2]);
-		tprints(", ");
-		/* loff_t *off_out */
-		printnum_int64(tcp, tcp->u_arg[3], "%" PRIu64);
-		tprints(", ");
-		/* size_t len */
-		tprintf("%lu, ", tcp->u_arg[4]);
-		/* unsigned int flags */
-		printflags(splice_flags, tcp->u_arg[5], "SPLICE_F_???");
-	}
-	return 0;
+	/* int fd_in */
+	printfd(tcp, tcp->u_arg[0]);
+	tprints(", ");
+	/* loff_t *off_in */
+	printnum_int64(tcp, tcp->u_arg[1], "%" PRIu64);
+	tprints(", ");
+	/* int fd_out */
+	printfd(tcp, tcp->u_arg[2]);
+	tprints(", ");
+	/* loff_t *off_out */
+	printnum_int64(tcp, tcp->u_arg[3], "%" PRIu64);
+	tprints(", ");
+	/* size_t len */
+	tprintf("%lu, ", tcp->u_arg[4]);
+	/* unsigned int flags */
+	printflags(splice_flags, tcp->u_arg[5], "SPLICE_F_???");
+
+	return RVAL_DECODED;
 }
 
 SYS_FUNC(vmsplice)
 {
-	if (entering(tcp)) {
-		/* int fd */
-		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);
-		tprintf(", %lu, ", tcp->u_arg[2]);
-		/* unsigned int flags */
-		printflags(splice_flags, tcp->u_arg[3], "SPLICE_F_???");
-	}
-	return 0;
+	/* int fd */
+	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);
+	tprintf(", %lu, ", tcp->u_arg[2]);
+	/* unsigned int flags */
+	printflags(splice_flags, tcp->u_arg[3], "SPLICE_F_???");
+
+	return RVAL_DECODED;
 }