Simplify print_lld_from_low_high_val ifdefery

[strace] / io.c

diff --git a/io.c b/io.c
index 28fe74ee94bf06ed5bc546b2fdc48973959015d2..94dcf88bedb5e139dd82ca85e749f73bb74c34f8 100644 (file)
--- a/io.c
+++ b/io.c
@@ -42,7 +42,7 @@ SYS_FUNC(read)
                        printaddr(tcp->u_arg[1]);
                else
                        printstrn(tcp, tcp->u_arg[1], tcp->u_rval);
-               tprintf(", %lu", tcp->u_arg[2]);
+               tprintf(", %" PRI_klu, tcp->u_arg[2]);
        }
        return 0;
 }
@@ -52,21 +52,21 @@ SYS_FUNC(write)
        printfd(tcp, tcp->u_arg[0]);
        tprints(", ");
        printstrn(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-       tprintf(", %lu", tcp->u_arg[2]);
+       tprintf(", %" PRI_klu, tcp->u_arg[2]);
 
        return RVAL_DECODED;
 }
 
 struct print_iovec_config {
        enum iov_decode decode_iov;
-       kernel_ureg_t data_size;
+       kernel_ulong_t data_size;
 };
 
 static bool
 print_iovec(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
 {
-       const kernel_ureg_t *iov;
-       kernel_ureg_t iov_buf[2], len;
+       const kernel_ulong_t *iov;
+       kernel_ulong_t iov_buf[2], len;
        struct print_iovec_config *c = data;
 
         if (elem_size < sizeof(iov_buf)) {
@@ -85,14 +85,14 @@ print_iovec(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
                case IOV_DECODE_STR:
                        if (len > c->data_size)
                                len = c->data_size;
-                       if (c->data_size != (kernel_ureg_t) -1)
+                       if (c->data_size != (kernel_ulong_t) -1)
                                c->data_size -= len;
                        printstrn(tcp, iov[0], len);
                        break;
                case IOV_DECODE_NETLINK:
                        if (len > c->data_size)
                                len = c->data_size;
-                       if (c->data_size != (kernel_ureg_t) -1)
+                       if (c->data_size != (kernel_ulong_t) -1)
                                c->data_size -= len;
                        decode_netlink(tcp, iov[0], iov[1]);
                        break;
@@ -101,7 +101,7 @@ print_iovec(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
                        break;
        }
 
-       tprintf(", iov_len=%lu}", iov[1]);
+       tprintf(", iov_len=%" PRI_klu "}", iov[1]);
 
        return true;
 }
@@ -111,11 +111,11 @@ print_iovec(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
  * Example: recvmsg returing a short read.
  */
 void
-tprint_iov_upto(struct tcb *const tcp, const kernel_ureg_t len,
-               const kernel_ureg_t addr, const enum iov_decode decode_iov,
-               const kernel_ureg_t data_size)
+tprint_iov_upto(struct tcb *const tcp, const kernel_ulong_t len,
+               const kernel_ulong_t addr, const enum iov_decode decode_iov,
+               const kernel_ulong_t data_size)
 {
-       kernel_ureg_t iov[2];
+       kernel_ulong_t iov[2];
        struct print_iovec_config config =
                { .decode_iov = decode_iov, .data_size = data_size };
 
@@ -132,7 +132,7 @@ SYS_FUNC(readv)
                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]);
+               tprintf(", %" PRI_klu, tcp->u_arg[2]);
        }
        return 0;
 }
@@ -142,7 +142,7 @@ SYS_FUNC(writev)
        printfd(tcp, tcp->u_arg[0]);
        tprints(", ");
        tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], IOV_DECODE_STR);
-       tprintf(", %lu", tcp->u_arg[2]);
+       tprintf(", %" PRI_klu, tcp->u_arg[2]);
 
        return RVAL_DECODED;
 }
@@ -157,7 +157,7 @@ SYS_FUNC(pread)
                        printaddr(tcp->u_arg[1]);
                else
                        printstrn(tcp, tcp->u_arg[1], tcp->u_rval);
-               tprintf(", %lu, ", tcp->u_arg[2]);
+               tprintf(", %" PRI_klu ", ", tcp->u_arg[2]);
                printllval(tcp, "%lld", 3);
        }
        return 0;
@@ -168,7 +168,7 @@ SYS_FUNC(pwrite)
        printfd(tcp, tcp->u_arg[0]);
        tprints(", ");
        printstrn(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-       tprintf(", %lu, ", tcp->u_arg[2]);
+       tprintf(", %" PRI_klu ", ", tcp->u_arg[2]);
        printllval(tcp, "%lld", 3);
 
        return RVAL_DECODED;
@@ -177,33 +177,20 @@ SYS_FUNC(pwrite)
 static void
 print_lld_from_low_high_val(struct tcb *tcp, int arg)
 {
-#if SIZEOF_LONG > 4 && SIZEOF_LONG == SIZEOF_LONG_LONG
+#if SIZEOF_KERNEL_LONG_T > 4
 # ifndef current_klongsize
-       if (current_klongsize < SIZEOF_LONG) {
-               tprintf("%ld", (tcp->u_arg[arg + 1] << current_wordsize * 8)
+       if (current_klongsize < SIZEOF_KERNEL_LONG_T) {
+               tprintf("%" PRI_kld, (tcp->u_arg[arg + 1] << 32)
                               | tcp->u_arg[arg]);
        } else
 # endif /* !current_klongsize */
        {
-               tprintf("%ld", tcp->u_arg[arg]);
+               tprintf("%" PRI_kld, tcp->u_arg[arg]);
        }
-#elif SIZEOF_LONG > 4
-# error Unsupported configuration: SIZEOF_LONG > 4 && SIZEOF_LONG_LONG > SIZEOF_LONG
-#elif HAVE_STRUCT_TCB_EXT_ARG
-# ifndef current_klongsize
-       if (current_klongsize < SIZEOF_LONG_LONG) {
-               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 /* !current_klongsize */
-       {
-               tprintf("%lld", tcp->ext_arg[arg]);
-       }
-#else /* SIZEOF_LONG_LONG > SIZEOF_LONG && !HAVE_STRUCT_TCB_EXT_ARG */
+#else /* SIZEOF_KERNEL_LONG_T == 4 */
        tprintf("%lld",
-               (zero_extend_signed_to_ull(tcp->u_arg[arg + 1]) << sizeof(long) * 8)
-               | zero_extend_signed_to_ull(tcp->u_arg[arg]));
+                 ((long long) tcp->u_arg[arg + 1] << 32)
+               | ((long long) tcp->u_arg[arg]));
 #endif
 }
 
@@ -280,7 +267,7 @@ SYS_FUNC(tee)
        printfd(tcp, tcp->u_arg[1]);
        tprints(", ");
        /* size_t len */
-       tprintf("%lu, ", tcp->u_arg[2]);
+       tprintf("%" PRI_klu ", ", tcp->u_arg[2]);
        /* unsigned int flags */
        printflags(splice_flags, tcp->u_arg[3], "SPLICE_F_???");
 
@@ -302,7 +289,7 @@ SYS_FUNC(splice)
        printnum_int64(tcp, tcp->u_arg[3], "%" PRId64);
        tprints(", ");
        /* size_t len */
-       tprintf("%lu, ", tcp->u_arg[4]);
+       tprintf("%" PRI_klu ", ", tcp->u_arg[4]);
        /* unsigned int flags */
        printflags(splice_flags, tcp->u_arg[5], "SPLICE_F_???");
 
@@ -316,7 +303,7 @@ SYS_FUNC(vmsplice)
        tprints(", ");
        /* const struct iovec *iov, unsigned long nr_segs */
        tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], IOV_DECODE_STR);
-       tprintf(", %lu, ", tcp->u_arg[2]);
+       tprintf(", %" PRI_klu ", ", tcp->u_arg[2]);
        /* unsigned int flags */
        printflags(splice_flags, tcp->u_arg[3], "SPLICE_F_???");