tests: check decoding of vcpu auxstr

[strace] / numa.c

diff --git a/numa.c b/numa.c
index b58a8fa3fc258088f0a0bbc0fcd8960840019d6f..c4500e84fd23f27341e8b7c6e1903b6baee907da 100644 (file)
--- a/numa.c
+++ b/numa.c
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2003-2007 Ulrich Drepper <drepper@redhat.com>
  * Copyright (c) 2005-2016 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2016-2018 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31,37 +32,39 @@
 static bool
 print_node(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
 {
-       if (elem_size < sizeof(long)) {
+       if (elem_size < sizeof(kernel_ulong_t)) {
                tprintf("%#0*x", (int) elem_size * 2 + 2,
-                       * (unsigned int *) elem_buf);
+                       *(unsigned int *) elem_buf);
        } else {
-               tprintf("%#0*lx", (int) elem_size * 2 + 2,
-                       * (unsigned long *) elem_buf);
+               tprintf("%#0*" PRI_klx, (int) elem_size * 2 + 2,
+                       *(kernel_ulong_t *) elem_buf);
        }
 
        return true;
 }
 
 static void
-print_nodemask(struct tcb *tcp, unsigned long addr, unsigned long maxnodes)
+print_nodemask(struct tcb *const tcp, const kernel_ulong_t addr,
+              const kernel_ulong_t maxnodes)
 {
-       const unsigned long nmemb =
-               (maxnodes + 8 * current_wordsize - 2) / (8 * current_wordsize);
+       const unsigned int bits_per_long = 8 * current_wordsize;
+       const kernel_ulong_t nmemb =
+               (maxnodes + bits_per_long - 2) / bits_per_long;
 
-       if (nmemb < maxnodes / (8 * current_wordsize) ||
+       if (nmemb < maxnodes / bits_per_long ||
            (maxnodes && !nmemb)) {
                printaddr(addr);
                return;
        }
 
-       unsigned long buf;
+       kernel_ulong_t buf;
        print_array(tcp, addr, nmemb, &buf, current_wordsize,
-                   umoven_or_printaddr, print_node, 0);
+                   tfetch_mem, print_node, 0);
 }
 
 SYS_FUNC(migrate_pages)
 {
-       tprintf("%d, %lu, ", (int) tcp->u_arg[0], tcp->u_arg[1]);
+       tprintf("%d, %" PRI_klu ", ", (int) tcp->u_arg[0], tcp->u_arg[1]);
        print_nodemask(tcp, tcp->u_arg[2], tcp->u_arg[1]);
        tprints(", ");
        print_nodemask(tcp, tcp->u_arg[3], tcp->u_arg[1]);
@@ -75,11 +78,11 @@ SYS_FUNC(migrate_pages)
 SYS_FUNC(mbind)
 {
        printaddr(tcp->u_arg[0]);
-       tprintf(", %lu, ", tcp->u_arg[1]);
-       printxval_long(policies, tcp->u_arg[2], "MPOL_???");
+       tprintf(", %" PRI_klu ", ", tcp->u_arg[1]);
+       printxval64(policies, tcp->u_arg[2], "MPOL_???");
        tprints(", ");
        print_nodemask(tcp, tcp->u_arg[3], tcp->u_arg[4]);
-       tprintf(", %lu, ", tcp->u_arg[4]);
+       tprintf(", %" PRI_klu ", ", tcp->u_arg[4]);
        printflags(mbindflags, tcp->u_arg[5], "MPOL_???");
 
        return RVAL_DECODED;
@@ -90,7 +93,7 @@ SYS_FUNC(set_mempolicy)
        printxval(policies, tcp->u_arg[0], "MPOL_???");
        tprints(", ");
        print_nodemask(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;
 }
@@ -108,10 +111,10 @@ SYS_FUNC(get_mempolicy)
                }
                tprints(", ");
                print_nodemask(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-               tprintf(", %lu, ", tcp->u_arg[2]);
+               tprintf(", %" PRI_klu ", ", tcp->u_arg[2]);
                printaddr(tcp->u_arg[3]);
                tprints(", ");
-               printflags(mempolicyflags, tcp->u_arg[4], "MPOL_???");
+               printflags64(mempolicyflags, tcp->u_arg[4], "MPOL_???");
        }
        return 0;
 }
@@ -121,12 +124,12 @@ SYS_FUNC(get_mempolicy)
 static bool
 print_addr(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
 {
-       unsigned long addr;
+       kernel_ulong_t addr;
 
-       if (elem_size < sizeof(long)) {
-               addr = * (unsigned int *) elem_buf;
+       if (elem_size < sizeof(addr)) {
+               addr = *(unsigned int *) elem_buf;
        } else {
-               addr = * (unsigned long *) elem_buf;
+               addr = *(kernel_ulong_t *) elem_buf;
        }
 
        printaddr(addr);
@@ -137,10 +140,10 @@ print_addr(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
 static bool
 print_status(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
 {
-       const int status = * (int *) elem_buf;
+       const int status = *(int *) elem_buf;
 
        if (status < 0 && (unsigned) -status < nerrnos)
-               tprintf("%s", errnoent[-status]);
+               tprintf("-%s", errnoent[-status]);
        else
                tprintf("%d", status);
 
@@ -150,27 +153,27 @@ print_status(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
 static bool
 print_int(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
 {
-       tprintf("%d", * (int *) elem_buf);
+       tprintf("%d", *(int *) elem_buf);
 
        return true;
 }
 
 SYS_FUNC(move_pages)
 {
-       const unsigned long npages = tcp->u_arg[1];
-       long buf;
+       const kernel_ulong_t npages = tcp->u_arg[1];
+       kernel_ulong_t buf;
 
        if (entering(tcp)) {
-               tprintf("%d, %lu, ", (int) tcp->u_arg[0], npages);
+               tprintf("%d, %" PRI_klu ", ", (int) tcp->u_arg[0], npages);
                print_array(tcp, tcp->u_arg[2], npages, &buf, current_wordsize,
-                           umoven_or_printaddr, print_addr, 0);
+                           tfetch_mem, print_addr, 0);
                tprints(", ");
                print_array(tcp, tcp->u_arg[3], npages, &buf, sizeof(int),
-                           umoven_or_printaddr, print_int, 0);
+                           tfetch_mem, print_int, 0);
                tprints(", ");
        } else {
                print_array(tcp, tcp->u_arg[4], npages, &buf, sizeof(int),
-                           umoven_or_printaddr, print_status, 0);
+                           tfetch_mem, print_status, 0);
                tprints(", ");
                printflags(move_pages_flags, tcp->u_arg[5], "MPOL_???");
        }