]> granicus.if.org Git - strace/blobdiff - file.c
Print struct iovec as a regular structure
[strace] / file.c
diff --git a/file.c b/file.c
index c2bf6d3a6464a31b37d96ef886f830befc5d24ec..3ea0b5da6165cc5c37a54c71cd5c5cb2b8f6dbe9 100644 (file)
--- a/file.c
+++ b/file.c
  */
 
 #include "defs.h"
-#include <sys/swap.h>
-
-#if defined(SPARC) || defined(SPARC64)
-struct stat {
-       unsigned short  st_dev;
-       unsigned int    st_ino;
-       unsigned short  st_mode;
-       short           st_nlink;
-       unsigned short  st_uid;
-       unsigned short  st_gid;
-       unsigned short  st_rdev;
-       unsigned int    st_size;
-       int             st_atime;
-       unsigned int    __unused1;
-       int             st_mtime;
-       unsigned int    __unused2;
-       int             st_ctime;
-       unsigned int    __unused3;
-       int             st_blksize;
-       int             st_blocks;
-       unsigned int    __unused4[2];
-};
-# if defined(SPARC64)
-struct stat_sparc64 {
-       unsigned int    st_dev;
-       unsigned long   st_ino;
-       unsigned int    st_mode;
-       unsigned int    st_nlink;
-       unsigned int    st_uid;
-       unsigned int    st_gid;
-       unsigned int    st_rdev;
-       long            st_size;
-       long            st_atime;
-       long            st_mtime;
-       long            st_ctime;
-       long            st_blksize;
-       long            st_blocks;
-       unsigned long   __unused4[2];
-};
-# endif /* SPARC64 */
-# define stat kernel_stat
-# include <asm/stat.h>
-# undef stat
-#elif defined(X32)
-struct stat {
-       unsigned long long      st_dev;
-       unsigned long long      st_ino;
-       unsigned long long      st_nlink;
-
-       unsigned int            st_mode;
-       unsigned int            st_uid;
-       unsigned int            st_gid;
-       unsigned int            __pad0;
-       unsigned long long      st_rdev;
-       long long               st_size;
-       long long               st_blksize;
-       long long               st_blocks;
-
-       unsigned long long      st_atime;
-       unsigned long long      st_atime_nsec;
-       unsigned long long      st_mtime;
-       unsigned long long      st_mtime_nsec;
-       unsigned long long      st_ctime;
-       unsigned long long      st_ctime_nsec;
-       long long               __unused[3];
-};
-
-struct stat64 {
-       unsigned long long      st_dev;
-       unsigned char           __pad0[4];
-       unsigned long           __st_ino;
-       unsigned int            st_mode;
-       unsigned int            st_nlink;
-       unsigned long           st_uid;
-       unsigned long           st_gid;
-       unsigned long long      st_rdev;
-       unsigned char           __pad3[4];
-       long long               st_size;
-       unsigned long           st_blksize;
-       unsigned long long      st_blocks;
-       unsigned long           st_atime;
-       unsigned long           st_atime_nsec;
-       unsigned long           st_mtime;
-       unsigned int            st_mtime_nsec;
-       unsigned long           st_ctime;
-       unsigned long           st_ctime_nsec;
-       unsigned long long      st_ino;
-} __attribute__((packed));
-# define HAVE_STAT64   1
-
-struct __old_kernel_stat {
-       unsigned short st_dev;
-       unsigned short st_ino;
-       unsigned short st_mode;
-       unsigned short st_nlink;
-       unsigned short st_uid;
-       unsigned short st_gid;
-       unsigned short st_rdev;
-       unsigned int   st_size;
-       unsigned int   st_atime;
-       unsigned int   st_mtime;
-       unsigned int   st_ctime;
-};
-#else
-# undef dev_t
-# undef ino_t
-# undef mode_t
-# undef nlink_t
-# undef uid_t
-# undef gid_t
-# undef off_t
-# undef loff_t
-# define dev_t __kernel_dev_t
-# define ino_t __kernel_ino_t
-# define mode_t __kernel_mode_t
-# define nlink_t __kernel_nlink_t
-# define uid_t __kernel_uid_t
-# define gid_t __kernel_gid_t
-# define off_t __kernel_off_t
-# define loff_t __kernel_loff_t
-
-# include <asm/stat.h>
-
-# undef dev_t
-# undef ino_t
-# undef mode_t
-# undef nlink_t
-# undef uid_t
-# undef gid_t
-# undef off_t
-# undef loff_t
-# define dev_t dev_t
-# define ino_t ino_t
-# define mode_t mode_t
-# define nlink_t nlink_t
-# define uid_t uid_t
-# define gid_t gid_t
-# define off_t off_t
-# define loff_t loff_t
-#endif
 
+#undef dev_t
+#undef ino_t
+#undef mode_t
+#undef nlink_t
+#undef uid_t
+#undef gid_t
+#undef off_t
+#undef loff_t
+#define dev_t __kernel_dev_t
+#define ino_t __kernel_ino_t
+#define mode_t __kernel_mode_t
+#define nlink_t __kernel_nlink_t
+#define uid_t __kernel_uid_t
+#define gid_t __kernel_gid_t
+#define off_t __kernel_off_t
+#define loff_t __kernel_loff_t
+
+#include "asm_stat.h"
+
+#undef dev_t
+#undef ino_t
+#undef mode_t
+#undef nlink_t
+#undef uid_t
+#undef gid_t
+#undef off_t
+#undef loff_t
+#define dev_t dev_t
+#define ino_t ino_t
+#define mode_t mode_t
+#define nlink_t nlink_t
+#define uid_t uid_t
+#define gid_t gid_t
+#define off_t off_t
+#define loff_t loff_t
+
+/* for S_IFMT */
 #define stat libc_stat
 #define stat64 libc_stat64
 #include <sys/stat.h>
@@ -180,512 +77,50 @@ struct __old_kernel_stat {
 #undef st_mtime
 #undef st_ctime
 
-#include <fcntl.h>
-#ifdef HAVE_LINUX_XATTR_H
-# include <linux/xattr.h>
-#else
-# define XATTR_CREATE 1
-# define XATTR_REPLACE 2
-#endif
-
-#ifdef MAJOR_IN_SYSMACROS
+#if defined MAJOR_IN_SYSMACROS
 # include <sys/sysmacros.h>
-#endif
-
-#ifdef MAJOR_IN_MKDEV
+#elif defined MAJOR_IN_MKDEV
 # include <sys/mkdev.h>
 #endif
 
-#ifdef HAVE_SYS_ASYNCH_H
-# include <sys/asynch.h>
-#endif
-
-#ifdef O_LARGEFILE
-# if O_LARGEFILE == 0          /* biarch platforms in 64-bit mode */
-#  undef O_LARGEFILE
-#  ifdef SPARC64
-#   define O_LARGEFILE 0x40000
-#  elif defined X86_64 || defined S390X
-#   define O_LARGEFILE 0100000
-#  endif
-# endif
-#endif
-
-#include "xlat/open_access_modes.h"
-#include "xlat/open_mode_flags.h"
-
-#ifndef AT_FDCWD
-# define AT_FDCWD                -100
-#endif
-
-/* The fd is an "int", so when decoding x86 on x86_64, we need to force sign
- * extension to get the right value.  We do this by declaring fd as int here.
- */
-void
-print_dirfd(struct tcb *tcp, int fd)
-{
-       if (fd == AT_FDCWD)
-               tprints("AT_FDCWD, ");
-       else {
-               printfd(tcp, fd);
-               tprints(", ");
-       }
-}
-
-/*
- * low bits of the open(2) flags define access mode,
- * other bits are real flags.
- */
-const char *
-sprint_open_modes(mode_t flags)
-{
-       static char outstr[(1 + ARRAY_SIZE(open_mode_flags)) * sizeof("O_LARGEFILE")];
-       char *p;
-       char sep;
-       const char *str;
-       const struct xlat *x;
-
-       sep = ' ';
-       p = stpcpy(outstr, "flags");
-       str = xlookup(open_access_modes, flags & 3);
-       if (str) {
-               *p++ = sep;
-               p = stpcpy(p, str);
-               flags &= ~3;
-               if (!flags)
-                       return outstr;
-               sep = '|';
-       }
-
-       for (x = open_mode_flags; x->str; x++) {
-               if ((flags & x->val) == x->val) {
-                       *p++ = sep;
-                       p = stpcpy(p, x->str);
-                       flags &= ~x->val;
-                       if (!flags)
-                               return outstr;
-                       sep = '|';
-               }
-       }
-       /* flags is still nonzero */
-       *p++ = sep;
-       sprintf(p, "%#x", flags);
-       return outstr;
-}
-
-void
-tprint_open_modes(mode_t flags)
-{
-       tprints(sprint_open_modes(flags) + sizeof("flags"));
-}
-
-static int
-decode_open(struct tcb *tcp, int offset)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[offset]);
-               tprints(", ");
-               /* flags */
-               tprint_open_modes(tcp->u_arg[offset + 1]);
-               if (tcp->u_arg[offset + 1] & O_CREAT) {
-                       /* mode */
-                       tprintf(", %#lo", tcp->u_arg[offset + 2]);
-               }
-       }
-       return RVAL_FD;
-}
-
-int
-sys_open(struct tcb *tcp)
-{
-       return decode_open(tcp, 0);
-}
-
-int
-sys_openat(struct tcb *tcp)
-{
-       if (entering(tcp))
-               print_dirfd(tcp, tcp->u_arg[0]);
-       return decode_open(tcp, 1);
-}
-
-#if defined(SPARC) || defined(SPARC64)
-#include "xlat/openmodessol.h"
-
-int
-solaris_open(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               /* flags */
-               printflags(openmodessol, tcp->u_arg[1] + 1, "O_???");
-               if (tcp->u_arg[1] & 0x100) {
-                       /* mode */
-                       tprintf(", %#lo", tcp->u_arg[2]);
-               }
-       }
-       return 0;
-}
-
-#endif
-
-int
-sys_creat(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprintf(", %#lo", tcp->u_arg[1]);
-       }
-       return RVAL_FD;
-}
-
-#include "xlat/access_flags.h"
-
-static int
-decode_access(struct tcb *tcp, int offset)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[offset]);
-               tprints(", ");
-               printflags(access_flags, tcp->u_arg[offset + 1], "?_OK");
-       }
-       return 0;
-}
-
-int
-sys_access(struct tcb *tcp)
-{
-       return decode_access(tcp, 0);
-}
-
-int
-sys_faccessat(struct tcb *tcp)
-{
-       if (entering(tcp))
-               print_dirfd(tcp, tcp->u_arg[0]);
-       return decode_access(tcp, 1);
-}
-
-int
-sys_umask(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               tprintf("%#lo", tcp->u_arg[0]);
-       }
-       return RVAL_OCTAL;
-}
-
-#include "xlat/whence_codes.h"
-
-/* Linux kernel has exactly one version of lseek:
- * fs/read_write.c::SYSCALL_DEFINE3(lseek, unsigned, fd, off_t, offset, unsigned, origin)
- * In kernel, off_t is always the same as (kernel's) long
- * (see include/uapi/asm-generic/posix_types.h),
- * which means that on x32 we need to use tcp->ext_arg[N] to get offset argument.
- * Use test/x32_lseek.c to test lseek decoding.
- */
-#if defined(LINUX_MIPSN32) || defined(X32)
-int
-sys_lseek(struct tcb *tcp)
-{
-       long long offset;
-       int whence;
-
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               offset = tcp->ext_arg[1];
-               whence = tcp->u_arg[2];
-               if (whence == SEEK_SET)
-                       tprintf(", %llu, ", offset);
-               else
-                       tprintf(", %lld, ", offset);
-               printxval(whence_codes, whence, "SEEK_???");
-       }
-       return RVAL_LUDECIMAL;
-}
-#else
-int
-sys_lseek(struct tcb *tcp)
-{
-       long offset;
-       int whence;
-
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               offset = tcp->u_arg[1];
-               whence = tcp->u_arg[2];
-               if (whence == SEEK_SET)
-                       tprintf(", %lu, ", offset);
-               else
-                       tprintf(", %ld, ", offset);
-               printxval(whence_codes, whence, "SEEK_???");
-       }
-       return RVAL_UDECIMAL;
-}
-#endif
-
-/* llseek syscall takes explicitly two ulong arguments hi, lo,
- * rather than one 64-bit argument for which LONG_LONG works
- * appropriate for the native byte order.
- *
- * See kernel's fs/read_write.c::SYSCALL_DEFINE5(llseek, ...)
- *
- * hi,lo are "unsigned longs" and combined exactly this way in kernel:
- * ((loff_t) hi << 32) | lo
- * Note that for architectures with kernel's long wider than userspace long
- * (such as x32), combining code will use *kernel's*, i.e. *wide* longs
- * for hi and lo. We would need to use tcp->ext_arg[N] on x32...
- * ...however, x32 (and x86_64) does not _have_ llseek syscall as such.
- */
-int
-sys_llseek(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               if (tcp->u_arg[4] == SEEK_SET)
-                       tprintf(", %llu, ",
-                               ((long long) tcp->u_arg[1]) << 32 |
-                               (unsigned long long) (unsigned) tcp->u_arg[2]);
-               else
-                       tprintf(", %lld, ",
-                               ((long long) tcp->u_arg[1]) << 32 |
-                               (unsigned long long) (unsigned) tcp->u_arg[2]);
-       }
-       else {
-               long long off;
-               if (syserror(tcp) || umove(tcp, tcp->u_arg[3], &off) < 0)
-                       tprintf("%#lx, ", tcp->u_arg[3]);
-               else
-                       tprintf("[%llu], ", off);
-               printxval(whence_codes, tcp->u_arg[4], "SEEK_???");
-       }
-       return 0;
-}
-
-int
-sys_readahead(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               int argn;
-               printfd(tcp, tcp->u_arg[0]);
-               argn = printllval(tcp, ", %lld", 1);
-               tprintf(", %ld", tcp->u_arg[argn]);
-       }
-       return 0;
-}
-
-int
-sys_truncate(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprintf(", %lu", tcp->u_arg[1]);
-       }
-       return 0;
-}
-
-int
-sys_truncate64(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               printllval(tcp, ", %llu", 1);
-       }
-       return 0;
-}
-
-int
-sys_ftruncate(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprintf(", %lu", tcp->u_arg[1]);
-       }
-       return 0;
-}
-
-int
-sys_ftruncate64(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               printllval(tcp, ", %llu", 1);
-       }
-       return 0;
-}
-
 /* several stats */
 
-#include "xlat/modetypes.h"
-
-static const char *
-sprintmode(int mode)
-{
-       static char buf[sizeof("S_IFSOCK|S_ISUID|S_ISGID|S_ISVTX|%o")
-                       + sizeof(int)*3
-                       + /*paranoia:*/ 8];
-       const char *s;
-
-       if ((mode & S_IFMT) == 0)
-               s = "";
-       else if ((s = xlookup(modetypes, mode & S_IFMT)) == NULL) {
-               sprintf(buf, "%#o", mode);
-               return buf;
-       }
-       s = buf + sprintf(buf, "%s%s%s%s", s,
-               (mode & S_ISUID) ? "|S_ISUID" : "",
-               (mode & S_ISGID) ? "|S_ISGID" : "",
-               (mode & S_ISVTX) ? "|S_ISVTX" : "");
-       mode &= ~(S_IFMT|S_ISUID|S_ISGID|S_ISVTX);
-       if (mode)
-               sprintf((char*)s, "|%#o", mode);
-       s = (*buf == '|') ? buf + 1 : buf;
-       return *s ? s : "0";
-}
-
-static char *
-sprinttime(time_t t)
-{
-       struct tm *tmp;
-       static char buf[sizeof("yyyy/mm/dd-hh:mm:ss")];
-
-       if (t == 0) {
-               strcpy(buf, "0");
-               return buf;
-       }
-       tmp = localtime(&t);
-       if (tmp)
-               snprintf(buf, sizeof buf, "%02d/%02d/%02d-%02d:%02d:%02d",
-                       tmp->tm_year + 1900, tmp->tm_mon + 1, tmp->tm_mday,
-                       tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
-       else
-               snprintf(buf, sizeof buf, "%lu", (unsigned long) t);
-
-       return buf;
-}
+#include "printstat.h"
 
-#if defined(SPARC) || defined(SPARC64)
-typedef struct {
-       int     tv_sec;
-       int     tv_nsec;
-} timestruct_t;
+/* all locally defined structures provide these fields */
+#undef HAVE_STRUCT_STAT_ST_ATIME_NSEC
+#define HAVE_STRUCT_STAT_ST_ATIME_NSEC 1
+#undef HAVE_STRUCT_STAT_ST_CTIME_NSEC
+#define HAVE_STRUCT_STAT_ST_CTIME_NSEC 1
+#undef HAVE_STRUCT_STAT_ST_MTIME_NSEC
+#define HAVE_STRUCT_STAT_ST_MTIME_NSEC 1
 
-struct solstat {
-       unsigned        st_dev;
-       int             st_pad1[3];     /* network id */
-       unsigned        st_ino;
-       unsigned        st_mode;
-       unsigned        st_nlink;
-       unsigned        st_uid;
-       unsigned        st_gid;
-       unsigned        st_rdev;
-       int             st_pad2[2];
-       int             st_size;
-       int             st_pad3;        /* st_size, off_t expansion */
-       timestruct_t    st_atime;
-       timestruct_t    st_mtime;
-       timestruct_t    st_ctime;
-       int             st_blksize;
-       int             st_blocks;
-       char            st_fstype[16];
-       int             st_pad4[8];     /* expansion area */
+#undef STAT32_PERSONALITY
+#if SUPPORTED_PERSONALITIES > 1
+# if defined AARCH64 || defined X86_64 || defined X32
+struct stat32 {
+       unsigned int    st_dev;
+       unsigned int    st_ino;
+       unsigned short  st_mode;
+       unsigned short  st_nlink;
+       unsigned short  st_uid;
+       unsigned short  st_gid;
+       unsigned int    st_rdev;
+       unsigned int    st_size;
+       unsigned int    st_blksize;
+       unsigned int    st_blocks;
+       unsigned int    st_atime;
+       unsigned int    st_atime_nsec;
+       unsigned int    st_mtime;
+       unsigned int    st_mtime_nsec;
+       unsigned int    st_ctime;
+       unsigned int    st_ctime_nsec;
+       unsigned int    __unused4;
+       unsigned int    __unused5;
 };
-
-static void
-printstatsol(struct tcb *tcp, long addr)
-{
-       struct solstat statbuf;
-
-       if (umove(tcp, addr, &statbuf) < 0) {
-               tprints("{...}");
-               return;
-       }
-       if (!abbrev(tcp)) {
-               tprintf("{st_dev=makedev(%lu, %lu), st_ino=%lu, st_mode=%s, ",
-                       (unsigned long) ((statbuf.st_dev >> 18) & 0x3fff),
-                       (unsigned long) (statbuf.st_dev & 0x3ffff),
-                       (unsigned long) statbuf.st_ino,
-                       sprintmode(statbuf.st_mode));
-               tprintf("st_nlink=%lu, st_uid=%lu, st_gid=%lu, ",
-                       (unsigned long) statbuf.st_nlink,
-                       (unsigned long) statbuf.st_uid,
-                       (unsigned long) statbuf.st_gid);
-               tprintf("st_blksize=%lu, ", (unsigned long) statbuf.st_blksize);
-               tprintf("st_blocks=%lu, ", (unsigned long) statbuf.st_blocks);
-       }
-       else
-               tprintf("{st_mode=%s, ", sprintmode(statbuf.st_mode));
-       switch (statbuf.st_mode & S_IFMT) {
-       case S_IFCHR: case S_IFBLK:
-               tprintf("st_rdev=makedev(%lu, %lu), ",
-                       (unsigned long) ((statbuf.st_rdev >> 18) & 0x3fff),
-                       (unsigned long) (statbuf.st_rdev & 0x3ffff));
-               break;
-       default:
-               tprintf("st_size=%u, ", statbuf.st_size);
-               break;
-       }
-       if (!abbrev(tcp)) {
-               tprintf("st_atime=%s, ", sprinttime(statbuf.st_atime.tv_sec));
-               tprintf("st_mtime=%s, ", sprinttime(statbuf.st_mtime.tv_sec));
-               tprintf("st_ctime=%s}", sprinttime(statbuf.st_ctime.tv_sec));
-       }
-       else
-               tprints("...}");
-}
-
-# if defined(SPARC64)
-static void
-printstat_sparc64(struct tcb *tcp, long addr)
-{
-       struct stat_sparc64 statbuf;
-
-       if (umove(tcp, addr, &statbuf) < 0) {
-               tprints("{...}");
-               return;
-       }
-
-       if (!abbrev(tcp)) {
-               tprintf("{st_dev=makedev(%lu, %lu), st_ino=%lu, st_mode=%s, ",
-                       (unsigned long) major(statbuf.st_dev),
-                       (unsigned long) minor(statbuf.st_dev),
-                       (unsigned long) statbuf.st_ino,
-                       sprintmode(statbuf.st_mode));
-               tprintf("st_nlink=%lu, st_uid=%lu, st_gid=%lu, ",
-                       (unsigned long) statbuf.st_nlink,
-                       (unsigned long) statbuf.st_uid,
-                       (unsigned long) statbuf.st_gid);
-               tprintf("st_blksize=%lu, ",
-                       (unsigned long) statbuf.st_blksize);
-               tprintf("st_blocks=%lu, ",
-                       (unsigned long) statbuf.st_blocks);
-       }
-       else
-               tprintf("{st_mode=%s, ", sprintmode(statbuf.st_mode));
-       switch (statbuf.st_mode & S_IFMT) {
-       case S_IFCHR: case S_IFBLK:
-               tprintf("st_rdev=makedev(%lu, %lu), ",
-                       (unsigned long) major(statbuf.st_rdev),
-                       (unsigned long) minor(statbuf.st_rdev));
-               break;
-       default:
-               tprintf("st_size=%lu, ", statbuf.st_size);
-               break;
-       }
-       if (!abbrev(tcp)) {
-               tprintf("st_atime=%s, ", sprinttime(statbuf.st_atime));
-               tprintf("st_mtime=%s, ", sprinttime(statbuf.st_mtime));
-               tprintf("st_ctime=%s}", sprinttime(statbuf.st_ctime));
-       }
-       else
-               tprints("...}");
-}
-# endif /* SPARC64 */
-#endif /* SPARC[64] */
-
-#if defined POWERPC64
-struct stat_powerpc32 {
+#  define STAT32_PERSONALITY 1
+# elif defined POWERPC64
+struct stat32 {
        unsigned int    st_dev;
        unsigned int    st_ino;
        unsigned int    st_mode;
@@ -705,1423 +140,354 @@ struct stat_powerpc32 {
        unsigned int    __unused4;
        unsigned int    __unused5;
 };
-
-static void
-printstat_powerpc32(struct tcb *tcp, long addr)
-{
-       struct stat_powerpc32 statbuf;
-
-       if (umove(tcp, addr, &statbuf) < 0) {
-               tprints("{...}");
-               return;
-       }
-
-       if (!abbrev(tcp)) {
-               tprintf("{st_dev=makedev(%u, %u), st_ino=%u, st_mode=%s, ",
-                       major(statbuf.st_dev), minor(statbuf.st_dev),
-                       statbuf.st_ino,
-                       sprintmode(statbuf.st_mode));
-               tprintf("st_nlink=%u, st_uid=%u, st_gid=%u, ",
-                       statbuf.st_nlink, statbuf.st_uid, statbuf.st_gid);
-               tprintf("st_blksize=%u, ", statbuf.st_blksize);
-               tprintf("st_blocks=%u, ", statbuf.st_blocks);
-       }
-       else
-               tprintf("{st_mode=%s, ", sprintmode(statbuf.st_mode));
-       switch (statbuf.st_mode & S_IFMT) {
-       case S_IFCHR: case S_IFBLK:
-               tprintf("st_rdev=makedev(%lu, %lu), ",
-                       (unsigned long) major(statbuf.st_rdev),
-                       (unsigned long) minor(statbuf.st_rdev));
-               break;
-       default:
-               tprintf("st_size=%u, ", statbuf.st_size);
-               break;
-       }
-       if (!abbrev(tcp)) {
-               tprintf("st_atime=%s, ", sprinttime(statbuf.st_atime));
-               tprintf("st_mtime=%s, ", sprinttime(statbuf.st_mtime));
-               tprintf("st_ctime=%s}", sprinttime(statbuf.st_ctime));
-       }
-       else
-               tprints("...}");
-}
-#endif /* POWERPC64 */
-
-#include "xlat/fileflags.h"
-
-static void
-realprintstat(struct tcb *tcp, struct stat *statbuf)
-{
-       if (!abbrev(tcp)) {
-               tprintf("{st_dev=makedev(%lu, %lu), st_ino=%lu, st_mode=%s, ",
-                       (unsigned long) major(statbuf->st_dev),
-                       (unsigned long) minor(statbuf->st_dev),
-                       (unsigned long) statbuf->st_ino,
-                       sprintmode(statbuf->st_mode));
-               tprintf("st_nlink=%lu, st_uid=%lu, st_gid=%lu, ",
-                       (unsigned long) statbuf->st_nlink,
-                       (unsigned long) statbuf->st_uid,
-                       (unsigned long) statbuf->st_gid);
-#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
-               tprintf("st_blksize=%lu, ", (unsigned long) statbuf->st_blksize);
-#endif
-#ifdef HAVE_STRUCT_STAT_ST_BLOCKS
-               tprintf("st_blocks=%lu, ", (unsigned long) statbuf->st_blocks);
-#endif
-       }
-       else
-               tprintf("{st_mode=%s, ", sprintmode(statbuf->st_mode));
-       switch (statbuf->st_mode & S_IFMT) {
-       case S_IFCHR: case S_IFBLK:
-#ifdef HAVE_STRUCT_STAT_ST_RDEV
-               tprintf("st_rdev=makedev(%lu, %lu), ",
-                       (unsigned long) major(statbuf->st_rdev),
-                       (unsigned long) minor(statbuf->st_rdev));
-#else /* !HAVE_STRUCT_STAT_ST_RDEV */
-               tprintf("st_size=makedev(%lu, %lu), ",
-                       (unsigned long) major(statbuf->st_size),
-                       (unsigned long) minor(statbuf->st_size));
-#endif /* !HAVE_STRUCT_STAT_ST_RDEV */
-               break;
-       default:
-               tprintf("st_size=%lu, ", (unsigned long) statbuf->st_size);
-               break;
-       }
-       if (!abbrev(tcp)) {
-               tprintf("st_atime=%s, ", sprinttime(statbuf->st_atime));
-               tprintf("st_mtime=%s, ", sprinttime(statbuf->st_mtime));
-               tprintf("st_ctime=%s", sprinttime(statbuf->st_ctime));
-#if HAVE_STRUCT_STAT_ST_FLAGS
-               tprints(", st_flags=");
-               printflags(fileflags, statbuf->st_flags, "UF_???");
-#endif
-#if HAVE_STRUCT_STAT_ST_ACLCNT
-               tprintf(", st_aclcnt=%d", statbuf->st_aclcnt);
-#endif
-#if HAVE_STRUCT_STAT_ST_LEVEL
-               tprintf(", st_level=%ld", statbuf->st_level);
-#endif
-#if HAVE_STRUCT_STAT_ST_FSTYPE
-               tprintf(", st_fstype=%.*s",
-                       (int) sizeof statbuf->st_fstype, statbuf->st_fstype);
-#endif
-#if HAVE_STRUCT_STAT_ST_GEN
-               tprintf(", st_gen=%u", statbuf->st_gen);
-#endif
-               tprints("}");
-       }
-       else
-               tprints("...}");
-}
-
-#ifndef X32
-static void
-printstat(struct tcb *tcp, long addr)
-{
-       struct stat statbuf;
-
-       if (!addr) {
-               tprints("NULL");
-               return;
-       }
-       if (syserror(tcp) || !verbose(tcp)) {
-               tprintf("%#lx", addr);
-               return;
-       }
-
-#if defined(SPARC) || defined(SPARC64)
-       if (current_personality == 1) {
-               printstatsol(tcp, addr);
-               return;
-       }
-#ifdef SPARC64
-       else if (current_personality == 2) {
-               printstat_sparc64(tcp, addr);
-               return;
-       }
-#endif
-#endif /* SPARC[64] */
-
-#if defined POWERPC64
-       if (current_personality == 1) {
-               printstat_powerpc32(tcp, addr);
-               return;
-       }
-#endif
-
-       if (umove(tcp, addr, &statbuf) < 0) {
-               tprints("{...}");
-               return;
-       }
-
-       realprintstat(tcp, &statbuf);
-}
-#else /* X32 */
-# define printstat printstat64
-#endif
-
-#if !defined HAVE_STAT64 && (defined AARCH64 || defined X86_64)
-/*
- * Linux x86_64 has unified `struct stat' but its i386 biarch needs
- * `struct stat64'.  Its <asm-i386/stat.h> definition expects 32-bit `long'.
- * <linux/include/asm-x86_64/ia32.h> is not in the public includes set.
- * __GNUC__ is needed for the required __attribute__ below.
- *
- * Similarly, aarch64 has a unified `struct stat' but its arm personality
- * needs `struct stat64' (which also expects a 32-bit `long' but which
- * shouldn't be packed).
- */
-struct stat64 {
-       unsigned long long      st_dev;
-       unsigned char   __pad0[4];
-       unsigned int    __st_ino;
-       unsigned int    st_mode;
-       unsigned int    st_nlink;
-       unsigned int    st_uid;
-       unsigned int    st_gid;
-       unsigned long long      st_rdev;
-       unsigned char   __pad3[4];
-       long long       st_size;
-       unsigned int    st_blksize;
-       unsigned long long      st_blocks;
+#  define STAT32_PERSONALITY 1
+# elif defined SPARC64
+struct stat32 {
+       unsigned short  st_dev;
+       unsigned int    st_ino;
+       unsigned short  st_mode;
+       unsigned short  st_nlink;
+       unsigned short  st_uid;
+       unsigned short  st_gid;
+       unsigned short  st_rdev;
+       unsigned int    st_size;
        unsigned int    st_atime;
        unsigned int    st_atime_nsec;
        unsigned int    st_mtime;
        unsigned int    st_mtime_nsec;
        unsigned int    st_ctime;
        unsigned int    st_ctime_nsec;
-       unsigned long long      st_ino;
-}
-# if defined X86_64
-   __attribute__((packed))
-#  define STAT64_SIZE  96
-#else
-#  define STAT64_SIZE  104
-# endif
-;
-# define HAVE_STAT64   1
-#endif
-
-#ifdef HAVE_STAT64
-static void
-printstat64(struct tcb *tcp, long addr)
-{
-#ifdef X32
-       struct stat statbuf;
-#else
-       struct stat64 statbuf;
-#endif
-
-#ifdef STAT64_SIZE
-       (void) sizeof(char[sizeof statbuf == STAT64_SIZE ? 1 : -1]);
-#endif
-
-       if (!addr) {
-               tprints("NULL");
-               return;
-       }
-       if (syserror(tcp) || !verbose(tcp)) {
-               tprintf("%#lx", addr);
-               return;
-       }
-
-#if defined(SPARC) || defined(SPARC64)
-       if (current_personality == 1) {
-               printstatsol(tcp, addr);
-               return;
-       }
-# ifdef SPARC64
-       else if (current_personality == 2) {
-               printstat_sparc64(tcp, addr);
-               return;
-       }
-# endif
-#endif /* SPARC[64] */
-
-#if defined AARCH64
-       if (current_personality != 0) {
-               printstat(tcp, addr);
-               return;
-       }
-#endif
-#if defined X86_64
-       if (current_personality != 1) {
-               printstat(tcp, addr);
-               return;
-       }
-#endif
-
-       if (umove(tcp, addr, &statbuf) < 0) {
-               tprints("{...}");
-               return;
-       }
-
-       if (!abbrev(tcp)) {
-               tprintf("{st_dev=makedev(%lu, %lu), st_ino=%llu, st_mode=%s, ",
-                       (unsigned long) major(statbuf.st_dev),
-                       (unsigned long) minor(statbuf.st_dev),
-                       (unsigned long long) statbuf.st_ino,
-                       sprintmode(statbuf.st_mode));
-               tprintf("st_nlink=%lu, st_uid=%lu, st_gid=%lu, ",
-                       (unsigned long) statbuf.st_nlink,
-                       (unsigned long) statbuf.st_uid,
-                       (unsigned long) statbuf.st_gid);
-#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
-               tprintf("st_blksize=%lu, ",
-                       (unsigned long) statbuf.st_blksize);
-#endif /* HAVE_STRUCT_STAT_ST_BLKSIZE */
-#ifdef HAVE_STRUCT_STAT_ST_BLOCKS
-               tprintf("st_blocks=%lu, ", (unsigned long) statbuf.st_blocks);
-#endif /* HAVE_STRUCT_STAT_ST_BLOCKS */
-       }
-       else
-               tprintf("{st_mode=%s, ", sprintmode(statbuf.st_mode));
-       switch (statbuf.st_mode & S_IFMT) {
-       case S_IFCHR: case S_IFBLK:
-#ifdef HAVE_STRUCT_STAT_ST_RDEV
-               tprintf("st_rdev=makedev(%lu, %lu), ",
-                       (unsigned long) major(statbuf.st_rdev),
-                       (unsigned long) minor(statbuf.st_rdev));
-#else /* !HAVE_STRUCT_STAT_ST_RDEV */
-               tprintf("st_size=makedev(%lu, %lu), ",
-                       (unsigned long) major(statbuf.st_size),
-                       (unsigned long) minor(statbuf.st_size));
-#endif /* !HAVE_STRUCT_STAT_ST_RDEV */
-               break;
-       default:
-               tprintf("st_size=%llu, ", (unsigned long long) statbuf.st_size);
-               break;
-       }
-       if (!abbrev(tcp)) {
-               tprintf("st_atime=%s, ", sprinttime(statbuf.st_atime));
-               tprintf("st_mtime=%s, ", sprinttime(statbuf.st_mtime));
-               tprintf("st_ctime=%s", sprinttime(statbuf.st_ctime));
-#if HAVE_STRUCT_STAT_ST_FLAGS
-               tprints(", st_flags=");
-               printflags(fileflags, statbuf.st_flags, "UF_???");
-#endif
-#if HAVE_STRUCT_STAT_ST_ACLCNT
-               tprintf(", st_aclcnt=%d", statbuf.st_aclcnt);
-#endif
-#if HAVE_STRUCT_STAT_ST_LEVEL
-               tprintf(", st_level=%ld", statbuf.st_level);
-#endif
-#if HAVE_STRUCT_STAT_ST_FSTYPE
-               tprintf(", st_fstype=%.*s",
-                       (int) sizeof statbuf.st_fstype, statbuf.st_fstype);
-#endif
-#if HAVE_STRUCT_STAT_ST_GEN
-               tprintf(", st_gen=%u", statbuf.st_gen);
-#endif
-               tprints("}");
-       }
-       else
-               tprints("...}");
-}
-#endif /* HAVE_STAT64 */
-
-#if defined(HAVE_STRUCT___OLD_KERNEL_STAT)
-static void
-convertoldstat(const struct __old_kernel_stat *oldbuf, struct stat *newbuf)
-{
-       newbuf->st_dev = oldbuf->st_dev;
-       newbuf->st_ino = oldbuf->st_ino;
-       newbuf->st_mode = oldbuf->st_mode;
-       newbuf->st_nlink = oldbuf->st_nlink;
-       newbuf->st_uid = oldbuf->st_uid;
-       newbuf->st_gid = oldbuf->st_gid;
-       newbuf->st_rdev = oldbuf->st_rdev;
-       newbuf->st_size = oldbuf->st_size;
-       newbuf->st_atime = oldbuf->st_atime;
-       newbuf->st_mtime = oldbuf->st_mtime;
-       newbuf->st_ctime = oldbuf->st_ctime;
-       newbuf->st_blksize = 0; /* not supported in old_stat */
-       newbuf->st_blocks = 0; /* not supported in old_stat */
-}
-
-static void
-printoldstat(struct tcb *tcp, long addr)
-{
-       struct __old_kernel_stat statbuf;
-       struct stat newstatbuf;
-
-       if (!addr) {
-               tprints("NULL");
-               return;
-       }
-       if (syserror(tcp) || !verbose(tcp)) {
-               tprintf("%#lx", addr);
-               return;
-       }
-
-# if defined(SPARC) || defined(SPARC64)
-       if (current_personality == 1) {
-               printstatsol(tcp, addr);
-               return;
-       }
-# endif
-
-       if (umove(tcp, addr, &statbuf) < 0) {
-               tprints("{...}");
-               return;
-       }
-
-       convertoldstat(&statbuf, &newstatbuf);
-       realprintstat(tcp, &newstatbuf);
-}
-#endif
-
-int
-sys_stat(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
-       } else {
-               printstat(tcp, tcp->u_arg[1]);
-       }
-       return 0;
-}
-
-#ifdef X32
-static void
-printstat64_x32(struct tcb *tcp, long addr)
-{
-       struct stat64 statbuf;
-
-       if (!addr) {
-               tprints("NULL");
-               return;
-       }
-       if (syserror(tcp) || !verbose(tcp)) {
-               tprintf("%#lx", addr);
-               return;
-       }
-
-       if (umove(tcp, addr, &statbuf) < 0) {
-               tprints("{...}");
-               return;
-       }
-
-       if (!abbrev(tcp)) {
-               tprintf("{st_dev=makedev(%lu, %lu), st_ino=%llu, st_mode=%s, ",
-                       (unsigned long) major(statbuf.st_dev),
-                       (unsigned long) minor(statbuf.st_dev),
-                       (unsigned long long) statbuf.st_ino,
-                       sprintmode(statbuf.st_mode));
-               tprintf("st_nlink=%lu, st_uid=%lu, st_gid=%lu, ",
-                       (unsigned long) statbuf.st_nlink,
-                       (unsigned long) statbuf.st_uid,
-                       (unsigned long) statbuf.st_gid);
-               tprintf("st_blksize=%lu, ",
-                       (unsigned long) statbuf.st_blksize);
-               tprintf("st_blocks=%lu, ", (unsigned long) statbuf.st_blocks);
-       }
-       else
-               tprintf("{st_mode=%s, ", sprintmode(statbuf.st_mode));
-       switch (statbuf.st_mode & S_IFMT) {
-       case S_IFCHR: case S_IFBLK:
-               tprintf("st_rdev=makedev(%lu, %lu), ",
-                       (unsigned long) major(statbuf.st_rdev),
-                       (unsigned long) minor(statbuf.st_rdev));
-               break;
-       default:
-               tprintf("st_size=%llu, ", (unsigned long long) statbuf.st_size);
-               break;
-       }
-       if (!abbrev(tcp)) {
-               tprintf("st_atime=%s, ", sprinttime(statbuf.st_atime));
-               tprintf("st_mtime=%s, ", sprinttime(statbuf.st_mtime));
-               tprintf("st_ctime=%s", sprinttime(statbuf.st_ctime));
-               tprints("}");
-       }
-       else
-               tprints("...}");
-}
-#endif /* X32 */
-
-int
-sys_stat64(struct tcb *tcp)
-{
-#ifdef HAVE_STAT64
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
-       } else {
-# ifdef X32
-               printstat64_x32(tcp, tcp->u_arg[1]);
-# else
-               printstat64(tcp, tcp->u_arg[1]);
-# endif
-       }
-       return 0;
-#else
-       return printargs(tcp);
-#endif
-}
-
-#ifndef AT_SYMLINK_NOFOLLOW
-# define AT_SYMLINK_NOFOLLOW   0x100
-#endif
-#ifndef AT_REMOVEDIR
-# define AT_REMOVEDIR          0x200
-#endif
-#ifndef AT_SYMLINK_FOLLOW
-# define AT_SYMLINK_FOLLOW     0x400
-#endif
-#ifndef AT_NO_AUTOMOUNT
-# define AT_NO_AUTOMOUNT       0x800
-#endif
-#ifndef AT_EMPTY_PATH
-# define AT_EMPTY_PATH         0x1000
-#endif
-
-#include "xlat/at_flags.h"
-
-int
-sys_newfstatat(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               print_dirfd(tcp, tcp->u_arg[0]);
-               printpath(tcp, tcp->u_arg[1]);
-               tprints(", ");
-       } else {
-#ifdef POWERPC64
-               if (current_personality == 0)
-                       printstat(tcp, tcp->u_arg[2]);
-               else
-                       printstat64(tcp, tcp->u_arg[2]);
-#elif defined HAVE_STAT64
-               printstat64(tcp, tcp->u_arg[2]);
-#else
-               printstat(tcp, tcp->u_arg[2]);
-#endif
-               tprints(", ");
-               printflags(at_flags, tcp->u_arg[3], "AT_???");
-       }
-       return 0;
-}
-
-#if defined(HAVE_STRUCT___OLD_KERNEL_STAT)
-int
-sys_oldstat(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
-       } else {
-               printoldstat(tcp, tcp->u_arg[1]);
-       }
-       return 0;
-}
-#endif
-
-int
-sys_fstat(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-       } else {
-               printstat(tcp, tcp->u_arg[1]);
-       }
-       return 0;
-}
-
-int
-sys_fstat64(struct tcb *tcp)
-{
-#ifdef HAVE_STAT64
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-       } else {
-# ifdef X32
-               printstat64_x32(tcp, tcp->u_arg[1]);
+       unsigned int    st_blksize;
+       unsigned int    st_blocks;
+       unsigned int    __unused4[2];
+};
+#  define STAT32_PERSONALITY 0
+# elif defined SPARC
+#  /* no 64-bit personalities */
+# elif defined TILE
+#  /* no 32-bit stat */
 # else
-               printstat64(tcp, tcp->u_arg[1]);
-# endif
-       }
-       return 0;
-#else
-       return printargs(tcp);
-#endif
-}
-
-#if defined(HAVE_STRUCT___OLD_KERNEL_STAT)
-int
-sys_oldfstat(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-       } else {
-               printoldstat(tcp, tcp->u_arg[1]);
-       }
-       return 0;
-}
-#endif
+#  warning FIXME: check whether struct stat32 definition is needed for this architecture!
+# endif /* X86_64 || X32 || POWERPC64 */
+#endif /* SUPPORTED_PERSONALITIES > 1 */
+
+#ifdef STAT32_PERSONALITY
+# define DO_PRINTSTAT do_printstat32
+# define STRUCT_STAT struct stat32
+# undef HAVE_STRUCT_STAT_ST_FLAGS
+# undef HAVE_STRUCT_STAT_ST_FSTYPE
+# undef HAVE_STRUCT_STAT_ST_GEN
+# include "printstat.h"
+#endif /* STAT32_PERSONALITY */
 
 #if defined(SPARC) || defined(SPARC64)
 
-int
-sys_xstat(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-               printpath(tcp, tcp->u_arg[1]);
-               tprints(", ");
-       } else {
-# ifdef _STAT64_VER
-               if (tcp->u_arg[0] == _STAT64_VER)
-                       printstat64(tcp, tcp->u_arg[2]);
-               else
-# endif
-               printstat(tcp, tcp->u_arg[2]);
-       }
-       return 0;
-}
-
-int
-sys_fxstat(struct tcb *tcp)
-{
-       if (entering(tcp))
-               tprintf("%ld, %ld, ", tcp->u_arg[0], tcp->u_arg[1]);
-       else {
-# ifdef _STAT64_VER
-               if (tcp->u_arg[0] == _STAT64_VER)
-                       printstat64(tcp, tcp->u_arg[2]);
-               else
-# endif
-               printstat(tcp, tcp->u_arg[2]);
-       }
-       return 0;
-}
-
-int
-sys_lxstat(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-               printpath(tcp, tcp->u_arg[1]);
-               tprints(", ");
-       } else {
-# ifdef _STAT64_VER
-               if (tcp->u_arg[0] == _STAT64_VER)
-                       printstat64(tcp, tcp->u_arg[2]);
-               else
-# endif
-               printstat(tcp, tcp->u_arg[2]);
-       }
-       return 0;
-}
-
-int
-sys_xmknod(struct tcb *tcp)
-{
-       int mode = tcp->u_arg[2];
-
-       if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-               printpath(tcp, tcp->u_arg[1]);
-               tprintf(", %s", sprintmode(mode));
-               switch (mode & S_IFMT) {
-               case S_IFCHR: case S_IFBLK:
-                       tprintf(", makedev(%lu, %lu)",
-                               (unsigned long) ((tcp->u_arg[3] >> 18) & 0x3fff),
-                               (unsigned long) (tcp->u_arg[3] & 0x3ffff));
-                       break;
-               default:
-                       break;
-               }
-       }
-       return 0;
-}
-
-# ifdef HAVE_SYS_ACL_H
-
-#  include <sys/acl.h>
-
-#include "xlat/aclcmds.h"
-
-int
-sys_acl(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printxval(aclcmds, tcp->u_arg[1], "???ACL???");
-               tprintf(", %ld", tcp->u_arg[2]);
-               /*
-                * FIXME - dump out the list of aclent_t's pointed to
-                * by "tcp->u_arg[3]" if it's not NULL.
-                */
-               if (tcp->u_arg[3])
-                       tprintf(", %#lx", tcp->u_arg[3]);
-               else
-                       tprints(", NULL");
-       }
-       return 0;
-}
-
-int
-sys_facl(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-               printxval(aclcmds, tcp->u_arg[1], "???ACL???");
-               tprintf(", %ld", tcp->u_arg[2]);
-               /*
-                * FIXME - dump out the list of aclent_t's pointed to
-                * by "tcp->u_arg[3]" if it's not NULL.
-                */
-               if (tcp->u_arg[3])
-                       tprintf(", %#lx", tcp->u_arg[3]);
-               else
-                       tprints(", NULL");
-       }
-       return 0;
-}
-
-#include "xlat/aclipc.h"
-
-int
-sys_aclipc(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printxval(aclipc, tcp->u_arg[0], "???IPC???");
-               tprintf(", %#lx, ", tcp->u_arg[1]);
-               printxval(aclcmds, tcp->u_arg[2], "???ACL???");
-               tprintf(", %ld", tcp->u_arg[3]);
-               /*
-                * FIXME - dump out the list of aclent_t's pointed to
-                * by "tcp->u_arg[4]" if it's not NULL.
-                */
-               if (tcp->u_arg[4])
-                       tprintf(", %#lx", tcp->u_arg[4]);
-               else
-                       tprints(", NULL");
-       }
-       return 0;
-}
-
-# endif /* HAVE_SYS_ACL_H */
-
-#endif /* SPARC[64] */
-
-/* directory */
-int
-sys_chdir(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-       }
-       return 0;
-}
-
-static int
-decode_mkdir(struct tcb *tcp, int offset)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[offset]);
-               tprintf(", %#lo", tcp->u_arg[offset + 1]);
-       }
-       return 0;
-}
-
-int
-sys_mkdir(struct tcb *tcp)
-{
-       return decode_mkdir(tcp, 0);
-}
-
-int
-sys_mkdirat(struct tcb *tcp)
-{
-       if (entering(tcp))
-               print_dirfd(tcp, tcp->u_arg[0]);
-       return decode_mkdir(tcp, 1);
-}
-
-int
-sys_link(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printpath(tcp, tcp->u_arg[1]);
-       }
-       return 0;
-}
-
-int
-sys_linkat(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               print_dirfd(tcp, tcp->u_arg[0]);
-               printpath(tcp, tcp->u_arg[1]);
-               tprints(", ");
-               print_dirfd(tcp, tcp->u_arg[2]);
-               printpath(tcp, tcp->u_arg[3]);
-               tprints(", ");
-               printflags(at_flags, tcp->u_arg[4], "AT_???");
-       }
-       return 0;
-}
-
-int
-sys_unlinkat(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               print_dirfd(tcp, tcp->u_arg[0]);
-               printpath(tcp, tcp->u_arg[1]);
-               tprints(", ");
-               printflags(at_flags, tcp->u_arg[2], "AT_???");
-       }
-       return 0;
-}
-
-int
-sys_symlinkat(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               print_dirfd(tcp, tcp->u_arg[1]);
-               printpath(tcp, tcp->u_arg[2]);
-       }
-       return 0;
-}
-
-static int
-decode_readlink(struct tcb *tcp, int offset)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[offset]);
-               tprints(", ");
-       } else {
-               if (syserror(tcp))
-                       tprintf("%#lx", tcp->u_arg[offset + 1]);
-               else
-                       /* Used to use printpathn(), but readlink
-                        * neither includes NUL in the returned count,
-                        * nor actually writes it into memory.
-                        * printpathn() would decide on printing
-                        * "..." continuation based on garbage
-                        * past return buffer's end.
-                        */
-                       printstr(tcp, tcp->u_arg[offset + 1], tcp->u_rval);
-               tprintf(", %lu", tcp->u_arg[offset + 2]);
-       }
-       return 0;
-}
-
-int
-sys_readlink(struct tcb *tcp)
-{
-       return decode_readlink(tcp, 0);
-}
-
-int
-sys_readlinkat(struct tcb *tcp)
-{
-       if (entering(tcp))
-               print_dirfd(tcp, tcp->u_arg[0]);
-       return decode_readlink(tcp, 1);
-}
-
-static void
-decode_renameat(struct tcb *tcp)
-{
-       print_dirfd(tcp, tcp->u_arg[0]);
-       printpath(tcp, tcp->u_arg[1]);
-       tprints(", ");
-       print_dirfd(tcp, tcp->u_arg[2]);
-       printpath(tcp, tcp->u_arg[3]);
-}
-
-int
-sys_renameat(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               decode_renameat(tcp);
-       }
-       return 0;
-}
-
-#include "xlat/rename_flags.h"
-
-int
-sys_renameat2(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               decode_renameat(tcp);
-               tprints(", ");
-               printflags(rename_flags, tcp->u_arg[4], "RENAME_??");
-       }
-       return 0;
-}
-
-int
-sys_chown(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               printuid(", ", tcp->u_arg[1]);
-               printuid(", ", tcp->u_arg[2]);
-       }
-       return 0;
-}
+struct solstat {
+       unsigned        st_dev;
+       unsigned int    st_pad1[3];     /* network id */
+       unsigned        st_ino;
+       unsigned        st_mode;
+       unsigned        st_nlink;
+       unsigned        st_uid;
+       unsigned        st_gid;
+       unsigned        st_rdev;
+       unsigned int    st_pad2[2];
+       unsigned int    st_size;
+       unsigned int    st_pad3;        /* st_size, off_t expansion */
+       unsigned int    st_atime;
+       unsigned int    st_atime_nsec;
+       unsigned int    st_mtime;
+       unsigned int    st_mtime_nsec;
+       unsigned int    st_ctime;
+       unsigned int    st_ctime_nsec;
+       unsigned int    st_blksize;
+       unsigned int    st_blocks;
+       char            st_fstype[16];
+       unsigned int    st_pad4[8];     /* expansion area */
+};
 
-int
-sys_fchownat(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               print_dirfd(tcp, tcp->u_arg[0]);
-               printpath(tcp, tcp->u_arg[1]);
-               printuid(", ", tcp->u_arg[2]);
-               printuid(", ", tcp->u_arg[3]);
-               tprints(", ");
-               printflags(at_flags, tcp->u_arg[4], "AT_???");
-       }
-       return 0;
-}
+# define DO_PRINTSTAT  do_printstat_sol
+# define STRUCT_STAT   struct solstat
+# define STAT_MAJOR(x) (((x) >> 18) & 0x3fff)
+# define STAT_MINOR(x) ((x) & 0x3ffff)
+# undef HAVE_STRUCT_STAT_ST_FLAGS
+# undef HAVE_STRUCT_STAT_ST_FSTYPE
+# undef HAVE_STRUCT_STAT_ST_GEN
+# include "printstat.h"
+#endif /* SPARC || SPARC64 */
 
-int
-sys_fchown(struct tcb *tcp)
+static void
+printstat(struct tcb *tcp, long addr)
 {
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               printuid(", ", tcp->u_arg[1]);
-               printuid(", ", tcp->u_arg[2]);
-       }
-       return 0;
-}
+       struct stat statbuf;
 
-static int
-decode_chmod(struct tcb *tcp, int offset)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[offset]);
-               tprintf(", %#lo", tcp->u_arg[offset + 1]);
-       }
-       return 0;
-}
+#ifdef STAT32_PERSONALITY
+       if (current_personality == STAT32_PERSONALITY) {
+               struct stat32 statbuf;
 
-int
-sys_chmod(struct tcb *tcp)
-{
-       return decode_chmod(tcp, 0);
-}
+               if (!umove_or_printaddr(tcp, addr, &statbuf))
+                       do_printstat32(tcp, &statbuf);
+               return;
+       }
+#endif
 
-int
-sys_fchmodat(struct tcb *tcp)
-{
-       if (entering(tcp))
-               print_dirfd(tcp, tcp->u_arg[0]);
-       return decode_chmod(tcp, 1);
-}
+#if defined(SPARC) || defined(SPARC64)
+       if (current_personality == 1) {
+               struct solstat statbuf;
 
-int
-sys_fchmod(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprintf(", %#lo", tcp->u_arg[1]);
+               if (!umove_or_printaddr(tcp, addr, &statbuf))
+                       do_printstat_sol(tcp, &statbuf);
+               return;
        }
-       return 0;
+#endif /* SPARC || SPARC64 */
+
+       if (!umove_or_printaddr(tcp, addr, &statbuf))
+               do_printstat(tcp, &statbuf);
 }
 
-#ifdef ALPHA
-int
-sys_osf_utimes(struct tcb *tcp)
+SYS_FUNC(stat)
 {
        if (entering(tcp)) {
                printpath(tcp, tcp->u_arg[0]);
                tprints(", ");
-               printtv_bitness(tcp, tcp->u_arg[1], BITNESS_32,  0);
+       } else {
+               printstat(tcp, tcp->u_arg[1]);
        }
        return 0;
 }
-#endif
 
-static int
-decode_utimes(struct tcb *tcp, int offset, int special)
+SYS_FUNC(fstat)
 {
        if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[offset]);
+               printfd(tcp, tcp->u_arg[0]);
                tprints(", ");
-               if (tcp->u_arg[offset + 1] == 0)
-                       tprints("NULL");
-               else {
-                       tprints("{");
-                       printtv_bitness(tcp, tcp->u_arg[offset + 1],
-                                       BITNESS_CURRENT, special);
-                       tprints(", ");
-                       printtv_bitness(tcp, tcp->u_arg[offset + 1]
-                                       + sizeof(struct timeval),
-                                       BITNESS_CURRENT, special);
-                       tprints("}");
-               }
+       } else {
+               printstat(tcp, tcp->u_arg[1]);
        }
        return 0;
 }
 
-int
-sys_utimes(struct tcb *tcp)
-{
-       return decode_utimes(tcp, 0, 0);
+#if defined STAT32_PERSONALITY && !defined HAVE_STRUCT_STAT64
+# if defined AARCH64 || defined X86_64 || defined X32
+/*
+ * Linux x86_64 and x32 have unified `struct stat' but their i386 personality
+ * needs `struct stat64'.
+ * linux/arch/x86/include/uapi/asm/stat.h defines `struct stat64' only for i386.
+ *
+ * Similarly, aarch64 has a unified `struct stat' but its arm personality
+ * needs `struct stat64' (unlike x86, it shouldn't be packed).
+ */
+struct stat64 {
+       unsigned long long      st_dev;
+       unsigned char   __pad0[4];
+       unsigned int    __st_ino;
+       unsigned int    st_mode;
+       unsigned int    st_nlink;
+       unsigned int    st_uid;
+       unsigned int    st_gid;
+       unsigned long long      st_rdev;
+       unsigned char   __pad3[4];
+       long long       st_size;
+       unsigned int    st_blksize;
+       unsigned long long      st_blocks;
+       unsigned int    st_atime;
+       unsigned int    st_atime_nsec;
+       unsigned int    st_mtime;
+       unsigned int    st_mtime_nsec;
+       unsigned int    st_ctime;
+       unsigned int    st_ctime_nsec;
+       unsigned long long      st_ino;
 }
+#  if defined X86_64 || defined X32
+  ATTRIBUTE_PACKED
+#   define STAT64_SIZE 96
+#  else
+#   define STAT64_SIZE 104
+#  endif
+;
+#  define HAVE_STRUCT_STAT64   1
+# else /* !(AARCH64 || X86_64 || X32) */
+#  warning FIXME: check whether struct stat64 definition is needed for this architecture!
+# endif
+#endif /* STAT32_PERSONALITY && !HAVE_STRUCT_STAT64 */
 
-int
-sys_futimesat(struct tcb *tcp)
-{
-       if (entering(tcp))
-               print_dirfd(tcp, tcp->u_arg[0]);
-       return decode_utimes(tcp, 1, 0);
-}
+#ifdef HAVE_STRUCT_STAT64
 
-int
-sys_utimensat(struct tcb *tcp)
+# define DO_PRINTSTAT do_printstat64
+# define STRUCT_STAT struct stat64
+# undef HAVE_STRUCT_STAT_ST_FLAGS
+# undef HAVE_STRUCT_STAT_ST_FSTYPE
+# undef HAVE_STRUCT_STAT_ST_GEN
+# include "printstat.h"
+
+static void
+printstat64(struct tcb *tcp, long addr)
 {
-       if (entering(tcp)) {
-               print_dirfd(tcp, tcp->u_arg[0]);
-               decode_utimes(tcp, 1, 1);
-               tprints(", ");
-               printflags(at_flags, tcp->u_arg[3], "AT_???");
+       struct stat64 statbuf;
+
+# ifdef STAT64_SIZE
+       (void) sizeof(char[sizeof statbuf == STAT64_SIZE ? 1 : -1]);
+# endif
+
+# ifdef STAT32_PERSONALITY
+       if (current_personality != STAT32_PERSONALITY) {
+               printstat(tcp, addr);
+               return;
        }
-       return 0;
+# endif /* STAT32_PERSONALITY */
+
+       if (!umove_or_printaddr(tcp, addr, &statbuf))
+               do_printstat64(tcp, &statbuf);
 }
 
-int
-sys_utime(struct tcb *tcp)
+SYS_FUNC(stat64)
 {
-       union {
-               long utl[2];
-               int uti[2];
-               long paranoia_for_huge_wordsize[4];
-       } u;
-       unsigned wordsize;
-
        if (entering(tcp)) {
                printpath(tcp, tcp->u_arg[0]);
                tprints(", ");
-
-               wordsize = current_wordsize;
-               if (!tcp->u_arg[1])
-                       tprints("NULL");
-               else if (!verbose(tcp))
-                       tprintf("%#lx", tcp->u_arg[1]);
-               else if (umoven(tcp, tcp->u_arg[1], 2 * wordsize, (char *) &u) < 0)
-                       tprints("[?, ?]");
-               else if (wordsize == sizeof u.utl[0]) {
-                       tprintf("[%s,", sprinttime(u.utl[0]));
-                       tprintf(" %s]", sprinttime(u.utl[1]));
-               }
-               else if (wordsize == sizeof u.uti[0]) {
-                       tprintf("[%s,", sprinttime(u.uti[0]));
-                       tprintf(" %s]", sprinttime(u.uti[1]));
-               }
-               else
-                       tprintf("<decode error: unsupported wordsize %d>",
-                               wordsize);
+       } else {
+               printstat64(tcp, tcp->u_arg[1]);
        }
        return 0;
 }
 
-static int
-decode_mknod(struct tcb *tcp, int offset)
+SYS_FUNC(fstat64)
 {
-       int mode = tcp->u_arg[offset + 1];
-
        if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[offset]);
-               tprintf(", %s", sprintmode(mode));
-               switch (mode & S_IFMT) {
-               case S_IFCHR:
-               case S_IFBLK:
-#if defined(SPARC) || defined(SPARC64)
-                       if (current_personality == 1)
-                               tprintf(", makedev(%lu, %lu)",
-                               (unsigned long) ((tcp->u_arg[offset + 2] >> 18) & 0x3fff),
-                               (unsigned long) (tcp->u_arg[offset + 2] & 0x3ffff));
-                       else
-#endif
-                               tprintf(", makedev(%lu, %lu)",
-                               (unsigned long) major(tcp->u_arg[offset + 2]),
-                               (unsigned long) minor(tcp->u_arg[offset + 2]));
-                       break;
-               default:
-                       break;
-               }
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
+       } else {
+               printstat64(tcp, tcp->u_arg[1]);
        }
        return 0;
 }
 
-int
-sys_mknod(struct tcb *tcp)
-{
-       return decode_mknod(tcp, 0);
-}
+#else
 
-int
-sys_mknodat(struct tcb *tcp)
+SYS_FUNC(stat64)
 {
-       if (entering(tcp))
-               print_dirfd(tcp, tcp->u_arg[0]);
-       return decode_mknod(tcp, 1);
+       return sys_stat(tcp);
 }
 
-int
-sys_getcwd(struct tcb *tcp)
+SYS_FUNC(fstat64)
 {
-       if (exiting(tcp)) {
-               if (syserror(tcp))
-                       tprintf("%#lx", tcp->u_arg[0]);
-               else
-                       printpathn(tcp, tcp->u_arg[0], tcp->u_rval - 1);
-               tprintf(", %lu", tcp->u_arg[1]);
-       }
-       return 0;
+       return sys_fstat(tcp);
 }
 
-#ifdef HAVE_SYS_ASYNCH_H
+#endif /* HAVE_STRUCT_STAT64 */
 
-int
-sys_aioread(struct tcb *tcp)
+SYS_FUNC(newfstatat)
 {
-       struct aio_result_t res;
-
        if (entering(tcp)) {
-               tprintf("%lu, ", tcp->u_arg[0]);
+               print_dirfd(tcp, tcp->u_arg[0]);
+               printpath(tcp, tcp->u_arg[1]);
+               tprints(", ");
        } else {
-               if (syserror(tcp))
-                       tprintf("%#lx", tcp->u_arg[1]);
-               else
-                       printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-               tprintf(", %lu, %lu, ", tcp->u_arg[2], tcp->u_arg[3]);
-               printxval(whence, tcp->u_arg[4], "L_???");
-               if (syserror(tcp) || tcp->u_arg[5] == 0
-                   || umove(tcp, tcp->u_arg[5], &res) < 0)
-                       tprintf(", %#lx", tcp->u_arg[5]);
-               else
-                       tprintf(", {aio_return %d aio_errno %d}",
-                               res.aio_return, res.aio_errno);
-       }
-       return 0;
-}
-
-int
-sys_aiowrite(struct tcb *tcp)
-{
-       struct aio_result_t res;
-
-       if (entering(tcp)) {
-               tprintf("%lu, ", tcp->u_arg[0]);
-               printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-               tprintf(", %lu, %lu, ", tcp->u_arg[2], tcp->u_arg[3]);
-               printxval(whence, tcp->u_arg[4], "L_???");
-       }
-       else {
-               if (tcp->u_arg[5] == 0)
-                       tprints(", NULL");
-               else if (syserror(tcp)
-                   || umove(tcp, tcp->u_arg[5], &res) < 0)
-                       tprintf(", %#lx", tcp->u_arg[5]);
+#if defined STAT32_PERSONALITY
+               if (current_personality == STAT32_PERSONALITY)
+                       printstat64(tcp, tcp->u_arg[2]);
                else
-                       tprintf(", {aio_return %d aio_errno %d}",
-                               res.aio_return, res.aio_errno);
+                       printstat(tcp, tcp->u_arg[2]);
+#elif defined HAVE_STRUCT_STAT64
+               printstat64(tcp, tcp->u_arg[2]);
+#else
+               printstat(tcp, tcp->u_arg[2]);
+#endif /* STAT32_PERSONALITY || HAVE_STRUCT_STAT64 */
+               tprints(", ");
+               printflags(at_flags, tcp->u_arg[3], "AT_???");
        }
        return 0;
 }
 
-int
-sys_aiowait(struct tcb *tcp)
-{
-       if (entering(tcp))
-               printtv(tcp, tcp->u_arg[0]);
-       return 0;
-}
+#if defined(HAVE_STRUCT___OLD_KERNEL_STAT)
 
-int
-sys_aiocancel(struct tcb *tcp)
+static void
+convertoldstat(const struct __old_kernel_stat *oldbuf, struct stat *newbuf)
 {
-       struct aio_result_t res;
-
-       if (exiting(tcp)) {
-               if (tcp->u_arg[0] == 0)
-                       tprints("NULL");
-               else if (syserror(tcp)
-                   || umove(tcp, tcp->u_arg[0], &res) < 0)
-                       tprintf("%#lx", tcp->u_arg[0]);
-               else
-                       tprintf("{aio_return %d aio_errno %d}",
-                               res.aio_return, res.aio_errno);
-       }
-       return 0;
+       memset(newbuf, 0, sizeof(*newbuf));
+       newbuf->st_dev = oldbuf->st_dev;
+       newbuf->st_ino = oldbuf->st_ino;
+       newbuf->st_mode = oldbuf->st_mode;
+       newbuf->st_nlink = oldbuf->st_nlink;
+       newbuf->st_uid = oldbuf->st_uid;
+       newbuf->st_gid = oldbuf->st_gid;
+       newbuf->st_rdev = oldbuf->st_rdev;
+       newbuf->st_size = oldbuf->st_size;
+       newbuf->st_atime = oldbuf->st_atime;
+       newbuf->st_mtime = oldbuf->st_mtime;
+       newbuf->st_ctime = oldbuf->st_ctime;
 }
 
-#endif /* HAVE_SYS_ASYNCH_H */
-
-#include "xlat/xattrflags.h"
-
 static void
-print_xattr_val(struct tcb *tcp, int failed,
-               unsigned long arg,
-               unsigned long insize,
-               unsigned long size)
+printoldstat(struct tcb *tcp, long addr)
 {
-       if (insize == 0)
-               failed = 1;
-       if (!failed) {
-               unsigned long capacity = 4 * size + 1;
-               unsigned char *buf = (capacity < size) ? NULL : malloc(capacity);
-               if (buf == NULL || /* probably a bogus size argument */
-                       umoven(tcp, arg, size, (char *) &buf[3 * size]) < 0) {
-                       failed = 1;
-               }
-               else {
-                       unsigned char *out = buf;
-                       unsigned char *in = &buf[3 * size];
-                       size_t i;
-                       for (i = 0; i < size; ++i) {
-                               if (in[i] >= ' ' && in[i] <= 0x7e)
-                                       *out++ = in[i];
-                               else {
-#define tohex(n) "0123456789abcdef"[n]
-                                       *out++ = '\\';
-                                       *out++ = 'x';
-                                       *out++ = tohex(in[i] / 16);
-                                       *out++ = tohex(in[i] % 16);
-                               }
-                       }
-                       /* Don't print terminating NUL if there is one.  */
-                       if (i > 0 && in[i - 1] == '\0')
-                               out -= 4;
-                       *out = '\0';
-                       tprintf(", \"%s\", %ld", buf, insize);
-               }
-               free(buf);
-       }
-       if (failed)
-               tprintf(", 0x%lx, %ld", arg, insize);
-}
+       struct __old_kernel_stat statbuf;
+       struct stat newstatbuf;
 
-int
-sys_setxattr(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printstr(tcp, tcp->u_arg[1], -1);
-               print_xattr_val(tcp, 0, tcp->u_arg[2], tcp->u_arg[3], tcp->u_arg[3]);
-               tprints(", ");
-               printflags(xattrflags, tcp->u_arg[4], "XATTR_???");
+# if defined(SPARC) || defined(SPARC64)
+       if (current_personality == 1) {
+               struct solstat statbuf;
+
+               if (!umove_or_printaddr(tcp, addr, &statbuf))
+                       do_printstat_sol(tcp, &statbuf);
+               return;
        }
-       return 0;
-}
+# endif
 
-int
-sys_fsetxattr(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printstr(tcp, tcp->u_arg[1], -1);
-               print_xattr_val(tcp, 0, tcp->u_arg[2], tcp->u_arg[3], tcp->u_arg[3]);
-               tprints(", ");
-               printflags(xattrflags, tcp->u_arg[4], "XATTR_???");
+       if (!umove_or_printaddr(tcp, addr, &statbuf)) {
+               convertoldstat(&statbuf, &newstatbuf);
+               do_printstat(tcp, &newstatbuf);
        }
-       return 0;
 }
 
-int
-sys_getxattr(struct tcb *tcp)
+SYS_FUNC(oldstat)
 {
        if (entering(tcp)) {
                printpath(tcp, tcp->u_arg[0]);
                tprints(", ");
-               printstr(tcp, tcp->u_arg[1], -1);
        } else {
-               print_xattr_val(tcp, syserror(tcp), tcp->u_arg[2], tcp->u_arg[3],
-                               tcp->u_rval);
+               printoldstat(tcp, tcp->u_arg[1]);
        }
        return 0;
 }
 
-int
-sys_fgetxattr(struct tcb *tcp)
+SYS_FUNC(oldfstat)
 {
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
                tprints(", ");
-               printstr(tcp, tcp->u_arg[1], -1);
        } else {
-               print_xattr_val(tcp, syserror(tcp), tcp->u_arg[2], tcp->u_arg[3],
-                               tcp->u_rval);
+               printoldstat(tcp, tcp->u_arg[1]);
        }
        return 0;
 }
 
-static void
-print_xattr_list(struct tcb *tcp, unsigned long addr, unsigned long size)
-{
-       if (syserror(tcp)) {
-               tprintf("%#lx", addr);
-       } else {
-               if (!addr) {
-                       tprints("NULL");
-               } else {
-                       unsigned long len =
-                               (size < (unsigned long) tcp->u_rval) ?
-                                       size : (unsigned long) tcp->u_rval;
-                       printstr(tcp, addr, len);
-               }
-       }
-       tprintf(", %lu", size);
-}
+#endif /* HAVE_STRUCT___OLD_KERNEL_STAT */
 
-int
-sys_listxattr(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
-       } else {
-               print_xattr_list(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-       }
-       return 0;
-}
+#if defined(SPARC) || defined(SPARC64)
 
-int
-sys_flistxattr(struct tcb *tcp)
+SYS_FUNC(xstat)
 {
        if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
+               tprintf("%ld, ", tcp->u_arg[0]);
+               printpath(tcp, tcp->u_arg[1]);
                tprints(", ");
        } else {
-               print_xattr_list(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-       }
-       return 0;
-}
-
-int
-sys_removexattr(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printstr(tcp, tcp->u_arg[1], -1);
+               printstat(tcp, tcp->u_arg[2]);
        }
        return 0;
 }
 
-int
-sys_fremovexattr(struct tcb *tcp)
+SYS_FUNC(fxstat)
 {
        if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
+               tprintf("%ld, ", tcp->u_arg[0]);
+               printfd(tcp, tcp->u_arg[1]);
                tprints(", ");
-               printstr(tcp, tcp->u_arg[1], -1);
-       }
-       return 0;
-}
-
-#include "xlat/advise.h"
-
-int
-sys_fadvise64(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               int argn;
-               printfd(tcp, tcp->u_arg[0]);
-               argn = printllval(tcp, ", %lld", 1);
-               tprintf(", %ld, ", tcp->u_arg[argn++]);
-               printxval(advise, tcp->u_arg[argn], "POSIX_FADV_???");
-       }
-       return 0;
-}
-
-int
-sys_fadvise64_64(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               int argn;
-               printfd(tcp, tcp->u_arg[0]);
-               argn = printllval(tcp, ", %lld, ", 1);
-               argn = printllval(tcp, "%lld, ", argn);
-#if defined __ARM_EABI__ || defined AARCH64 || defined POWERPC || defined XTENSA
-               printxval(advise, tcp->u_arg[1], "POSIX_FADV_???");
-#else
-               printxval(advise, tcp->u_arg[argn], "POSIX_FADV_???");
-#endif
-       }
-       return 0;
-}
-
-#include "xlat/sync_file_range_flags.h"
-
-int
-sys_sync_file_range(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               int argn;
-               printfd(tcp, tcp->u_arg[0]);
-               argn = printllval(tcp, ", %lld, ", 1);
-               argn = printllval(tcp, "%lld, ", argn);
-               printflags(sync_file_range_flags, tcp->u_arg[argn],
-                          "SYNC_FILE_RANGE_???");
-       }
-       return 0;
-}
-
-int
-sys_sync_file_range2(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               int argn;
-               printfd(tcp, tcp->u_arg[0]);
-               printflags(sync_file_range_flags, 1,
-                          "SYNC_FILE_RANGE_???");
-               argn = printllval(tcp, ", %lld, ", 2);
-               argn = printllval(tcp, "%lld, ", argn);
-       }
-       return 0;
-}
-
-int
-sys_fallocate(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               int argn;
-               printfd(tcp, tcp->u_arg[0]);            /* fd */
-               tprintf(", %#lo, ", tcp->u_arg[1]);     /* mode */
-               argn = printllval(tcp, "%llu, ", 2);    /* offset */
-               printllval(tcp, "%llu", argn);          /* len */
+       } else {
+               printstat(tcp, tcp->u_arg[2]);
        }
        return 0;
 }
 
-#ifndef SWAP_FLAG_PREFER
-# define SWAP_FLAG_PREFER 0x8000
-#endif
-#ifndef SWAP_FLAG_DISCARD
-# define SWAP_FLAG_DISCARD 0x10000
-#endif
-#include "xlat/swap_flags.h"
-
-int
-sys_swapon(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               int flags = tcp->u_arg[1];
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printflags(swap_flags, flags & ~SWAP_FLAG_PRIO_MASK,
-                       "SWAP_FLAG_???");
-               if (flags & SWAP_FLAG_PREFER)
-                       tprintf("|%d", flags & SWAP_FLAG_PRIO_MASK);
-       }
-       return 0;
-}
+#endif /* SPARC || SPARC64 */