tests/nsyscalls.c: change the type of syscall arguments to kernel_ulong_t

As most syscalls on x32 and mips n32 are actually 64-bit,
check that 64-bit syscall arguments are decoded properly.

This also workarounds x32 gcc sign extension bug
reported by Eugene Syromyatnikov at
https://sourceforge.net/p/strace/mailman/message/35150860/

* tests/nsyscalls.c: Include "kernel_types.h".
(main): Change the type of syscall arguments to kernel_ulong_t.

diff --git a/tests/nsyscalls.c b/tests/nsyscalls.c
index 25f0719fedbdf56f9eea854520b97a8862c3d594..c9c92c4a702c99df3d3ab529fad4c0e07ba7addd 100644 (file)
--- a/tests/nsyscalls.c
+++ b/tests/nsyscalls.c
@@ -28,6 +28,7 @@
  */
 
 #include "defs.h"
+#include "kernel_types.h"
 #include "syscall.h"
 
 #define TD 0
@@ -61,13 +62,13 @@ static const unsigned long nr = ARRAY_SIZE(syscallent) | SYSCALL_BIT;
 int
 main(void)
 {
-       static const unsigned long a[] = {
-               (unsigned long) 0xface0fedbadc0ded,
-               (unsigned long) 0xface1fedbadc1ded,
-               (unsigned long) 0xface2fedbadc2ded,
-               (unsigned long) 0xface3fedbadc3ded,
-               (unsigned long) 0xface4fedbadc4ded,
-               (unsigned long) 0xface5fedbadc5ded
+       static const kernel_ulong_t a[] = {
+               (kernel_ulong_t) 0xface0fedbadc0ded,
+               (kernel_ulong_t) 0xface1fedbadc1ded,
+               (kernel_ulong_t) 0xface2fedbadc2ded,
+               (kernel_ulong_t) 0xface3fedbadc3ded,
+               (kernel_ulong_t) 0xface4fedbadc4ded,
+               (kernel_ulong_t) 0xface5fedbadc5ded
        };
 
        long rc = syscall(nr, a[0], a[1], a[2], a[3], a[4], a[5]);
@@ -76,9 +77,15 @@ main(void)
               " = %ld ENOSYS (%m)\n", nr,
               a[0], a[1], a[2], a[3], a[4], a[5], rc);
 #else
-       printf("syscall_%lu(%#lx, %#lx, %#lx, %#lx, %#lx, %#lx)"
+       printf("syscall_%lu(%#llx, %#llx, %#llx, %#llx, %#llx, %#llx)"
               " = %ld (errno %d)\n", nr & (~SYSCALL_BIT),
-              a[0], a[1], a[2], a[3], a[4], a[5], rc, errno);
+              (unsigned long long) a[0],
+              (unsigned long long) a[1],
+              (unsigned long long) a[2],
+              (unsigned long long) a[3],
+              (unsigned long long) a[4],
+              (unsigned long long) a[5],
+              rc, errno);
 #endif
 
        puts("+++ exited with 0 +++");