]> granicus.if.org Git - strace/blobdiff - mem.c
Fix decoding and dumping of readv syscall in case of short read
[strace] / mem.c
diff --git a/mem.c b/mem.c
index 264faab4240c5c2a0e15db76aaccd0786546ba21..37c7daba88dfc3b7ef322a25bc6d3e5291bcc4bd 100644 (file)
--- a/mem.c
+++ b/mem.c
 #include "defs.h"
 #include <asm/mman.h>
 #include <sys/mman.h>
-#if defined(I386) || defined(X86_64)
-# include <asm/ldt.h>
-# ifdef HAVE_STRUCT_USER_DESC
-#  define modify_ldt_ldt_s user_desc
-# endif
-#endif /* I386 || X86_64 */
-
-static unsigned long
-get_pagesize()
+
+unsigned long
+get_pagesize(void)
 {
        static unsigned long pagesize;
 
@@ -50,158 +44,38 @@ get_pagesize()
        return pagesize;
 }
 
-int
-sys_brk(struct tcb *tcp)
+SYS_FUNC(brk)
 {
-       if (entering(tcp)) {
-               tprintf("%#lx", tcp->u_arg[0]);
-       }
-       return RVAL_HEX;
+       printaddr(tcp->u_arg[0]);
+
+       return RVAL_DECODED | RVAL_HEX;
 }
 
-static const struct xlat mmap_prot[] = {
-       XLAT(PROT_NONE),
-       XLAT(PROT_READ),
-       XLAT(PROT_WRITE),
-       XLAT(PROT_EXEC),
-#ifdef PROT_SEM
-       XLAT(PROT_SEM),
-#endif
-#ifdef PROT_GROWSDOWN
-       XLAT(PROT_GROWSDOWN),
-#endif
-#ifdef PROT_GROWSUP
-       XLAT(PROT_GROWSUP),
-#endif
-#ifdef PROT_SAO
-       XLAT(PROT_SAO),
-#endif
-       XLAT_END
-};
-
-static const struct xlat mmap_flags[] = {
-       XLAT(MAP_SHARED),
-       XLAT(MAP_PRIVATE),
-       XLAT(MAP_FIXED),
-#ifdef MAP_ANONYMOUS
-       XLAT(MAP_ANONYMOUS),
-#endif
-#ifdef MAP_32BIT
-       XLAT(MAP_32BIT),
-#endif
-#ifdef MAP_RENAME
-       XLAT(MAP_RENAME),
-#endif
-#ifdef MAP_NORESERVE
-       XLAT(MAP_NORESERVE),
-#endif
-#ifdef MAP_POPULATE
-       XLAT(MAP_POPULATE),
-#endif
-#ifdef MAP_NONBLOCK
-       XLAT(MAP_NONBLOCK),
-#endif
-       /*
-        * XXX - this was introduced in SunOS 4.x to distinguish between
-        * the old pre-4.x "mmap()", which:
-        *
-        *      only let you map devices with an "mmap" routine (e.g.,
-        *      frame buffers) in;
-        *
-        *      required you to specify the mapping address;
-        *
-        *      returned 0 on success and -1 on failure;
-        *
-        * memory and which, and the 4.x "mmap()" which:
-        *
-        *      can map plain files;
-        *
-        *      can be asked to pick where to map the file;
-        *
-        *      returns the address where it mapped the file on success
-        *      and -1 on failure.
-        *
-        * It's not actually used in source code that calls "mmap()"; the
-        * "mmap()" routine adds it for you.
-        *
-        * It'd be nice to come up with some way of eliminating it from
-        * the flags, e.g. reporting calls *without* it as "old_mmap()"
-        * and calls with it as "mmap()".
-        */
-#ifdef _MAP_NEW
-       XLAT(_MAP_NEW),
-#endif
-#ifdef MAP_GROWSDOWN
-       XLAT(MAP_GROWSDOWN),
-#endif
-#ifdef MAP_DENYWRITE
-       XLAT(MAP_DENYWRITE),
-#endif
-#ifdef MAP_EXECUTABLE
-       XLAT(MAP_EXECUTABLE),
-#endif
-#ifdef MAP_INHERIT
-       XLAT(MAP_INHERIT),
-#endif
-#ifdef MAP_FILE
-       XLAT(MAP_FILE),
-#endif
-#ifdef MAP_LOCKED
-       XLAT(MAP_LOCKED),
-#endif
-       /* FreeBSD ones */
-#if defined(MAP_ANON) && (!defined(MAP_ANONYMOUS) || MAP_ANON != MAP_ANONYMOUS)
-       XLAT(MAP_ANON),
-#endif
-#ifdef MAP_HASSEMAPHORE
-       XLAT(MAP_HASSEMAPHORE),
-#endif
-#ifdef MAP_STACK
-       XLAT(MAP_STACK),
-#endif
-#ifdef MAP_HUGETLB
-       XLAT(MAP_HUGETLB),
-#endif
-#if defined MAP_UNINITIALIZED && MAP_UNINITIALIZED > 0
-       XLAT(MAP_UNINITIALIZED),
-#endif
-#ifdef MAP_NOSYNC
-       XLAT(MAP_NOSYNC),
-#endif
-#ifdef MAP_NOCORE
-       XLAT(MAP_NOCORE),
-#endif
-       XLAT_END
-};
+#include "xlat/mmap_prot.h"
+#include "xlat/mmap_flags.h"
 
-static int
+static void
 print_mmap(struct tcb *tcp, long *u_arg, unsigned long long offset)
 {
-       if (entering(tcp)) {
-               /* addr */
-               if (!u_arg[0])
-                       tprints("NULL, ");
-               else
-                       tprintf("%#lx, ", u_arg[0]);
-               /* len */
-               tprintf("%lu, ", u_arg[1]);
-               /* prot */
-               printflags(mmap_prot, u_arg[2], "PROT_???");
-               tprints(", ");
-               /* flags */
+       /* addr */
+       printaddr(u_arg[0]);
+       /* len */
+       tprintf(", %lu, ", u_arg[1]);
+       /* prot */
+       printflags(mmap_prot, u_arg[2], "PROT_???");
+       tprints(", ");
+       /* flags */
 #ifdef MAP_TYPE
-               printxval(mmap_flags, u_arg[3] & MAP_TYPE, "MAP_???");
-               addflags(mmap_flags, u_arg[3] & ~MAP_TYPE);
+       printxval(mmap_flags, u_arg[3] & MAP_TYPE, "MAP_???");
+       addflags(mmap_flags, u_arg[3] & ~MAP_TYPE);
 #else
-               printflags(mmap_flags, u_arg[3], "MAP_???");
+       printflags(mmap_flags, u_arg[3], "MAP_???");
 #endif
-               tprints(", ");
-               /* fd */
-               printfd(tcp, u_arg[4]);
-               /* offset */
-               tprintf(", %#llx", offset);
-       }
-       return RVAL_HEX;
+       tprints(", ");
+       /* fd */
+       printfd(tcp, u_arg[4]);
+       /* offset */
+       tprintf(", %#llx", offset);
 }
 
 /* Syscall name<->function correspondence is messed up on many arches.
@@ -213,8 +87,7 @@ print_mmap(struct tcb *tcp, long *u_arg, unsigned long long offset)
  */
 
 /* Params are pointed to by u_arg[0], offset is in bytes */
-int
-sys_old_mmap(struct tcb *tcp)
+SYS_FUNC(old_mmap)
 {
        long u_arg[6];
 #if defined(IA64)
@@ -224,7 +97,7 @@ sys_old_mmap(struct tcb *tcp)
         */
        int i;
        unsigned narrow_arg[6];
-       if (umoven(tcp, tcp->u_arg[0], sizeof(narrow_arg), (char *) narrow_arg) == -1)
+       if (umoven(tcp, tcp->u_arg[0], sizeof(narrow_arg), narrow_arg) == -1)
                return 0;
        for (i = 0; i < 6; i++)
                u_arg[i] = (unsigned long) narrow_arg[i];
@@ -232,39 +105,41 @@ sys_old_mmap(struct tcb *tcp)
        /* We are here only in personality 1 (i386) */
        int i;
        unsigned narrow_arg[6];
-       if (umoven(tcp, tcp->u_arg[0], sizeof(narrow_arg), (char *) narrow_arg) == -1)
+       if (umoven(tcp, tcp->u_arg[0], sizeof(narrow_arg), narrow_arg) == -1)
                return 0;
        for (i = 0; i < 6; ++i)
                u_arg[i] = (unsigned long) narrow_arg[i];
 #else
-       if (umoven(tcp, tcp->u_arg[0], sizeof(u_arg), (char *) u_arg) == -1)
+       if (umoven(tcp, tcp->u_arg[0], sizeof(u_arg), u_arg) == -1)
                return 0;
 #endif
-       return print_mmap(tcp, u_arg, (unsigned long) u_arg[5]);
+       print_mmap(tcp, u_arg, (unsigned long) u_arg[5]);
+
+       return RVAL_DECODED | RVAL_HEX;
 }
 
 #if defined(S390)
 /* Params are pointed to by u_arg[0], offset is in pages */
-int
-sys_old_mmap_pgoff(struct tcb *tcp)
+SYS_FUNC(old_mmap_pgoff)
 {
        long u_arg[5];
        int i;
        unsigned narrow_arg[6];
        unsigned long long offset;
-       if (umoven(tcp, tcp->u_arg[0], sizeof(narrow_arg), (char *) narrow_arg) == -1)
+       if (umoven(tcp, tcp->u_arg[0], sizeof(narrow_arg), narrow_arg) == -1)
                return 0;
        for (i = 0; i < 5; i++)
                u_arg[i] = (unsigned long) narrow_arg[i];
        offset = narrow_arg[5];
        offset *= get_pagesize();
-       return print_mmap(tcp, u_arg, offset);
+       print_mmap(tcp, u_arg, offset);
+
+       return RVAL_DECODED | RVAL_HEX;
 }
 #endif
 
 /* Params are passed directly, offset is in bytes */
-int
-sys_mmap(struct tcb *tcp)
+SYS_FUNC(mmap)
 {
        unsigned long long offset = (unsigned long) tcp->u_arg[5];
 #if defined(LINUX_MIPSN32) || defined(X32)
@@ -276,247 +151,127 @@ sys_mmap(struct tcb *tcp)
         * sys_mmap_pgoff(..., off >> PAGE_SHIFT); i.e. off is in bytes,
         * since the above code converts off to pages.
         */
-       return print_mmap(tcp, tcp->u_arg, offset);
+       print_mmap(tcp, tcp->u_arg, offset);
+
+       return RVAL_DECODED | RVAL_HEX;
 }
 
 /* Params are passed directly, offset is in pages */
-int
-sys_mmap_pgoff(struct tcb *tcp)
+SYS_FUNC(mmap_pgoff)
 {
        /* Try test/mmap_offset_decode.c */
        unsigned long long offset;
        offset = (unsigned long) tcp->u_arg[5];
        offset *= get_pagesize();
-       return print_mmap(tcp, tcp->u_arg, offset);
+       print_mmap(tcp, tcp->u_arg, offset);
+
+       return RVAL_DECODED | RVAL_HEX;
 }
 
 /* Params are passed directly, offset is in 4k units */
-int
-sys_mmap_4koff(struct tcb *tcp)
+SYS_FUNC(mmap_4koff)
 {
        unsigned long long offset;
        offset = (unsigned long) tcp->u_arg[5];
        offset <<= 12;
-       return print_mmap(tcp, tcp->u_arg, offset);
+       print_mmap(tcp, tcp->u_arg, offset);
+
+       return RVAL_DECODED | RVAL_HEX;
 }
 
-int
-sys_munmap(struct tcb *tcp)
+SYS_FUNC(munmap)
 {
-       if (entering(tcp)) {
-               tprintf("%#lx, %lu",
-                       tcp->u_arg[0], tcp->u_arg[1]);
-       }
-       return 0;
+       printaddr(tcp->u_arg[0]);
+       tprintf(", %lu", tcp->u_arg[1]);
+
+       return RVAL_DECODED;
 }
 
-int
-sys_mprotect(struct tcb *tcp)
+SYS_FUNC(mprotect)
 {
-       if (entering(tcp)) {
-               tprintf("%#lx, %lu, ",
-                       tcp->u_arg[0], tcp->u_arg[1]);
-               printflags(mmap_prot, tcp->u_arg[2], "PROT_???");
-       }
-       return 0;
+       printaddr(tcp->u_arg[0]);
+       tprintf(", %lu, ", tcp->u_arg[1]);
+       printflags(mmap_prot, tcp->u_arg[2], "PROT_???");
+
+       return RVAL_DECODED;
 }
 
-static const struct xlat mremap_flags[] = {
-       XLAT(MREMAP_MAYMOVE),
-#ifdef MREMAP_FIXED
-       XLAT(MREMAP_FIXED),
-#endif
-       XLAT_END
-};
+#include "xlat/mremap_flags.h"
 
-int
-sys_mremap(struct tcb *tcp)
+SYS_FUNC(mremap)
 {
-       if (entering(tcp)) {
-               tprintf("%#lx, %lu, %lu, ", tcp->u_arg[0], tcp->u_arg[1],
-                       tcp->u_arg[2]);
-               printflags(mremap_flags, tcp->u_arg[3], "MREMAP_???");
+       printaddr(tcp->u_arg[0]);
+       tprintf(", %lu, %lu, ", tcp->u_arg[1], tcp->u_arg[2]);
+       printflags(mremap_flags, tcp->u_arg[3], "MREMAP_???");
 #ifdef MREMAP_FIXED
-               if ((tcp->u_arg[3] & (MREMAP_MAYMOVE | MREMAP_FIXED)) ==
-                   (MREMAP_MAYMOVE | MREMAP_FIXED))
-                       tprintf(", %#lx", tcp->u_arg[4]);
-#endif
+       if ((tcp->u_arg[3] & (MREMAP_MAYMOVE | MREMAP_FIXED)) ==
+           (MREMAP_MAYMOVE | MREMAP_FIXED)) {
+               tprints(", ");
+               printaddr(tcp->u_arg[4]);
        }
-       return RVAL_HEX;
+#endif
+       return RVAL_DECODED | RVAL_HEX;
 }
 
-static const struct xlat madvise_cmds[] = {
-#ifdef MADV_NORMAL
-       XLAT(MADV_NORMAL),
-#endif
-#ifdef MADV_RANDOM
-       XLAT(MADV_RANDOM),
-#endif
-#ifdef MADV_SEQUENTIAL
-       XLAT(MADV_SEQUENTIAL),
-#endif
-#ifdef MADV_WILLNEED
-       XLAT(MADV_WILLNEED),
-#endif
-#ifdef MADV_DONTNEED
-       XLAT(MADV_DONTNEED),
-#endif
-#ifdef MADV_REMOVE
-       XLAT(MADV_REMOVE),
-#endif
-#ifdef MADV_DONTFORK
-       XLAT(MADV_DONTFORK),
-#endif
-#ifdef MADV_DOFORK
-       XLAT(MADV_DOFORK),
-#endif
-#ifdef MADV_HWPOISON
-       XLAT(MADV_HWPOISON),
-#endif
-#ifdef MADV_SOFT_OFFLINE
-       XLAT(MADV_SOFT_OFFLINE),
-#endif
-#ifdef MADV_MERGEABLE
-       XLAT(MADV_MERGEABLE),
-#endif
-#ifdef MADV_UNMERGEABLE
-       XLAT(MADV_UNMERGEABLE),
-#endif
-#ifdef MADV_HUGEPAGE
-       XLAT(MADV_HUGEPAGE),
-#endif
-#ifdef MADV_NOHUGEPAGE
-       XLAT(MADV_NOHUGEPAGE),
-#endif
-#ifdef MADV_DONTDUMP
-       XLAT(MADV_DONTDUMP),
-#endif
-#ifdef MADV_DODUMP
-       XLAT(MADV_DODUMP),
-#endif
-       XLAT_END
-};
+#include "xlat/madvise_cmds.h"
 
-int
-sys_madvise(struct tcb *tcp)
+SYS_FUNC(madvise)
 {
-       if (entering(tcp)) {
-               tprintf("%#lx, %lu, ", tcp->u_arg[0], tcp->u_arg[1]);
-               printxval(madvise_cmds, tcp->u_arg[2], "MADV_???");
-       }
-       return 0;
+       printaddr(tcp->u_arg[0]);
+       tprintf(", %lu, ", tcp->u_arg[1]);
+       printxval(madvise_cmds, tcp->u_arg[2], "MADV_???");
+
+       return RVAL_DECODED;
 }
 
-static const struct xlat mlockall_flags[] = {
-#ifdef MCL_CURRENT
-       XLAT(MCL_CURRENT),
-#endif
-#ifdef MCL_FUTURE
-       XLAT(MCL_FUTURE),
-#endif
-       XLAT_END
-};
+#include "xlat/mlockall_flags.h"
 
-int
-sys_mlockall(struct tcb *tcp)
+SYS_FUNC(mlockall)
 {
-       if (entering(tcp)) {
-               printflags(mlockall_flags, tcp->u_arg[0], "MCL_???");
-       }
-       return 0;
-}
+       printflags(mlockall_flags, tcp->u_arg[0], "MCL_???");
 
-#ifdef MS_ASYNC
+       return RVAL_DECODED;
+}
 
-static const struct xlat mctl_sync[] = {
-#ifdef MS_SYNC
-       XLAT(MS_SYNC),
-#endif
-       XLAT(MS_ASYNC),
-       XLAT(MS_INVALIDATE),
-       XLAT_END
-};
+#include "xlat/mctl_sync.h"
 
-int
-sys_msync(struct tcb *tcp)
+SYS_FUNC(msync)
 {
-       if (entering(tcp)) {
-               /* addr */
-               tprintf("%#lx", tcp->u_arg[0]);
-               /* len */
-               tprintf(", %lu, ", tcp->u_arg[1]);
-               /* flags */
-               printflags(mctl_sync, tcp->u_arg[2], "MS_???");
-       }
-       return 0;
+       /* addr */
+       printaddr(tcp->u_arg[0]);
+       /* len */
+       tprintf(", %lu, ", tcp->u_arg[1]);
+       /* flags */
+       printflags(mctl_sync, tcp->u_arg[2], "MS_???");
+
+       return RVAL_DECODED;
 }
 
-#endif /* MS_ASYNC */
-
-#ifdef MC_SYNC
+#include "xlat/mlock_flags.h"
 
-static const struct xlat mctl_funcs[] = {
-       XLAT(MC_LOCK),
-       XLAT(MC_LOCKAS),
-       XLAT(MC_SYNC),
-       XLAT(MC_UNLOCK),
-       XLAT(MC_UNLOCKAS),
-       XLAT_END
-};
-
-static const struct xlat mctl_lockas[] = {
-       XLAT(MCL_CURRENT),
-       XLAT(MCL_FUTURE),
-       XLAT_END
-};
-
-int
-sys_mctl(struct tcb *tcp)
+SYS_FUNC(mlock2)
 {
-       int arg, function;
+       printaddr(tcp->u_arg[0]);
+       tprintf(", %lu, ", tcp->u_arg[1]);
+       printflags(mlock_flags, tcp->u_arg[2], "MLOCK_???");
 
-       if (entering(tcp)) {
-               /* addr */
-               tprintf("%#lx", tcp->u_arg[0]);
-               /* len */
-               tprintf(", %lu, ", tcp->u_arg[1]);
-               /* function */
-               function = tcp->u_arg[2];
-               printflags(mctl_funcs, function, "MC_???");
-               /* arg */
-               arg = tcp->u_arg[3];
-               tprints(", ");
-               switch (function) {
-               case MC_SYNC:
-                       printflags(mctl_sync, arg, "MS_???");
-                       break;
-               case MC_LOCKAS:
-                       printflags(mctl_lockas, arg, "MCL_???");
-                       break;
-               default:
-                       tprintf("%#x", arg);
-                       break;
-               }
-       }
-       return 0;
+       return RVAL_DECODED;
 }
 
-#endif /* MC_SYNC */
-
-int
-sys_mincore(struct tcb *tcp)
+SYS_FUNC(mincore)
 {
        if (entering(tcp)) {
-               tprintf("%#lx, %lu, ", tcp->u_arg[0], tcp->u_arg[1]);
+               printaddr(tcp->u_arg[0]);
+               tprintf(", %lu, ", tcp->u_arg[1]);
        } else {
                unsigned long i, len;
                char *vec = NULL;
 
                len = tcp->u_arg[1];
-               if (syserror(tcp) || tcp->u_arg[2] == 0 ||
-                       (vec = malloc(len)) == NULL ||
-                       umoven(tcp, tcp->u_arg[2], len, vec) < 0)
-                       tprintf("%#lx", tcp->u_arg[2]);
+               if (syserror(tcp) || !verbose(tcp) ||
+                   !tcp->u_arg[2] || !(vec = malloc(len)) ||
+                   umoven(tcp, tcp->u_arg[2], len, vec) < 0)
+                       printaddr(tcp->u_arg[2]);
                else {
                        tprints("[");
                        for (i = 0; i < len; i++) {
@@ -533,142 +288,28 @@ sys_mincore(struct tcb *tcp)
        return 0;
 }
 
-#if defined(ALPHA) || defined(IA64) || defined(SPARC) || defined(SPARC64)
-int
-sys_getpagesize(struct tcb *tcp)
+#if defined ALPHA || defined IA64 || defined M68K \
+ || defined SPARC || defined SPARC64
+SYS_FUNC(getpagesize)
 {
-       if (exiting(tcp))
-               return RVAL_HEX;
-       return 0;
+       return RVAL_DECODED | RVAL_HEX;
 }
 #endif
 
-#if defined(I386) || defined(X86_64)
-void
-print_ldt_entry(struct modify_ldt_ldt_s *ldt_entry)
+SYS_FUNC(remap_file_pages)
 {
-       tprintf("base_addr:%#08lx, "
-               "limit:%d, "
-               "seg_32bit:%d, "
-               "contents:%d, "
-               "read_exec_only:%d, "
-               "limit_in_pages:%d, "
-               "seg_not_present:%d, "
-               "useable:%d}",
-               (long) ldt_entry->base_addr,
-               ldt_entry->limit,
-               ldt_entry->seg_32bit,
-               ldt_entry->contents,
-               ldt_entry->read_exec_only,
-               ldt_entry->limit_in_pages,
-               ldt_entry->seg_not_present,
-               ldt_entry->useable);
-}
-
-int
-sys_modify_ldt(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               struct modify_ldt_ldt_s copy;
-               tprintf("%ld", tcp->u_arg[0]);
-               if (tcp->u_arg[1] == 0
-                               || tcp->u_arg[2] != sizeof(struct modify_ldt_ldt_s)
-                               || umove(tcp, tcp->u_arg[1], &copy) == -1)
-                       tprintf(", %lx", tcp->u_arg[1]);
-               else {
-                       tprintf(", {entry_number:%d, ", copy.entry_number);
-                       if (!verbose(tcp))
-                               tprints("...}");
-                       else {
-                               print_ldt_entry(&copy);
-                       }
-               }
-               tprintf(", %lu", tcp->u_arg[2]);
-       }
-       return 0;
-}
-
-int
-sys_set_thread_area(struct tcb *tcp)
-{
-       struct modify_ldt_ldt_s copy;
-       if (entering(tcp)) {
-               if (umove(tcp, tcp->u_arg[0], &copy) != -1) {
-                       if (copy.entry_number == -1)
-                               tprintf("{entry_number:%d -> ",
-                                       copy.entry_number);
-                       else
-                               tprints("{entry_number:");
-               }
-       } else {
-               if (umove(tcp, tcp->u_arg[0], &copy) != -1) {
-                       tprintf("%d, ", copy.entry_number);
-                       if (!verbose(tcp))
-                               tprints("...}");
-                       else {
-                               print_ldt_entry(&copy);
-                       }
-               } else {
-                       tprintf("%lx", tcp->u_arg[0]);
-               }
-       }
-       return 0;
-
-}
-
-int
-sys_get_thread_area(struct tcb *tcp)
-{
-       struct modify_ldt_ldt_s copy;
-       if (exiting(tcp)) {
-               if (umove(tcp, tcp->u_arg[0], &copy) != -1) {
-                       tprintf("{entry_number:%d, ", copy.entry_number);
-                       if (!verbose(tcp))
-                               tprints("...}");
-                       else {
-                               print_ldt_entry(&copy);
-                       }
-               } else {
-                       tprintf("%lx", tcp->u_arg[0]);
-               }
-       }
-       return 0;
-
-}
-#endif /* I386 || X86_64 */
-
-#if defined(M68K)
-int
-sys_set_thread_area(struct tcb *tcp)
-{
-       if (entering(tcp))
-               tprintf("%#lx", tcp->u_arg[0]);
-       return 0;
-
-}
-
-int
-sys_get_thread_area(struct tcb *tcp)
-{
-       return RVAL_HEX;
-}
-#endif
-
-int
-sys_remap_file_pages(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               tprintf("%#lx, %lu, ", tcp->u_arg[0], tcp->u_arg[1]);
-               printflags(mmap_prot, tcp->u_arg[2], "PROT_???");
-               tprintf(", %lu, ", tcp->u_arg[3]);
+       printaddr(tcp->u_arg[0]);
+       tprintf(", %lu, ", tcp->u_arg[1]);
+       printflags(mmap_prot, tcp->u_arg[2], "PROT_???");
+       tprintf(", %lu, ", tcp->u_arg[3]);
 #ifdef MAP_TYPE
-               printxval(mmap_flags, tcp->u_arg[4] & MAP_TYPE, "MAP_???");
-               addflags(mmap_flags, tcp->u_arg[4] & ~MAP_TYPE);
+       printxval(mmap_flags, tcp->u_arg[4] & MAP_TYPE, "MAP_???");
+       addflags(mmap_flags, tcp->u_arg[4] & ~MAP_TYPE);
 #else
-               printflags(mmap_flags, tcp->u_arg[4], "MAP_???");
+       printflags(mmap_flags, tcp->u_arg[4], "MAP_???");
 #endif
-       }
-       return 0;
+
+       return RVAL_DECODED;
 }
 
 #define MPOL_DEFAULT    0
@@ -683,32 +324,10 @@ sys_remap_file_pages(struct tcb *tcp)
 #define MPOL_MF_MOVE   (1<<1)
 #define MPOL_MF_MOVE_ALL (1<<2)
 
-static const struct xlat policies[] = {
-       XLAT(MPOL_DEFAULT),
-       XLAT(MPOL_PREFERRED),
-       XLAT(MPOL_BIND),
-       XLAT(MPOL_INTERLEAVE),
-       XLAT_END
-};
-
-static const struct xlat mbindflags[] = {
-       XLAT(MPOL_MF_STRICT),
-       XLAT(MPOL_MF_MOVE),
-       XLAT(MPOL_MF_MOVE_ALL),
-       XLAT_END
-};
-
-static const struct xlat mempolicyflags[] = {
-       XLAT(MPOL_F_NODE),
-       XLAT(MPOL_F_ADDR),
-       XLAT_END
-};
-
-static const struct xlat move_pages_flags[] = {
-       XLAT(MPOL_MF_MOVE),
-       XLAT(MPOL_MF_MOVE_ALL),
-       XLAT_END
-};
+#include "xlat/policies.h"
+#include "xlat/mbindflags.h"
+#include "xlat/mempolicyflags.h"
+#include "xlat/move_pages_flags.h"
 
 static void
 get_nodes(struct tcb *tcp, unsigned long ptr, unsigned long maxnodes, int err)
@@ -738,7 +357,7 @@ get_nodes(struct tcb *tcp, unsigned long ptr, unsigned long maxnodes, int err)
                                tprints("...");
                                break;
                        }
-                       if (umoven(tcp, cur, sizeof(n), (char *) &n) < 0) {
+                       if (umoven(tcp, cur, sizeof(n), &n) < 0) {
                                tprints("?");
                                failed = 1;
                                break;
@@ -746,68 +365,63 @@ get_nodes(struct tcb *tcp, unsigned long ptr, unsigned long maxnodes, int err)
                        tprintf("%#0*lx", (int) sizeof(long) * 2 + 2, n);
                }
                tprints("}");
-               if (failed)
-                       tprintf(" %#lx", ptr);
-       } else
-               tprintf(", %#lx", ptr);
+               if (failed) {
+                       tprints(" ");
+                       printaddr(ptr);
+               }
+       } else {
+               tprints(" ");
+               printaddr(ptr);
+       }
        tprintf(", %lu", maxnodes);
 }
 
-int
-sys_mbind(struct tcb *tcp)
+SYS_FUNC(mbind)
 {
-       if (entering(tcp)) {
-               tprintf("%#lx, %lu, ", tcp->u_arg[0], tcp->u_arg[1]);
-               printxval(policies, tcp->u_arg[2], "MPOL_???");
-               get_nodes(tcp, tcp->u_arg[3], tcp->u_arg[4], 0);
-               tprints(", ");
-               printflags(mbindflags, tcp->u_arg[5], "MPOL_???");
-       }
-       return 0;
+       printaddr(tcp->u_arg[0]);
+       tprintf(", %lu, ", tcp->u_arg[1]);
+       printxval(policies, tcp->u_arg[2], "MPOL_???");
+       get_nodes(tcp, tcp->u_arg[3], tcp->u_arg[4], 0);
+       tprints(", ");
+       printflags(mbindflags, tcp->u_arg[5], "MPOL_???");
+
+       return RVAL_DECODED;
 }
 
-int
-sys_set_mempolicy(struct tcb *tcp)
+SYS_FUNC(set_mempolicy)
 {
-       if (entering(tcp)) {
-               printxval(policies, tcp->u_arg[0], "MPOL_???");
-               get_nodes(tcp, tcp->u_arg[1], tcp->u_arg[2], 0);
-       }
-       return 0;
+       printxval(policies, tcp->u_arg[0], "MPOL_???");
+       get_nodes(tcp, tcp->u_arg[1], tcp->u_arg[2], 0);
+
+       return RVAL_DECODED;
 }
 
-int
-sys_get_mempolicy(struct tcb *tcp)
+SYS_FUNC(get_mempolicy)
 {
        if (exiting(tcp)) {
                int pol;
-               if (tcp->u_arg[0] == 0)
-                       tprints("NULL");
-               else if (syserror(tcp) || umove(tcp, tcp->u_arg[0], &pol) < 0)
-                       tprintf("%#lx", tcp->u_arg[0]);
-               else
+               if (!umove_or_printaddr(tcp, tcp->u_arg[0], &pol))
                        printxval(policies, pol, "MPOL_???");
                get_nodes(tcp, tcp->u_arg[1], tcp->u_arg[2], syserror(tcp));
-               tprintf(", %#lx, ", tcp->u_arg[3]);
+               tprints(", ");
+               printaddr(tcp->u_arg[3]);
+               tprints(", ");
                printflags(mempolicyflags, tcp->u_arg[4], "MPOL_???");
        }
        return 0;
 }
 
-int
-sys_migrate_pages(struct tcb *tcp)
+SYS_FUNC(migrate_pages)
 {
-       if (entering(tcp)) {
-               tprintf("%ld, ", (long) (pid_t) tcp->u_arg[0]);
-               get_nodes(tcp, tcp->u_arg[2], tcp->u_arg[1], 0);
-               tprints(", ");
-               get_nodes(tcp, tcp->u_arg[3], tcp->u_arg[1], 0);
-       }
-       return 0;
+       tprintf("%ld, ", (long) (pid_t) tcp->u_arg[0]);
+       get_nodes(tcp, tcp->u_arg[2], tcp->u_arg[1], 0);
+       tprints(", ");
+       get_nodes(tcp, tcp->u_arg[3], tcp->u_arg[1], 0);
+
+       return RVAL_DECODED;
 }
 
-int
-sys_move_pages(struct tcb *tcp)
+SYS_FUNC(move_pages)
 {
        if (entering(tcp)) {
                unsigned long npages = tcp->u_arg[1];
@@ -815,7 +429,7 @@ sys_move_pages(struct tcb *tcp)
                if (tcp->u_arg[2] == 0)
                        tprints("NULL, ");
                else {
-                       int i;
+                       unsigned int i;
                        long puser = tcp->u_arg[2];
                        tprints("{");
                        for (i = 0; i < npages; ++i) {
@@ -834,7 +448,7 @@ sys_move_pages(struct tcb *tcp)
                if (tcp->u_arg[3] == 0)
                        tprints("NULL, ");
                else {
-                       int i;
+                       unsigned int i;
                        long nodeuser = tcp->u_arg[3];
                        tprints("{");
                        for (i = 0; i < npages; ++i) {
@@ -850,13 +464,12 @@ sys_move_pages(struct tcb *tcp)
                        }
                        tprints("}, ");
                }
-       }
-       if (exiting(tcp)) {
+       } else {
                unsigned long npages = tcp->u_arg[1];
                if (tcp->u_arg[4] == 0)
                        tprints("NULL, ");
                else {
-                       int i;
+                       unsigned int i;
                        long statususer = tcp->u_arg[4];
                        tprints("{");
                        for (i = 0; i < npages; ++i) {
@@ -878,50 +491,50 @@ sys_move_pages(struct tcb *tcp)
 }
 
 #if defined(POWERPC)
-int
-sys_subpage_prot(struct tcb *tcp)
+SYS_FUNC(subpage_prot)
 {
-       if (entering(tcp)) {
-               unsigned long cur, end, abbrev_end, entries;
-               unsigned int entry;
-
-               tprintf("%#lx, %#lx, ", tcp->u_arg[0], tcp->u_arg[1]);
-               entries = tcp->u_arg[1] >> 16;
-               if (!entries || !tcp->u_arg[2]) {
-                       tprints("{}");
-                       return 0;
-               }
-               cur = tcp->u_arg[2];
-               end = cur + (sizeof(int) * entries);
-               if (!verbose(tcp) || end < tcp->u_arg[2]) {
-                       tprintf("%#lx", tcp->u_arg[2]);
-                       return 0;
+       unsigned long cur, end, abbrev_end, entries;
+       unsigned int entry;
+
+       printaddr(tcp->u_arg[0]);
+       tprints(", ");
+       printaddr(tcp->u_arg[1]);
+       tprints(", ");
+       entries = tcp->u_arg[1] >> 16;
+       if (!entries || !tcp->u_arg[2]) {
+               tprints("{}");
+               return 0;
+       }
+       cur = tcp->u_arg[2];
+       end = cur + (sizeof(int) * entries);
+       if (!verbose(tcp) || end < (unsigned long) tcp->u_arg[2]) {
+               printaddr(tcp->u_arg[2]);
+               return 0;
+       }
+       if (abbrev(tcp)) {
+               abbrev_end = cur + (sizeof(int) * max_strlen);
+               if (abbrev_end > end)
+                       abbrev_end = end;
+       }
+       else
+               abbrev_end = end;
+       tprints("{");
+       for (; cur < end; cur += sizeof(int)) {
+               if (cur > (unsigned long) tcp->u_arg[2])
+                       tprints(", ");
+               if (cur >= abbrev_end) {
+                       tprints("...");
+                       break;
                }
-               if (abbrev(tcp)) {
-                       abbrev_end = cur + (sizeof(int) * max_strlen);
-                       if (abbrev_end > end)
-                               abbrev_end = end;
+               if (umove(tcp, cur, &entry) < 0) {
+                       tprintf("??? [%#lx]", cur);
+                       break;
                }
                else
-                       abbrev_end = end;
-               tprints("{");
-               for (; cur < end; cur += sizeof(int)) {
-                       if (cur > tcp->u_arg[2])
-                               tprints(", ");
-                       if (cur >= abbrev_end) {
-                               tprints("...");
-                               break;
-                       }
-                       if (umove(tcp, cur, &entry) < 0) {
-                               tprintf("??? [%#lx]", cur);
-                               break;
-                       }
-                       else
-                               tprintf("%#08x", entry);
-               }
-               tprints("}");
+                       tprintf("%#08x", entry);
        }
+       tprints("}");
 
-       return 0;
+       return RVAL_DECODED;
 }
 #endif