]> 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 08a5f926e06c8cee8e63e8cc5e843e88c129bab6..37c7daba88dfc3b7ef322a25bc6d3e5291bcc4bd 100644 (file)
--- a/mem.c
+++ b/mem.c
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *     $Id$
  */
 
 #include "defs.h"
-
-#ifdef LINUX
 #include <asm/mman.h>
-#endif
 #include <sys/mman.h>
 
-#if defined(LINUX) && defined(I386)
-#include <asm/ldt.h>
-# ifdef HAVE_STRUCT_USER_DESC
-#  define modify_ldt_ldt_s user_desc
-# endif
-#endif
-#if defined(LINUX) && defined(SH64)
-#include <asm/page.h>      /* for PAGE_SHIFT */
-#endif
-
-#ifdef HAVE_LONG_LONG_OFF_T
-/*
- * Ugly hacks for systems that have a long long off_t
- */
-#define sys_mmap64     sys_mmap
-#endif
-
-int
-sys_brk(tcp)
-struct tcb *tcp;
+unsigned long
+get_pagesize(void)
 {
-       if (entering(tcp)) {
-               tprintf("%#lx", tcp->u_arg[0]);
-       }
-#ifdef LINUX
-       return RVAL_HEX;
-#else
-       return 0;
-#endif
+       static unsigned long pagesize;
+
+       if (!pagesize)
+               pagesize = sysconf(_SC_PAGESIZE);
+       return pagesize;
 }
 
-int
-sys_sbrk(tcp)
-struct tcb *tcp;
+SYS_FUNC(brk)
 {
-       if (entering(tcp)) {
-               tprintf("%lu", tcp->u_arg[0]);
-       }
-       return RVAL_HEX;
+       printaddr(tcp->u_arg[0]);
+
+       return RVAL_DECODED | RVAL_HEX;
 }
 
-static const struct xlat mmap_prot[] = {
-       { PROT_NONE,    "PROT_NONE",    },
-       { PROT_READ,    "PROT_READ"     },
-       { PROT_WRITE,   "PROT_WRITE"    },
-       { PROT_EXEC,    "PROT_EXEC"     },
-#ifdef PROT_SEM
-       { PROT_SEM,     "PROT_SEM"      },
-#endif
-#ifdef PROT_GROWSDOWN
-       { PROT_GROWSDOWN,"PROT_GROWSDOWN"},
-#endif
-#ifdef PROT_GROWSUP
-       { PROT_GROWSUP, "PROT_GROWSUP"  },
-#endif
-       { 0,            NULL            },
-};
-
-static const struct xlat mmap_flags[] = {
-       { MAP_SHARED,   "MAP_SHARED"    },
-       { MAP_PRIVATE,  "MAP_PRIVATE"   },
-       { MAP_FIXED,    "MAP_FIXED"     },
-#ifdef MAP_ANONYMOUS
-       { MAP_ANONYMOUS,"MAP_ANONYMOUS" },
-#endif
-#ifdef MAP_RENAME
-       { MAP_RENAME,   "MAP_RENAME"    },
-#endif
-#ifdef MAP_NORESERVE
-       { MAP_NORESERVE,"MAP_NORESERVE" },
-#endif
-#ifdef MAP_POPULATE
-       { MAP_POPULATE, "MAP_POPULATE" },
-#endif
-#ifdef MAP_NONBLOCK
-       { MAP_NONBLOCK, "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
-       { _MAP_NEW,     "_MAP_NEW"      },
-#endif
-#ifdef MAP_GROWSDOWN
-       { MAP_GROWSDOWN,"MAP_GROWSDOWN" },
-#endif
-#ifdef MAP_DENYWRITE
-       { MAP_DENYWRITE,"MAP_DENYWRITE" },
-#endif
-#ifdef MAP_EXECUTABLE
-       { MAP_EXECUTABLE,"MAP_EXECUTABLE"},
-#endif
-#ifdef MAP_INHERIT
-       { MAP_INHERIT,"MAP_INHERIT"     },
-#endif
-#ifdef MAP_FILE
-       { MAP_FILE,"MAP_FILE"},
-#endif
-#ifdef MAP_LOCKED
-       { MAP_LOCKED,"MAP_LOCKED"},
-#endif
-       /* FreeBSD ones */
-#ifdef MAP_ANON
-       { MAP_ANON,             "MAP_ANON"      },
-#endif
-#ifdef MAP_HASSEMAPHORE
-       { MAP_HASSEMAPHORE,     "MAP_HASSEMAPHORE"      },
-#endif
-#ifdef MAP_STACK
-       { MAP_STACK,            "MAP_STACK"     },
-#endif
-#ifdef MAP_NOSYNC
-       { MAP_NOSYNC,           "MAP_NOSYNC"    },
-#endif
-#ifdef MAP_NOCORE
-       { MAP_NOCORE,           "MAP_NOCORE"    },
-#endif
-       { 0,            NULL            },
-};
-
-#if !HAVE_LONG_LONG_OFF_T
-static
-int
-print_mmap(tcp,u_arg)
-struct tcb *tcp;
-long *u_arg;
+#include "xlat/mmap_prot.h"
+#include "xlat/mmap_flags.h"
+
+static void
+print_mmap(struct tcb *tcp, long *u_arg, unsigned long long offset)
 {
-       if (entering(tcp)) {
-               /* addr */
-               if (!u_arg[0])
-                       tprintf("NULL, ");
-               else
-                       tprintf("%#lx, ", u_arg[0]);
-               /* len */
-               tprintf("%lu, ", u_arg[1]);
-               /* prot */
-               printflags(mmap_prot, u_arg[2], "PROT_???");
-               tprintf(", ");
-               /* 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
-               /* fd (is always int, not long) */
-               tprintf(", %d, ", (int)u_arg[4]);
-               /* offset */
-               tprintf("%#lx", u_arg[5]);
-       }
-       return RVAL_HEX;
+       tprints(", ");
+       /* fd */
+       printfd(tcp, u_arg[4]);
+       /* offset */
+       tprintf(", %#llx", offset);
 }
 
-#ifdef LINUX
-int sys_old_mmap(tcp)
-struct tcb *tcp;
+/* Syscall name<->function correspondence is messed up on many arches.
+ * For example:
+ * i386 has __NR_mmap == 90, and it is "old mmap", and
+ * also it has __NR_mmap2 == 192, which is a "new mmap with page offsets".
+ * But x86_64 has just one __NR_mmap == 9, a "new mmap with byte offsets".
+ * Confused? Me too!
+ */
+
+/* Params are pointed to by u_arg[0], offset is in bytes */
+SYS_FUNC(old_mmap)
 {
-    long u_arg[6];
-
-#if    defined(IA64)
-    int i, v;
-    /*
-     *  IA64 processes never call this routine, they only use the
-     *  new `sys_mmap' interface.  This code converts the integer
-     *  arguments that the IA32 process pushed onto the stack into
-     *  longs.
-     *
-     *  Note that addresses with bit 31 set will be sign extended.
-     *  Fortunately, those addresses are not currently being generated
-     *  for IA32 processes so it's not a problem.
-     */
-    for (i = 0; i < 6; i++)
-       if (umove(tcp, tcp->u_arg[0] + (i * sizeof(int)), &v) == -1)
+       long u_arg[6];
+#if defined(IA64)
+       /*
+        * IA64 processes never call this routine, they only use the
+        * new 'sys_mmap' interface. Only IA32 processes come here.
+        */
+       int i;
+       unsigned narrow_arg[6];
+       if (umoven(tcp, tcp->u_arg[0], sizeof(narrow_arg), narrow_arg) == -1)
                return 0;
-       else
-               u_arg[i] = v;
-#elif defined(SH) || defined(SH64)
-    /* SH has always passed the args in registers */
-    int i;
-    for (i=0; i<6; i++)
-        u_arg[i] = tcp->u_arg[i];
+       for (i = 0; i < 6; i++)
+               u_arg[i] = (unsigned long) narrow_arg[i];
+#elif defined(X86_64)
+       /* We are here only in personality 1 (i386) */
+       int i;
+       unsigned narrow_arg[6];
+       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)
-           return 0;
-#endif // defined(IA64)
-    return print_mmap(tcp, u_arg);
-
-}
+       if (umoven(tcp, tcp->u_arg[0], sizeof(u_arg), u_arg) == -1)
+               return 0;
 #endif
+       print_mmap(tcp, u_arg, (unsigned long) u_arg[5]);
 
-int
-sys_mmap(tcp)
-struct tcb *tcp;
-{
-#if defined(LINUX) && defined(SH64)
-    /*
-     * Old mmap differs from new mmap in specifying the
-     * offset in units of bytes rather than pages.  We
-     * pretend it's in byte units so the user only ever
-     * sees bytes in the printout.
-     */
-    tcp->u_arg[5] <<= PAGE_SHIFT;
-#endif
-    return print_mmap(tcp, tcp->u_arg);
+       return RVAL_DECODED | RVAL_HEX;
 }
-#endif /* !HAVE_LONG_LONG_OFF_T */
 
-#if _LFS64_LARGEFILE || HAVE_LONG_LONG_OFF_T
-int
-sys_mmap64(tcp)
-struct tcb *tcp;
+#if defined(S390)
+/* Params are pointed to by u_arg[0], offset is in pages */
+SYS_FUNC(old_mmap_pgoff)
 {
-#ifdef linux
-#ifdef ALPHA
-       long *u_arg = tcp->u_arg;
-#else /* !ALPHA */
-       long u_arg[7];
-#endif /* !ALPHA */
-#else /* !linux */
-       long *u_arg = tcp->u_arg;
-#endif /* !linux */
+       long u_arg[5];
+       int i;
+       unsigned narrow_arg[6];
+       unsigned long long offset;
+       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();
+       print_mmap(tcp, u_arg, offset);
 
-       if (entering(tcp)) {
-#ifdef linux
-#ifndef ALPHA
-               if (umoven(tcp, tcp->u_arg[0], sizeof u_arg,
-                               (char *) u_arg) == -1)
-                       return 0;
-#endif /* ALPHA */
-#endif /* linux */
-               ALIGN64 (tcp, 5);       /* FreeBSD wierdies */
-
-               /* addr */
-               tprintf("%#lx, ", u_arg[0]);
-               /* len */
-               tprintf("%lu, ", u_arg[1]);
-               /* prot */
-               printflags(mmap_prot, u_arg[2], "PROT_???");
-               tprintf(", ");
-               /* flags */
-#ifdef 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_???");
-#endif
-               /* fd */
-               tprintf(", %ld, ", u_arg[4]);
-               /* offset */
-               tprintf("%#llx", LONG_LONG(u_arg[5], u_arg[6]));
-       }
-       return RVAL_HEX;
+       return RVAL_DECODED | RVAL_HEX;
 }
 #endif
 
-
-int
-sys_munmap(tcp)
-struct tcb *tcp;
+/* Params are passed directly, offset is in bytes */
+SYS_FUNC(mmap)
 {
-       if (entering(tcp)) {
-               tprintf("%#lx, %lu",
-                       tcp->u_arg[0], tcp->u_arg[1]);
-       }
-       return 0;
-}
+       unsigned long long offset = (unsigned long) tcp->u_arg[5];
+#if defined(LINUX_MIPSN32) || defined(X32)
+       /* Try test/x32_mmap.c */
+       offset = tcp->ext_arg[5];
+#endif
+       /* Example of kernel-side handling of this variety of mmap:
+        * arch/x86/kernel/sys_x86_64.c::SYSCALL_DEFINE6(mmap, ...) calls
+        * sys_mmap_pgoff(..., off >> PAGE_SHIFT); i.e. off is in bytes,
+        * since the above code converts off to pages.
+        */
+       print_mmap(tcp, tcp->u_arg, offset);
 
-int
-sys_mprotect(tcp)
-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_???");
-       }
-       return 0;
+       return RVAL_DECODED | RVAL_HEX;
 }
 
-#ifdef LINUX
+/* Params are passed directly, offset is in pages */
+SYS_FUNC(mmap_pgoff)
+{
+       /* Try test/mmap_offset_decode.c */
+       unsigned long long offset;
+       offset = (unsigned long) tcp->u_arg[5];
+       offset *= get_pagesize();
+       print_mmap(tcp, tcp->u_arg, offset);
 
-static const struct xlat mremap_flags[] = {
-       { MREMAP_MAYMOVE,       "MREMAP_MAYMOVE"        },
-       { 0,                    NULL                    }
-};
+       return RVAL_DECODED | RVAL_HEX;
+}
 
-int
-sys_mremap(tcp)
-struct tcb *tcp;
+/* Params are passed directly, offset is in 4k units */
+SYS_FUNC(mmap_4koff)
 {
-       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_???");
-       }
-       return RVAL_HEX;
+       unsigned long long offset;
+       offset = (unsigned long) tcp->u_arg[5];
+       offset <<= 12;
+       print_mmap(tcp, tcp->u_arg, offset);
+
+       return RVAL_DECODED | RVAL_HEX;
 }
 
-static const struct xlat madvise_flags[] = {
-#ifdef MADV_NORMAL
-       { MADV_NORMAL,          "MADV_NORMAL" },
-#endif
-#ifdef MADZV_RANDOM
-       { MADV_RANDOM,          "MADV_RANDOM" },
-#endif
-#ifdef MADV_SEQUENTIAL
-       { MADV_SEQUENTIAL,      "MADV_SEQUENTIAL" },
-#endif
-#ifdef MADV_WILLNEED
-       { MADV_WILLNEED,        "MADV_WILLNEED" },
-#endif
-#ifdef MADV_DONTNED
-       { MADV_DONTNEED,        "MADV_DONTNEED" },
-#endif
-       { 0,                    NULL },
-};
+SYS_FUNC(munmap)
+{
+       printaddr(tcp->u_arg[0]);
+       tprintf(", %lu", tcp->u_arg[1]);
 
+       return RVAL_DECODED;
+}
 
-int
-sys_madvise(tcp)
-struct tcb *tcp;
+SYS_FUNC(mprotect)
 {
-       if (entering(tcp)) {
-               tprintf("%#lx, %lu, ", tcp->u_arg[0], tcp->u_arg[1]);
-               printflags(madvise_flags, tcp->u_arg[2], "MADV_???");
-       }
-       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 mlockall_flags[] = {
-#ifdef MCL_CURRENT
-       { MCL_CURRENT,  "MCL_CURRENT" },
-#endif
-#ifdef MCL_FUTURE
-       { MCL_FUTURE,   "MCL_FUTURE" },
-#endif
-       { 0,            NULL}
-};
+#include "xlat/mremap_flags.h"
 
-int
-sys_mlockall(tcp)
-struct tcb *tcp;
+SYS_FUNC(mremap)
 {
-       if (entering(tcp)) {
-               printflags(mlockall_flags, tcp->u_arg[0], "MCL_???");
+       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)) {
+               tprints(", ");
+               printaddr(tcp->u_arg[4]);
        }
-       return 0;
+#endif
+       return RVAL_DECODED | RVAL_HEX;
 }
 
+#include "xlat/madvise_cmds.h"
 
-#endif /* LINUX */
-
-#ifdef MS_ASYNC
-
-static const struct xlat mctl_sync[] = {
-#ifdef MS_SYNC
-       { MS_SYNC,      "MS_SYNC"       },
-#endif
-       { MS_ASYNC,     "MS_ASYNC"      },
-       { MS_INVALIDATE,"MS_INVALIDATE" },
-       { 0,            NULL            },
-};
-
-int
-sys_msync(tcp)
-struct tcb *tcp;
+SYS_FUNC(madvise)
 {
-       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;
+       printaddr(tcp->u_arg[0]);
+       tprintf(", %lu, ", tcp->u_arg[1]);
+       printxval(madvise_cmds, tcp->u_arg[2], "MADV_???");
+
+       return RVAL_DECODED;
 }
 
-#endif /* MS_ASYNC */
+#include "xlat/mlockall_flags.h"
 
-#ifdef MC_SYNC
+SYS_FUNC(mlockall)
+{
+       printflags(mlockall_flags, tcp->u_arg[0], "MCL_???");
 
-static const struct xlat mctl_funcs[] = {
-       { MC_LOCK,      "MC_LOCK"       },
-       { MC_LOCKAS,    "MC_LOCKAS"     },
-       { MC_SYNC,      "MC_SYNC"       },
-       { MC_UNLOCK,    "MC_UNLOCK"     },
-       { MC_UNLOCKAS,  "MC_UNLOCKAS"   },
-       { 0,            NULL            },
-};
+       return RVAL_DECODED;
+}
 
-static const struct xlat mctl_lockas[] = {
-       { MCL_CURRENT,  "MCL_CURRENT"   },
-       { MCL_FUTURE,   "MCL_FUTURE"    },
-       { 0,            NULL            },
-};
+#include "xlat/mctl_sync.h"
 
-int
-sys_mctl(tcp)
-struct tcb *tcp;
+SYS_FUNC(msync)
 {
-       int arg, function;
-
-       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];
-               tprintf(", ");
-               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;
+       /* 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 /* MC_SYNC */
+#include "xlat/mlock_flags.h"
 
-int
-sys_mincore(tcp)
-struct tcb *tcp;
+SYS_FUNC(mlock2)
 {
-       unsigned long i, len;
-       char *vec = NULL;
+       printaddr(tcp->u_arg[0]);
+       tprintf(", %lu, ", tcp->u_arg[1]);
+       printflags(mlock_flags, tcp->u_arg[2], "MLOCK_???");
+
+       return RVAL_DECODED;
+}
 
+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 {
-                       tprintf("[");
+                       tprints("[");
                        for (i = 0; i < len; i++) {
                                if (abbrev(tcp) && i >= max_strlen) {
-                                       tprintf("...");
+                                       tprints("...");
                                        break;
                                }
-                               tprintf((vec[i] & 1) ? "1" : "0");
-                       }
-                       tprintf("]");
-               }
-               if (vec)
-                       free(vec);
-       }
-       return 0;
-}
-
-int
-sys_getpagesize(tcp)
-struct tcb *tcp;
-{
-       if (exiting(tcp))
-               return RVAL_HEX;
-       return 0;
-}
-
-#if defined(LINUX) && defined(__i386__)
-void
-print_ldt_entry (ldt_entry)
-struct modify_ldt_ldt_s *ldt_entry;
-{
-       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}",
-               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(tcp)
-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))
-                               tprintf("...}");
-                       else {
-                               print_ldt_entry(&copy);
-                       }
-               }
-               tprintf(", %lu", tcp->u_arg[2]);
-       }
-       return 0;
-}
-
-int
-sys_set_thread_area(tcp)
-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
-                               tprintf("{entry_number:");
-               }
-       } else {
-               if (umove(tcp, tcp->u_arg[0], &copy) != -1) {
-                       tprintf("%d, ", copy.entry_number);
-                       if (!verbose(tcp))
-                               tprintf("...}");
-                       else {
-                               print_ldt_entry(&copy);
+                               tprints((vec[i] & 1) ? "1" : "0");
                        }
-               } else {
-                       tprintf("%lx", tcp->u_arg[0]);
+                       tprints("]");
                }
+               free(vec);
        }
        return 0;
-
 }
 
-int
-sys_get_thread_area(tcp)
-struct tcb *tcp;
+#if defined ALPHA || defined IA64 || defined M68K \
+ || defined SPARC || defined SPARC64
+SYS_FUNC(getpagesize)
 {
-       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))
-                               tprintf("...}");
-                       else {
-                               print_ldt_entry(&copy);
-                       }
-               } else {
-                       tprintf("%lx", tcp->u_arg[0]);
-               }
-       }
-       return 0;
-
+       return RVAL_DECODED | RVAL_HEX;
 }
-#endif /* LINUX && __i386__ */
+#endif
 
-#if defined(LINUX)
-int
-sys_remap_file_pages(tcp)
-struct tcb *tcp;
+SYS_FUNC(remap_file_pages)
 {
-       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
 #define MPOL_PREFERRED  1
@@ -663,99 +321,220 @@ struct tcb *tcp;
 #define MPOL_F_ADDR     (1<<1)
 
 #define MPOL_MF_STRICT  (1<<0)
+#define MPOL_MF_MOVE   (1<<1)
+#define MPOL_MF_MOVE_ALL (1<<2)
 
-
-static const struct xlat policies[] = {
-       { MPOL_DEFAULT,         "MPOL_DEFAULT"          },
-       { MPOL_PREFERRED,       "MPOL_PREFERRED"        },
-       { MPOL_BIND,            "MPOL_BIND"             },
-       { MPOL_INTERLEAVE,      "MPOL_INTERLEAVE"       },
-       { 0,                    NULL                    }
-};
-
-static const struct xlat mbindflags[] = {
-       { MPOL_MF_STRICT,       "MPOL_MF_STRICT"        },
-       { 0,                    NULL                    }
-};
-
-static const struct xlat mempolicyflags[] = {
-       { MPOL_F_NODE,          "MPOL_F_NODE"           },
-       { MPOL_F_ADDR,          "MPOL_F_ADDR"           },
-       { 0,                    NULL                    }
-};
-
+#include "xlat/policies.h"
+#include "xlat/mbindflags.h"
+#include "xlat/mempolicyflags.h"
+#include "xlat/move_pages_flags.h"
 
 static void
-get_nodes(tcp, ptr, maxnodes, err)
-struct tcb *tcp;
-unsigned long ptr;
-unsigned long maxnodes;
-int err;
+get_nodes(struct tcb *tcp, unsigned long ptr, unsigned long maxnodes, int err)
 {
-       int nlongs = (maxnodes + 8 * sizeof(long) - 1) / (8 * sizeof(long));
-       if (err || !abbrev(tcp) || nlongs > getpagesize() / sizeof(long)
-           || nlongs == 0) {
-               long buf[nlongs];
-               if (umoven(tcp, ptr, nlongs * sizeof(long),
-                          (char *) buf) < 0)
-                       tprintf(", %lx", ptr);
-               else {
-                       int i;
-                       tprintf(", {");
-                       for (i = 0; i < nlongs; ++i) {
-                               if (i > 0)
-                                       tprintf(", ");
-                               tprintf("%#0*lx", (int) sizeof(long) * 2 + 2,
-                                       buf[i]);
+       unsigned long nlongs, size, end;
+
+       nlongs = (maxnodes + 8 * sizeof(long) - 1) / (8 * sizeof(long));
+       size = nlongs * sizeof(long);
+       end = ptr + size;
+       if (nlongs == 0 || ((err || verbose(tcp)) && (size * 8 == maxnodes)
+                           && (end > ptr))) {
+               unsigned long n, cur, abbrev_end;
+               int failed = 0;
+
+               if (abbrev(tcp)) {
+                       abbrev_end = ptr + max_strlen * sizeof(long);
+                       if (abbrev_end < ptr)
+                               abbrev_end = end;
+               } else {
+                       abbrev_end = end;
+               }
+               tprints(", {");
+               for (cur = ptr; cur < end; cur += sizeof(long)) {
+                       if (cur > ptr)
+                               tprints(", ");
+                       if (cur >= abbrev_end) {
+                               tprints("...");
+                               break;
+                       }
+                       if (umoven(tcp, cur, sizeof(n), &n) < 0) {
+                               tprints("?");
+                               failed = 1;
+                               break;
                        }
-                       tprintf("}");
+                       tprintf("%#0*lx", (int) sizeof(long) * 2 + 2, n);
                }
-       } else
-               tprintf(", %lx", ptr);
+               tprints("}");
+               if (failed) {
+                       tprints(" ");
+                       printaddr(ptr);
+               }
+       } else {
+               tprints(" ");
+               printaddr(ptr);
+       }
        tprintf(", %lu", maxnodes);
 }
 
-int
-sys_mbind(tcp)
-struct tcb *tcp;
+SYS_FUNC(mbind)
 {
-       if (entering(tcp)) {
-               tprintf("%lu, %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);
-               tprintf(", ");
-               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(tcp)
-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(tcp)
-struct tcb *tcp;
+SYS_FUNC(get_mempolicy)
 {
        if (exiting(tcp)) {
                int pol;
-               if (tcp->u_arg[0] == 0)
-                       tprintf("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;
 }
+
+SYS_FUNC(migrate_pages)
+{
+       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;
+}
+
+SYS_FUNC(move_pages)
+{
+       if (entering(tcp)) {
+               unsigned long npages = tcp->u_arg[1];
+               tprintf("%ld, %lu, ", tcp->u_arg[0], npages);
+               if (tcp->u_arg[2] == 0)
+                       tprints("NULL, ");
+               else {
+                       unsigned int i;
+                       long puser = tcp->u_arg[2];
+                       tprints("{");
+                       for (i = 0; i < npages; ++i) {
+                               void *p;
+                               if (i > 0)
+                                       tprints(", ");
+                               if (umove(tcp, puser, &p) < 0) {
+                                       tprints("???");
+                                       break;
+                               }
+                               tprintf("%p", p);
+                               puser += sizeof(void *);
+                       }
+                       tprints("}, ");
+               }
+               if (tcp->u_arg[3] == 0)
+                       tprints("NULL, ");
+               else {
+                       unsigned int i;
+                       long nodeuser = tcp->u_arg[3];
+                       tprints("{");
+                       for (i = 0; i < npages; ++i) {
+                               int node;
+                               if (i > 0)
+                                       tprints(", ");
+                               if (umove(tcp, nodeuser, &node) < 0) {
+                                       tprints("???");
+                                       break;
+                               }
+                               tprintf("%#x", node);
+                               nodeuser += sizeof(int);
+                       }
+                       tprints("}, ");
+               }
+       } else {
+               unsigned long npages = tcp->u_arg[1];
+               if (tcp->u_arg[4] == 0)
+                       tprints("NULL, ");
+               else {
+                       unsigned int i;
+                       long statususer = tcp->u_arg[4];
+                       tprints("{");
+                       for (i = 0; i < npages; ++i) {
+                               int status;
+                               if (i > 0)
+                                       tprints(", ");
+                               if (umove(tcp, statususer, &status) < 0) {
+                                       tprints("???");
+                                       break;
+                               }
+                               tprintf("%#x", status);
+                               statususer += sizeof(int);
+                       }
+                       tprints("}, ");
+               }
+               printflags(move_pages_flags, tcp->u_arg[5], "MPOL_???");
+       }
+       return 0;
+}
+
+#if defined(POWERPC)
+SYS_FUNC(subpage_prot)
+{
+       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 (umove(tcp, cur, &entry) < 0) {
+                       tprintf("??? [%#lx]", cur);
+                       break;
+               }
+               else
+                       tprintf("%#08x", entry);
+       }
+       tprints("}");
+
+       return RVAL_DECODED;
+}
 #endif